diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 190b5038c3f8fac135d53ec38e75a2b6b1ffb812..0000000000000000000000000000000000000000
--- a/.babelrc
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "presets": [
-    "react",
-    [
-      "env",
-      {
-        "exclude": ["transform-async-to-generator", "transform-regenerator"],
-        "loose": true,
-        "modules": false,
-        "targets": {
-          "browsers": ["last 2 versions", "IE >= 11", "iOS >= 9"]
-        }
-      }
-    ]
-  ],
-  "plugins": [
-    "syntax-dynamic-import",
-    ["transform-object-rest-spread", { "useBuiltIns": true }],
-    "transform-decorators-legacy",
-    "transform-class-properties",
-    [
-      "react-intl",
-      {
-        "messagesDir": "./build/messages"
-      }
-    ],
-    "preval"
-  ],
-  "env": {
-    "development": {
-      "plugins": [
-        "transform-react-jsx-source",
-        "transform-react-jsx-self"
-      ]
-    },
-    "production": {
-      "plugins": [
-        "lodash",
-        [
-          "transform-react-remove-prop-types",
-          {
-            "mode": "remove",
-            "removeImport": true,
-            "additionalLibraries": [
-              "react-immutable-proptypes"
-            ]
-          }
-        ],
-        "transform-react-inline-elements",
-        [
-          "transform-runtime",
-          {
-            "helpers": true,
-            "polyfill": false,
-            "regenerator": false
-          }
-        ]
-      ]
-    },
-    "test": {
-      "plugins": [
-        "transform-es2015-modules-commonjs"
-      ]
-    }
-  }
-}
diff --git a/.buildpacks b/.buildpacks
index c232c712f75139ebfad1686ae162c23f4213f0a1..3450683ce84ce6592d034ed2b4d7f7c29259c657 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,3 +1,4 @@
 https://github.com/heroku/heroku-buildpack-apt
+https://github.com/Scalingo/ffmpeg-buildpack
 https://github.com/Scalingo/nodejs-buildpack
 https://github.com/Scalingo/ruby-buildpack
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a1c842536d0770708e74eac03217b07ac29bb06..e8bfde2994629f53eb8e038586ed38e6247f7217 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 aliases:
   - &defaults
     docker:
-      - image: circleci/ruby:2.5.1-stretch-node
+      - image: circleci/ruby:2.6.0-stretch-node
         environment: &ruby_environment
           BUNDLE_APP_CONFIG: ./.bundle/
           DB_HOST: localhost
@@ -13,6 +13,9 @@ aliases:
           ALLOW_NOPAM: true
           CONTINUOUS_INTEGRATION: true
           DISABLE_SIMPLECOV: true
+          PAM_ENABLED: true
+          PAM_DEFAULT_SERVICE: pam_test
+          PAM_CONTROLLED_SERVICE: pam_test_controlled
     working_directory: ~/projects/mastodon/
 
   - &attach_workspace
@@ -64,12 +67,17 @@ aliases:
 
         - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
         - *restore_ruby_dependencies
-        - run: bundle install --clean --jobs 16 --path ./vendor/bundle/ --retry 3 --with pam_authentication --without development production
+        - run: bundle install --clean --jobs 16 --path ./vendor/bundle/ --retry 3 --with pam_authentication --without development production && bundle clean
         - save_cache:
             key: v2-ruby-dependencies-{{ checksum "/tmp/.ruby-version" }}-{{ checksum "Gemfile.lock" }}
             paths:
               - ./.bundle/
               - ./vendor/bundle/
+        - persist_to_workspace:
+            root: ~/projects/
+            paths:
+                - ./mastodon/.bundle/
+                - ./mastodon/vendor/bundle/
 
   - &test_steps
       steps:
@@ -78,15 +86,6 @@ aliases:
         - *install_system_dependencies
         - run: sudo apt-get install -y ffmpeg
 
-        - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
-        - *restore_ruby_dependencies
-
-        - restore_cache:
-            keys:
-              - precompiled-assets-{{ .Branch }}-{{ .Revision }}
-              - precompiled-assets-{{ .Branch }}-
-              - precompiled-assets-
-
         - run:
             name: Prepare Tests
             command: ./bin/rails parallel:create parallel:load_schema parallel:prepare
@@ -99,21 +98,21 @@ jobs:
     <<: *defaults
     <<: *install_steps
 
-  install-ruby2.5:
+  install-ruby2.6:
     <<: *defaults
     <<: *install_ruby_dependencies
 
-  install-ruby2.4:
+  install-ruby2.5:
     <<: *defaults
     docker:
-      - image: circleci/ruby:2.4.4-stretch-node
+      - image: circleci/ruby:2.5.3-stretch-node
         environment: *ruby_environment
     <<: *install_ruby_dependencies
 
-  install-ruby2.3:
+  install-ruby2.4:
     <<: *defaults
     docker:
-      - image: circleci/ruby:2.3.7-stretch-node
+      - image: circleci/ruby:2.4.5-stretch-node
         environment: *ruby_environment
     <<: *install_ruby_dependencies
 
@@ -122,52 +121,50 @@ jobs:
     steps:
       - *attach_workspace
       - *install_system_dependencies
-      - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
-      - *restore_ruby_dependencies
       - run: ./bin/rails assets:precompile
-      - save_cache:
-          key: precompiled-assets-{{ .Branch }}-{{ .Revision }}
+      - persist_to_workspace:
+          root: ~/projects/
           paths:
-            - ./public/assets
-            - ./public/packs-test/
+              - ./mastodon/public/assets
+              - ./mastodon/public/packs-test/
 
-  test-ruby2.5:
+  test-ruby2.6:
     <<: *defaults
     docker:
-      - image: circleci/ruby:2.5.1-stretch-node
+      - image: circleci/ruby:2.6.0-stretch-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.3-alpine
+      - image: circleci/postgres:10.6-alpine
         environment:
           POSTGRES_USER: root
-      - image: circleci/redis:4.0.9-alpine
+      - image: circleci/redis:5.0.3-alpine3.8
     <<: *test_steps
 
-  test-ruby2.4:
+  test-ruby2.5:
     <<: *defaults
     docker:
-      - image: circleci/ruby:2.4.4-stretch-node
+      - image: circleci/ruby:2.5.3-stretch-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.3-alpine
+      - image: circleci/postgres:10.6-alpine
         environment:
           POSTGRES_USER: root
-      - image: circleci/redis:4.0.9-alpine
+      - image: circleci/redis:4.0.12-alpine
     <<: *test_steps
 
-  test-ruby2.3:
+  test-ruby2.4:
     <<: *defaults
     docker:
-      - image: circleci/ruby:2.3.7-stretch-node
+      - image: circleci/ruby:2.4.5-stretch-node
         environment: *ruby_environment
-      - image: circleci/postgres:10.3-alpine
+      - image: circleci/postgres:10.6-alpine
         environment:
           POSTGRES_USER: root
-      - image: circleci/redis:4.0.9-alpine
+      - image: circleci/redis:4.0.12-alpine
     <<: *test_steps
 
   test-webui:
     <<: *defaults
     docker:
-      - image: circleci/node:8.11.1-stretch
+      - image: circleci/node:8.15.0-stretch
     steps:
       - *attach_workspace
       - run: ./bin/retry yarn test:jest
@@ -176,28 +173,34 @@ jobs:
     <<: *defaults
     steps:
       - *attach_workspace
-      - run: ruby -e 'puts RUBY_VERSION' | tee /tmp/.ruby-version
-      - *restore_ruby_dependencies
       - run: bundle exec i18n-tasks check-normalized
       - run: bundle exec i18n-tasks unused
+      - run: bundle exec i18n-tasks missing -t plural
+      - run: bundle exec i18n-tasks check-consistent-interpolations
 
 workflows:
   version: 2
   build-and-test:
     jobs:
       - install
-      - install-ruby2.5:
+      - install-ruby2.6:
           requires:
             - install
-      - install-ruby2.4:
+      - install-ruby2.5:
           requires:
             - install
-      - install-ruby2.3:
+            - install-ruby2.6
+      - install-ruby2.4:
           requires:
             - install
+            - install-ruby2.6
       - build:
           requires:
-            - install-ruby2.5
+            - install-ruby2.6
+      - test-ruby2.6:
+          requires:
+            - install-ruby2.6
+            - build
       - test-ruby2.5:
           requires:
             - install-ruby2.5
@@ -206,13 +209,9 @@ workflows:
           requires:
             - install-ruby2.4
             - build
-      - test-ruby2.3:
-          requires:
-            - install-ruby2.3
-            - build
       - test-webui:
           requires:
             - install
       - check-i18n:
           requires:
-            - install-ruby2.5
+            - install-ruby2.6
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 58f6b3de4d90dc5d21cfad8e3b688e98d567be2b..a704597649c32e233953cd0e9851c64fbff15256 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -27,7 +27,7 @@ plugins:
     enabled: true
   eslint:
     enabled: true
-    channel: eslint-4
+    channel: eslint-5
   rubocop:
     enabled: true
     channel: rubocop-0-54
diff --git a/.env.nanobox b/.env.nanobox
index 8e0af6a8a8a136f7b2350b38a1ac722dfc372cce..b60b6ee689729902d408338e32b20224ad933a0b 100644
--- a/.env.nanobox
+++ b/.env.nanobox
@@ -136,8 +136,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
 # Defaults to 60 seconds. Set to 0 to disable
 # SWIFT_CACHE_TTL=
 
-# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
-# S3_CLOUDFRONT_HOST=
+# 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=
diff --git a/.env.production.sample b/.env.production.sample
index ebb0788781d59a7dc0705cbdf298359eee60e282..d1164efdc0cce0882d2ec0cf594c3e59921d065d 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -134,8 +134,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # Defaults to 60 seconds. Set to 0 to disable
 # SWIFT_CACHE_TTL=
 
-# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
-# S3_CLOUDFRONT_HOST=
+# 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=
@@ -162,6 +162,7 @@ STREAMING_CLUSTER_NUM=1
 # LDAP_BIND_DN=
 # LDAP_PASSWORD=
 # LDAP_UID=cn
+# LDAP_SEARCH_FILTER="%{uid}=%{email}"
 
 # PAM authentication (optional)
 # PAM authentication uses for the email generation the "email" pam variable
diff --git a/.env.test b/.env.test
index 726351c5e357c2fcf78bdb14a3073c3bfa038080..fa4e1d91fa81987eb63a841a2e130db0186666a7 100644
--- a/.env.test
+++ b/.env.test
@@ -3,7 +3,3 @@ NODE_ENV=test
 # Federation
 LOCAL_DOMAIN=cb6e6126.ngrok.io
 LOCAL_HTTPS=true
-# test pam authentication
-PAM_ENABLED=true
-PAM_DEFAULT_SERVICE=pam_test
-PAM_CONTROLLED_SERVICE=pam_test_controlled
diff --git a/.env.vagrant b/.env.vagrant
index 04b889d0070e4ad8e01c23a2ca6f977f5a65b341..f3b54f6e38646e2515fe7f964fef9055b8d3d834 100644
--- a/.env.vagrant
+++ b/.env.vagrant
@@ -1,2 +1,2 @@
 VAGRANT=true
-LOCAL_DOMAIN=mastodon.dev
\ No newline at end of file
+LOCAL_DOMAIN=mastodon.local
diff --git a/.eslintignore b/.eslintignore
index 6d540c41387223b03972cebb21c4f2e2020c4541..d4930e1f5280020eb83d26c3d83cbcc4a35d26f5 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,30 +1,13 @@
-# 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.
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log/*
-!/log/.keep
-/tmp
-coverage
-public/system
-public/assets
-.env
-.env.production
-node_modules/
-neo4j/
-
-# Ignore Vagrant files
-.vagrant/
-
-# Ignore Capistrano customizations
-config/deploy/*
+/build/**
+/coverage/**
+/db/**
+/lib/**
+/log/**
+/node_modules/**
+/nonobox/**
+/public/**
+!/public/embed.js
+/spec/**
+/tmp/**
+/vendor/**
+!.eslintrc.js
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000000000000000000000000000000000000..56e3d0530f5918e63b5e00729d777401c603a2bb
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,199 @@
+module.exports = {
+  root: true,
+
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+    jest: true,
+  },
+
+  globals: {
+    ATTACHMENT_HOST: false,
+  },
+
+  parser: 'babel-eslint',
+
+  plugins: [
+    'react',
+    'jsx-a11y',
+    'import',
+    'promise',
+  ],
+
+  parserOptions: {
+    sourceType: 'module',
+    ecmaFeatures: {
+      experimentalObjectRestSpread: true,
+      jsx: true,
+    },
+    ecmaVersion: 2018,
+  },
+
+  settings: {
+    react: {
+      version: 'detect',
+    },
+    'import/extensions': [
+      '.js',
+    ],
+    'import/ignore': [
+      'node_modules',
+      '\\.(css|scss|json)$',
+    ],
+  },
+
+  rules: {
+    'brace-style': 'warn',
+    'comma-dangle': ['error', 'always-multiline'],
+    'comma-spacing': [
+      'warn',
+      {
+        before: false,
+        after: true,
+      },
+    ],
+    'comma-style': ['warn', 'last'],
+    'consistent-return': 'error',
+    'dot-notation': 'error',
+    eqeqeq: 'error',
+    indent: ['warn', 2],
+    'jsx-quotes': ['error', 'prefer-single'],
+    'no-catch-shadow': 'error',
+    'no-cond-assign': 'error',
+    'no-console': [
+      'warn',
+      {
+        allow: [
+          'error',
+          'warn',
+        ],
+      },
+    ],
+    'no-fallthrough': 'error',
+    'no-irregular-whitespace': 'error',
+    'no-mixed-spaces-and-tabs': 'warn',
+    'no-nested-ternary': 'warn',
+    'no-trailing-spaces': 'warn',
+    'no-undef': 'error',
+    'no-unreachable': 'error',
+    'no-unused-expressions': 'error',
+    'no-unused-vars': [
+      'error',
+      {
+        vars: 'all',
+        args: 'after-used',
+        ignoreRestSiblings: true,
+      },
+    ],
+    'object-curly-spacing': ['error', 'always'],
+    'padded-blocks': [
+      'error',
+      {
+        classes: 'always',
+      },
+    ],
+    quotes: ['error', 'single'],
+    semi: 'error',
+    strict: 'off',
+    'valid-typeof': 'error',
+
+    'react/jsx-boolean-value': 'error',
+    'react/jsx-closing-bracket-location': ['error', 'line-aligned'],
+    'react/jsx-curly-spacing': 'error',
+    'react/jsx-equals-spacing': 'error',
+    'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'],
+    'react/jsx-indent': ['error', 2],
+    'react/jsx-no-bind': 'error',
+    'react/jsx-no-duplicate-props': 'error',
+    'react/jsx-no-undef': 'error',
+    'react/jsx-tag-spacing': 'error',
+    'react/jsx-uses-react': 'error',
+    'react/jsx-uses-vars': 'error',
+    'react/jsx-wrap-multilines': 'error',
+    'react/no-multi-comp': 'off',
+    'react/no-string-refs': 'error',
+    'react/prop-types': 'error',
+    'react/self-closing-comp': 'error',
+
+    'jsx-a11y/accessible-emoji': 'warn',
+    'jsx-a11y/alt-text': 'warn',
+    'jsx-a11y/anchor-has-content': 'warn',
+    'jsx-a11y/anchor-is-valid': [
+      'warn',
+      {
+        components: [
+          'Link',
+          'NavLink',
+        ],
+        specialLink: [
+          'to',
+        ],
+        aspect: [
+          'noHref',
+          'invalidHref',
+          'preferButton',
+        ],
+      },
+    ],
+    'jsx-a11y/aria-activedescendant-has-tabindex': 'warn',
+    'jsx-a11y/aria-props': 'warn',
+    'jsx-a11y/aria-proptypes': 'warn',
+    'jsx-a11y/aria-role': 'warn',
+    'jsx-a11y/aria-unsupported-elements': 'warn',
+    'jsx-a11y/heading-has-content': 'warn',
+    'jsx-a11y/html-has-lang': 'warn',
+    'jsx-a11y/iframe-has-title': 'warn',
+    'jsx-a11y/img-redundant-alt': 'warn',
+    'jsx-a11y/interactive-supports-focus': 'warn',
+    'jsx-a11y/label-has-for': 'off',
+    'jsx-a11y/mouse-events-have-key-events': 'warn',
+    'jsx-a11y/no-access-key': 'warn',
+    'jsx-a11y/no-distracting-elements': 'warn',
+    'jsx-a11y/no-noninteractive-element-interactions': [
+      'warn',
+      {
+        handlers: [
+          'onClick',
+        ],
+      },
+    ],
+    'jsx-a11y/no-onchange': 'warn',
+    'jsx-a11y/no-redundant-roles': 'warn',
+    'jsx-a11y/no-static-element-interactions': [
+      'warn',
+      {
+        handlers: [
+          'onClick',
+        ],
+      },
+    ],
+    'jsx-a11y/role-has-required-aria-props': 'warn',
+    'jsx-a11y/role-supports-aria-props': 'off',
+    'jsx-a11y/scope': 'warn',
+    'jsx-a11y/tabindex-no-positive': 'warn',
+
+    'import/extensions': [
+      'error',
+      'always',
+      {
+        js: 'never',
+      },
+    ],
+    'import/newline-after-import': 'error',
+    'import/no-extraneous-dependencies': [
+      'error',
+      {
+        devDependencies: [
+          'config/webpack/**',
+          'app/javascript/mastodon/test_setup.js',
+          'app/javascript/**/__tests__/**',
+        ],
+      },
+    ],
+    'import/no-unresolved': 'error',
+    'import/no-webpack-loader-syntax': 'error',
+
+    'promise/catch-or-return': 'error',
+  },
+};
diff --git a/.eslintrc.yml b/.eslintrc.yml
deleted file mode 100644
index fbda265498119748c8dac30462ebc47ab5caad24..0000000000000000000000000000000000000000
--- a/.eslintrc.yml
+++ /dev/null
@@ -1,170 +0,0 @@
----
-root: true
-
-env:
-  browser: true
-  node: true
-  es6: true
-  jest: true
-
-globals:
-  ATTACHMENT_HOST: false
-
-parser: babel-eslint
-
-plugins:
-- react
-- jsx-a11y
-- import
-- promise
-
-parserOptions:
-  sourceType: module
-  ecmaFeatures:
-    experimentalObjectRestSpread: true
-    jsx: true
-  ecmaVersion: 2018
-
-settings:
-  import/extensions:
-  - .js
-  import/ignore:
-  - node_modules
-  - \\.(css|scss|json)$
-
-rules:
-  brace-style: warn
-  comma-dangle:
-  - error
-  - always-multiline
-  comma-spacing:
-  - warn
-  - before: false
-    after: true
-  comma-style:
-  - warn
-  - last
-  consistent-return: error
-  dot-notation: error
-  eqeqeq: error
-  indent:
-  - warn
-  - 2
-  jsx-quotes:
-  - error
-  - prefer-single
-  no-catch-shadow: error
-  no-cond-assign: error
-  no-console:
-  - warn
-  - allow:
-    - error
-    - warn
-  no-fallthrough: error
-  no-irregular-whitespace: error
-  no-mixed-spaces-and-tabs: warn
-  no-nested-ternary: warn
-  no-trailing-spaces: warn
-  no-undef: error
-  no-unreachable: error
-  no-unused-expressions: error
-  no-unused-vars:
-  - error
-  - vars: all
-    args: after-used
-    ignoreRestSiblings: true
-  object-curly-spacing:
-  - error
-  - always
-  padded-blocks:
-  - error
-  - classes: always
-  quotes:
-  - error
-  - single
-  semi: error
-  strict: off
-  valid-typeof: error
-
-  react/jsx-boolean-value: error
-  react/jsx-closing-bracket-location:
-  - error
-  - line-aligned
-  react/jsx-curly-spacing: error
-  react/jsx-equals-spacing: error
-  react/jsx-first-prop-new-line:
-  - error
-  - multiline-multiprop
-  react/jsx-indent:
-  - error
-  - 2
-  react/jsx-no-bind: error
-  react/jsx-no-duplicate-props: error
-  react/jsx-no-undef: error
-  react/jsx-tag-spacing: error
-  react/jsx-uses-react: error
-  react/jsx-uses-vars: error
-  react/jsx-wrap-multilines: error
-  react/no-multi-comp: off
-  react/no-string-refs: error
-  react/prop-types: error
-  react/self-closing-comp: error
-
-  jsx-a11y/accessible-emoji: warn
-  jsx-a11y/alt-text: warn
-  jsx-a11y/anchor-has-content: warn
-  jsx-a11y/anchor-is-valid:
-  - warn
-  - components:
-    - Link
-    - NavLink
-    specialLink:
-    - to
-    aspect:
-    - noHref
-    - invalidHref
-    - preferButton
-  jsx-a11y/aria-activedescendant-has-tabindex: warn
-  jsx-a11y/aria-props: warn
-  jsx-a11y/aria-proptypes: warn
-  jsx-a11y/aria-role: warn
-  jsx-a11y/aria-unsupported-elements: warn
-  jsx-a11y/heading-has-content: warn
-  jsx-a11y/html-has-lang: warn
-  jsx-a11y/iframe-has-title: warn
-  jsx-a11y/img-redundant-alt: warn
-  jsx-a11y/interactive-supports-focus: warn
-  jsx-a11y/label-has-for: off
-  jsx-a11y/mouse-events-have-key-events: warn
-  jsx-a11y/no-access-key: warn
-  jsx-a11y/no-distracting-elements: warn
-  jsx-a11y/no-noninteractive-element-interactions:
-  - warn
-  - handlers:
-    - onClick
-  jsx-a11y/no-onchange: warn
-  jsx-a11y/no-redundant-roles: warn
-  jsx-a11y/no-static-element-interactions:
-  - warn
-  - handlers:
-    - onClick
-  jsx-a11y/role-has-required-aria-props: warn
-  jsx-a11y/role-supports-aria-props: off
-  jsx-a11y/scope: warn
-  jsx-a11y/tabindex-no-positive: warn
-
-  import/extensions:
-  - error
-  - always
-  - js: never
-  import/newline-after-import: error
-  import/no-extraneous-dependencies:
-  - error
-  - devDependencies:
-    - "config/webpack/**"
-    - "app/javascript/mastodon/test_setup.js"
-    - "app/javascript/**/__tests__/**"
-  import/no-unresolved: error
-  import/no-webpack-loader-syntax: error
-
-  promise/catch-or-return: error
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 602530db0e935b6915d2c3ff3ecfdd10d55ba690..f49964bd9f5bfb2637bd258c3c4b399020ad7600 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,27 @@
 ---
 name: Bug Report
-about: Create a report to help us improve
+about: If something isn't working as expected
 
 ---
 
-[Issue text goes here].
+<!-- Make sure that you are submitting a new bug that was not previously reported or already fixed -->
 
-* * * *
+<!-- Please use a concise and distinct title for the issue -->
 
-- [ ] I searched or browsed the repoâ€™s other issues to ensure this is not a duplicate.
-- [ ] This bug happens on a [tagged release](https://github.com/tootsuite/mastodon/releases) and not on `master` (If you're a user, don't worry about this).
+### Expected behaviour
+
+<!-- What should have happened? -->
+
+### Actual behaviour
+
+<!-- What happened? -->
+
+### Steps to reproduce the problem
+
+<!-- What were you trying to do? -->
+
+### Specifications
+
+<!-- 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? -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 46602fd2c0c9f57c2998c97190b33bd947431f3a..3890729e22f22d5933f2e852573d5ac6c0397fdb 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,11 +1,17 @@
 ---
 name: Feature Request
-about: Suggest an idea for this project
+about: I have a suggestion
 
 ---
 
-[Issue text goes here].
+<!-- Please use a concise and distinct title for the issue -->
 
-* * * *
+<!-- Consider: Could it be implemented as a 3rd party app using the REST API instead? -->
 
-- [ ] I searched or browsed the repoâ€™s other issues to ensure this is not a duplicate.
+### Pitch
+
+<!-- Describe your idea for a feature. Make sure it has not already been suggested/implemented/turned down before -->
+
+### Motivation
+
+<!-- Why do you think this feature is needed? Who would benefit from it? -->
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
new file mode 100644
index 0000000000000000000000000000000000000000..7fbc86ff14f699cf099f1d048bbc7ffa888337d8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -0,0 +1,10 @@
+---
+name: Support
+about: Ask for help with your deployment
+
+---
+
+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/.nvmrc b/.nvmrc
index 1e8b314962144c26d5e0e50fd29d2ca327864913..45a4fb75db864000d01701c0f7a51864bd4daabf 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-6
+8
diff --git a/.postcssrc.yml b/.postcssrc.yml
deleted file mode 100644
index efffb39ba61f2ff62b95aa08c53cf7a39859e51c..0000000000000000000000000000000000000000
--- a/.postcssrc.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins:
-  postcss-smart-import: {}
-  precss: {}
-  autoprefixer:
-    browsers:
-      - last 2 versions
-      - IE >= 11
-      - iOS >= 9
-  postcss-object-fit-images: {}
diff --git a/.rubocop.yml b/.rubocop.yml
index 6faeaca6f200fc371b27ae75f4b13f76db8a5762..59e8a757ac12ae9a2df6489e85a96cf2cbbf6d85 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,6 +11,7 @@ AllCops:
   - 'Vagrantfile'
   - 'vendor/**/*'
   - 'lib/json_ld/*'
+  - 'lib/templates/**/*'
 
 Bundler/OrderedGems:
   Enabled: false
@@ -61,6 +62,9 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 20
 
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
 Rails:
   Enabled: true
 
@@ -70,6 +74,14 @@ Rails/HasAndBelongsToMany:
 Rails/SkipsModelValidations:
   Enabled: false
 
+Rails/HttpStatus:
+  Enabled: false
+
+Rails/Exit:
+  Exclude:
+    - 'lib/mastodon/*'
+    - 'lib/cli'
+
 Style/ClassAndModuleChildren:
   Enabled: false
 
diff --git a/.ruby-version b/.ruby-version
index 73462a5a13445f66009e00988279d30e55aa8363..e70b4523ae7ffe8aa3cac8ecd1b093fba5a98737 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.5.1
+2.6.0
diff --git a/AUTHORS.md b/AUTHORS.md
index c4bbb60140b17842aae4d2f60c3cddde91cec1da..1bcf455b11f1b10e450c6b760aa901d72a3c9a74 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,158 +1,199 @@
+Authors
+=======
+
 Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
 and provided thanks to the work of the following contributors:
 
 * [Gargron](https://github.com/Gargron)
 * [ykzts](https://github.com/ykzts)
-* [mjankowski](https://github.com/mjankowski)
 * [akihikodaki](https://github.com/akihikodaki)
+* [ThibG](https://github.com/ThibG)
+* [mjankowski](https://github.com/mjankowski)
 * [unarist](https://github.com/unarist)
-* [yiskah](https://github.com/yiskah)
 * [m4sk1n](https://github.com/m4sk1n)
+* [dependabot[bot]](https://github.com/apps/dependabot)
+* [yiskah](https://github.com/yiskah)
 * [nolanlawson](https://github.com/nolanlawson)
 * [sorin-davidoi](https://github.com/sorin-davidoi)
+* [ysksn](https://github.com/ysksn)
 * [abcang](https://github.com/abcang)
-* [ThibG](https://github.com/ThibG)
 * [lynlynlynx](https://github.com/lynlynlynx)
 * [alpaca-tc](https://github.com/alpaca-tc)
+* [mayaeh](https://github.com/mayaeh)
+* [renatolond](https://github.com/renatolond)
 * [nclm](https://github.com/nclm)
 * [ineffyble](https://github.com/ineffyble)
 * [jeroenpraat](https://github.com/jeroenpraat)
 * [blackle](https://github.com/blackle)
 * [Quent-in](https://github.com/Quent-in)
 * [JantsoP](https://github.com/JantsoP)
+* [mabkenar](https://github.com/mabkenar)
 * [nullkal](https://github.com/nullkal)
 * [yookoala](https://github.com/yookoala)
-* [ysksn](https://github.com/ysksn)
+* [Kjwon15](https://github.com/Kjwon15)
+* [shuheiktgw](https://github.com/shuheiktgw)
 * [ashfurrow](https://github.com/ashfurrow)
-* [eramdam](https://github.com/eramdam)
-* [mayaeh](https://github.com/mayaeh)
+* [Quenty31](https://github.com/Quenty31)
 * [zunda](https://github.com/zunda)
-* [ticky](https://github.com/ticky)
+* [eramdam](https://github.com/eramdam)
+* [takayamaki](https://github.com/takayamaki)
 * [masarakki](https://github.com/masarakki)
+* [ticky](https://github.com/ticky)
+* [danhunsaker](https://github.com/danhunsaker)
+* [ThisIsMissEm](https://github.com/ThisIsMissEm)
+* [hcmiya](https://github.com/hcmiya)
+* [stephenburgess8](https://github.com/stephenburgess8)
 * [Wonderfall](https://github.com/Wonderfall)
 * [matteoaquila](https://github.com/matteoaquila)
 * [rkarabut](https://github.com/rkarabut)
-* [stephenburgess8](https://github.com/stephenburgess8)
-* [Kjwon15](https://github.com/Kjwon15)
-* [Artoria2e5](https://github.com/Artoria2e5)
 * [yukimochi](https://github.com/yukimochi)
+* [Artoria2e5](https://github.com/Artoria2e5)
 * [marrus-sh](https://github.com/marrus-sh)
 * [krainboltgreene](https://github.com/krainboltgreene)
-* [renatolond](https://github.com/renatolond)
-* [BoFFire](https://github.com/BoFFire)
-* [clworld](https://github.com/clworld)
-* [danhunsaker](https://github.com/danhunsaker)
 * [patf](https://github.com/patf)
-* [Quenty31](https://github.com/Quenty31)
-* [MitarashiDango](https://github.com/MitarashiDango)
 * [Aldarone](https://github.com/Aldarone)
+* [BoFFire](https://github.com/BoFFire)
+* [clworld](https://github.com/clworld)
+* [dracos](https://github.com/dracos)
+* [SerCom_KC](mailto:sercom-kc@users.noreply.github.com)
+* [Sylvhem](https://github.com/Sylvhem)
+* [nightpool](https://github.com/nightpool)
+* [MasterGroosha](https://github.com/MasterGroosha)
 * [JeanGauthier](https://github.com/JeanGauthier)
 * [kschaper](https://github.com/kschaper)
-* [takayamaki](https://github.com/takayamaki)
+* [MaciekBaron](https://github.com/MaciekBaron)
+* [MitarashiDango](mailto:mitarashidango@users.noreply.github.com)
+* [beatrix-bitrot](https://github.com/beatrix-bitrot)
 * [adbelle](https://github.com/adbelle)
 * [evanminto](https://github.com/evanminto)
-* [mabkenar](https://github.com/mabkenar)
 * [MightyPork](https://github.com/MightyPork)
-* [beatrix-bitrot](https://github.com/beatrix-bitrot)
 * [yhirano55](https://github.com/yhirano55)
 * [camponez](https://github.com/camponez)
+* [SerCom-KC](https://github.com/SerCom-KC)
 * [aschmitz](https://github.com/aschmitz)
+* [devkral](https://github.com/devkral)
 * [fpiesche](https://github.com/fpiesche)
 * [gandaro](https://github.com/gandaro)
 * [johnsudaar](https://github.com/johnsudaar)
 * [trebmuh](https://github.com/trebmuh)
-* [Sylvhem](https://github.com/Sylvhem)
+* [Rakib Hasan](mailto:rmhasan@gmail.com)
 * [lindwurm](https://github.com/lindwurm)
+* [victorhck](mailto:victorhck@geeko.site)
 * [voidsatisfaction](https://github.com/voidsatisfaction)
-* [neetshin](https://github.com/neetshin)
-* [valentin2105](https://github.com/valentin2105)
 * [hikari-no-yume](https://github.com/hikari-no-yume)
-* [Angristan](https://github.com/Angristan)
+* [angristan](https://github.com/angristan)
 * [seefood](https://github.com/seefood)
 * [jackjennings](https://github.com/jackjennings)
-* [hcmiya](https://github.com/hcmiya)
-* [nightpool](https://github.com/nightpool)
-* [salvadorpla](https://github.com/salvadorpla)
+* [spla](mailto:spla@mastodont.cat)
 * [expenses](https://github.com/expenses)
 * [walf443](https://github.com/walf443)
 * [JoelQ](https://github.com/JoelQ)
 * [mistydemeo](https://github.com/mistydemeo)
 * [dunn](https://github.com/dunn)
 * [xqus](https://github.com/xqus)
+* [hugogameiro](https://github.com/hugogameiro)
 * [pfm-eyesightjp](https://github.com/pfm-eyesightjp)
 * [fakenine](https://github.com/fakenine)
 * [tsuwatch](https://github.com/tsuwatch)
 * [victorhck](https://github.com/victorhck)
+* [ashleyhull-versent](https://github.com/ashleyhull-versent)
+* [kedamaDQ](https://github.com/kedamaDQ)
 * [puckipedia](https://github.com/puckipedia)
+* [fvh-P](https://github.com/fvh-P)
 * [contraexemplo](https://github.com/contraexemplo)
 * [kazu9su](https://github.com/kazu9su)
 * [Komic](https://github.com/Komic)
+* [lmorchard](https://github.com/lmorchard)
 * [diomed](https://github.com/diomed)
+* [ariasuni](https://github.com/ariasuni)
+* [Neetshin](mailto:neetshin@neetsh.in)
 * [rainyday](https://github.com/rainyday)
+* [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)
-* [ProgVal](https://github.com/ProgVal)
+* [rtucker](https://github.com/rtucker)
+* [KScl](https://github.com/KScl)
 * [sterdev](https://github.com/sterdev)
 * [TheKinrar](https://github.com/TheKinrar)
 * [AA4ch1](https://github.com/AA4ch1)
 * [alexgleason](https://github.com/alexgleason)
 * [cpytel](https://github.com/cpytel)
 * [northerner](https://github.com/northerner)
-* [hnrysmth](https://github.com/hnrysmth)
-* [hugogameiro](https://github.com/hugogameiro)
+* [fhemberger](https://github.com/fhemberger)
+* [greysteil](https://github.com/greysteil)
+* [hensmith](https://github.com/hensmith)
+* [hinaloe](https://github.com/hinaloe)
+* [d6rkaiz](https://github.com/d6rkaiz)
+* [Reverite](https://github.com/Reverite)
+* [JMendyk](https://github.com/JMendyk)
 * [JohnD28](https://github.com/JohnD28)
 * [znz](https://github.com/znz)
 * [Naouak](https://github.com/Naouak)
-* [rtucker](https://github.com/rtucker)
+* [pawelngei](https://github.com/pawelngei)
 * [reneklacan](https://github.com/reneklacan)
-* [KScl](https://github.com/KScl)
-* [SerCom-KC](https://github.com/SerCom-KC)
+* [ekiru](https://github.com/ekiru)
 * [tcitworld](https://github.com/tcitworld)
 * [geta6](https://github.com/geta6)
-* [goofy-bz](https://github.com/goofy-bz)
 * [happycoloredbanana](https://github.com/happycoloredbanana)
 * [leopku](https://github.com/leopku)
 * [SansPseudoFix](https://github.com/SansPseudoFix)
 * [tomfhowe](https://github.com/tomfhowe)
 * [noraworld](https://github.com/noraworld)
-* [fvh-P](https://github.com/fvh-P)
+* [theboss](https://github.com/theboss)
 * [178inaba](https://github.com/178inaba)
-* [devkral](https://github.com/devkral)
+* [Aditoo17](https://github.com/Aditoo17)
 * [alyssais](https://github.com/alyssais)
 * [kodnaplakal](https://github.com/kodnaplakal)
 * [stalker314314](https://github.com/stalker314314)
 * [huertanix](https://github.com/huertanix)
 * [genesixx](https://github.com/genesixx)
-* [fhemberger](https://github.com/fhemberger)
 * [halkeye](https://github.com/halkeye)
 * [treby](https://github.com/treby)
-* [d6rkaiz](https://github.com/d6rkaiz)
 * [jpdevries](https://github.com/jpdevries)
-* [rndm-stranger](https://github.com/rndm-stranger)
+* [gdpelican](https://github.com/gdpelican)
+* [kmichl](https://github.com/kmichl)
+* [Kurtis Rainbolt-Greene](mailto:me@kurtisrainboltgreene.name)
 * [saper](https://github.com/saper)
 * [nevillepark](https://github.com/nevillepark)
 * [ornithocoder](https://github.com/ornithocoder)
 * [pierreozoux](https://github.com/pierreozoux)
-* [ramlmn](https://github.com/ramlmn)
+* [qguv](https://github.com/qguv)
+* [Ram Lmn](mailto:ramlmn@users.noreply.github.com)
 * [harukasan](https://github.com/harukasan)
 * [stamak](https://github.com/stamak)
+* [noellabo](https://github.com/noellabo)
+* [Technowix](mailto:technowix@users.noreply.github.com)
 * [Eychics](https://github.com/Eychics)
-* [thor-the-norseman](https://github.com/thor-the-norseman)
+* [Thor Harald Johansen](mailto:thj@thj.no)
 * [0x70b1a5](https://github.com/0x70b1a5)
 * [gled-rs](https://github.com/gled-rs)
+* [Valentin_NC](mailto:valentin.ouvrard@nautile.sarl)
 * [R0ckweb](https://github.com/R0ckweb)
+* [caasi](https://github.com/caasi)
+* [chr-1x](https://github.com/chr-1x)
 * [esetomo](https://github.com/esetomo)
 * [foxiehkins](https://github.com/foxiehkins)
-* [sdukhovni](https://github.com/sdukhovni)
+* [hoodie](mailto:hoodiekitten@outlook.com)
+* [luzi82](https://github.com/luzi82)
+* [duxovni](https://github.com/duxovni)
+* [trwnh](https://github.com/trwnh)
 * [unsmell](https://github.com/unsmell)
+* [valerauko](https://github.com/valerauko)
 * [chriswmartin](https://github.com/chriswmartin)
 * [vahnj](https://github.com/vahnj)
 * [ikuradon](https://github.com/ikuradon)
 * [AndreLewin](https://github.com/AndreLewin)
+* [rinsuki](https://github.com/rinsuki)
+* [0xflotus](https://github.com/0xflotus)
 * [redtachyons](https://github.com/redtachyons)
 * [thurloat](https://github.com/thurloat)
 * [aaribaud](https://github.com/aaribaud)
+* [Andrew](mailto:andrewlchronister@gmail.com)
 * [estuans](https://github.com/estuans)
+* [BenLubar](https://github.com/BenLubar)
 * [dissolve](https://github.com/dissolve)
 * [PurpleBooth](https://github.com/PurpleBooth)
 * [bradurani](https://github.com/bradurani)
@@ -164,37 +205,50 @@ and provided thanks to the work of the following contributors:
 * [cdutson](https://github.com/cdutson)
 * [farlistener](https://github.com/farlistener)
 * [DavidLibeau](https://github.com/DavidLibeau)
-* [SirCmpwn](https://github.com/SirCmpwn)
-* [MasterGroosha](https://github.com/MasterGroosha)
+* [ddevault](https://github.com/ddevault)
 * [Fjoerfoks](https://github.com/Fjoerfoks)
 * [fmauNeko](https://github.com/fmauNeko)
 * [gloaec](https://github.com/gloaec)
-* [greysteil](https://github.com/greysteil)
+* [Gomasy](https://github.com/Gomasy)
 * [unstabler](https://github.com/unstabler)
 * [potato4d](https://github.com/potato4d)
 * [h-izumi](https://github.com/h-izumi)
 * [ErikXXon](https://github.com/ErikXXon)
 * [ian-kelling](https://github.com/ian-kelling)
+* [immae](https://github.com/immae)
 * [foozmeat](https://github.com/foozmeat)
 * [jasonrhodes](https://github.com/jasonrhodes)
-* [asm](https://github.com/asm)
+* [Jason Snell](mailto:jason@newrelic.com)
 * [jviide](https://github.com/jviide)
+* [YuleZ](https://github.com/YuleZ)
 * [crakaC](https://github.com/crakaC)
 * [tkbky](https://github.com/tkbky)
+* [Kaylee](mailto:kaylee@codethat.sucks)
 * [Kazhnuz](https://github.com/Kazhnuz)
+* [connyduck](https://github.com/connyduck)
+* [Lindsey Bieda](mailto:lindseyb@users.noreply.github.com)
+* [Lorenz Diener](mailto:halcyon@icosahedron.website)
 * [alimony](https://github.com/alimony)
 * [mig5](https://github.com/mig5)
 * [ndarville](https://github.com/ndarville)
 * [Abzol](https://github.com/Abzol)
+* [pwoolcoc](https://github.com/pwoolcoc)
 * [xPaw](https://github.com/xPaw)
+* [petzah](https://github.com/petzah)
+* [ignisf](https://github.com/ignisf)
 * [raymestalez](https://github.com/raymestalez)
+* [remram44](https://github.com/remram44)
+* [sascha-sl](https://github.com/sascha-sl)
+* [u1-liquid](https://github.com/u1-liquid)
 * [sim6](https://github.com/sim6)
-* [ekiru](https://github.com/ekiru)
-* [Technowix](https://github.com/Technowix)
+* [stemid](https://github.com/stemid)
+* [sumdog](https://github.com/sumdog)
 * [ThomasLeister](https://github.com/ThomasLeister)
 * [mcat-ee](https://github.com/mcat-ee)
 * [tototoshi](https://github.com/tototoshi)
+* [TrashMacNugget](https://github.com/TrashMacNugget)
 * [VirtuBox](https://github.com/VirtuBox)
+* [Vladyslav](mailto:vaden@tuta.io)
 * [kaniini](https://github.com/kaniini)
 * [vayan](https://github.com/vayan)
 * [yannicka](https://github.com/yannicka)
@@ -202,45 +256,61 @@ and provided thanks to the work of the following contributors:
 * [zacanger](https://github.com/zacanger)
 * [amazedkoumei](https://github.com/amazedkoumei)
 * [anon5r](https://github.com/anon5r)
+* [aus-social](https://github.com/aus-social)
+* [imbsky](https://github.com/imbsky)
+* [bsky](mailto:me@imbsky.net)
 * [codl](https://github.com/codl)
+* [cpsdqs](https://github.com/cpsdqs)
 * [barzamin](https://github.com/barzamin)
 * [fhalna](https://github.com/fhalna)
 * [haoyayoi](https://github.com/haoyayoi)
 * [ik11235](https://github.com/ik11235)
 * [kawax](https://github.com/kawax)
 * [007lva](https://github.com/007lva)
+* [mbajur](https://github.com/mbajur)
 * [matsurai25](https://github.com/matsurai25)
 * [mecab](https://github.com/mecab)
 * [nicobz25](https://github.com/nicobz25)
 * [oliverkeeble](https://github.com/oliverkeeble)
 * [pinfort](https://github.com/pinfort)
 * [rbaumert](https://github.com/rbaumert)
+* [rhoio](https://github.com/rhoio)
 * [usagi-f](https://github.com/usagi-f)
 * [vidarlee](https://github.com/vidarlee)
 * [vjackson725](https://github.com/vjackson725)
 * [wxcafe](https://github.com/wxcafe)
-* [rinsuki](https://github.com/rinsuki)
+* [æ–°éƒ½å¿ƒ(Neet Shin)](mailto:nucx@dio-vox.com)
 * [cygnan](https://github.com/cygnan)
 * [Awea](https://github.com/Awea)
 * [halcy](https://github.com/halcy)
-* [bounshi](https://github.com/bounshi)
+* [naaaaaaaaaaaf](https://github.com/naaaaaaaaaaaf)
 * [8398a7](https://github.com/8398a7)
 * [857b](https://github.com/857b)
+* [insom](https://github.com/insom)
+* [tachyons](https://github.com/tachyons)
+* [Esteth](https://github.com/Esteth)
 * [unascribed](https://github.com/unascribed)
 * [Aguay-val](https://github.com/Aguay-val)
+* [Akihiko Odaki](mailto:nekomanma@pixiv.co.jp)
 * [knu](https://github.com/knu)
+* [h3poteto](https://github.com/h3poteto)
+* [unleashed](https://github.com/unleashed)
 * [alxrcs](https://github.com/alxrcs)
 * [console-cowboy](https://github.com/console-cowboy)
 * [pointlessone](https://github.com/pointlessone)
+* [Alkarex](https://github.com/Alkarex)
 * [a2](https://github.com/a2)
 * [0xa](https://github.com/0xa)
+* [palindromordnilap](https://github.com/palindromordnilap)
 * [virtualpain](https://github.com/virtualpain)
 * [sapphirus](https://github.com/sapphirus)
 * [amandavisconti](https://github.com/amandavisconti)
 * [ameliavoncat](https://github.com/ameliavoncat)
 * [ilpianista](https://github.com/ilpianista)
-* [andydrop](https://github.com/andydrop)
+* [Andreas Drop](mailto:andy@remline.de)
+* [andi1984](https://github.com/andi1984)
 * [schas002](https://github.com/schas002)
+* [abackstrom](https://github.com/abackstrom)
 * [jumbosushi](https://github.com/jumbosushi)
 * [ayumin](https://github.com/ayumin)
 * [BaptisteGelez](https://github.com/BaptisteGelez)
@@ -251,6 +321,7 @@ and provided thanks to the work of the following contributors:
 * [brycied00d](https://github.com/brycied00d)
 * [carlosjs23](https://github.com/carlosjs23)
 * [cgxxx](https://github.com/cgxxx)
+* [kibitan](https://github.com/kibitan)
 * [chrisheninger](https://github.com/chrisheninger)
 * [chris-martin](https://github.com/chris-martin)
 * [DoubleMalt](https://github.com/DoubleMalt)
@@ -259,22 +330,34 @@ and provided thanks to the work of the following contributors:
 * [chriswk](https://github.com/chriswk)
 * [csu](https://github.com/csu)
 * [kklleemm](https://github.com/kklleemm)
-* [monsterpit-daggertooth](https://github.com/monsterpit-daggertooth)
+* [colindean](https://github.com/colindean)
+* [dachinat](https://github.com/dachinat)
+* [multiple-creatures](https://github.com/multiple-creatures)
 * [watilde](https://github.com/watilde)
 * [daprice](https://github.com/daprice)
 * [dar5hak](https://github.com/dar5hak)
 * [kant](https://github.com/kant)
+* [maxolasersquad](https://github.com/maxolasersquad)
 * [singingwolfboy](https://github.com/singingwolfboy)
 * [davidcelis](https://github.com/davidcelis)
+* [davefp](https://github.com/davefp)
 * [yipdw](https://github.com/yipdw)
 * [debanshuk](https://github.com/debanshuk)
+* [Derek Lewis](mailto:derekcecillewis@gmail.com)
 * [dblandin](https://github.com/dblandin)
-* [aranaur](https://github.com/aranaur)
+* [Drew Gates](mailto:aranaur@users.noreply.github.com)
+* [dtschust](https://github.com/dtschust)
+* [Dryusdan](https://github.com/Dryusdan)
+* [eai04191](https://github.com/eai04191)
 * [d3vgru](https://github.com/d3vgru)
 * [Elizafox](https://github.com/Elizafox)
 * [ericblade](https://github.com/ericblade)
 * [mikoim](https://github.com/mikoim)
+* [espenronnevik](https://github.com/espenronnevik)
+* [Finariel](https://github.com/Finariel)
 * [siuying](https://github.com/siuying)
+* [fwenzel](https://github.com/fwenzel)
+* [GenbuHase](https://github.com/GenbuHase)
 * [hattori6789](https://github.com/hattori6789)
 * [algernon](https://github.com/algernon)
 * [Fastbyte01](https://github.com/Fastbyte01)
@@ -283,22 +366,25 @@ and provided thanks to the work of the following contributors:
 * [Fiaxhs](https://github.com/Fiaxhs)
 * [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)
-* [hinaloe](https://github.com/hinaloe)
 * [suzukaze](https://github.com/suzukaze)
 * [Hiromi-Kai](https://github.com/Hiromi-Kai)
+* [hishamhm](https://github.com/hishamhm)
 * [musashino205](https://github.com/musashino205)
 * [iwaim](https://github.com/iwaim)
 * [valrus](https://github.com/valrus)
 * [IMcD23](https://github.com/IMcD23)
 * [yi0713](https://github.com/yi0713)
-* [immae](https://github.com/immae)
 * [iblech](https://github.com/iblech)
+* [usbsnowcrash](https://github.com/usbsnowcrash)
 * [jack-michaud](https://github.com/jack-michaud)
 * [Floppy](https://github.com/Floppy)
 * [loomchild](https://github.com/loomchild)
-* [docjkl](https://github.com/docjkl)
+* [jenkr55](https://github.com/jenkr55)
+* [press5](https://github.com/press5)
 * [TrollDecker](https://github.com/TrollDecker)
 * [jmontane](https://github.com/jmontane)
 * [jonathanklee](https://github.com/jonathanklee)
@@ -307,28 +393,33 @@ and provided thanks to the work of the following contributors:
 * [joshuap](https://github.com/joshuap)
 * [Tiwy57](https://github.com/Tiwy57)
 * [xuv](https://github.com/xuv)
-* [Jnsll](https://github.com/Jnsll)
+* [June Sallou](mailto:jnsll@users.noreply.github.com)
 * [j0k3r](https://github.com/j0k3r)
 * [KEINOS](https://github.com/KEINOS)
 * [futoase](https://github.com/futoase)
-* [abjectio](https://github.com/abjectio)
+* [Pneumaticat](https://github.com/Pneumaticat)
+* [Kit Redgrave](mailto:qwertyitis@gmail.com)
+* [Knut Erik](mailto:abjectio@users.noreply.github.com)
 * [mkody](https://github.com/mkody)
-* [connyduck](https://github.com/connyduck)
 * [k0ta0uchi](https://github.com/k0ta0uchi)
 * [KrzysiekJ](https://github.com/KrzysiekJ)
 * [leowzukw](https://github.com/leowzukw)
-* [lmorchard](https://github.com/lmorchard)
+* [Tak](https://github.com/Tak)
 * [cacheflow](https://github.com/cacheflow)
 * [ldidry](https://github.com/ldidry)
 * [jemus42](https://github.com/jemus42)
 * [lfuelling](https://github.com/lfuelling)
 * [Grabacr07](https://github.com/Grabacr07)
 * [mistermantas](https://github.com/mistermantas)
+* [mareklach](https://github.com/mareklach)
 * [wirehack7](https://github.com/wirehack7)
+* [martymcguire](https://github.com/martymcguire)
 * [marvinkopf](https://github.com/marvinkopf)
 * [otsune](https://github.com/otsune)
-* [m-blc](https://github.com/m-blc)
+* [Mathias B](mailto:10813340+mathias-b@users.noreply.github.com)
 * [matt-auckland](https://github.com/matt-auckland)
+* [webroo](https://github.com/webroo)
+* [matthiasbeyer](https://github.com/matthiasbeyer)
 * [mattjmattj](https://github.com/mattjmattj)
 * [mtparet](https://github.com/mtparet)
 * [maximeborges](https://github.com/maximeborges)
@@ -336,16 +427,21 @@ and provided thanks to the work of the following contributors:
 * [michaeljdeeb](https://github.com/michaeljdeeb)
 * [Themimitoof](https://github.com/Themimitoof)
 * [cyweo](https://github.com/cyweo)
-* [M1dgard](https://github.com/M1dgard)
+* [Midgard](mailto:m1dgard@users.noreply.github.com)
 * [mike-burns](https://github.com/mike-burns)
 * [verymilan](https://github.com/verymilan)
 * [milmazz](https://github.com/milmazz)
+* [premist](https://github.com/premist)
 * [Mnkai](https://github.com/Mnkai)
 * [mitchhentges](https://github.com/mitchhentges)
 * [moritzheiber](https://github.com/moritzheiber)
 * [mouse-reeve](https://github.com/mouse-reeve)
+* [Mozinet-fr](https://github.com/Mozinet-fr)
 * [lae](https://github.com/lae)
 * [Nanamachi](https://github.com/Nanamachi)
+* [orinthe](https://github.com/orinthe)
+* [NecroTechno](https://github.com/NecroTechno)
+* [Dar13](https://github.com/Dar13)
 * [ngerakines](https://github.com/ngerakines)
 * [vonneudeck](https://github.com/vonneudeck)
 * [Ninetailed](https://github.com/Ninetailed)
@@ -355,96 +451,381 @@ and provided thanks to the work of the following contributors:
 * [norayr](https://github.com/norayr)
 * [joyeusenoelle](https://github.com/joyeusenoelle)
 * [OlivierNicole](https://github.com/OlivierNicole)
+* [noppa](https://github.com/noppa)
 * [Otakan951](https://github.com/Otakan951)
 * [fahy](https://github.com/fahy)
+* [PatrickRWells](https://github.com/PatrickRWells)
 * [Pangoraw](https://github.com/Pangoraw)
-* [pwoolcoc](https://github.com/pwoolcoc)
 * [peterkeen](https://github.com/peterkeen)
-* [petzah](https://github.com/petzah)
-* [ignisf](https://github.com/ignisf)
+* [pgate](https://github.com/pgate)
+* [retokromer](https://github.com/retokromer)
 * [rfwatson](https://github.com/rfwatson)
 * [rfreebern](https://github.com/rfreebern)
+* [Ryan Wade](mailto:ryan.wade@protonmail.com)
 * [sylph01](https://github.com/sylph01)
+* [S-H-GAMELINKS](https://github.com/S-H-GAMELINKS)
 * [staticsafe](https://github.com/staticsafe)
 * [snwh](https://github.com/snwh)
+* [sts10](https://github.com/sts10)
 * [skoji](https://github.com/skoji)
 * [ScienJus](https://github.com/ScienJus)
-* [larkinscott](https://github.com/larkinscott)
-* [imolein](https://github.com/imolein)
-* [blinry](https://github.com/blinry)
-* [Noiwex](https://github.com/Noiwex)
-* [yuki764](https://github.com/yuki764)
-* [shnjp](https://github.com/shnjp)
-* [ernix](https://github.com/ernix)
-* [rosylilly](https://github.com/rosylilly)
-* [shouko](https://github.com/shouko)
-* [sossii](https://github.com/sossii)
-* [StefOfficiel](https://github.com/StefOfficiel)
-* [svetlik](https://github.com/svetlik)
-* [dereckson](https://github.com/dereckson)
-* [theboss](https://github.com/theboss)
-* [takp](https://github.com/takp)
-* [tkusano](https://github.com/tkusano)
-* [TheInventrix](https://github.com/TheInventrix)
-* [shug0](https://github.com/shug0)
-* [Fortyseven](https://github.com/Fortyseven)
-* [tobypinder](https://github.com/tobypinder)
-* [tomosm](https://github.com/tomosm)
-* [TomoyaShibata](https://github.com/TomoyaShibata)
-* [TrashMacNugget](https://github.com/TrashMacNugget)
-* [treyssatvincent](https://github.com/treyssatvincent)
-* [optikfluffel](https://github.com/optikfluffel)
-* [vmincev](https://github.com/vmincev)
-* [waldyrious](https://github.com/waldyrious)
-* [tahnok](https://github.com/tahnok)
-* [YDrogen](https://github.com/YDrogen)
-* [YOSHIOKAEiichiro](https://github.com/YOSHIOKAEiichiro)
-* [S-YOU](https://github.com/S-YOU)
-* [YaQ00](https://github.com/YaQ00)
-* [yanakend](https://github.com/yanakend)
-* [orzFly](https://github.com/orzFly)
-* [chansuke](https://github.com/chansuke)
-* [yuntan](https://github.com/yuntan)
-* [LogicalDash](https://github.com/LogicalDash)
-* [ZiiX](https://github.com/ZiiX)
-* [benklop](https://github.com/benklop)
-* [caasi](https://github.com/caasi)
-* [caesarologia](https://github.com/caesarologia)
-* [chrolis](https://github.com/chrolis)
-* [cormojs](https://github.com/cormojs)
-* [cpsdqs](https://github.com/cpsdqs)
-* [d0p1s4m4](https://github.com/d0p1s4m4)
-* [evilny0](https://github.com/evilny0)
-* [febrezo](https://github.com/febrezo)
-* [fsubal](https://github.com/fsubal)
-* [dikky1218](https://github.com/dikky1218)
-* [gentarok](https://github.com/gentarok)
-* [hakoai](https://github.com/hakoai)
-* [chaosbunker](https://github.com/chaosbunker)
-* [isati](https://github.com/isati)
-* [jkap](https://github.com/jkap)
-* [jirayudech](https://github.com/jirayudech)
-* [jukper](https://github.com/jukper)
-* [karlyeurl](https://github.com/karlyeurl)
-* [kedamaDQ](https://github.com/kedamaDQ)
-* [kuro5hin](https://github.com/kuro5hin)
-* [maxypy](https://github.com/maxypy)
-* [marcus-herrmann](https://github.com/marcus-herrmann)
-* [mshrtkch](https://github.com/mshrtkch)
-* [muan](https://github.com/muan)
-* [rch850](https://github.com/rch850)
-* [roikale](https://github.com/roikale)
-* [rysiekpl](https://github.com/rysiekpl)
-* [saturday06](https://github.com/saturday06)
-* [scriptjunkie](https://github.com/scriptjunkie)
-* [seekr](https://github.com/seekr)
-* [syui](https://github.com/syui)
-* [tackeyy](https://github.com/tackeyy)
-* [tmyt](https://github.com/tmyt)
-* [utam0k](https://github.com/utam0k)
-* [vpzomtrrfrt](https://github.com/vpzomtrrfrt)
-* [walfie](https://github.com/walfie)
-* [y-temp4](https://github.com/y-temp4)
-* [ymmtmdk](https://github.com/ymmtmdk)
+* [Scott Larkin](mailto:scott@codeclimate.com)
+* [Sebastian HÃ¼bner](mailto:imolein@users.noreply.github.com)
+* [Sebastian Morr](mailto:sebastian@morr.cc)
+* [Sergei ÄŒ](mailto:noiwex1911@gmail.com)
+* [Setuu](mailto:yuki764setuu@gmail.com)
+* [Shaun Gillies](mailto:me@shaungillies.net)
+* [Shin Adachi](mailto:shn@glucose.jp)
+* [Shin Kojima](mailto:shin@kojima.org)
+* [Sho Kusano](mailto:rosylilly@aduca.org)
+* [Shouko Yu](mailto:imshouko@gmail.com)
+* [Sina Mashek](mailto:sina@mashek.xyz)
+* [Sir-Boops](mailto:admin@boops.me)
+* [Soshi Kato](mailto:mail@sossii.com)
+* [Spanky](mailto:2788886+spankyworks@users.noreply.github.com)
+* [StefOfficiel](mailto:pichard.stephane@free.fr)
+* [Steven Tappert](mailto:admin@dark-it.net)
+* [Svetlozar Todorov](mailto:svetlik@users.noreply.github.com)
+* [SÃ©bastien Santoro](mailto:dereckson@espace-win.org)
+* [Tad Thorley](mailto:phaedryx@users.noreply.github.com)
+* [Takayoshi Nishida](mailto:takayoshi.nishida@gmail.com)
+* [Takayuki KUSANO](mailto:github@tkusano.jp)
+* [TakesxiSximada](mailto:takesxi.sximada@gmail.com)
+* [TheInventrix](mailto:theinventrix@users.noreply.github.com)
+* [Thomas Alberola](mailto:thomas@needacoffee.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)
+* [Treyssat-Vincent Nino](mailto:treyssatvincent@users.noreply.github.com)
+* [Udo Kramer](mailto:optik@fluffel.io)
+* [Una](mailto:una@unascribed.com)
+* [Ushitora Anqou](mailto:ushitora_anqou@yahoo.co.jp)
+* [Valentin Lorentz](mailto:progval+git@progval.net)
+* [Vladimir Mincev](mailto:vladimir@canicinteractive.com)
+* [Waldir Pimenta](mailto:waldyrious@gmail.com)
+* [Wesley Ellis](mailto:tahnok@gmail.com)
+* [Wiktor](mailto:wiktor@metacode.biz)
+* [Wonderfall](mailto:wonderfall@schrodinger.io)
+* [YDrogen](mailto:ydrogen45@gmail.com)
+* [YMHuang](mailto:ymhuang@fmbase.tw)
+* [YOSHIOKA Eiichiro](mailto:yoshioka.eiichiro@gmail.com)
+* [YOU](mailto:stackexchange.you@gmail.com)
+* [YaQ](mailto:i_k_o_m_a_7@yahoo.co.jp)
+* [Yanaken](mailto:yanakend@gmail.com)
+* [Yann Klis](mailto:yann.klis@gmail.com)
+* [Yeechan Lu](mailto:wz.bluesnow@gmail.com)
+* [Yusuke Abe](mailto:moonset20@gmail.com)
+* [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)
+* [bsky](mailto:git@imbsky.net)
+* [caesarologia](mailto:lopesgemelli.1@gmail.com)
+* [cbayerlein](mailto:c.bayerlein@gmail.com)
+* [chrolis](mailto:chrolis@users.noreply.github.com)
+* [cormo](mailto:cormorant2+github@gmail.com)
+* [d0p1](mailto:dopi-sama@hush.com)
+* [evilny0](mailto:evilny0@moomoocamp.net)
+* [febrezo](mailto:felixbrezo@gmail.com)
+* [fsubal](mailto:fsubal@users.noreply.github.com)
+* [fusshi-](mailto:dikky1218@users.noreply.github.com)
+* [gentaro](mailto:gentaroooo@gmail.com)
+* [hakoai](mailto:hk--76@qa2.so-net.ne.jp)
+* [haosbvnker](mailto:github@chaosbunker.com)
+* [isati](mailto:phil@juchnowi.cz)
+* [jacob](mailto:jacobherringtondeveloper@gmail.com)
+* [jenn kaplan](mailto:me@jkap.io)
+* [jirayudech](mailto:jirayudech@gmail.com)
+* [jomo](mailto:github@jomo.tv)
+* [jooops](mailto:joops@autistici.org)
+* [jukper](mailto:jukkaperanto@gmail.com)
+* [jumoru](mailto:jumoru@mailbox.org)
+* [karlyeurl](mailto:karl.yeurl@gmail.com)
+* [kedama](mailto:32974885+kedamadq@users.noreply.github.com)
+* [kodai](mailto:shirafuta.kodai@gmail.com)
+* [kuro5hin](mailto:rusty@kuro5hin.org)
+* [luzpaz](mailto:luzpaz@users.noreply.github.com)
+* [maxypy](mailto:maxime@mpigou.fr)
+* [mhe](mailto:mail@marcus-herrmann.com)
+* [mimikun](mailto:dzdzble_effort_311@outlook.jp)
+* [mshrtkch](mailto:mshrtkch@users.noreply.github.com)
+* [muan](mailto:muan@github.com)
+* [namelessGonbai](mailto:43787036+namelessgonbai@users.noreply.github.com)
+* [neetshin](mailto:neetshin@neetsh.in)
+* [nightpool](mailto:nightpool@users.noreply.github.com)
+* [rch850](mailto:rich850@gmail.com)
+* [roikale](mailto:roikale@users.noreply.github.com)
+* [rysiekpl](mailto:rysiek@hackerspace.pl)
+* [saturday06](mailto:dyob@lunaport.net)
+* [scriptjunkie](mailto:scriptjunkie@scriptjunkie.us)
+* [seekr](mailto:mario.drs@gmail.com)
+* [sundevour](mailto:31990469+sundevour@users.noreply.github.com)
+* [syui](mailto:syui@users.noreply.github.com)
+* [tackeyy](mailto:mailto.takita.yusuke@gmail.com)
+* [tateisu](mailto:tateisu@gmail.com)
+* [tmyt](mailto:shigure@refy.net)
+* [trevDev()](mailto:trev@trevdev.ca)
+* [utam0k](mailto:k0ma@utam0k.jp)
+* [vpzomtrrfrt](mailto:vpzomtrrfrt@gmail.com)
+* [walfie](mailto:walfington@gmail.com)
+* [y-temp4](mailto:y.temp4@gmail.com)
+* [ymmtmdk](mailto:ymmtmdk@gmail.com)
+* [yoshipc](mailto:yoooo@yoshipc.net)
+* [Ã–zcan Zafer AYAN](mailto:ozcanzaferayan@gmail.com)
+* [ã°ã‚“](mailto:detteiu0321@gmail.com)
+* [ã¿ãŸã‚‰ã—ã ã‚“ã”](mailto:mitarashidango@users.noreply.github.com)
+* [ã‚Šã‚“ã™ã](mailto:6533808+rinsuki@users.noreply.github.com)
+* [ãƒ¨ã‚¤ãƒ„ã®è³¢ç‹¼ãƒ›ãƒ | 3rd style](mailto:horo@yoitsu.moe)
+* [çŒ«å¸è¡€é¬¼ãƒ‡ã‚£ãƒ•ãƒªã‚¹ / çŒ«ãƒã‚P](mailto:deflis@gmail.com)
+* [è‰® é®Ÿé±‡](mailto:ushitora_anqou@yahoo.co.jp)
+* [è¥¿å°å€‰å®ä¿¡](mailto:nishiko@mindia.jp)
+* [é›¨å®®ç¾Žç¾½](mailto:k737566@gmail.com)
 
 This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
+
+## Translators
+
+Following people have contributed to translation of Mastodon:
+
+- **Arabic**
+  - ButterflyOfFire
+- **Asturian**
+  - ButterflyOfFire
+  - Enol P.
+- **Basque**
+  - Aitzol
+  - ButterflyOfFire
+  - Gorka Azkarate
+  - Osoitz
+  - Peru Iparragirre
+- **Bulgarian**
+  - ButterflyOfFire
+- **Catalan**
+  - ButterflyOfFire
+  - Joan MontanÃ©
+  - Jose Luis
+  - spla
+- **Chinese (Hong Kong)**
+  - ButterflyOfFire
+  - Luzi Leung
+- **Chinese (Simplified)**
+  - Allen Zhong
+  - ButterflyOfFire
+  - SerCom_KC
+- **Chinese (Traditional)**
+  - ButterflyOfFire
+  - James58899
+  - Jeff Huang
+  - S1ttidoe477
+  - SHA265
+- **Corsican**
+  - Alix D. R.
+  - ButterflyOfFire
+- **Croatian**
+  - ButterflyOfFire
+- **Czech**
+  - ButterflyOfFire
+  - Lorem Ipsum
+  - Marek Ä½ach
+- **Danish**
+  - ButterflyOfFire
+  - Rasmus SÃ¦derup
+- **Dutch**
+  - ButterflyOfFire
+  - Jelv
+  - jeroenpraat
+  - rscmbbng
+- **English**
+  - ButterflyOfFire
+  - Renato "Lond" Cerqueira
+- **Esperanto**
+  - ButterflyOfFire
+  - Jeong Arm
+  - Martin Bodin
+  - MÃ©lanie Chauvel
+  - Vanege
+  - tuxayo/Victor Grousset
+- **Finnish**
+  - ButterflyOfFire
+  - Jonne Arjoranta
+  - S Heija
+  - Taru Luojola
+- **French**
+  - Alda Marteau-Hardi
+  - Alix D. R.
+  - Baptiste Jonglez
+  - ButterflyOfFire
+  - Franck Paul
+  - Jean-Baptiste Holcroft
+  - Jonathan Chan
+  - Letiteuf55
+  - Martin Bodin
+  - MÃ©lanie Chauvel
+  - Olivier Humbert
+  - Paul Marques Mota
+  - Sylvhem
+  - Technowix
+  - Thibaut Girka
+  - ThÃ©odore
+  - azenet
+  - codl
+- **Galician**
+  - ButterflyOfFire
+  - Xose M.
+  - manequim
+- **Georgian**
+  - ButterflyOfFire
+- **German**
+  - Benedikt GeiÃŸler
+  - ButterflyOfFire
+  - Daniel
+  - Eugen Rochko
+  - Koyu Berteon
+  - Patrick Figel
+  - Weblate Admin
+  - averageunicorn
+  - ePirat
+  - koyu
+  - larsreineke
+  - lilo
+- **Greek**
+  - Antonis
+  - ButterflyOfFire
+  - Dimitris Maroulidis
+  - Konstantinos Grevenitis
+- **Hebrew**
+  - ButterflyOfFire
+  - Ira
+  - Yaron Shahrabani
+- **Hungarian**
+  - Adam Paszternak
+  - ButterflyOfFire
+  - Tibike MiklÃ³s
+- **Ido**
+  - ButterflyOfFire
+- **Indonesian**
+  - Alfiana Sibuea
+  - ButterflyOfFire
+  - Dito Kurnia Pratama
+  - Eirworks
+  - afachri
+  - se7entime
+- **Italian**
+  - Alessandro Levati
+  - ButterflyOfFire
+  - Giuseppe Pignataro
+  - Stefano
+- **Japanese**
+  - ButterflyOfFire
+  - Kumasun Morino
+  - Yamagishi Kazutoshi
+  - mayaeh
+  - osapon
+  - unarist
+  - å°é³¥éŠã¾ã‚Šã‚
+  - æ£®ã®åãƒªã‚¹ã®ãƒŸãƒ¼ã‚³ã®å¤§å†’é™º
+- **Korean**
+  - ButterflyOfFire
+  - Jeong Arm
+  - Minori Hiraoka
+  - Yamagishi Kazutoshi
+- **Malay**
+  - ButterflyOfFire
+  - Muhammad Nur Hidayat (MNH48)
+- **Norwegian (old code)**
+  - ButterflyOfFire
+  - Espen RÃ¸nnevik
+  - Tale
+- **Occitan**
+  - ButterflyOfFire
+  - MaxenÃ§
+  - Quenti2
+  - QuentÃ
+- **Persian**
+  - ButterflyOfFire
+  - Masoud Abkenar
+- **Polish**
+  - ButterflyOfFire
+  - Jakub Mendyk
+  - Marcin MikoÅ‚ajczak
+  - Marek Ä½ach
+  - Stasiek Michalski
+  - krkk
+- **Portuguese**
+  - ButterflyOfFire
+  - Hugo Gameiro
+  - manequim
+- **Portuguese (Brazil)**
+  - AndrÃ© Andrade
+  - Anna e sÃ³
+  - ButterflyOfFire
+  - Renato "Lond" Cerqueira
+- **Romanian**
+  - ButterflyOfFire
+  - adrianbblk
+- **Russian**
+  - Andrew Zyabin
+  - ButterflyOfFire
+  - Evgeny Petrov
+  - Yaron Shahrabani
+- **Serbian**
+  - Branko Kokanovic
+  - Burekz Finezt
+  - ButterflyOfFire
+- **Serbian (latin)**
+  - ButterflyOfFire
+- **Slovak**
+  - ButterflyOfFire
+  - Ivan Pleva
+  - Lorem Ipsum
+  - Marek Ä½ach
+  - Peter
+- **Slovenian**
+  - ButterflyOfFire
+  - Kristijan Tkalec
+- **Spanish**
+  - Angeles BroullÃ³n
+  - AntÃ³n LÃ³pez
+  - ButterflyOfFire
+  - Carlos Mondragon
+  - David Charte
+  - Emmanuel
+  - Lothar Wolf
+  - Pablo de la ConcepciÃ³n Sanz
+- **Swedish**
+  - ButterflyOfFire
+  - Elias MÃ¥rtenson
+  - Isak HolmstrÃ¶m
+  - Shellkr
+  - Stefan Midjich
+  - Tim Stahel
+- **Telugu**
+  - ButterflyOfFire
+  - Joseph Nuthalapati
+  - Ranjith Tellakula
+  - avndp
+- **Thai**
+  - ButterflyOfFire
+- **Turkish**
+  - ButterflyOfFire
+- **Ukrainian**
+  - ButterflyOfFire
+  - Ivan Verchenko
+  - alexcleac
+- **Welsh**
+  - ButterflyOfFire
+  - Jaz-Michael King
+  - Kevin Beynon
+  - Owain Rhys Lewis
+  - Renato "Lond" Cerqueira
+  - Rhoslyn Prys
+  - carl morris
+- **Armenian**
+  - ButterflyOfFire
+- **Latvian**
+  - ButterflyOfFire
+- **Tamil**
+  - ButterflyOfFire
+  - Prasanna Venkadesh
diff --git a/Aptfile b/Aptfile
index 5dac836079eb024570a7cf20847cd921bf9cbb13..0a01fa24bdf07b4f073b65fb5c95044bdd7e1181 100644
--- a/Aptfile
+++ b/Aptfile
@@ -5,6 +5,25 @@ libidn11
 libidn11-dev
 libpq-dev
 libprotobuf-dev
+libssl-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
+libvpx5
+libxcb-render0
+libxcb-shm0
+libxrender1
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..3bafbe1e9e11142715c94bd34cf1f9a4fcbca675
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,330 @@
+Changelog
+=========
+
+All notable changes to this project will be documented in this file.
+
+## [2.7.0] - 2019-01-20
+### Added
+
+- Add link for adding a user to a list from their profile ([namelessGonbai](https://github.com/tootsuite/mastodon/pull/9062))
+- Add joining several hashtags in a single column ([gdpelican](https://github.com/tootsuite/mastodon/pull/8904))
+- Add volume sliders for videos ([sumdog](https://github.com/tootsuite/mastodon/pull/9366))
+- Add a tooltip explaining what a locked account is ([pawelngei](https://github.com/tootsuite/mastodon/pull/9403))
+- Add preloaded cache for common JSON-LD contexts ([ThibG](https://github.com/tootsuite/mastodon/pull/9412))
+- Add profile directory ([Gargron](https://github.com/tootsuite/mastodon/pull/9427))
+- Add setting to not group reblogs in home feed ([ThibG](https://github.com/tootsuite/mastodon/pull/9248))
+- Add admin ability to remove a user's header image ([ThibG](https://github.com/tootsuite/mastodon/pull/9495))
+- Add account hashtags to ActivityPub actor JSON ([Gargron](https://github.com/tootsuite/mastodon/pull/9450))
+- Add error message for avatar image that's too large ([sumdog](https://github.com/tootsuite/mastodon/pull/9518))
+- Add notification quick-filter bar ([pawelngei](https://github.com/tootsuite/mastodon/pull/9399))
+- Add new first-time tutorial ([Gargron](https://github.com/tootsuite/mastodon/pull/9531))
+- Add moderation warnings ([Gargron](https://github.com/tootsuite/mastodon/pull/9519))
+- Add emoji codepoint mappings for v11.0 ([Gargron](https://github.com/tootsuite/mastodon/pull/9618))
+- Add REST API for creating an account ([Gargron](https://github.com/tootsuite/mastodon/pull/9572))
+- Add support for Malayalam in language filter ([tachyons](https://github.com/tootsuite/mastodon/pull/9624))
+- Add exclude_reblogs option to account statuses API ([Gargron](https://github.com/tootsuite/mastodon/pull/9640))
+- Add local followers page to admin account UI ([chr-1x](https://github.com/tootsuite/mastodon/pull/9610))
+- Add healthcheck commands to docker-compose.yml ([BenLubar](https://github.com/tootsuite/mastodon/pull/9143))
+- Add handler for Move activity to migrate followers ([Gargron](https://github.com/tootsuite/mastodon/pull/9629))
+- Add CSV export for lists and domain blocks ([Gargron](https://github.com/tootsuite/mastodon/pull/9677))
+- Add `tootctl accounts follow ACCT` ([Gargron](https://github.com/tootsuite/mastodon/pull/9414))
+- Add scheduled statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/9706))
+- Add immutable caching for S3 objects ([nolanlawson](https://github.com/tootsuite/mastodon/pull/9722))
+- Add cache to custom emojis API ([Gargron](https://github.com/tootsuite/mastodon/pull/9732))
+- Add preview cards to non-detailed statuses on public pages ([Gargron](https://github.com/tootsuite/mastodon/pull/9714))
+- Add `mod` and `moderator` to list of default reserved usernames ([Gargron](https://github.com/tootsuite/mastodon/pull/9713))
+- Add quick links to the admin interface in the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/8545))
+- Add `tootctl domains crawl` ([Gargron](https://github.com/tootsuite/mastodon/pull/9809))
+- Add attachment list fallback to public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/9780))
+- Add `tootctl --version` ([Gargron](https://github.com/tootsuite/mastodon/pull/9835))
+- Add information about how to opt-in to the directory on the directory ([Gargron](https://github.com/tootsuite/mastodon/pull/9834))
+- Add timeouts for S3 ([Gargron](https://github.com/tootsuite/mastodon/pull/9842))
+- Add support for non-public reblogs from ActivityPub ([Gargron](https://github.com/tootsuite/mastodon/pull/9841))
+- Add sending of `Reject` activity when sending a `Block` activity ([ThibG](https://github.com/tootsuite/mastodon/pull/9811))
+
+### Changed
+
+- Temporarily pause timeline if mouse moved recently ([lmorchard](https://github.com/tootsuite/mastodon/pull/9200))
+- Change the password form order ([mayaeh](https://github.com/tootsuite/mastodon/pull/9267))
+- Redesign admin UI for accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/9340), [Gargron](https://github.com/tootsuite/mastodon/pull/9643))
+- Redesign admin UI for instances/domain blocks ([Gargron](https://github.com/tootsuite/mastodon/pull/9645))
+- Swap avatar and header input fields in profile page ([ThibG](https://github.com/tootsuite/mastodon/pull/9271))
+- When posting in mobile mode, go back to previous history location ([ThibG](https://github.com/tootsuite/mastodon/pull/9502))
+- Split out is_changing_upload from is_submitting ([ThibG](https://github.com/tootsuite/mastodon/pull/9536))
+- Back to the getting-started when pins the timeline. ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/9561))
+- Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/9573))
+- Limit maximum visibility of local silenced users to unlisted ([ThibG](https://github.com/tootsuite/mastodon/pull/9583))
+- Change API error message for unconfirmed accounts ([noellabo](https://github.com/tootsuite/mastodon/pull/9625))
+- Change the icon to "reply-all" when it's a reply to other accounts ([mayaeh](https://github.com/tootsuite/mastodon/pull/9378))
+- Do not ignore federated reports targetting already-reported accounts ([ThibG](https://github.com/tootsuite/mastodon/pull/9534))
+- Upgrade default Ruby version to 2.6.0 ([Gargron](https://github.com/tootsuite/mastodon/pull/9688))
+- Change e-mail digest frequency ([Gargron](https://github.com/tootsuite/mastodon/pull/9689))
+- Change Docker images for Tor support in docker-compose.yml ([Sir-Boops](https://github.com/tootsuite/mastodon/pull/9438))
+- Display fallback link card thumbnail when none is given ([Gargron](https://github.com/tootsuite/mastodon/pull/9715))
+- Change account bio length validation to ignore mention domains and URLs ([Gargron](https://github.com/tootsuite/mastodon/pull/9717))
+- Use configured contact user for "anonymous" federation activities ([yukimochi](https://github.com/tootsuite/mastodon/pull/9661))
+- Change remote interaction dialog to use specific actions instead of generic "interact" ([Gargron](https://github.com/tootsuite/mastodon/pull/9743))
+- Always re-fetch public key when signature verification fails to support blind key rotation ([ThibG](https://github.com/tootsuite/mastodon/pull/9667))
+- Make replies to boosts impossible, connect reply to original status instead ([valerauko](https://github.com/tootsuite/mastodon/pull/9129))
+- Change e-mail MX validation to check both A and MX records against blacklist ([Gargron](https://github.com/tootsuite/mastodon/pull/9489))
+- Hide floating action button on search and getting started pages ([tmm576](https://github.com/tootsuite/mastodon/pull/9826))
+- Redesign public hashtag page to use a masonry layout ([Gargron](https://github.com/tootsuite/mastodon/pull/9822))
+- Use `summary` as summary instead of content warning for converted ActivityPub objects ([Gargron](https://github.com/tootsuite/mastodon/pull/9823))
+- Display a double reply arrow on public pages for toots that are replies ([ThibG](https://github.com/tootsuite/mastodon/pull/9808))
+- Change admin UI right panel size to be wider ([Kjwon15](https://github.com/tootsuite/mastodon/pull/9768))
+
+### Removed
+
+- Remove links to bridge.joinmastodon.org (non-functional) ([Gargron](https://github.com/tootsuite/mastodon/pull/9608))
+- Remove LD-Signatures from activities that do not need them ([ThibG](https://github.com/tootsuite/mastodon/pull/9659))
+
+### Fixed
+
+- Remove unused computation of reblog references from updateTimeline ([ThibG](https://github.com/tootsuite/mastodon/pull/9244))
+- Fix loaded embeds resetting if a status arrives from API again ([ThibG](https://github.com/tootsuite/mastodon/pull/9270))
+- Fix race condition causing shallow status with only a "favourited" attribute ([ThibG](https://github.com/tootsuite/mastodon/pull/9272))
+- Remove intermediary arrays when creating hash maps from results ([Gargron](https://github.com/tootsuite/mastodon/pull/9291))
+- Extract counters from accounts table to account_stats table to improve performance ([Gargron](https://github.com/tootsuite/mastodon/pull/9295))
+- Change identities id column to a bigint ([Gargron](https://github.com/tootsuite/mastodon/pull/9371))
+- Fix conversations API pagination ([ThibG](https://github.com/tootsuite/mastodon/pull/9407))
+- Improve account suspension speed and completeness ([Gargron](https://github.com/tootsuite/mastodon/pull/9290))
+- Fix thread depth computation in statuses_controller ([ThibG](https://github.com/tootsuite/mastodon/pull/9426))
+- Fix database deadlocks by moving account stats update outside transaction ([ThibG](https://github.com/tootsuite/mastodon/pull/9437))
+- Escape HTML in profile name preview in profile settings ([pawelngei](https://github.com/tootsuite/mastodon/pull/9446))
+- Use same CORS policy for /@:username and /users/:username ([ThibG](https://github.com/tootsuite/mastodon/pull/9485))
+- Make custom emoji domains case insensitive ([Esteth](https://github.com/tootsuite/mastodon/pull/9474))
+- Various fixes to scrollable lists and media gallery ([ThibG](https://github.com/tootsuite/mastodon/pull/9501))
+- Fix bootsnap cache directory being declared relatively ([Gargron](https://github.com/tootsuite/mastodon/pull/9511))
+- Fix timeline pagination in the web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9516))
+- Fix padding on dropdown elements in preferences ([ThibG](https://github.com/tootsuite/mastodon/pull/9517))
+- Make avatar and headers respect GIF autoplay settings ([ThibG](https://github.com/tootsuite/mastodon/pull/9515))
+- Do no retry Web Push workers if the server returns a 4xx response ([Gargron](https://github.com/tootsuite/mastodon/pull/9434))
+- Minor scrollable list fixes ([ThibG](https://github.com/tootsuite/mastodon/pull/9551))
+- Ignore low-confidence CharlockHolmes guesses when parsing link cards ([ThibG](https://github.com/tootsuite/mastodon/pull/9510))
+- Fix `tootctl accounts rotate` not updating public keys ([Gargron](https://github.com/tootsuite/mastodon/pull/9556))
+- Fix CSP / X-Frame-Options for media players ([jomo](https://github.com/tootsuite/mastodon/pull/9558))
+- Fix unnecessary loadMore calls when the end of a timeline has been reached ([ThibG](https://github.com/tootsuite/mastodon/pull/9581))
+- Skip mailer job retries when a record no longer exists ([Gargron](https://github.com/tootsuite/mastodon/pull/9590))
+- Fix composer not getting focus after reply confirmation dialog ([ThibG](https://github.com/tootsuite/mastodon/pull/9602))
+- Fix signature verification stoplight triggering on non-timeout errors ([Gargron](https://github.com/tootsuite/mastodon/pull/9617))
+- Fix ThreadResolveWorker getting queued with invalid URLs ([Gargron](https://github.com/tootsuite/mastodon/pull/9628))
+- Fix crash when clearing uninitialized timeline ([ThibG](https://github.com/tootsuite/mastodon/pull/9662))
+- Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker ([ThibG](https://github.com/tootsuite/mastodon/pull/9660))
+- Skip full text search if it fails, instead of erroring out completely ([Kjwon15](https://github.com/tootsuite/mastodon/pull/9654))
+- Fix profile metadata links not verifying correctly sometimes ([shrft](https://github.com/tootsuite/mastodon/pull/9673))
+- Ensure blocked user unfollows blocker if Block/Undo-Block activities are processed out of order ([ThibG](https://github.com/tootsuite/mastodon/pull/9687))
+- Fix unreadable text color in report modal for some statuses ([Gargron](https://github.com/tootsuite/mastodon/pull/9716))
+- Stop GIFV timeline preview explicitly when it's opened in modal ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/9749))
+- Fix scrollbar width compensation ([ThibG](https://github.com/tootsuite/mastodon/pull/9824))
+- Fix race conditions when processing deleted toots ([ThibG](https://github.com/tootsuite/mastodon/pull/9815))
+- Fix SSO issues on WebKit browsers by disabling Same-Site cookie again ([moritzheiber](https://github.com/tootsuite/mastodon/pull/9819))
+- Fix empty OEmbed error ([renatolond](https://github.com/tootsuite/mastodon/pull/9807))
+- Fix drag & drop modal not disappearing sometimes ([hinaloe](https://github.com/tootsuite/mastodon/pull/9797))
+- Fix statuses with content warnings being displayed in web push notifications sometimes ([ThibG](https://github.com/tootsuite/mastodon/pull/9778))
+- Fix scroll-to-detailed status not working on public pages ([ThibG](https://github.com/tootsuite/mastodon/pull/9773))
+- Fix media modal loading indicator ([ThibG](https://github.com/tootsuite/mastodon/pull/9771))
+- Fix hashtag search results not having a permalink fallback in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9810))
+- Fix slightly cropped font on settings page dropdowns when using system font ([ariasuni](https://github.com/tootsuite/mastodon/pull/9839))
+- Fix not being able to drag & drop text into forms ([tmm576](https://github.com/tootsuite/mastodon/pull/9840))
+
+### Security
+
+- Sanitize and sandbox toot embeds in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9552))
+- Add tombstones for remote statuses to prevent replay attacks ([ThibG](https://github.com/tootsuite/mastodon/pull/9830))
+
+## [2.6.5] - 2018-12-01
+### Changed
+
+- Change lists to display replies to others on the list and list owner ([ThibG](https://github.com/tootsuite/mastodon/pull/9324))
+
+### Fixed
+
+- Fix failures caused by commonly-used JSON-LD contexts being unavailable ([ThibG](https://github.com/tootsuite/mastodon/pull/9412))
+
+## [2.6.4] - 2018-11-30
+### Fixed
+
+- Fix yarn dependencies not installing due to yanked event-stream package ([Gargron](https://github.com/tootsuite/mastodon/pull/9401))
+
+## [2.6.3] - 2018-11-30
+### Added
+
+- Add hyphen to characters allowed in remote usernames ([ThibG](https://github.com/tootsuite/mastodon/pull/9345))
+
+### Changed
+
+- Change server user count to exclude suspended accounts ([Gargron](https://github.com/tootsuite/mastodon/pull/9380))
+
+### Fixed
+
+- Fix ffmpeg processing sometimes stalling due to overfilled stdout buffer ([hugogameiro](https://github.com/tootsuite/mastodon/pull/9368))
+- Fix missing DNS records raising the wrong kind of exception ([Gargron](https://github.com/tootsuite/mastodon/pull/9379))
+- Fix already queued deliveries still trying to reach inboxes marked as unavailable ([Gargron](https://github.com/tootsuite/mastodon/pull/9358))
+
+### Security
+
+- Fix TLS handshake timeout not being enforced ([Gargron](https://github.com/tootsuite/mastodon/pull/9381))
+
+## [2.6.2] - 2018-11-23
+### Added
+
+- Add Page to whitelisted ActivityPub types ([mbajur](https://github.com/tootsuite/mastodon/pull/9188))
+- Add 20px to column width in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/9227))
+- Add amount of freed disk space in `tootctl media remove` ([Gargron](https://github.com/tootsuite/mastodon/pull/9229), [Gargron](https://github.com/tootsuite/mastodon/pull/9239), [mayaeh](https://github.com/tootsuite/mastodon/pull/9288))
+- Add "Show thread" link to self-replies ([Gargron](https://github.com/tootsuite/mastodon/pull/9228))
+
+### Changed
+
+- Change order of Atom and RSS links so Atom is first ([Alkarex](https://github.com/tootsuite/mastodon/pull/9302))
+- Change Nginx configuration for Nanobox apps ([danhunsaker](https://github.com/tootsuite/mastodon/pull/9310))
+- Change the follow action to appear instant in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/9220))
+- Change how the ActiveRecord connection is instantiated in on_worker_boot ([Gargron](https://github.com/tootsuite/mastodon/pull/9238))
+- Change `tootctl accounts cull` to always touch accounts so they can be skipped ([renatolond](https://github.com/tootsuite/mastodon/pull/9293))
+- Change mime type comparison to ignore JSON-LD profile ([valerauko](https://github.com/tootsuite/mastodon/pull/9179))
+
+### Fixed
+
+- Fix web UI crash when conversation has no last status ([sammy8806](https://github.com/tootsuite/mastodon/pull/9207))
+- Fix follow limit validator reporting lower number past threshold ([Gargron](https://github.com/tootsuite/mastodon/pull/9230))
+- Fix form validation flash message color and input borders ([Gargron](https://github.com/tootsuite/mastodon/pull/9235))
+- Fix invalid twitter:player cards being displayed ([ThibG](https://github.com/tootsuite/mastodon/pull/9254))
+- Fix emoji update date being processed incorrectly ([ThibG](https://github.com/tootsuite/mastodon/pull/9255))
+- Fix playing embed resetting if status is reloaded in web UI ([ThibG](https://github.com/tootsuite/mastodon/pull/9270), [Gargron](https://github.com/tootsuite/mastodon/pull/9275))
+- Fix web UI crash when favouriting a deleted status ([ThibG](https://github.com/tootsuite/mastodon/pull/9272))
+- Fix intermediary arrays being created for hash maps ([Gargron](https://github.com/tootsuite/mastodon/pull/9291))
+- Fix filter ID not being a string in REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/9303))
+
+### Security
+
+- Fix multiple remote account deletions being able to deadlock the database ([Gargron](https://github.com/tootsuite/mastodon/pull/9292))
+- Fix HTTP connection timeout of 10s not being enforced ([Gargron](https://github.com/tootsuite/mastodon/pull/9329))
+
+## [2.6.1] - 2018-10-30
+### Fixed
+
+- Fix resolving resources by URL not working due to a regression in [valerauko](https://github.com/tootsuite/mastodon/pull/9132) ([Gargron](https://github.com/tootsuite/mastodon/pull/9171))
+- Fix reducer error in web UI when a conversation has no last status ([Gargron](https://github.com/tootsuite/mastodon/pull/9173))
+
+## [2.6.0] - 2018-10-30
+### Added
+
+- Add link ownership verification ([Gargron](https://github.com/tootsuite/mastodon/pull/8703))
+- Add conversations API ([Gargron](https://github.com/tootsuite/mastodon/pull/8832))
+- Add limit for the number of people that can be followed from one account ([Gargron](https://github.com/tootsuite/mastodon/pull/8807))
+- Add admin setting to customize mascot ([ashleyhull-versent](https://github.com/tootsuite/mastodon/pull/8766))
+- Add support for more granular ActivityPub audiences from other software, i.e. circles ([Gargron](https://github.com/tootsuite/mastodon/pull/8950), [Gargron](https://github.com/tootsuite/mastodon/pull/9093), [Gargron](https://github.com/tootsuite/mastodon/pull/9150))
+- Add option to block all reports from a domain ([Gargron](https://github.com/tootsuite/mastodon/pull/8830))
+- Add user preference to always expand toots marked with content warnings ([webroo](https://github.com/tootsuite/mastodon/pull/8762))
+- Add user preference to always hide all media ([fvh-P](https://github.com/tootsuite/mastodon/pull/8569))
+- Add `force_login` param to OAuth authorize page ([Gargron](https://github.com/tootsuite/mastodon/pull/8655))
+- Add `tootctl accounts backup` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts create` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts cull` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts delete` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts modify` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl accounts refresh` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl feeds build` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl feeds clear` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl settings registrations open` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `tootctl settings registrations close` ([Gargron](https://github.com/tootsuite/mastodon/pull/8642), [Gargron](https://github.com/tootsuite/mastodon/pull/8811))
+- Add `min_id` param to REST API to support backwards pagination ([Gargron](https://github.com/tootsuite/mastodon/pull/8736))
+- Add a confirmation dialog when hitting reply and the compose box isn't empty ([ThibG](https://github.com/tootsuite/mastodon/pull/8893))
+- Add PostgreSQL disk space growth tracking in PGHero ([Gargron](https://github.com/tootsuite/mastodon/pull/8906))
+- Add button for disabling local account to report quick actions bar ([Gargron](https://github.com/tootsuite/mastodon/pull/9024))
+- Add Czech language ([Aditoo17](https://github.com/tootsuite/mastodon/pull/8594))
+- Add `same-site` (`lax`) attribute to cookies ([sorin-davidoi](https://github.com/tootsuite/mastodon/pull/8626))
+- Add support for styled scrollbars in Firefox Nightly ([sorin-davidoi](https://github.com/tootsuite/mastodon/pull/8653))
+- Add highlight to the active tab in web UI profiles ([rhoio](https://github.com/tootsuite/mastodon/pull/8673))
+- Add auto-focus for comment textarea in report modal ([ThibG](https://github.com/tootsuite/mastodon/pull/8689))
+- Add auto-focus for emoji picker's search field ([ThibG](https://github.com/tootsuite/mastodon/pull/8688))
+- Add nginx and systemd templates to `dist/` directory ([Gargron](https://github.com/tootsuite/mastodon/pull/8770))
+- Add support for `/.well-known/change-password` ([Gargron](https://github.com/tootsuite/mastodon/pull/8828))
+- Add option to override FFMPEG binary path ([sascha-sl](https://github.com/tootsuite/mastodon/pull/8855))
+- Add `dns-prefetch` tag when using different host for assets or uploads ([Gargron](https://github.com/tootsuite/mastodon/pull/8942))
+- Add `description` meta tag ([Gargron](https://github.com/tootsuite/mastodon/pull/8941))
+- Add `Content-Security-Policy` header ([ThibG](https://github.com/tootsuite/mastodon/pull/8957))
+- Add cache for the instance info API ([ykzts](https://github.com/tootsuite/mastodon/pull/8765))
+- Add suggested follows to search screen in mobile layout ([Gargron](https://github.com/tootsuite/mastodon/pull/9010))
+- Add CORS header to `/.well-known/*` routes ([BenLubar](https://github.com/tootsuite/mastodon/pull/9083))
+- Add `card` attribute to statuses returned from REST API ([Gargron](https://github.com/tootsuite/mastodon/pull/9120))
+- Add in-stream link preview ([Gargron](https://github.com/tootsuite/mastodon/pull/9120))
+- Add support for ActivityPub `Page` objects ([mbajur](https://github.com/tootsuite/mastodon/pull/9121))
+
+### Changed
+
+- Change forms design ([Gargron](https://github.com/tootsuite/mastodon/pull/8703))
+- Change reports overview to group by target account ([Gargron](https://github.com/tootsuite/mastodon/pull/8674))
+- Change web UI to show "read more" link on overly long in-stream statuses ([lanodan](https://github.com/tootsuite/mastodon/pull/8205))
+- Change design of direct messages column ([Gargron](https://github.com/tootsuite/mastodon/pull/8832), [Gargron](https://github.com/tootsuite/mastodon/pull/9022))
+- Change home timelines to exclude DMs ([Gargron](https://github.com/tootsuite/mastodon/pull/8940))
+- Change list timelines to exclude all replies ([cbayerlein](https://github.com/tootsuite/mastodon/pull/8683))
+- Change admin accounts UI default sort to most recent ([Gargron](https://github.com/tootsuite/mastodon/pull/8813))
+- Change documentation URL in the UI ([Gargron](https://github.com/tootsuite/mastodon/pull/8898))
+- Change style of success and failure messages ([Gargron](https://github.com/tootsuite/mastodon/pull/8973))
+- Change DM filtering to always allow DMs from staff ([qguv](https://github.com/tootsuite/mastodon/pull/8993))
+- Change recommended Ruby version to 2.5.3 ([zunda](https://github.com/tootsuite/mastodon/pull/9003))
+- Change docker-compose default to persist volumes in current directory ([Gargron](https://github.com/tootsuite/mastodon/pull/9055))
+- Change character counters on edit profile page to input length limit ([Gargron](https://github.com/tootsuite/mastodon/pull/9100))
+- Change notification filtering to always let through messages from staff ([Gargron](https://github.com/tootsuite/mastodon/pull/9152))
+- Change "hide boosts from user" function also hiding notifications about boosts ([ThibG](https://github.com/tootsuite/mastodon/pull/9147))
+- Change CSS `detailed-status__wrapper` class actually wrap the detailed status ([trwnh](https://github.com/tootsuite/mastodon/pull/8547))
+
+### Deprecated
+
+- `GET /api/v1/timelines/direct` â†’ `GET /api/v1/conversations` ([Gargron](https://github.com/tootsuite/mastodon/pull/8832))
+- `POST /api/v1/notifications/dismiss` â†’ `POST /api/v1/notifications/:id/dismiss` ([Gargron](https://github.com/tootsuite/mastodon/pull/8905))
+- `GET /api/v1/statuses/:id/card` â†’ `card` attributed included in status ([Gargron](https://github.com/tootsuite/mastodon/pull/9120))
+
+### Removed
+
+- Remove "on this device" label in column push settings ([rhoio](https://github.com/tootsuite/mastodon/pull/8704))
+- Remove rake tasks in favour of tootctl commands ([Gargron](https://github.com/tootsuite/mastodon/pull/8675))
+
+### Fixed
+
+- Fix remote statuses using instance's default locale if no language given ([Kjwon15](https://github.com/tootsuite/mastodon/pull/8861))
+- Fix streaming API not exiting when port or socket is unavailable ([Gargron](https://github.com/tootsuite/mastodon/pull/9023))
+- Fix network calls being performed in database transaction in ActivityPub handler ([Gargron](https://github.com/tootsuite/mastodon/pull/8951))
+- Fix dropdown arrow position ([ThibG](https://github.com/tootsuite/mastodon/pull/8637))
+- Fix first element of dropdowns being focused even if not using keyboard ([ThibG](https://github.com/tootsuite/mastodon/pull/8679))
+- Fix tootctl requiring `bundle exec` invocation ([abcang](https://github.com/tootsuite/mastodon/pull/8619))
+- Fix public pages not using animation preference for avatars ([renatolond](https://github.com/tootsuite/mastodon/pull/8614))
+- Fix OEmbed/OpenGraph cards not understanding relative URLs ([ThibG](https://github.com/tootsuite/mastodon/pull/8669))
+- Fix some dark emojis not having a white outline ([ThibG](https://github.com/tootsuite/mastodon/pull/8597))
+- Fix media description not being displayed in various media modals ([ThibG](https://github.com/tootsuite/mastodon/pull/8678))
+- Fix generated URLs of desktop notifications missing base URL ([GenbuHase](https://github.com/tootsuite/mastodon/pull/8758))
+- Fix RTL styles ([mabkenar](https://github.com/tootsuite/mastodon/pull/8764), [mabkenar](https://github.com/tootsuite/mastodon/pull/8767), [mabkenar](https://github.com/tootsuite/mastodon/pull/8823), [mabkenar](https://github.com/tootsuite/mastodon/pull/8897), [mabkenar](https://github.com/tootsuite/mastodon/pull/9005), [mabkenar](https://github.com/tootsuite/mastodon/pull/9007), [mabkenar](https://github.com/tootsuite/mastodon/pull/9018), [mabkenar](https://github.com/tootsuite/mastodon/pull/9021), [mabkenar](https://github.com/tootsuite/mastodon/pull/9145), [mabkenar](https://github.com/tootsuite/mastodon/pull/9146))
+- Fix crash in streaming API when tag param missing ([Gargron](https://github.com/tootsuite/mastodon/pull/8955))
+- Fix hotkeys not working when no element is focused ([ThibG](https://github.com/tootsuite/mastodon/pull/8998))
+- Fix some hotkeys not working on detailed status view ([ThibG](https://github.com/tootsuite/mastodon/pull/9006))
+- Fix og:url on status pages ([ThibG](https://github.com/tootsuite/mastodon/pull/9047))
+- Fix upload option buttons only being visible on hover ([Gargron](https://github.com/tootsuite/mastodon/pull/9074))
+- Fix tootctl not returning exit code 1 on wrong arguments ([sascha-sl](https://github.com/tootsuite/mastodon/pull/9094))
+- Fix preview cards for appearing for profiles mentioned in toot ([ThibG](https://github.com/tootsuite/mastodon/pull/6934), [ThibG](https://github.com/tootsuite/mastodon/pull/9158))
+- Fix local accounts sometimes being duplicated as faux-remote ([Gargron](https://github.com/tootsuite/mastodon/pull/9109))
+- Fix emoji search when the shortcode has multiple separators ([ThibG](https://github.com/tootsuite/mastodon/pull/9124))
+- Fix dropdowns sometimes being partially obscured by other elements ([kedamaDQ](https://github.com/tootsuite/mastodon/pull/9126))
+- Fix cache not updating when reply/boost/favourite counters or media sensitivity update ([Gargron](https://github.com/tootsuite/mastodon/pull/9119))
+- Fix empty display name precedence over username in web UI ([Gargron](https://github.com/tootsuite/mastodon/pull/9163))
+- Fix td instead of th in sessions table header ([Gargron](https://github.com/tootsuite/mastodon/pull/9162))
+- Fix handling of content types with profile ([valerauko](https://github.com/tootsuite/mastodon/pull/9132))
+
+## [2.5.2] - 2018-10-12
+### Security
+
+- Fix XSS vulnerability ([Gargron](https://github.com/tootsuite/mastodon/pull/8959))
+
+## [2.5.1] - 2018-10-07
+### Fixed
+
+- Fix database migrations for PostgreSQL below 9.5 ([Gargron](https://github.com/tootsuite/mastodon/pull/8903))
+- Fix class autoloading issue in ActivityPub Create handler ([Gargron](https://github.com/tootsuite/mastodon/pull/8820))
+- Fix cache statistics not being sent via statsd when statsd enabled ([ykzts](https://github.com/tootsuite/mastodon/pull/8831))
+- Bump puma from 3.11.4 to 3.12.0 ([dependabot[bot]](https://github.com/tootsuite/mastodon/pull/8883))
+
+### Security
+
+- Fix some local images not having their EXIF metadata stripped on upload ([ThibG](https://github.com/tootsuite/mastodon/pull/8714))
+- Fix being able to enable a disabled relay via ActivityPub Accept handler ([ThibG](https://github.com/tootsuite/mastodon/pull/8864))
+- Bump nokogiri from 1.8.4 to 1.8.5 ([dependabot[bot]](https://github.com/tootsuite/mastodon/pull/8881))
+- Fix being able to report statuses not belonging to the reported account ([ThibG](https://github.com/tootsuite/mastodon/pull/8916))
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d0f75f2e453fc3067f4e1c527771260e7dce8ddc..b55729a9ba2da8ef06eed1f26f10f89092f81148 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,56 +1,37 @@
-CONTRIBUTING
+Contributing
 ============
 
-There are three ways in which you can contribute to this repository:
+Thank you for considering contributing to Mastodon ðŸ˜ 
 
-1. By improving the documentation
-2. By working on the back-end application
-3. By working on the front-end application
+You can contribute in the following ways:
 
-Choosing what to work on in a large open source project is not easy. The list of [GitHub issues](https://github.com/tootsuite/mastodon/issues) may provide some ideas, but not every feature request has been greenlit. Likewise, not every change or feature that resolves a personal itch will be merged into the main repository. Some communication ahead of time may be wise. If your addition creates a new feature or setting, or otherwise changes how things work in some substantial way, please remember to submit a correlating pull request to document your changes in the [documentation](http://github.com/tootsuite/documentation).
+- Finding and reporting bugs
+- Translating the Mastodon interface into various languages
+- Contributing code to Mastodon by fixing bugs or implementing features
+- Improving the documentation
 
-Below are the guidelines for working on pull requests:
+## Bug reports
 
-## General
+Bug reports and feature suggestions can be submitted to [GitHub Issues](https://github.com/tootsuite/mastodon/issues). Please make sure that you are not submitting duplicates, and that a similar report or request has not already been resolved or rejected in the past using the search function. Please also use descriptive, concise titles.
 
-- 2 spaces indentation
+## Translations
 
-## Documentation
-
-- No spelling mistakes
-- No orthographic mistakes
-- No Markdown syntax errors
-
-## Requirements
-
-- Ruby
-- Node.js
-- PostgreSQL
-- Redis
-- Nginx (optional)
-
-## Back-end application
+You can submit translations via [Weblate](https://weblate.joinmastodon.org/). They are periodically merged into the codebase.
 
-It is expected that you have a working development environment set up. The development environment includes [rubocop](https://github.com/bbatsov/rubocop), which checks your Ruby code for compliance with our style guide and best practices. Sublime Text, likely like other editors, has a [Rubocop plugin](https://github.com/pderichs/sublime_rubocop) that runs checks on files as you edit them. The codebase also has a test suite.
-
-* The codebase is not perfect, at the time of writing, but it is expected that you do not introduce new code style violations
-* The rspec test suite must pass
-* To the extent that it is possible, verify your changes. In the best case, by adding new tests to the test suite. At the very least, by running the server or console and checking it manually
-* If you are introducing new strings to the user interface, they must be using localization methods
+[![Mastodon translation statistics by language](https://weblate.joinmastodon.org/widgets/mastodon/-/multi-auto.svg)](https://weblate.joinmastodon.org/)
 
-If your code has syntax errors that won't let it run, it's a good sign that the pull request isn't ready for submission yet.
+## Pull requests
 
-## Front-end application
+Please use clean, concise titles for your pull requests. We use commit squashing, so the final commit in the master branch will carry the title of the pull request.
 
-It is expected that you have a working development environment set up (see back-end application section). This project includes an ESLint configuration file, with which you can lint your changes.
+The smaller the set of changes in the pull request is, the quicker it can be reviewed and merged. Splitting tasks into multiple smaller pull requests is often preferable.
 
-* Avoid grave ESLint violations
-* Verify that your changes work
-* If you are introducing new strings, they must be using localization methods
+**Pull requests that do not pass automated checks may not be reviewed**. In particular, you need to keep in mind:
 
-If the JavaScript or CSS assets won't compile due to a syntax error, it's a good sign that the pull request isn't ready for submission yet.
+- Unit and integration tests (rspec, jest)
+- Code style rules (rubocop, eslint)
+- Normalization of locale files (i18n-tasks)
 
-## Translate
+## Documentation
 
-You can contribute to translating Mastodon via Weblate at [weblate.joinmastodon.org](https://weblate.joinmastodon.org/).
-[![Mastodon translation statistics by language](https://weblate.joinmastodon.org/widgets/mastodon/-/multi-auto.svg)](https://weblate.joinmastodon.org/)
+The [Mastodon documentation](https://docs.joinmastodon.org) is a statically generated site. You can [submit merge requests to mastodon/docs](https://source.joinmastodon.org/mastodon/docs).
diff --git a/Dockerfile b/Dockerfile
index fe1cea89a42a08dedd4974ac5439e3d17d3b49ad..19090533757c5260aff2366a962498734bd5983f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.4.4-alpine3.6
+FROM node:8.15-alpine as node
+FROM ruby:2.6-alpine3.8
 
 LABEL maintainer="https://github.com/tootsuite/mastodon" \
       description="Your self-hosted, globally interconnected microblogging community"
@@ -11,8 +12,6 @@ ENV PATH=/mastodon/bin:$PATH \
     RAILS_ENV=production \
     NODE_ENV=production
 
-ARG YARN_VERSION=1.3.2
-ARG YARN_DOWNLOAD_SHA256=6cfe82e530ef0837212f13e45c1565ba53f5199eec2527b85ecbcd88bf26821d
 ARG LIBICONV_VERSION=1.15
 ARG LIBICONV_DOWNLOAD_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
 
@@ -20,6 +19,11 @@ EXPOSE 3000 4000
 
 WORKDIR /mastodon
 
+COPY --from=node /usr/local/bin/node /usr/local/bin/node
+COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
+COPY --from=node /usr/local/bin/npm /usr/local/bin/npm
+COPY --from=node /opt/yarn-* /opt/yarn
+
 RUN apk -U upgrade \
  && apk add -t build-dependencies \
     build-base \
@@ -27,6 +31,8 @@ RUN apk -U upgrade \
     libidn-dev \
     libressl \
     libtool \
+    libxml2-dev \
+    libxslt-dev \
     postgresql-dev \
     protobuf-dev \
     python \
@@ -39,20 +45,15 @@ RUN apk -U upgrade \
     imagemagick \
     libidn \
     libpq \
-    nodejs \
-    nodejs-npm \
+    libxml2 \
+    libxslt \
     protobuf \
     tini \
     tzdata \
  && update-ca-certificates \
- && mkdir -p /tmp/src /opt \
- && wget -O yarn.tar.gz "https://github.com/yarnpkg/yarn/releases/download/v$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
- && echo "$YARN_DOWNLOAD_SHA256 *yarn.tar.gz" | sha256sum -c - \
- && tar -xzf yarn.tar.gz -C /tmp/src \
- && rm yarn.tar.gz \
- && mv /tmp/src/yarn-v$YARN_VERSION /opt/yarn \
  && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
  && ln -s /opt/yarn/bin/yarnpkg /usr/local/bin/yarnpkg \
+ && mkdir -p /tmp/src /opt \
  && wget -O libiconv.tar.gz "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \
  && echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \
  && tar -xzf libiconv.tar.gz -C /tmp/src \
@@ -67,9 +68,9 @@ RUN apk -U upgrade \
 
 COPY Gemfile Gemfile.lock package.json yarn.lock .yarnclean /mastodon/
 
-RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
+RUN bundle config build.nokogiri --use-system-libraries --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
  && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \
- && yarn --pure-lockfile \
+ && yarn install --pure-lockfile --ignore-engines \
  && yarn cache clean
 
 RUN addgroup -g ${GID} mastodon && adduser -h /mastodon -s /bin/sh -D -G mastodon -u ${UID} mastodon \
@@ -80,8 +81,10 @@ COPY . /mastodon
 
 RUN chown -R mastodon:mastodon /mastodon
 
-VOLUME /mastodon/public/system /mastodon/public/assets /mastodon/public/packs
+VOLUME /mastodon/public/system
 
 USER mastodon
 
+RUN OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder bundle exec rails assets:precompile
+
 ENTRYPOINT ["/sbin/tini", "--"]
diff --git a/Gemfile b/Gemfile
index 7a6e1568d28c355b09bc3d778b4c8c272c6135cf..d17ff1a51c3820b8e8ed4481a2296df385e7950f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,138 +1,139 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 2.3.0', '< 2.6.0'
+ruby '>= 2.4.0', '< 2.7.0'
 
 gem 'pkg-config', '~> 1.3'
 
-gem 'puma', '~> 3.11'
-gem 'rails', '~> 5.2.0'
+gem 'puma', '~> 3.12'
+gem 'rails', '~> 5.2.2'
+gem 'thor', '~> 0.20'
 
 gem 'hamlit-rails', '~> 0.2'
-gem 'pg', '~> 1.0'
-gem 'pghero', '~> 2.1'
-gem 'dotenv-rails', '~> 2.2', '< 2.3'
-
-gem 'aws-sdk-s3', '~> 1.9', require: false
-gem 'fog-core', '~> 1.45'
-gem 'fog-local', '~> 0.5', require: false
-gem 'fog-openstack', '~> 0.1', require: false
+gem 'pg', '~> 1.1'
+gem 'makara', '~> 0.4'
+gem 'pghero', '~> 2.2'
+gem 'dotenv-rails', '~> 2.6'
+
+gem 'aws-sdk-s3', '~> 1.30', require: false
+gem 'fog-core', '<= 2.1.0'
+gem 'fog-openstack', '~> 0.3', require: false
 gem 'paperclip', '~> 6.0'
 gem 'paperclip-av-transcoder', '~> 0.6'
 gem 'streamio-ffmpeg', '~> 3.0'
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.5'
-gem 'bootsnap', '~> 1.3'
+gem 'bootsnap', '~> 1.3', require: false
 gem 'browser'
 gem 'charlock_holmes', '~> 0.7.6'
 gem 'iso-639'
 gem 'chewy', '~> 5.0'
-gem 'cld3', '~> 3.2.0'
-gem 'devise', '~> 4.4'
+gem 'cld3', '~> 3.2.3'
+gem 'devise', '~> 4.5'
 gem 'devise-two-factor', '~> 3.0'
 
 group :pam_authentication, optional: true do
-  gem 'devise_pam_authenticatable2', '~> 9.1'
+  gem 'devise_pam_authenticatable2', '~> 9.2'
 end
 
 gem 'net-ldap', '~> 0.10'
 gem 'omniauth-cas', '~> 1.1'
 gem 'omniauth-saml', '~> 1.10'
-gem 'omniauth', '~> 1.2'
+gem 'omniauth', '~> 1.9'
 
-gem 'doorkeeper', '~> 4.2', '< 4.3'
+gem 'doorkeeper', '~> 5.0'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'goldfinger', '~> 2.1'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.5'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 3.2'
+gem 'http', '~> 3.3'
 gem 'http_accept_language', '~> 2.1'
 gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2'
-gem 'httplog', '~> 1.0'
+gem 'httplog', '~> 1.2'
 gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.1'
 gem 'link_header', '~> 0.0'
-gem 'mime-types', '~> 3.1', require: 'mime/types/columnar'
-gem 'nokogiri', '~> 1.8'
+gem 'mime-types', '~> 3.2', require: 'mime/types/columnar'
+gem 'nokogiri', '~> 1.10'
 gem 'nsa', '~> 0.2'
-gem 'oj', '~> 3.5'
+gem 'oj', '~> 3.7'
 gem 'ostatus2', '~> 2.0'
-gem 'ox', '~> 2.9'
+gem 'ox', '~> 2.10'
 gem 'posix-spawn', git: 'https://github.com/rtomayko/posix-spawn', ref: '58465d2e213991f8afb13b984854a49fcdcc980c'
-gem 'pundit', '~> 1.1'
+gem 'pundit', '~> 2.0'
 gem 'premailer-rails'
-gem 'rack-attack', '~> 5.2'
+gem 'rack-attack', '~> 5.4'
 gem 'rack-cors', '~> 1.0', require: 'rack/cors'
 gem 'rails-i18n', '~> 5.1'
 gem 'rails-settings-cached', '~> 0.6'
-gem 'redis', '~> 4.0', require: ['redis', 'redis/connection/hiredis']
+gem 'redis', '~> 4.1', require: ['redis', 'redis/connection/hiredis']
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 0.10'
-gem 'ruby-progressbar', '~> 1.4'
-gem 'sanitize', '~> 4.6'
-gem 'sidekiq', '~> 5.1'
-gem 'sidekiq-scheduler', '~> 2.2'
-gem 'sidekiq-unique-jobs', '~> 5.0'
-gem 'sidekiq-bulk', '~>0.1.1'
+gem 'sanitize', '~> 5.0'
+gem 'sidekiq', '~> 5.2'
+gem 'sidekiq-scheduler', '~> 3.0'
+gem 'sidekiq-unique-jobs', '~> 6.0'
+gem 'sidekiq-bulk', '~>0.2.0'
 gem 'simple-navigation', '~> 4.0'
-gem 'simple_form', '~> 4.0'
+gem 'simple_form', '~> 4.1'
 gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
 gem 'stoplight', '~> 2.1.3'
-gem 'strong_migrations', '~> 0.2'
+gem 'strong_migrations', '~> 0.3'
 gem 'tty-command', '~> 0.8', require: false
-gem 'tty-prompt', '~> 0.16', require: false
+gem 'tty-prompt', '~> 0.18', require: false
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2018'
-gem 'webpacker', '~> 3.4'
+gem 'webpacker', '~> 3.5'
 gem 'webpush'
 
-gem 'json-ld', '~> 2.2'
+gem 'json-ld', '~> 3.0'
+gem 'json-ld-preloaded', '~> 3.0'
 gem 'rdf-normalize', '~> 0.3'
 
 group :development, :test do
   gem 'fabrication', '~> 2.20'
-  gem 'fuubar', '~> 2.2'
+  gem 'fuubar', '~> 2.3'
   gem 'i18n-tasks', '~> 0.9', require: false
   gem 'pry-byebug', '~> 3.6'
   gem 'pry-rails', '~> 0.3'
-  gem 'rspec-rails', '~> 3.7'
+  gem 'rspec-rails', '~> 3.8'
 end
 
 group :production, :test do
-  gem 'private_address_check', '~> 0.4.1'
+  gem 'private_address_check', '~> 0.5'
 end
 
 group :test do
-  gem 'capybara', '~> 2.18'
+  gem 'capybara', '~> 3.12'
   gem 'climate_control', '~> 0.2'
-  gem 'faker', '~> 1.8'
+  gem 'faker', '~> 1.9'
   gem 'microformats', '~> 4.0'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
   gem 'simplecov', '~> 0.16', require: false
-  gem 'webmock', '~> 3.3'
-  gem 'parallel_tests', '~> 2.21'
+  gem 'webmock', '~> 3.5'
+  gem 'parallel_tests', '~> 2.27'
 end
 
 group :development do
   gem 'active_record_query_trace', '~> 1.5'
   gem 'annotate', '~> 2.7'
-  gem 'better_errors', '~> 2.4'
+  gem 'better_errors', '~> 2.5'
   gem 'binding_of_caller', '~> 0.7'
-  gem 'bullet', '~> 5.7'
-  gem 'letter_opener', '~> 1.4'
+  gem 'bullet', '~> 5.9'
+  gem 'letter_opener', '~> 1.7'
   gem 'letter_opener_web', '~> 1.3'
   gem 'memory_profiler'
-  gem 'rubocop', '~> 0.55', require: false
-  gem 'brakeman', '~> 4.2', require: false
+  gem 'rubocop', '~> 0.63', require: false
+  gem 'brakeman', '~> 4.4', require: false
   gem 'bundler-audit', '~> 0.6', require: false
   gem 'scss_lint', '~> 0.57', require: false
 
-  gem 'capistrano', '~> 3.10'
-  gem 'capistrano-rails', '~> 1.3'
+  gem 'capistrano', '~> 3.11'
+  gem 'capistrano-rails', '~> 1.4'
   gem 'capistrano-rbenv', '~> 2.1'
   gem 'capistrano-yarn', '~> 2.0'
 
@@ -144,3 +145,5 @@ group :production do
   gem 'lograge', '~> 0.10'
   gem 'redis-rails', '~> 5.0'
 end
+
+gem 'concurrent-ruby', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index e1929a05c83069691dda609af022755060798f6c..acb4b8dda98fe5377ec88c9a2767fc66ce0fac8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,49 +15,49 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.7)
+    active_model_serializers (0.10.8)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
     active_record_query_trace (1.5.4)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -66,7 +66,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     airbrussh (1.3.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    annotate (2.7.3)
+    annotate (2.7.4)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 13.0)
     arel (9.0.0)
@@ -75,40 +75,42 @@ GEM
       encryptor (~> 3.0.0)
     av (0.9.0)
       cocaine (~> 0.5.3)
-    aws-partitions (1.80.0)
-    aws-sdk-core (3.19.0)
+    aws-eventstream (1.0.1)
+    aws-partitions (1.131.0)
+    aws-sdk-core (3.45.0)
+      aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.5.0)
-      aws-sdk-core (~> 3)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.9.1)
-      aws-sdk-core (~> 3)
+    aws-sdk-s3 (1.30.1)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.0.3)
     bcrypt (3.1.12)
     benchmark-ips (2.7.2)
-    better_errors (2.4.0)
+    better_errors (2.5.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.3.0)
+    bootsnap (1.3.2)
       msgpack (~> 1.0)
-    brakeman (4.2.1)
+    brakeman (4.4.0)
     browser (2.5.3)
     builder (3.2.3)
-    bullet (5.7.5)
+    bullet (5.9.0)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.11.0)
-    bundler-audit (0.6.0)
-      bundler (~> 1.2)
+      uniform_notifier (~> 1.11)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     byebug (10.0.2)
-    capistrano (3.10.2)
+    capistrano (3.11.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -116,21 +118,22 @@ GEM
     capistrano-bundler (1.3.0)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.3.1)
+    capistrano-rails (1.4.0)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
-    capistrano-rbenv (2.1.3)
+    capistrano-rbenv (2.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (2.18.0)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     case_transform (0.2)
       activesupport
     charlock_holmes (0.7.6)
@@ -139,22 +142,21 @@ GEM
       elasticsearch (>= 2.0.0)
       elasticsearch-dsl
     chunky_png (1.3.10)
-    cld3 (3.2.2)
+    cld3 (3.2.3)
       ffi (>= 1.1.0, < 1.10.0)
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.2)
-    colorize (0.8.1)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
+    concurrent-ruby (1.1.4)
+    connection_pool (2.2.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
     css_parser (1.6.0)
       addressable
     debug_inspector (0.0.3)
-    derailed_benchmarks (1.3.4)
+    derailed_benchmarks (1.3.5)
       benchmark-ips (~> 2)
       get_process_mem (~> 0)
       heapy (~> 0)
@@ -162,7 +164,7 @@ GEM
       rack (>= 1)
       rake (> 10, < 13)
       thor (~> 0.19)
-    devise (4.4.3)
+    devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
@@ -174,22 +176,19 @@ GEM
       devise (~> 4.0)
       railties (< 5.3)
       rotp (~> 2.0)
-    devise_pam_authenticatable2 (9.1.0)
+    devise_pam_authenticatable2 (9.2.0)
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
     diff-lcs (1.3)
     docile (1.3.0)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.2.6)
+    doorkeeper (5.0.2)
       railties (>= 4.2)
-    dotenv (2.2.2)
-    dotenv-rails (2.2.2)
-      dotenv (= 2.2.2)
+    dotenv (2.6.0)
+    dotenv-rails (2.6.0)
+      dotenv (= 2.6.0)
       railties (>= 3.2, < 6.0)
-    easy_translate (0.5.1)
-      thread
-      thread_safe
     elasticsearch (6.0.2)
       elasticsearch-api (= 6.0.2)
       elasticsearch-transport (= 6.0.2)
@@ -201,36 +200,38 @@ GEM
       multi_json
     encryptor (3.0.0)
     equatable (0.5.0)
-    erubi (1.7.1)
-    et-orbi (1.1.0)
+    erubi (1.8.0)
+    et-orbi (1.1.6)
       tzinfo
     excon (0.62.0)
     fabrication (2.20.1)
-    faker (1.8.7)
+    faker (1.9.1)
       i18n (>= 0.7)
     faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
     fast_blank (1.0.0)
-    fastimage (2.1.1)
-    ffi (1.9.23)
-    fog-core (1.45.0)
+    fastimage (2.1.5)
+    ffi (1.9.25)
+    fog-core (2.1.0)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
+      mime-types
+    fog-json (1.2.0)
+      fog-core
       multi_json (~> 1.10)
-    fog-local (0.5.0)
-      fog-core (>= 1.27, < 3.0)
-    fog-openstack (0.1.25)
-      fog-core (~> 1.40)
+    fog-openstack (0.3.7)
+      fog-core (>= 1.45, <= 2.1.0)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
     formatador (0.2.5)
-    fuubar (2.3.1)
+    fugit (1.1.6)
+      et-orbi (~> 1.1, >= 1.1.6)
+      raabro (~> 1.1)
+    fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    get_process_mem (0.2.1)
+    get_process_mem (0.2.3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     goldfinger (2.1.0)
@@ -250,45 +251,49 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashdiff (0.3.7)
-    hashie (3.5.7)
-    heapy (0.1.3)
-    highline (1.7.10)
-    hiredis (0.6.1)
-    hitimes (1.2.6)
+    hashie (3.6.0)
+    heapy (0.1.4)
+    highline (2.0.0)
+    hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
-    http (3.2.0)
+    http (3.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.0)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.0)
+    http-form_data (2.1.1)
     http_accept_language (2.1.1)
-    httplog (1.0.2)
-      colorize (~> 0.8)
+    httplog (1.2.0)
       rack (>= 1.0)
-    i18n (1.0.1)
+      rainbow (>= 2.0.0)
+    i18n (1.5.2)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.21)
+    i18n-tasks (0.9.28)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
-      easy_translate (>= 0.5.1)
       erubi
-      highline (>= 1.7.3)
+      highline (>= 2.0.0)
       i18n
       parser (>= 2.2.3.0)
+      rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     idn-ruby (0.1.0)
     ipaddress (0.8.3)
     iso-639 (0.2.8)
+    jaro_winkler (1.5.2)
     jmespath (1.4.0)
     json (2.1.0)
-    json-ld (2.2.1)
+    json-ld (3.0.2)
       multi_json (~> 1.12)
       rdf (>= 2.2.8, < 4.0)
+    json-ld-preloaded (3.0.0)
+      json-ld (>= 2.2, < 4.0)
+      multi_json (~> 1.12)
+      rdf (~> 3.0)
     jsonapi-renderer (0.2.0)
     jwt (2.1.0)
     kaminari (1.1.1)
@@ -305,7 +310,7 @@ GEM
     kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    letter_opener (1.6.0)
+    letter_opener (1.7.0)
       launchy (~> 2.2)
     letter_opener_web (1.3.4)
       actionmailer (>= 3.2)
@@ -317,26 +322,28 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    makara (0.4.0)
+      activerecord (>= 3.0.0)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
-    memory_profiler (0.9.10)
-    method_source (0.9.0)
+    memory_profiler (0.9.12)
+    method_source (0.9.2)
     microformats (4.0.7)
       json
       nokogiri
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2018.0812)
     mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     msgpack (1.2.4)
     multi_json (1.13.1)
@@ -345,26 +352,26 @@ GEM
     net-ldap (0.16.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
-    nio4r (2.3.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    nokogumbo (1.5.0)
-      nokogiri
-    nsa (0.2.4)
+    net-ssh (5.0.2)
+    nio4r (2.3.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.0)
+      nokogiri (~> 1.8, >= 1.8.4)
+    nsa (0.2.7)
       activesupport (>= 4.2, < 6)
-      concurrent-ruby (~> 1.0.0)
-      sidekiq (>= 3.5.0)
-      statsd-ruby (~> 1.2.0)
-    oj (3.5.1)
-    omniauth (1.8.1)
-      hashie (>= 3.4.6, < 3.6.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      sidekiq (>= 3.5)
+      statsd-ruby (~> 1.4, >= 1.4.0)
+    oj (3.7.7)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
       rack (>= 1.6.2, < 3)
     omniauth-cas (1.1.1)
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
-    omniauth-saml (1.10.0)
+    omniauth-saml (1.10.1)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.7)
     orm_adapter (0.5.0)
@@ -372,7 +379,7 @@ GEM
       addressable (~> 2.5)
       http (~> 3.0)
       nokogiri (~> 1.8)
-    ox (2.9.2)
+    ox (2.10.0)
     paperclip (6.0.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
@@ -383,18 +390,18 @@ GEM
       av (~> 0.9.0)
       paperclip (>= 2.5.2)
     parallel (1.12.1)
-    parallel_tests (2.21.3)
+    parallel_tests (2.27.1)
       parallel
-    parser (2.5.1.0)
+    parser (2.6.0.0)
       ast (~> 2.4.0)
     pastel (0.7.2)
       equatable (~> 0.5.0)
       tty-color (~> 0.4.0)
-    pg (1.0.0)
-    pghero (2.1.0)
+    pg (1.1.4)
+    pghero (2.2.0)
       activerecord
-    pkg-config (1.3.0)
-    powerpack (0.1.1)
+    pkg-config (1.3.2)
+    powerpack (0.1.2)
     premailer (1.11.1)
       addressable
       css_parser (>= 1.6.0)
@@ -402,73 +409,74 @@ GEM
     premailer-rails (1.10.2)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
-    private_address_check (0.4.1)
-    pry (0.11.3)
+    private_address_check (0.5.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
-    pry-rails (0.3.6)
+    pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (3.0.2)
-    puma (3.11.4)
-    pundit (1.1.0)
+    public_suffix (3.0.3)
+    puma (3.12.0)
+    pundit (2.0.0)
       activesupport (>= 3.0.0)
-    rack (2.0.4)
-    rack-attack (5.2.0)
-      rack
+    raabro (1.1.6)
+    rack (2.0.6)
+    rack-attack (5.4.2)
+      rack (>= 1.0, < 3)
     rack-cors (1.0.2)
-    rack-protection (2.0.1)
+    rack-protection (2.0.5)
       rack
     rack-proxy (0.6.4)
       rack
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.0)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.1)
+    rails-i18n (5.1.2)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
     rails-settings-cached (0.6.6)
       rails (>= 4.2.0)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rdf (3.0.2)
+    rdf (3.0.9)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.3.3)
       rdf (>= 2.2, < 4.0)
-    redis (4.0.1)
+    redis (4.1.0)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
       redis-rack (>= 1, < 3)
@@ -487,6 +495,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.5.0)
       redis (>= 2.2, < 5)
+    regexp_parser (1.3.0)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.0)
@@ -496,72 +505,73 @@ GEM
     rpam2 (4.0.2)
     rqrcode (0.10.1)
       chunky_png (~> 1.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
     rspec-sidekiq (3.0.3)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.7.1)
-    rubocop (0.55.0)
+    rspec-support (3.8.0)
+    rubocop (0.63.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    ruby-saml (1.7.2)
+      unicode-display_width (~> 1.4.0)
+    ruby-progressbar (1.10.0)
+    ruby-saml (1.9.0)
       nokogiri (>= 1.5.10)
-    rufus-scheduler (3.4.2)
-      et-orbi (~> 1.0)
+    rufus-scheduler (3.5.2)
+      fugit (~> 1.1, >= 1.1.5)
     safe_yaml (1.0.4)
-    sanitize (4.6.4)
+    sanitize (5.0.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.4.4)
-      nokogumbo (~> 1.4)
-    sass (3.5.6)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    scss_lint (0.57.0)
+    scss_lint (0.57.1)
       rake (>= 0.9, < 13)
-      sass (~> 3.5.5)
-    sidekiq (5.1.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
+      sass (~> 3.5, >= 3.5.5)
+    sidekiq (5.2.5)
+      connection_pool (~> 2.2, >= 2.2.2)
+      rack (>= 1.5.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
-    sidekiq-bulk (0.1.1)
-      activesupport
+    sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (2.2.1)
+    sidekiq-scheduler (3.0.0)
       redis (>= 3, < 5)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 3)
       tilt (>= 1.4.0)
-    sidekiq-unique-jobs (5.0.10)
-      sidekiq (>= 4.0, <= 6.0)
+    sidekiq-unique-jobs (6.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.5)
+      sidekiq (>= 4.0, < 6.0)
       thor (~> 0)
     simple-navigation (4.0.5)
       activesupport (>= 2.3.2)
-    simple_form (4.0.0)
-      actionpack (> 4)
-      activemodel (> 4)
+    simple_form (4.1.0)
+      actionpack (>= 5.0)
+      activemodel (>= 5.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -574,71 +584,69 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.16.0)
+    sshkit (1.17.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    stackprof (0.2.11)
-    statsd-ruby (1.2.1)
+    stackprof (0.2.12)
+    statsd-ruby (1.4.0)
     stoplight (2.1.3)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
-    strong_migrations (0.2.2)
+    strong_migrations (0.3.1)
       activerecord (>= 3.2.0)
     temple (0.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (0.20.0)
-    thread (0.2.2)
+    thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    timers (4.1.2)
-      hitimes
-    tty-color (0.4.2)
-    tty-command (0.8.0)
+    timers (4.2.0)
+    tty-color (0.4.3)
+    tty-command (0.8.2)
       pastel (~> 0.7.0)
-    tty-cursor (0.5.0)
-    tty-prompt (0.16.0)
+    tty-cursor (0.6.0)
+    tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
       timers (~> 4.0)
-      tty-cursor (~> 0.5.0)
-      tty-reader (~> 0.2.0)
-    tty-reader (0.2.0)
-      tty-cursor (~> 0.5.0)
+      tty-cursor (~> 0.6.0)
+      tty-reader (~> 0.5.0)
+    tty-reader (0.5.0)
+      tty-cursor (~> 0.6.0)
       tty-screen (~> 0.6.4)
       wisper (~> 2.0.0)
-    tty-screen (0.6.4)
+    tty-screen (0.6.5)
     twitter-text (1.14.7)
       unf (~> 0.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2018.4)
+    tzinfo-data (1.2018.9)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.2)
-    uniform_notifier (1.11.0)
+    unicode-display_width (1.4.1)
+    uniform_notifier (1.12.1)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (3.3.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.4.3)
+    webpacker (3.5.5)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
-    webpush (0.3.3)
+    webpush (0.3.6)
       hkdf (~> 0.2)
       jwt (~> 2.0)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     wisper (2.0.0)
-    xpath (3.0.0)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -649,119 +657,121 @@ DEPENDENCIES
   active_record_query_trace (~> 1.5)
   addressable (~> 2.5)
   annotate (~> 2.7)
-  aws-sdk-s3 (~> 1.9)
-  better_errors (~> 2.4)
+  aws-sdk-s3 (~> 1.30)
+  better_errors (~> 2.5)
   binding_of_caller (~> 0.7)
   bootsnap (~> 1.3)
-  brakeman (~> 4.2)
+  brakeman (~> 4.4)
   browser
-  bullet (~> 5.7)
+  bullet (~> 5.9)
   bundler-audit (~> 0.6)
-  capistrano (~> 3.10)
-  capistrano-rails (~> 1.3)
+  capistrano (~> 3.11)
+  capistrano-rails (~> 1.4)
   capistrano-rbenv (~> 2.1)
   capistrano-yarn (~> 2.0)
-  capybara (~> 2.18)
+  capybara (~> 3.12)
   charlock_holmes (~> 0.7.6)
   chewy (~> 5.0)
-  cld3 (~> 3.2.0)
+  cld3 (~> 3.2.3)
   climate_control (~> 0.2)
+  concurrent-ruby
   derailed_benchmarks
-  devise (~> 4.4)
+  devise (~> 4.5)
   devise-two-factor (~> 3.0)
-  devise_pam_authenticatable2 (~> 9.1)
-  doorkeeper (~> 4.2, < 4.3)
-  dotenv-rails (~> 2.2, < 2.3)
+  devise_pam_authenticatable2 (~> 9.2)
+  doorkeeper (~> 5.0)
+  dotenv-rails (~> 2.6)
   fabrication (~> 2.20)
-  faker (~> 1.8)
+  faker (~> 1.9)
   fast_blank (~> 1.0)
   fastimage
-  fog-core (~> 1.45)
-  fog-local (~> 0.5)
-  fog-openstack (~> 0.1)
-  fuubar (~> 2.2)
+  fog-core (<= 2.1.0)
+  fog-openstack (~> 0.3)
+  fuubar (~> 2.3)
   goldfinger (~> 2.1)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
-  http (~> 3.2)
+  http (~> 3.3)
   http_accept_language (~> 2.1)
   http_parser.rb (~> 0.6)!
-  httplog (~> 1.0)
+  httplog (~> 1.2)
   i18n-tasks (~> 0.9)
   idn-ruby
   iso-639
-  json-ld (~> 2.2)
+  json-ld (~> 3.0)
+  json-ld-preloaded (~> 3.0)
   kaminari (~> 1.1)
-  letter_opener (~> 1.4)
+  letter_opener (~> 1.7)
   letter_opener_web (~> 1.3)
   link_header (~> 0.0)
   lograge (~> 0.10)
+  makara (~> 0.4)
   mario-redis-lock (~> 1.2)
   memory_profiler
   microformats (~> 4.0)
-  mime-types (~> 3.1)
+  mime-types (~> 3.2)
   net-ldap (~> 0.10)
-  nokogiri (~> 1.8)
+  nokogiri (~> 1.10)
   nsa (~> 0.2)
-  oj (~> 3.5)
-  omniauth (~> 1.2)
+  oj (~> 3.7)
+  omniauth (~> 1.9)
   omniauth-cas (~> 1.1)
   omniauth-saml (~> 1.10)
   ostatus2 (~> 2.0)
-  ox (~> 2.9)
+  ox (~> 2.10)
   paperclip (~> 6.0)
   paperclip-av-transcoder (~> 0.6)
-  parallel_tests (~> 2.21)
-  pg (~> 1.0)
-  pghero (~> 2.1)
+  parallel_tests (~> 2.27)
+  pg (~> 1.1)
+  pghero (~> 2.2)
   pkg-config (~> 1.3)
   posix-spawn!
   premailer-rails
-  private_address_check (~> 0.4.1)
+  private_address_check (~> 0.5)
   pry-byebug (~> 3.6)
   pry-rails (~> 0.3)
-  puma (~> 3.11)
-  pundit (~> 1.1)
-  rack-attack (~> 5.2)
+  puma (~> 3.12)
+  pundit (~> 2.0)
+  rack-attack (~> 5.4)
   rack-cors (~> 1.0)
-  rails (~> 5.2.0)
+  rails (~> 5.2.2)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 5.1)
   rails-settings-cached (~> 0.6)
   rdf-normalize (~> 0.3)
-  redis (~> 4.0)
+  redis (~> 4.1)
   redis-namespace (~> 1.5)
   redis-rails (~> 5.0)
   rqrcode (~> 0.10)
-  rspec-rails (~> 3.7)
+  rspec-rails (~> 3.8)
   rspec-sidekiq (~> 3.0)
-  rubocop (~> 0.55)
-  ruby-progressbar (~> 1.4)
-  sanitize (~> 4.6)
+  rubocop (~> 0.63)
+  sanitize (~> 5.0)
   scss_lint (~> 0.57)
-  sidekiq (~> 5.1)
-  sidekiq-bulk (~> 0.1.1)
-  sidekiq-scheduler (~> 2.2)
-  sidekiq-unique-jobs (~> 5.0)
+  sidekiq (~> 5.2)
+  sidekiq-bulk (~> 0.2.0)
+  sidekiq-scheduler (~> 3.0)
+  sidekiq-unique-jobs (~> 6.0)
   simple-navigation (~> 4.0)
-  simple_form (~> 4.0)
+  simple_form (~> 4.1)
   simplecov (~> 0.16)
   sprockets-rails (~> 3.2)
   stackprof
   stoplight (~> 2.1.3)
   streamio-ffmpeg (~> 3.0)
-  strong_migrations (~> 0.2)
+  strong_migrations (~> 0.3)
+  thor (~> 0.20)
   tty-command (~> 0.8)
-  tty-prompt (~> 0.16)
+  tty-prompt (~> 0.18)
   twitter-text (~> 1.14)
   tzinfo-data (~> 1.2018)
-  webmock (~> 3.3)
-  webpacker (~> 3.4)
+  webmock (~> 3.5)
+  webpacker (~> 3.5)
   webpush
 
 RUBY VERSION
-   ruby 2.5.0p0
+   ruby 2.6.0p0
 
 BUNDLED WITH
-   1.16.2
+   1.17.3
diff --git a/README.md b/README.md
index 458946f2cc28f84200f57a92c41c83a5336d4f61..6c4918e6f237bd78590a3703827e307cce647457 100644
--- a/README.md
+++ b/README.md
@@ -1,96 +1,95 @@
 ![Mastodon](https://i.imgur.com/NhZc40l.png)
 ========
 
+[![GitHub release](https://img.shields.io/github/release/tootsuite/mastodon.svg)][releases]
 [![Build Status](https://img.shields.io/circleci/project/github/tootsuite/mastodon.svg)][circleci]
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/tootsuite/mastodon.svg)][code_climate]
+[![Translation status](https://weblate.joinmastodon.org/widgets/mastodon/-/svg-badge.svg)][weblate]
+[![Docker Pulls](https://img.shields.io/docker/pulls/tootsuite/mastodon.svg)][docker]
 
+[releases]: https://github.com/tootsuite/mastodon/releases
 [circleci]: https://circleci.com/gh/tootsuite/mastodon
 [code_climate]: https://codeclimate.com/github/tootsuite/mastodon
+[weblate]: https://weblate.joinmastodon.org/engage/mastodon/
+[docker]: https://hub.docker.com/r/tootsuite/mastodon/
 
-Mastodon is a **free, open-source social network server** based on **open web protocols** like ActivityPub and OStatus. The social focus of the project is a viable decentralized alternative to commercial social media silos that returns the control of the content distribution channels to the people. The technical focus of the project is a good user interface, a clean REST API for 3rd party apps and robust anti-abuse tools.
+Mastodon is a **free, open-source social network server** based on ActivityPub. Follow friends and discover new ones. Publish anything you want: links, pictures, text, video. All servers of Mastodon are interoperable as a federated network, i.e. users on one server can seamlessly communicate with users from another one. This includes non-Mastodon software that also implements ActivityPub!
 
-Click on the screenshot below to watch a demo of the UI:
+Click below to **learn more** in a video:
 
-[![Screenshot](https://i.imgur.com/qrNOiSp.png)][youtube_demo]
+[![Screenshot](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/ezgif-2-60f1b00403.gif)][youtube_demo]
 
 [youtube_demo]: https://www.youtube.com/watch?v=IPSbNdBmWKE
 
-**Ruby on Rails** is used for the back-end, while **React.js** and Redux are used for the dynamic front-end. A static front-end for public resources (profiles and statuses) is also provided.
+## Navigation 
 
-If you would like, you can [support the development of this project on Patreon][patreon] or [Liberapay][liberapay].
+- [Project homepage ðŸ˜](https://joinmastodon.org)
+- [Support the development via Patreon][patreon]
+- [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 apps](https://joinmastodon.org/apps)
 
-[patreon]: https://www.patreon.com/user?u=619786
-[liberapay]: https://liberapay.com/Mastodon/
-
----
-
-## Resources
-
-- [Frequently Asked Questions](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md)
-- [Use this tool to find Twitter friends on Mastodon](https://bridge.joinmastodon.org)
-- [API overview](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md)
-- [List of Mastodon instances](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/List-of-Mastodon-instances.md)
-- [List of apps](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md)
-- [List of sponsors](https://joinmastodon.org/sponsors)
+[patreon]: https://www.patreon.com/mastodon
 
 ## Features
 
+<img src="https://docs.joinmastodon.org/elephant.svg" align="right" width="30%" />
+
 **No vendor lock-in: Fully interoperable with any conforming platform**
 
-It doesn't have to be Mastodon, whatever implements ActivityPub or OStatus is part of the social network!
+It doesn't have to be Mastodon, whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
 
-**Real-time timeline updates**
+**Real-time, chronological timeline updates**
 
 See the updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
 
-**Federated thread resolving**
-
-If someone you follow replies to a user unknown to the server, the server fetches the full thread so you can view it without leaving the UI
-
 **Media attachments like images and short videos**
 
 Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos are looped - like vines!
 
-**OAuth2 and a straightforward REST API**
+**Safety and moderation tools**
 
-Mastodon acts as an OAuth2 provider so 3rd party apps can use the API
+Private posts, locked accounts, phrase filtering, muting, blocking and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
 
-**Fast response times**
+**OAuth2 and a straightforward REST API**
 
-Mastodon tries to be as fast and responsive as possible, so all long-running tasks are delegated to background processing
+Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Streaming APIs, resulting in a rich app ecosystem with a lot of choice!
 
-**Deployable via Docker**
+## Deployment
 
-You don't need to mess with dependencies and configuration if you want to try Mastodon, if you have Docker and Docker Compose the deployment is extremely easy
+**Tech stack:**
 
----
+- **Ruby on Rails** powers the REST API and other web pages
+- **React.js** and Redux are used for the dynamic parts of the interface
+- **Node.js** powers the streaming API
 
-## Development
+**Requirements:**
 
-Please follow the [development guide](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Development-guide.md) from the documentation repository.
+- **PostgreSQL** 9.5+
+- **Redis**
+- **Ruby** 2.4+
+- **Node.js** 8+
 
-## Deployment
+The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/administration/installation/) is available in the documentation.
 
-There are guides in the documentation repository for [deploying on various platforms](https://github.com/tootsuite/documentation#running-mastodon).
+A **Vagrant** configuration is included for development purposes.
 
 ## Contributing
 
-You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository. [Here are the guidelines for code contributions](CONTRIBUTING.md)
+Mastodon is **free, open source software** licensed under **AGPLv3**.
+
+You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository, or submit translations using Weblate. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md)
 
 **IRC channel**: #mastodon on irc.freenode.net
 
 ## License
 
-Copyright (C) 2016-2018 Eugen Rochko & other Mastodon contributors (see AUTHORS.md)
+Copyright (C) 2016-2018 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.
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
-
----
-
-## Extra credits
-
-The elephant friend illustrations are created by [Dopatwo](https://mastodon.social/@dopatwo)
diff --git a/Vagrantfile b/Vagrantfile
index ddcdf3510240441abd3408c0046b7df8a590962a..f9839fffb9cb3cc392d059743327df8ee08edadf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,7 @@ 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_6.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_8.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"]}
@@ -44,7 +44,7 @@ sudo apt-get install \
 
 # Install rvm
 read RUBY_VERSION < .ruby-version
-gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
 curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION
 source /home/vagrant/.rvm/scripts/rvm
 
@@ -85,6 +85,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
     vb.customize ["modifyvm", :id, "--memory", "2048"]
+    # Increase the number of CPUs. Uncomment and adjust to
+    # increase performance
+    # vb.customize ["modifyvm", :id, "--cpus", "3"]
 
     # Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
     # https://github.com/mitchellh/vagrant/issues/1172
@@ -97,19 +100,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   end
 
-  config.vm.hostname = "mastodon.dev"
-
   # This uses the vagrant-hostsupdater plugin, and lets you
-  # access the development site at http://mastodon.dev.
+  # access the development site at http://mastodon.local.
+  # If you change it, also change it in .env.vagrant before provisioning
+  # the vagrant server to update the development build.
+  #
   # To install:
   #   $ vagrant plugin install vagrant-hostsupdater
+  config.vm.hostname = "mastodon.local"
+
   if defined?(VagrantPlugins::HostsUpdater)
     config.vm.network :private_network, ip: "192.168.42.42", nictype: "virtio"
     config.hostsupdater.remove_on_suspend = false
   end
 
   if config.vm.networks.any? { |type, options| type == :private_network }
-    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp']
+    config.vm.synced_folder ".", "/vagrant", type: "nfs", mount_options: ['rw', 'vers=3', 'tcp', 'actimeo=1']
   else
     config.vm.synced_folder ".", "/vagrant"
   end
diff --git a/app/chewy/statuses_index.rb b/app/chewy/statuses_index.rb
index 8bf5b4af7cf52cb9a35f3106756f9b88f08f6707..d3104172c485d1d7b3feaf006857993425bd27c6 100644
--- a/app/chewy/statuses_index.rb
+++ b/app/chewy/statuses_index.rb
@@ -31,7 +31,7 @@ class StatusesIndex < Chewy::Index
     },
   }
 
-  define_type ::Status.without_reblogs do
+  define_type ::Status.unscoped.without_reblogs do
     crutch :mentions do |collection|
       data = ::Mention.where(status_id: collection.map(&:id)).pluck(:status_id, :account_id)
       data.each.with_object({}) { |(id, name), result| (result[id] ||= []).push(name) }
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 4ffdfb6856c3d43a03774c9dcf6823e1db10a4c9..0dbf0283d206e8959c2fbdfaab78835128deedfb 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -9,9 +9,13 @@ class AboutController < ApplicationController
     @initial_state_json   = serializable_resource.to_json
   end
 
-  def more; end
+  def more
+    render layout: 'public'
+  end
 
-  def terms; end
+  def terms
+    render layout: 'public'
+  end
 
   private
 
@@ -26,7 +30,7 @@ class AboutController < ApplicationController
   end
 
   def set_body_classes
-    @body_classes = 'about-body'
+    @body_classes = 'with-modals'
   end
 
   def initial_state_params
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 1152d4aca57e334de6f3321474058a35d4e65663..f788a907893059ca3abad0e94745115863d9495f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -10,7 +10,9 @@ class AccountsController < ApplicationController
   def show
     respond_to do |format|
       format.html do
-        @pinned_statuses = []
+        @body_classes      = 'with-modals'
+        @pinned_statuses   = []
+        @endorsed_accounts = @account.endorsed_accounts.to_a.sample(4)
 
         if current_account && @account.blocking?(current_account)
           @statuses = []
@@ -40,7 +42,7 @@ class AccountsController < ApplicationController
       format.json do
         skip_session!
 
-        render_cached_json(['activitypub', 'actor', @account.cache_key], content_type: 'application/activity+json') do
+        render_cached_json(['activitypub', 'actor', @account], content_type: 'application/activity+json') do
           ActiveModelSerializers::SerializableResource.new(@account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter)
         end
       end
@@ -50,7 +52,7 @@ class AccountsController < ApplicationController
   private
 
   def show_pinned_statuses?
-    [replies_requested?, media_requested?, params[:max_id].present?, params[:since_id].present?].none?
+    [replies_requested?, media_requested?, params[:max_id].present?, params[:min_id].present?].none?
   end
 
   def filtered_statuses
diff --git a/app/controllers/activitypub/collections_controller.rb b/app/controllers/activitypub/collections_controller.rb
index 96bf901a7cc14251707498c679cdc73ec98f9bb5..995da9c55dc0858f814d56f584c27e8a9274003c 100644
--- a/app/controllers/activitypub/collections_controller.rb
+++ b/app/controllers/activitypub/collections_controller.rb
@@ -31,7 +31,7 @@ class ActivityPub::CollectionsController < Api::BaseController
     when 'featured'
       @account.pinned_statuses.count
     else
-      raise ActiveRecord::NotFound
+      raise ActiveRecord::RecordNotFound
     end
   end
 
@@ -42,7 +42,7 @@ class ActivityPub::CollectionsController < Api::BaseController
         scope.merge!(@account.pinned_statuses)
       end
     else
-      raise ActiveRecord::NotFound
+      raise ActiveRecord::RecordNotFound
     end
   end
 
diff --git a/app/controllers/activitypub/inboxes_controller.rb b/app/controllers/activitypub/inboxes_controller.rb
index af51e32d5d31148512b655a9a225340babe40e6a..8f5e1887ea427525bb72bca04d1405d756978d57 100644
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -36,6 +36,6 @@ class ActivityPub::InboxesController < Api::BaseController
   end
 
   def process_payload
-    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8'))
+    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8'), @account&.id)
   end
 end
diff --git a/app/controllers/admin/account_actions_controller.rb b/app/controllers/admin/account_actions_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a2cea461ee1950e2c971e3455378380407221a50
--- /dev/null
+++ b/app/controllers/admin/account_actions_controller.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Admin
+  class AccountActionsController < BaseController
+    before_action :set_account
+
+    def new
+      @account_action  = Admin::AccountAction.new(type: params[:type], report_id: params[:report_id], send_email_notification: true)
+      @warning_presets = AccountWarningPreset.all
+    end
+
+    def create
+      account_action                 = Admin::AccountAction.new(resource_params)
+      account_action.target_account  = @account
+      account_action.current_account = current_account
+
+      account_action.save!
+
+      if account_action.with_report?
+        redirect_to admin_reports_path
+      else
+        redirect_to admin_account_path(@account.id)
+      end
+    end
+
+    private
+
+    def set_account
+      @account = Account.find(params[:account_id])
+    end
+
+    def resource_params
+      params.require(:admin_account_action).permit(:type, :report_id, :warning_preset_id, :text, :send_email_notification)
+    end
+  end
+end
diff --git a/app/controllers/admin/account_moderation_notes_controller.rb b/app/controllers/admin/account_moderation_notes_controller.rb
index 7d5b9bf52c83f633404267b4d035180a6600c545..44f6e34f80b0ad4f30d6dba37969320d4d842851 100644
--- a/app/controllers/admin/account_moderation_notes_controller.rb
+++ b/app/controllers/admin/account_moderation_notes_controller.rb
@@ -14,6 +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
 
         render template: 'admin/accounts/show'
       end
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index e7ca6b9074ab725fb89c1f7de801cb52035238dc..562fba9960dd21d8e9ceeb7cee72302a847bf8a7 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -2,9 +2,9 @@
 
 module Admin
   class AccountsController < BaseController
-    before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :enable, :disable, :memorialize]
+    before_action :set_account, only: [:show, :subscribe, :unsubscribe, :redownload, :remove_avatar, :remove_header, :enable, :unsilence, :unsuspend, :memorialize]
     before_action :require_remote_account!, only: [:subscribe, :unsubscribe, :redownload]
-    before_action :require_local_account!, only: [:enable, :disable, :memorialize]
+    before_action :require_local_account!, only: [:enable, :memorialize]
 
     def index
       authorize :account, :index?
@@ -13,8 +13,10 @@ module Admin
 
     def show
       authorize @account, :show?
+
       @account_moderation_note = current_account.account_moderation_notes.new(target_account: @account)
-      @moderation_notes = @account.targeted_moderation_notes.latest
+      @moderation_notes        = @account.targeted_moderation_notes.latest
+      @warnings                = @account.targeted_account_warnings.latest.custom
     end
 
     def subscribe
@@ -43,19 +45,25 @@ module Admin
       redirect_to admin_account_path(@account.id)
     end
 
-    def disable
-      authorize @account.user, :disable?
-      @account.user.disable!
-      log_action :disable, @account.user
+    def unsilence
+      authorize @account, :unsilence?
+      @account.unsilence!
+      log_action :unsilence, @account
+      redirect_to admin_account_path(@account.id)
+    end
+
+    def unsuspend
+      authorize @account, :unsuspend?
+      @account.unsuspend!
+      log_action :unsuspend, @account
       redirect_to admin_account_path(@account.id)
     end
 
     def redownload
       authorize @account, :redownload?
 
-      @account.reset_avatar!
-      @account.reset_header!
-      @account.save!
+      @account.update!(last_webfingered_at: nil)
+      ResolveAccountService.new.call(@account)
 
       redirect_to admin_account_path(@account.id)
     end
@@ -71,6 +79,17 @@ module Admin
       redirect_to admin_account_path(@account.id)
     end
 
+    def remove_header
+      authorize @account, :remove_header?
+
+      @account.header = nil
+      @account.save!
+
+      log_action :remove_header, @account.user
+
+      redirect_to admin_account_path(@account.id)
+    end
+
     private
 
     def set_account
@@ -94,8 +113,8 @@ module Admin
         :local,
         :remote,
         :by_domain,
+        :active,
         :silenced,
-        :recent,
         :suspended,
         :username,
         :display_name,
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 7fb69d5789ec855b487d08284f2a2e6122d98371..7b81a2b01d1b4a7b52cb4e32d74c4a9222282446 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -5,8 +5,19 @@ module Admin
     include Authorization
     include AccountableConcern
 
+    layout 'admin'
+
     before_action :require_staff!
+    before_action :set_body_classes
 
-    layout 'admin'
+    private
+
+    def set_body_classes
+      @body_classes = 'admin'
+    end
+
+    def set_user
+      @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
+    end
   end
 end
diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index 8d3477e660256c58e39f60f31f4cb0544d3b9c2a..efe7dcbd4b3a408d94732ba30244e00d666109ea 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -25,10 +25,6 @@ module Admin
 
     private
 
-    def set_user
-      @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
-    end
-
     def check_confirmation
       if @user.confirmed?
         flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bb923c18594c78fee477a00eee9238466e715a4e
--- /dev/null
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require 'sidekiq/api'
+
+module Admin
+  class DashboardController < BaseController
+    def index
+      @users_count           = User.count
+      @registrations_week    = Redis.current.get("activity:accounts:local:#{current_week}") || 0
+      @logins_week           = Redis.current.pfcount("activity:logins:#{current_week}")
+      @interactions_week     = Redis.current.get("activity:interactions:#{current_week}") || 0
+      @relay_enabled         = Relay.enabled.exists?
+      @single_user_mode      = Rails.configuration.x.single_user_mode
+      @registrations_enabled = Setting.open_registrations
+      @deletions_enabled     = Setting.open_deletion
+      @invites_enabled       = Setting.min_invite_role == 'user'
+      @search_enabled        = Chewy.enabled?
+      @version               = Mastodon::Version.to_s
+      @database_version      = ActiveRecord::Base.connection.execute('SELECT VERSION()').first['version'].match(/\A(?:PostgreSQL |)([^\s]+).*\z/)[1]
+      @redis_version         = redis_info['redis_version']
+      @reports_count         = Report.unresolved.count
+      @queue_backlog         = Sidekiq::Stats.new.enqueued
+      @recent_users          = User.confirmed.recent.includes(:account).limit(4)
+      @database_size         = ActiveRecord::Base.connection.execute('SELECT pg_database_size(current_database())').first['pg_database_size']
+      @redis_size            = redis_info['used_memory']
+      @ldap_enabled          = ENV['LDAP_ENABLED'] == 'true'
+      @cas_enabled           = ENV['CAS_ENABLED'] == 'true'
+      @saml_enabled          = ENV['SAML_ENABLED'] == 'true'
+      @pam_enabled           = ENV['PAM_ENABLED'] == 'true'
+      @hidden_service        = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
+      @trending_hashtags     = TrendingTags.get(7)
+      @profile_directory     = Setting.profile_directory
+    end
+
+    private
+
+    def current_week
+      @current_week ||= Time.now.utc.to_date.cweek
+    end
+
+    def redis_info
+      @redis_info ||= Redis.current.info
+    end
+  end
+end
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index 64de2cbf0cfd0998d52c420072533b9ab10a874a..5f307ddeeca04564e75a93c18bc64656c0f2dd79 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -4,14 +4,9 @@ module Admin
   class DomainBlocksController < BaseController
     before_action :set_domain_block, only: [:show, :destroy]
 
-    def index
-      authorize :domain_block, :index?
-      @domain_blocks = DomainBlock.page(params[:page])
-    end
-
     def new
       authorize :domain_block, :create?
-      @domain_block = DomainBlock.new
+      @domain_block = DomainBlock.new(domain: params[:_domain])
     end
 
     def create
@@ -22,7 +17,7 @@ module Admin
       if @domain_block.save
         DomainBlockWorker.perform_async(@domain_block.id)
         log_action :create, @domain_block
-        redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.created_msg')
+        redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.created_msg')
       else
         render :new
       end
@@ -36,7 +31,7 @@ module Admin
       authorize @domain_block, :destroy?
       UnblockDomainService.new.call(@domain_block, retroactive_unblock?)
       log_action :destroy, @domain_block
-      redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.destroyed_msg')
+      redirect_to admin_instances_path(limited: '1'), notice: I18n.t('admin.domain_blocks.destroyed_msg')
     end
 
     private
@@ -46,7 +41,7 @@ module Admin
     end
 
     def resource_params
-      params.require(:domain_block).permit(:domain, :severity, :reject_media, :retroactive)
+      params.require(:domain_block).permit(:domain, :severity, :reject_media, :reject_reports, :retroactive)
     end
 
     def retroactive_unblock?
diff --git a/app/controllers/admin/followers_controller.rb b/app/controllers/admin/followers_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d826f47c5ae81f752de8adf0d268379beeec227b
--- /dev/null
+++ b/app/controllers/admin/followers_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Admin
+  class FollowersController < BaseController
+    before_action :set_account
+
+    PER_PAGE = 40
+
+    def index
+      authorize :account, :index?
+      @followers = @account.followers.local.recent.page(params[:page]).per(PER_PAGE)
+    end
+
+    def set_account
+      @account = Account.find(params[:account_id])
+    end
+  end
+end
diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index 8ed0ea4219556f53767476d843849c53a11d505f..431ce6f4de1768696e2d0ff5880dd26711eb1844 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -4,14 +4,21 @@ module Admin
   class InstancesController < BaseController
     def index
       authorize :instance, :index?
+
       @instances = ordered_instances
     end
 
-    def resubscribe
-      authorize :instance, :resubscribe?
-      params.require(:by_domain)
-      Pubsubhubbub::SubscribeWorker.push_bulk(subscribeable_accounts.pluck(:id))
-      redirect_to admin_instances_path
+    def show
+      authorize :instance, :show?
+
+      @instance        = Instance.new(Account.by_domain_accounts.find_by(domain: params[:id]) || DomainBlock.find_by!(domain: params[:id]))
+      @following_count = Follow.where(account: Account.where(domain: params[:id])).count
+      @followers_count = Follow.where(target_account: Account.where(domain: params[:id])).count
+      @reports_count   = Report.where(target_account: Account.where(domain: params[:id])).count
+      @blocks_count    = Block.where(target_account: Account.where(domain: params[:id])).count
+      @available       = DeliveryFailureTracker.available?(Account.select(:shared_inbox_url).where(domain: params[:id]).first&.shared_inbox_url)
+      @media_storage   = MediaAttachment.where(account: Account.where(domain: params[:id])).sum(:file_file_size)
+      @domain_block    = DomainBlock.find_by(domain: params[:id])
     end
 
     private
@@ -27,17 +34,11 @@ module Admin
     helper_method :paginated_instances
 
     def ordered_instances
-      paginated_instances.map { |account| Instance.new(account) }
-    end
-
-    def subscribeable_accounts
-      Account.with_followers.remote.where(domain: params[:by_domain])
+      paginated_instances.map { |resource| Instance.new(resource) }
     end
 
     def filter_params
-      params.permit(
-        :domain_name
-      )
+      params.permit(:limited)
     end
   end
 end
diff --git a/app/controllers/admin/invites_controller.rb b/app/controllers/admin/invites_controller.rb
index faccaa7c899da1be4084738991b065a0233810af..44a8eec77b2eea27baf239b82797c5e87a2ef225 100644
--- a/app/controllers/admin/invites_controller.rb
+++ b/app/controllers/admin/invites_controller.rb
@@ -30,6 +30,12 @@ module Admin
       redirect_to admin_invites_path
     end
 
+    def deactivate_all
+      authorize :invite, :deactivate_all?
+      Invite.available.in_batches.update_all(expires_at: Time.now.utc)
+      redirect_to admin_invites_path
+    end
+
     private
 
     def resource_params
diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1b02d3c361a9e77c49c2fc40e2e15fdf52afc05c
--- /dev/null
+++ b/app/controllers/admin/relays_controller.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Admin
+  class RelaysController < BaseController
+    before_action :set_relay, except: [:index, :new, :create]
+
+    def index
+      authorize :relay, :update?
+      @relays = Relay.all
+    end
+
+    def new
+      authorize :relay, :update?
+      @relay = Relay.new(inbox_url: Relay::PRESET_RELAY)
+    end
+
+    def create
+      authorize :relay, :update?
+
+      @relay = Relay.new(resource_params)
+
+      if @relay.save
+        @relay.enable!
+        redirect_to admin_relays_path
+      else
+        render action: :new
+      end
+    end
+
+    def destroy
+      authorize :relay, :update?
+      @relay.destroy
+      redirect_to admin_relays_path
+    end
+
+    def enable
+      authorize :relay, :update?
+      @relay.enable!
+      redirect_to admin_relays_path
+    end
+
+    def disable
+      authorize :relay, :update?
+      @relay.disable!
+      redirect_to admin_relays_path
+    end
+
+    private
+
+    def set_relay
+      @relay = Relay.find(params[:id])
+    end
+
+    def resource_params
+      params.require(:relay).permit(:inbox_url)
+    end
+  end
+end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index d00b3d2227357dec958d7d1e164d52de1b57f624..f138376b2f73611cea0ff4b6c102784a14714156 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -13,72 +13,42 @@ module Admin
       authorize @report, :show?
 
       @report_note  = @report.notes.new
-      @report_notes = (@report.notes.latest + @report.history).sort_by(&:created_at)
+      @report_notes = (@report.notes.latest + @report.history + @report.target_account.targeted_account_warnings.latest.custom).sort_by(&:created_at)
       @form         = Form::StatusBatch.new
     end
 
-    def update
+    def assign_to_self
       authorize @report, :update?
-      process_report
-
-      if @report.action_taken?
-        redirect_to admin_reports_path, notice: I18n.t('admin.reports.resolved_msg')
-      else
-        redirect_to admin_report_path(@report)
-      end
+      @report.update!(assigned_account_id: current_account.id)
+      log_action :assigned_to_self, @report
+      redirect_to admin_report_path(@report)
     end
 
-    private
-
-    def process_report
-      case params[:outcome].to_s
-      when 'assign_to_self'
-        @report.update!(assigned_account_id: current_account.id)
-        log_action :assigned_to_self, @report
-      when 'unassign'
-        @report.update!(assigned_account_id: nil)
-        log_action :unassigned, @report
-      when 'reopen'
-        @report.unresolve!
-        log_action :reopen, @report
-      when 'resolve'
-        @report.resolve!(current_account)
-        log_action :resolve, @report
-      when 'suspend'
-        Admin::SuspensionWorker.perform_async(@report.target_account.id)
-
-        log_action :resolve, @report
-        log_action :suspend, @report.target_account
-
-        resolve_all_target_account_reports
-      when 'silence'
-        @report.target_account.update!(silenced: true)
-
-        log_action :resolve, @report
-        log_action :silence, @report.target_account
-
-        resolve_all_target_account_reports
-      else
-        raise ActiveRecord::RecordNotFound
-      end
-      @report.reload
+    def unassign
+      authorize @report, :update?
+      @report.update!(assigned_account_id: nil)
+      log_action :unassigned, @report
+      redirect_to admin_report_path(@report)
     end
 
-    def resolve_all_target_account_reports
-      unresolved_reports_for_target_account.update_all(action_taken: true, action_taken_by_account_id: current_account.id)
+    def reopen
+      authorize @report, :update?
+      @report.unresolve!
+      log_action :reopen, @report
+      redirect_to admin_report_path(@report)
     end
 
-    def unresolved_reports_for_target_account
-      Report.where(
-        target_account: @report.target_account
-      ).unresolved
+    def resolve
+      authorize @report, :update?
+      @report.resolve!(current_account)
+      log_action :resolve, @report
+      redirect_to admin_reports_path, notice: I18n.t('admin.reports.resolved_msg')
     end
 
+    private
+
     def filtered_reports
-      ReportFilter.new(filter_params).results.order(id: :desc).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/resets_controller.rb b/app/controllers/admin/resets_controller.rb
index 3e27d01ac2719efc5c409737de3543833071f284..db8f61d64cb13f4590639f36f5e8169d8e74a378 100644
--- a/app/controllers/admin/resets_controller.rb
+++ b/app/controllers/admin/resets_controller.rb
@@ -10,11 +10,5 @@ module Admin
       log_action :reset_password, @user
       redirect_to admin_accounts_path
     end
-
-    private
-
-    def set_user
-      @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
-    end
   end
 end
diff --git a/app/controllers/admin/roles_controller.rb b/app/controllers/admin/roles_controller.rb
index af7ec0740d2a89b90ba03ab38cd9c18b7260a503..13f56e9beb52b983accd4c53cd6a05a037b63f6f 100644
--- a/app/controllers/admin/roles_controller.rb
+++ b/app/controllers/admin/roles_controller.rb
@@ -17,11 +17,5 @@ module Admin
       log_action :demote, @user
       redirect_to admin_account_path(@user.account_id)
     end
-
-    private
-
-    def set_user
-      @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
-    end
   end
 end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 75d00326c76f86f00412bbe05251f45c5cb773a8..4a049fc235638a649dad3f4045e6c2a521f36b84 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -6,6 +6,7 @@ module Admin
       site_contact_username
       site_contact_email
       site_title
+      site_short_description
       site_description
       site_extended_description
       site_terms
@@ -15,13 +16,17 @@ module Admin
       timeline_preview
       show_staff_badge
       bootstrap_timeline_accounts
+      theme
       thumbnail
       hero
+      mascot
       min_invite_role
       activity_api_enabled
       peers_api_enabled
       show_known_fediverse_at_about_page
       preview_sensitive_media
+      custom_css
+      profile_directory
     ).freeze
 
     BOOLEAN_SETTINGS = %w(
@@ -33,11 +38,13 @@ module Admin
       peers_api_enabled
       show_known_fediverse_at_about_page
       preview_sensitive_media
+      profile_directory
     ).freeze
 
     UPLOAD_SETTINGS = %w(
       thumbnail
       hero
+      mascot
     ).freeze
 
     def edit
diff --git a/app/controllers/admin/silences_controller.rb b/app/controllers/admin/silences_controller.rb
deleted file mode 100644
index 4c06a9c0cc7b051f8478be29917e3a2073d89693..0000000000000000000000000000000000000000
--- a/app/controllers/admin/silences_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class SilencesController < BaseController
-    before_action :set_account
-
-    def create
-      authorize @account, :silence?
-      @account.update!(silenced: true)
-      log_action :silence, @account
-      redirect_to admin_accounts_path
-    end
-
-    def destroy
-      authorize @account, :unsilence?
-      @account.update!(silenced: false)
-      log_action :unsilence, @account
-      redirect_to admin_accounts_path
-    end
-
-    private
-
-    def set_account
-      @account = Account.find(params[:account_id])
-    end
-  end
-end
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
index 382bfc4a23fa67a751e534b78bca32639475af80..650195034691663baea2e47244abbf5c56da89d0 100644
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -22,12 +22,25 @@ module Admin
       @form     = Form::StatusBatch.new
     end
 
+    def show
+      authorize :status, :index?
+
+      @statuses = @account.statuses.where(id: params[:id])
+      authorize @statuses.first, :show?
+
+      @form = Form::StatusBatch.new
+    end
+
     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_account_statuses_path(@account.id, current_params)
+    rescue ActionController::ParameterMissing
+      flash[:alert] = I18n.t('admin.statuses.no_status_selected')
+
       redirect_to admin_account_statuses_path(@account.id, current_params)
     end
 
diff --git a/app/controllers/admin/suspensions_controller.rb b/app/controllers/admin/suspensions_controller.rb
deleted file mode 100644
index 5f222e12588ee970904f3dd01a421c1ddb6df118..0000000000000000000000000000000000000000
--- a/app/controllers/admin/suspensions_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Admin
-  class SuspensionsController < BaseController
-    before_action :set_account
-
-    def create
-      authorize @account, :suspend?
-      Admin::SuspensionWorker.perform_async(@account.id)
-      log_action :suspend, @account
-      redirect_to admin_accounts_path
-    end
-
-    def destroy
-      authorize @account, :unsuspend?
-      @account.unsuspend!
-      log_action :unsuspend, @account
-      redirect_to admin_accounts_path
-    end
-
-    private
-
-    def set_account
-      @account = Account.find(params[:account_id])
-    end
-  end
-end
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e9f4f2cfa3b35a67101d0957ee6a22f1f66f41fc
--- /dev/null
+++ b/app/controllers/admin/tags_controller.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Admin
+  class TagsController < BaseController
+    before_action :set_tags, only: :index
+    before_action :set_tag, except: :index
+    before_action :set_filter_params
+
+    def index
+      authorize :tag, :index?
+    end
+
+    def hide
+      authorize @tag, :hide?
+      @tag.account_tag_stat.update!(hidden: true)
+      redirect_to admin_tags_path(@filter_params)
+    end
+
+    def unhide
+      authorize @tag, :unhide?
+      @tag.account_tag_stat.update!(hidden: false)
+      redirect_to admin_tags_path(@filter_params)
+    end
+
+    private
+
+    def set_tags
+      @tags = Tag.discoverable
+      @tags.merge!(Tag.hidden) if filter_params[:hidden]
+    end
+
+    def set_tag
+      @tag = Tag.find(params[:id])
+    end
+
+    def set_filter_params
+      @filter_params = filter_params.to_hash.symbolize_keys
+    end
+
+    def filter_params
+      params.permit(:hidden)
+    end
+  end
+end
diff --git a/app/controllers/admin/two_factor_authentications_controller.rb b/app/controllers/admin/two_factor_authentications_controller.rb
index 0221072032566453ae2274d96a0f966c4eb4b813..2577a4b17fff4b59c93a506e4f0fecca0cbcb4cc 100644
--- a/app/controllers/admin/two_factor_authentications_controller.rb
+++ b/app/controllers/admin/two_factor_authentications_controller.rb
@@ -2,7 +2,7 @@
 
 module Admin
   class TwoFactorAuthenticationsController < BaseController
-    before_action :set_user
+    before_action :set_target_user
 
     def destroy
       authorize @user, :disable_2fa?
@@ -13,7 +13,7 @@ module Admin
 
     private
 
-    def set_user
+    def set_target_user
       @user = User.find(params[:user_id])
     end
   end
diff --git a/app/controllers/admin/warning_presets_controller.rb b/app/controllers/admin/warning_presets_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..37be842c5b055fabbdbe91d1b5222c0770e66ca5
--- /dev/null
+++ b/app/controllers/admin/warning_presets_controller.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Admin
+  class WarningPresetsController < BaseController
+    before_action :set_warning_preset, except: [:index, :create]
+
+    def index
+      authorize :account_warning_preset, :index?
+
+      @warning_presets = AccountWarningPreset.all
+      @warning_preset  = AccountWarningPreset.new
+    end
+
+    def create
+      authorize :account_warning_preset, :create?
+
+      @warning_preset = AccountWarningPreset.new(warning_preset_params)
+
+      if @warning_preset.save
+        redirect_to admin_warning_presets_path
+      else
+        @warning_presets = AccountWarningPreset.all
+        render :index
+      end
+    end
+
+    def edit
+      authorize @warning_preset, :update?
+    end
+
+    def update
+      authorize @warning_preset, :update?
+
+      if @warning_preset.update(warning_preset_params)
+        redirect_to admin_warning_presets_path
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      authorize @warning_preset, :destroy?
+
+      @warning_preset.destroy!
+      redirect_to admin_warning_presets_path
+    end
+
+    private
+
+    def set_warning_preset
+      @warning_preset = AccountWarningPreset.find(params[:id])
+    end
+
+    def warning_preset_params
+      params.require(:account_warning_preset).permit(:text)
+    end
+  end
+end
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 770a69921a8a4da6f1bc78de85a8afc0ec005b3f..a1dd30918f34550758f1b5c3d7d38c1bfd0a1b8d 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -7,6 +7,8 @@ class Api::BaseController < ApplicationController
   include RateLimitHeaders
 
   skip_before_action :store_current_location
+  skip_before_action :check_user_permissions
+
   protect_from_forgery with: :null_session
 
   rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
@@ -51,8 +53,8 @@ class Api::BaseController < ApplicationController
     [params[:limit].to_i.abs, default_limit * 2].min
   end
 
-  def truthy_param?(key)
-    ActiveModel::Type::Boolean.new.cast(params[key])
+  def params_slice(*keys)
+    params.slice(*keys).permit(*keys)
   end
 
   def current_resource_owner
@@ -66,12 +68,14 @@ class Api::BaseController < ApplicationController
   end
 
   def require_user!
-    if current_user && !current_user.disabled?
-      set_user_activity
-    elsif current_user
+    if !current_user
+      render json: { error: 'This method requires an authenticated user' }, status: 422
+    elsif current_user.disabled?
       render json: { error: 'Your login is currently disabled' }, status: 403
+    elsif !current_user.confirmed?
+      render json: { error: 'Email confirmation is not completed' }, status: 403
     else
-      render json: { error: 'This method requires an authenticated user' }, status: 422
+      set_user_activity
     end
   end
 
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index dcd41b35c1b3722a30483650e69bcb783219cad3..e77f57910b2bfbcbe11c0fb958bb7b9eb43e3f63 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -21,7 +21,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
   private
 
   def account_params
-    params.permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
+    params.permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
   end
 
   def user_settings_params
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index daa35769ebf12a6c078d5694924cecdd9b06f6cd..ec15debb0cf4646f640477765acfc126af3a2e29 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:active_relationships).references(:active_relationships)
+    Account.includes(:active_relationships, :account_stat).references(:active_relationships)
   end
 
   def paginated_follows
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 6be97b87ece4c131275b2ed611b5367728ee5988..f3e112f2c3e2e80714d43697015f5dbf09bf9958 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -25,7 +25,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:passive_relationships).references(:passive_relationships)
+    Account.includes(:passive_relationships, :account_stat).references(:passive_relationships)
   end
 
   def paginated_follows
diff --git a/app/controllers/api/v1/accounts/pins_controller.rb b/app/controllers/api/v1/accounts/pins_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0a0239c424e8bf3e9325173be13947034518b03e
--- /dev/null
+++ b/app/controllers/api/v1/accounts/pins_controller.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class Api::V1::Accounts::PinsController < Api::BaseController
+  include Authorization
+
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
+  before_action :require_user!
+  before_action :set_account
+
+  respond_to :json
+
+  def create
+    AccountPin.create!(account: current_account, target_account: @account)
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
+  end
+
+  def destroy
+    pin = AccountPin.find_by(account: current_account, target_account: @account)
+    pin&.destroy!
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships_presenter
+  end
+
+  private
+
+  def set_account
+    @account = Account.find(params[:account_id])
+  end
+
+  def relationships_presenter
+    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
+  end
+end
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 06fa6c762399f70603e8e6203011489558b517e4..6c2a5c141431c17d579cf6f2d4c017086b702bd2 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Accounts::StatusesController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :set_account
   after_action :insert_pagination_headers
 
@@ -28,14 +28,11 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
 
   def account_statuses
     statuses = truthy_param?(:pinned) ? pinned_scope : permitted_account_statuses
-    statuses = statuses.paginate_by_max_id(
-      limit_param(DEFAULT_STATUSES_LIMIT),
-      params[:max_id],
-      params[:since_id]
-    )
+    statuses = statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id))
 
     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
   end
@@ -66,6 +63,10 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
     Status.without_replies
   end
 
+  def no_reblogs_scope
+    Status.without_reblogs
+  end
+
   def pagination_params(core_params)
     params.slice(:limit, :only_media, :exclude_replies).permit(:limit, :only_media, :exclude_replies).merge(core_params)
   end
@@ -82,7 +83,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
 
   def prev_path
     unless @statuses.empty?
-      api_v1_account_statuses_url pagination_params(since_id: pagination_since_id)
+      api_v1_account_statuses_url pagination_params(min_id: pagination_since_id)
     end
   end
 
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 1d5372a8cdd4f2d7d0793119d99545efd1deba00..2ccbc3cbbdf50e1d64cd6292a3bdb133b29759c5 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 class Api::V1::AccountsController < Api::BaseController
-  before_action -> { authorize_if_got_token! :read, :'read:accounts' }, except: [:follow, :unfollow, :block, :unblock, :mute, :unmute]
+  before_action -> { authorize_if_got_token! :read, :'read:accounts' }, except: [:create, :follow, :unfollow, :block, :unblock, :mute, :unmute]
   before_action -> { doorkeeper_authorize! :follow, :'write:follows' }, only: [:follow, :unfollow]
   before_action -> { doorkeeper_authorize! :follow, :'write:mutes' }, only: [:mute, :unmute]
   before_action -> { doorkeeper_authorize! :follow, :'write:blocks' }, only: [:block, :unblock]
+  before_action -> { doorkeeper_authorize! :write, :'write:accounts' }, only: [:create]
 
-  before_action :require_user!, except: [:show]
-  before_action :set_account
+  before_action :require_user!, except: [:show, :create]
+  before_action :set_account, except: [:create]
   before_action :check_account_suspension, only: [:show]
+  before_action :check_enabled_registrations, only: [:create]
 
   respond_to :json
 
@@ -16,8 +18,18 @@ class Api::V1::AccountsController < Api::BaseController
     render json: @account, serializer: REST::AccountSerializer
   end
 
+  def create
+    token    = AppSignUpService.new.call(doorkeeper_token.application, account_params)
+    response = Doorkeeper::OAuth::TokenResponse.new(token)
+
+    headers.merge!(response.headers)
+
+    self.response_body = Oj.dump(response.body)
+    self.status        = response.status
+  end
+
   def follow
-    FollowService.new.call(current_user.account, @account.acct, reblogs: truthy_param?(:reblogs))
+    FollowService.new.call(current_user.account, @account, reblogs: truthy_param?(:reblogs))
 
     options = @account.locked? ? {} : { following_map: { @account.id => { reblogs: truthy_param?(:reblogs) } }, requested_map: { @account.id => false } }
 
@@ -62,4 +74,12 @@ class Api::V1::AccountsController < Api::BaseController
   def check_account_suspension
     gone if @account.suspended?
   end
+
+  def account_params
+    params.permit(:username, :email, :password, :agreement, :locale)
+  end
+
+  def check_enabled_registrations
+    forbidden if single_user_mode? || !Setting.open_registrations
+  end
 end
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 99c53d59af8bf9b70b067049bce8e89e6856dfeb..4cff04cad7fd1506a19094e936a89f019d14b73a 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::BlocksController < Api::BaseController
   end
 
   def paginated_blocks
-    @paginated_blocks ||= Block.eager_load(:target_account)
+    @paginated_blocks ||= Block.eager_load(target_account: :account_stat)
                                .where(account: current_account)
                                .paginate_by_max_id(
                                  limit_param(DEFAULT_ACCOUNTS_LIMIT),
diff --git a/app/controllers/api/v1/conversations_controller.rb b/app/controllers/api/v1/conversations_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b19f27ebfb6c4750a64dbd83cfa014ffae464d4e
--- /dev/null
+++ b/app/controllers/api/v1/conversations_controller.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+class Api::V1::ConversationsController < Api::BaseController
+  LIMIT = 20
+
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:conversations' }, except: :index
+  before_action :require_user!
+  before_action :set_conversation, except: :index
+  after_action :insert_pagination_headers, only: :index
+
+  respond_to :json
+
+  def index
+    @conversations = paginated_conversations
+    render json: @conversations, each_serializer: REST::ConversationSerializer
+  end
+
+  def read
+    @conversation.update!(unread: false)
+    render json: @conversation, serializer: REST::ConversationSerializer
+  end
+
+  def destroy
+    @conversation.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_conversation
+    @conversation = AccountConversation.where(account: current_account).find(params[:id])
+  end
+
+  def paginated_conversations
+    AccountConversation.where(account: current_account)
+                       .paginate_by_id(limit_param(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
+    if records_continue?
+      api_v1_conversations_url pagination_params(max_id: pagination_max_id)
+    end
+  end
+
+  def prev_path
+    unless @conversations.empty?
+      api_v1_conversations_url pagination_params(min_id: pagination_since_id)
+    end
+  end
+
+  def pagination_max_id
+    @conversations.last.last_status_id
+  end
+
+  def pagination_since_id
+    @conversations.first.last_status_id
+  end
+
+  def records_continue?
+    @conversations.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index f8cd64455a009bb3aacbe8e5763f278cc393f451..7bac27da4b78dd3689f16794751c525f1870e029 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -4,6 +4,8 @@ class Api::V1::CustomEmojisController < Api::BaseController
   respond_to :json
 
   def index
-    render json: CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer
+    render_cached_json('api:v1:custom_emojis', expires_in: 1.minute) do
+      ActiveModelSerializers::SerializableResource.new(CustomEmoji.local.where(disabled: false), each_serializer: REST::CustomEmojiSerializer)
+    end
   end
 end
diff --git a/app/controllers/api/v1/endorsements_controller.rb b/app/controllers/api/v1/endorsements_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2770c7aef67825859f24af7af8b2a21536b1e6c3
--- /dev/null
+++ b/app/controllers/api/v1/endorsements_controller.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+class Api::V1::EndorsementsController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:accounts' }
+  before_action :require_user!
+  after_action :insert_pagination_headers
+
+  respond_to :json
+
+  def index
+    @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
+  end
+
+  private
+
+  def load_accounts
+    if unlimited?
+      endorsed_accounts.all
+    else
+      endorsed_accounts.paginate_by_max_id(
+        limit_param(DEFAULT_ACCOUNTS_LIMIT),
+        params[:max_id],
+        params[:since_id]
+      )
+    end
+  end
+
+  def endorsed_accounts
+    current_account.endorsed_accounts.includes(:account_stat)
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    return if unlimited?
+
+    if records_continue?
+      api_v1_endorsements_url pagination_params(max_id: pagination_max_id)
+    end
+  end
+
+  def prev_path
+    return if unlimited?
+
+    unless @accounts.empty?
+      api_v1_endorsements_url pagination_params(since_id: pagination_since_id)
+    end
+  end
+
+  def pagination_max_id
+    @accounts.last.id
+  end
+
+  def pagination_since_id
+    @accounts.first.id
+  end
+
+  def records_continue?
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def unlimited?
+    params[:limit] == '0'
+  end
+end
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index ab5204355cd620a4b6f5765c6ed4d51e07b7eb35..db827f9d4aa2aae2452c42fe2f475520e73e266f 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -26,10 +26,9 @@ class Api::V1::FavouritesController < Api::BaseController
   end
 
   def results
-    @_results ||= account_favourites.paginate_by_max_id(
+    @_results ||= account_favourites.paginate_by_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
-      params[:max_id],
-      params[:since_id]
+      params_slice(:max_id, :since_id, :min_id)
     )
   end
 
@@ -49,7 +48,7 @@ class Api::V1::FavouritesController < Api::BaseController
 
   def prev_path
     unless results.empty?
-      api_v1_favourites_url pagination_params(since_id: pagination_since_id)
+      api_v1_favourites_url pagination_params(min_id: pagination_since_id)
     end
   end
 
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index 313fe2f81ce82eda317a31b8dc3ce88070b3f178..e6888154e22217c23f79fd70d64ebd3c37cbd219 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -13,6 +13,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
 
   def authorize
     AuthorizeFollowService.new.call(account, current_account)
+    NotifyService.new.call(current_account, Follow.find_by(account: account, target_account: current_account))
     render_empty
   end
 
@@ -32,7 +33,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:follow_requests).references(:follow_requests)
+    Account.includes(:follow_requests, :account_stat).references(:follow_requests)
   end
 
   def paginated_follow_requests
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index 1c6971c1828a87dd25eca3408664591482b6cba6..5686e8d7c394e5a5c510fd0e28a465f133c68204 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -4,6 +4,8 @@ class Api::V1::InstancesController < Api::BaseController
   respond_to :json
 
   def show
-    render json: {}, serializer: REST::InstanceSerializer
+    render_cached_json('api:v1:instances', expires_in: 5.minutes) do
+      ActiveModelSerializers::SerializableResource.new({}, serializer: REST::InstanceSerializer)
+    end
   end
 end
diff --git a/app/controllers/api/v1/lists/accounts_controller.rb b/app/controllers/api/v1/lists/accounts_controller.rb
index 19de567321641d1503ef790e05be47cc743f06e9..23078263e7abdd70843a62906245afd35774fb3b 100644
--- a/app/controllers/api/v1/lists/accounts_controller.rb
+++ b/app/controllers/api/v1/lists/accounts_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::Lists::AccountsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:lists' },    only:  [:show]
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:show]
   before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:show]
 
   before_action :require_user!
@@ -37,9 +37,9 @@ class Api::V1::Lists::AccountsController < Api::BaseController
 
   def load_accounts
     if unlimited?
-      @list.accounts.all
+      @list.accounts.includes(:account_stat).all
     else
-      @list.accounts.paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
+      @list.accounts.includes(:account_stat).paginate_by_max_id(limit_param(DEFAULT_ACCOUNTS_LIMIT), params[:max_id], params[:since_id])
     end
   end
 
diff --git a/app/controllers/api/v1/lists_controller.rb b/app/controllers/api/v1/lists_controller.rb
index b42b8b9710d2a9f42f5d32d4ede3c8875624203e..054172bee3aa64e25a19751bda99d814854bdc61 100644
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V1::ListsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:lists' },    only:  [:index, :show]
+  before_action -> { doorkeeper_authorize! :read, :'read:lists' }, only: [:index, :show]
   before_action -> { doorkeeper_authorize! :write, :'write:lists' }, except: [:index, :show]
 
   before_action :require_user!
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index faa7d16cd9f59ef2ae3263bde6770063eebc5e00..df6c8e86c5960953312ce3445703ce6716087156 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -15,19 +15,17 @@ class Api::V1::MutesController < Api::BaseController
   private
 
   def load_accounts
-    default_accounts.merge(paginated_mutes).to_a
-  end
-
-  def default_accounts
-    Account.includes(:muted_by).references(:muted_by)
+    paginated_mutes.map(&:target_account)
   end
 
   def paginated_mutes
-    Mute.where(account: current_account).paginate_by_max_id(
-      limit_param(DEFAULT_ACCOUNTS_LIMIT),
-      params[:max_id],
-      params[:since_id]
-    )
+    @paginated_mutes ||= Mute.eager_load(:target_account)
+                             .where(account: current_account)
+                             .paginate_by_max_id(
+                               limit_param(DEFAULT_ACCOUNTS_LIMIT),
+                               params[:max_id],
+                               params[:since_id]
+                             )
   end
 
   def insert_pagination_headers
@@ -41,21 +39,21 @@ class Api::V1::MutesController < Api::BaseController
   end
 
   def prev_path
-    unless @accounts.empty?
+    unless paginated_mutes.empty?
       api_v1_mutes_url pagination_params(since_id: pagination_since_id)
     end
   end
 
   def pagination_max_id
-    @accounts.last.muted_by_ids.last
+    paginated_mutes.last.id
   end
 
   def pagination_since_id
-    @accounts.first.muted_by_ids.first
+    paginated_mutes.first.id
   end
 
   def records_continue?
-    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+    paginated_mutes.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
   end
 
   def pagination_params(core_params)
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index 593c8f9a9c8a201e4218479bd642a5f0a3a67fca..e2dec62afaef4a4d07cf982649369f6042515239 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -37,10 +37,9 @@ class Api::V1::NotificationsController < Api::BaseController
   end
 
   def paginated_notifications
-    browserable_account_notifications.paginate_by_max_id(
+    browserable_account_notifications.paginate_by_id(
       limit_param(DEFAULT_NOTIFICATIONS_LIMIT),
-      params[:max_id],
-      params[:since_id]
+      params_slice(:max_id, :since_id, :min_id)
     )
   end
 
@@ -64,7 +63,7 @@ class Api::V1::NotificationsController < Api::BaseController
 
   def prev_path
     unless @notifications.empty?
-      api_v1_notifications_url pagination_params(since_id: pagination_since_id)
+      api_v1_notifications_url pagination_params(min_id: pagination_since_id)
     end
   end
 
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index a954101cb8fee46da9ed91f1cd807dc96e5d22ac..e182a9c6cf6245fb052b435416e2d667ba212390 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -1,17 +1,11 @@
 # frozen_string_literal: true
 
 class Api::V1::ReportsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:reports' }, except: [:create]
   before_action -> { doorkeeper_authorize! :write, :'write:reports' }, only: [:create]
   before_action :require_user!
 
   respond_to :json
 
-  def index
-    @reports = current_account.reports
-    render json: @reports, each_serializer: REST::ReportSerializer
-  end
-
   def create
     @report = ReportService.new.call(
       current_account,
@@ -27,7 +21,7 @@ class Api::V1::ReportsController < Api::BaseController
   private
 
   def reported_status_ids
-    Status.find(status_ids).pluck(:id)
+    reported_account.statuses.find(status_ids).pluck(:id)
   end
 
   def status_ids
diff --git a/app/controllers/api/v1/scheduled_statuses_controller.rb b/app/controllers/api/v1/scheduled_statuses_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9950296f3bc8f72b2ccd9930144daf4e6d630aa9
--- /dev/null
+++ b/app/controllers/api/v1/scheduled_statuses_controller.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class Api::V1::ScheduledStatusesController < Api::BaseController
+  include Authorization
+
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, except: [:update, :destroy]
+  before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: [:update, :destroy]
+
+  before_action :set_statuses, only: :index
+  before_action :set_status, except: :index
+
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    render json: @statuses, each_serializer: REST::ScheduledStatusSerializer
+  end
+
+  def show
+    render json: @status, serializer: REST::ScheduledStatusSerializer
+  end
+
+  def update
+    @status.update!(scheduled_status_params)
+    render json: @status, serializer: REST::ScheduledStatusSerializer
+  end
+
+  def destroy
+    @status.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_statuses
+    @statuses = current_account.scheduled_statuses.paginate_by_id(limit_param(DEFAULT_STATUSES_LIMIT), params_slice(:max_id, :since_id, :min_id))
+  end
+
+  def set_status
+    @status = current_account.scheduled_statuses.find(params[:id])
+  end
+
+  def scheduled_status_params
+    params.permit(:scheduled_at)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    if records_continue?
+      api_v1_scheduled_statuses_url pagination_params(max_id: pagination_max_id)
+    end
+  end
+
+  def prev_path
+    unless @statuses.empty?
+      api_v1_scheduled_statuses_url pagination_params(min_id: pagination_since_id)
+    end
+  end
+
+  def records_continue?
+    @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+  end
+
+  def pagination_max_id
+    @statuses.last.id
+  end
+
+  def pagination_since_id
+    @statuses.first.id
+  end
+end
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index 8f4070bc781adedd70f6b90f079d455eefcafbab..657e57831989dbbf56890f540632c4d25ff72bd9 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -22,7 +22,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController
 
   def default_accounts
     Account
-      .includes(:favourites)
+      .includes(:favourites, :account_stat)
       .references(:favourites)
       .where(favourites: { status_id: @status.id })
   end
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index 93b83ce485179690dc23c83d78af0e419d43a138..6851099f6612cd794c456291e2b788e71cb3cb4b 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -21,11 +21,11 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
   end
 
   def default_accounts
-    Account.includes(:statuses).references(:statuses)
+    Account.includes(:statuses, :account_stat).references(:statuses)
   end
 
   def paginated_statuses
-    Status.where(reblog_of_id: @status.id).paginate_by_max_id(
+    Status.where(reblog_of_id: @status.id).where(visibility: [:public, :unlisted]).paginate_by_max_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params[:max_id],
       params[:since_id]
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index c6925d46292de0a837fb6fae8793bfc23e4d344f..29b420c67525f7560d6f01bdee9e1d24ce26c668 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -17,8 +17,7 @@ class Api::V1::StatusesController < Api::BaseController
   CONTEXT_LIMIT = 4_096
 
   def show
-    cached  = Rails.cache.read(@status.cache_key)
-    @status = cached unless cached.nil?
+    @status = cache_collection([@status], Status).first
     render json: @status, serializer: REST::StatusSerializer
   end
 
@@ -46,16 +45,17 @@ class Api::V1::StatusesController < Api::BaseController
 
   def create
     @status = PostStatusService.new.call(current_user.account,
-                                         status_params[:status],
-                                         status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id]),
+                                         text: status_params[:status],
+                                         thread: status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id]),
                                          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,
                                          idempotency: request.headers['Idempotency-Key'])
 
-    render json: @status, serializer: REST::StatusSerializer
+    render json: @status, serializer: @status.is_a?(ScheduledStatus) ? REST::ScheduledStatusSerializer : REST::StatusSerializer
   end
 
   def destroy
@@ -78,7 +78,7 @@ class Api::V1::StatusesController < Api::BaseController
   end
 
   def status_params
-    params.permit(:status, :in_reply_to_id, :sensitive, :spoiler_text, :visibility, media_ids: [])
+    params.permit(:status, :in_reply_to_id, :sensitive, :spoiler_text, :visibility, :scheduled_at, media_ids: [])
   end
 
   def pagination_params(core_params)
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 4412aaaa391c7f0dca66d03e7741e476c5aee86e..fcd0757f1a87c0d6792cfb12de536d9ef46c4643 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -30,7 +30,8 @@ class Api::V1::Timelines::HomeController < Api::BaseController
     account_home_feed.get(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params[:max_id],
-      params[:since_id]
+      params[:since_id],
+      params[:min_id]
     )
   end
 
@@ -51,7 +52,7 @@ class Api::V1::Timelines::HomeController < Api::BaseController
   end
 
   def prev_path
-    api_v1_timelines_home_url pagination_params(since_id: pagination_since_id)
+    api_v1_timelines_home_url pagination_params(min_id: pagination_since_id)
   end
 
   def pagination_max_id
diff --git a/app/controllers/api/v1/timelines/list_controller.rb b/app/controllers/api/v1/timelines/list_controller.rb
index cfc5f3b5e4d68326ffe03161f96ec5dd65863c93..a15eae468d92b44f0c3228192d144d9e045ba034 100644
--- a/app/controllers/api/v1/timelines/list_controller.rb
+++ b/app/controllers/api/v1/timelines/list_controller.rb
@@ -32,7 +32,8 @@ class Api::V1::Timelines::ListController < Api::BaseController
     list_feed.get(
       limit_param(DEFAULT_STATUSES_LIMIT),
       params[:max_id],
-      params[:since_id]
+      params[:since_id],
+      params[:min_id]
     )
   end
 
@@ -53,7 +54,7 @@ class Api::V1::Timelines::ListController < Api::BaseController
   end
 
   def prev_path
-    api_v1_timelines_list_url params[:id], pagination_params(since_id: pagination_since_id)
+    api_v1_timelines_list_url params[:id], pagination_params(min_id: pagination_since_id)
   end
 
   def pagination_max_id
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 13fe015b7df335b550b1678e313517d11238a2cf..aabe24324312421b5f9c0765b3a7c037907ab9df 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -21,10 +21,9 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   end
 
   def public_statuses
-    statuses = public_timeline_statuses.paginate_by_max_id(
+    statuses = public_timeline_statuses.paginate_by_id(
       limit_param(DEFAULT_STATUSES_LIMIT),
-      params[:max_id],
-      params[:since_id]
+      params_slice(:max_id, :since_id, :min_id)
     )
 
     if truthy_param?(:only_media)
@@ -53,7 +52,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
   end
 
   def prev_path
-    api_v1_timelines_public_url pagination_params(since_id: pagination_since_id)
+    api_v1_timelines_public_url pagination_params(min_id: pagination_since_id)
   end
 
   def pagination_max_id
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 7de49a5ed683598a6fc2392fb2edbd88399dad63..92c32c1784b2e2c56a689c0284294f0c26a298a0 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -29,10 +29,9 @@ class Api::V1::Timelines::TagController < Api::BaseController
     if @tag.nil?
       []
     else
-      statuses = tag_timeline_statuses.paginate_by_max_id(
+      statuses = tag_timeline_statuses.paginate_by_id(
         limit_param(DEFAULT_STATUSES_LIMIT),
-        params[:max_id],
-        params[:since_id]
+        params_slice(:max_id, :since_id, :min_id)
       )
 
       if truthy_param?(:only_media)
@@ -46,7 +45,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
   end
 
   def tag_timeline_statuses
-    Status.as_tag_timeline(@tag, current_account, truthy_param?(:local))
+    HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, truthy_param?(:local))
   end
 
   def insert_pagination_headers
@@ -62,7 +61,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
   end
 
   def prev_path
-    api_v1_timelines_tag_url params[:id], pagination_params(since_id: pagination_since_id)
+    api_v1_timelines_tag_url params[:id], pagination_params(min_id: pagination_since_id)
   end
 
   def pagination_max_id
diff --git a/app/controllers/api/web/embeds_controller.rb b/app/controllers/api/web/embeds_controller.rb
index 987290a14ce5be54b1fc3aa942598c79a34d1286..6231733b71aa101f395a7e8b80f7ea684d488b3c 100644
--- a/app/controllers/api/web/embeds_controller.rb
+++ b/app/controllers/api/web/embeds_controller.rb
@@ -10,6 +10,7 @@ class Api::Web::EmbedsController < Api::Web::BaseController
     render json: status, serializer: OEmbedSerializer, width: 400
   rescue ActiveRecord::RecordNotFound
     oembed = FetchOEmbedService.new.call(params[:url])
+    oembed[:html] = Formatter.instance.sanitize(oembed[:html], Sanitize::Config::MASTODON_OEMBED) if oembed[:html].present?
 
     if oembed
       render json: oembed
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 29ba6cad616b1a5902fcd2f61e3510dfef00a04b..b54e7b008eeb06283bb7b7a94e39ddb6a4dbaf97 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -24,7 +24,7 @@ class ApplicationController < ActionController::Base
   rescue_from Mastodon::NotPermittedError, with: :forbidden
 
   before_action :store_current_location, except: :raise_not_found, unless: :devise_controller?
-  before_action :check_suspension, if: :user_signed_in?
+  before_action :check_user_permissions, if: :user_signed_in?
 
   def raise_not_found
     raise ActionController::RoutingError, "No route matches #{params[:unmatched_route]}"
@@ -48,8 +48,8 @@ class ApplicationController < ActionController::Base
     forbidden unless current_user&.staff?
   end
 
-  def check_suspension
-    forbidden if current_user.account.suspended?
+  def check_user_permissions
+    forbidden if current_user.disabled? || current_user.account.suspended?
   end
 
   def after_sign_out_path_for(_resource_or_scope)
@@ -58,6 +58,10 @@ class ApplicationController < ActionController::Base
 
   protected
 
+  def truthy_param?(key)
+    ActiveModel::Type::Boolean.new.cast(params[key])
+  end
+
   def forbidden
     respond_with_error(403)
   end
@@ -95,7 +99,7 @@ class ApplicationController < ActionController::Base
   end
 
   def current_theme
-    return Setting.default_settings['theme'] unless Themes.instance.names.include? current_user&.setting_theme
+    return Setting.theme unless Themes.instance.names.include? current_user&.setting_theme
     current_user.setting_theme
   end
 
@@ -103,29 +107,26 @@ class ApplicationController < ActionController::Base
     return raw unless klass.respond_to?(:with_includes)
 
     raw                    = raw.cache_ids.to_a if raw.is_a?(ActiveRecord::Relation)
-    uncached_ids           = []
-    cached_keys_with_value = Rails.cache.read_multi(*raw.map(&:cache_key))
-
-    raw.each do |item|
-      uncached_ids << item.id unless cached_keys_with_value.key?(item.cache_key)
-    end
+    cached_keys_with_value = Rails.cache.read_multi(*raw).transform_keys(&:id)
+    uncached_ids           = raw.map(&:id) - cached_keys_with_value.keys
 
     klass.reload_stale_associations!(cached_keys_with_value.values) if klass.respond_to?(:reload_stale_associations!)
 
     unless uncached_ids.empty?
-      uncached = klass.where(id: uncached_ids).with_includes.map { |item| [item.id, item] }.to_h
+      uncached = klass.where(id: uncached_ids).with_includes.each_with_object({}) { |item, h| h[item.id] = item }
 
       uncached.each_value do |item|
-        Rails.cache.write(item.cache_key, item)
+        Rails.cache.write(item, item)
       end
     end
 
-    raw.map { |item| cached_keys_with_value[item.cache_key] || uncached[item.id] }.compact
+    raw.map { |item| cached_keys_with_value[item.id] || uncached[item.id] }.compact
   end
 
   def respond_with_error(code)
     respond_to do |format|
       format.any  { head code }
+
       format.html do
         set_locale
         render "errors/#{code}", layout: 'error', status: code
@@ -135,7 +136,6 @@ class ApplicationController < ActionController::Base
 
   def render_cached_json(cache_key, **options)
     options[:expires_in] ||= 3.minutes
-    cache_key              = cache_key.join(':') if cache_key.is_a?(Enumerable)
     cache_public           = options.key?(:public) ? options.delete(:public) : true
     content_type           = options.delete(:content_type) || 'application/json'
 
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb
index 068e71cada69c03012bdd1cefbef079b72af92e2..c28c7471c0d1636b5f14f59400c4d8746a8d262b 100644
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -3,11 +3,12 @@
 class Auth::ConfirmationsController < Devise::ConfirmationsController
   layout 'auth'
 
+  before_action :set_body_classes
   before_action :set_user, only: [:finish_signup]
 
-  # GET/PATCH /users/:id/finish_signup
   def finish_signup
     return unless request.patch? && params[:user]
+
     if @user.update(user_params)
       @user.skip_reconfirmation!
       bypass_sign_in(@user)
@@ -23,7 +24,19 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
     @user = current_user
   end
 
+  def set_body_classes
+    @body_classes = 'lighter'
+  end
+
   def user_params
     params.require(:user).permit(:email)
   end
+
+  def after_confirmation_path_for(_resource_name, user)
+    if user.created_by_application && truthy_param?(:redirect_to_app)
+      user.created_by_application.redirect_uri
+    else
+      super
+    end
+  end
 end
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index 171b997dc486f62c6e002c7f838cb3343f602316..34b98da53bfc1cb52120009d1f39d403cba6f3e9 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -2,6 +2,7 @@
 
 class Auth::PasswordsController < Devise::PasswordsController
   before_action :check_validity_of_reset_password_token, only: :edit
+  before_action :set_body_classes
 
   layout 'auth'
 
@@ -14,6 +15,10 @@ class Auth::PasswordsController < Devise::PasswordsController
     end
   end
 
+  def set_body_classes
+    @body_classes = 'lighter'
+  end
+
   def reset_password_token_is_valid?
     resource_class.with_reset_password_token(params[:reset_password_token]).present?
   end
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 58961554e6b7fe46cc86b2725eed7c6d823f49ce..f2a832542fe5489dc8cce2e1670bd054d9071c5c 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -8,6 +8,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   before_action :configure_sign_up_params, only: [:create]
   before_action :set_sessions, only: [:edit, :update]
   before_action :set_instance_presenter, only: [:new, :create, :update]
+  before_action :set_body_classes, only: [:new, :create, :edit, :update]
 
   def destroy
     not_found
@@ -25,6 +26,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
 
     resource.locale      = I18n.locale
     resource.invite_code = params[:invite_code] if resource.invite_code.blank?
+    resource.agreement   = true
 
     resource.build_account if resource.account.nil?
   end
@@ -79,6 +81,10 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     @instance_presenter = InstancePresenter.new
   end
 
+  def set_body_classes
+    @body_classes = %w(edit update).include?(action_name) ? 'admin' : 'lighter'
+  end
+
   def set_invite
     @invite = invite_code.present? ? Invite.find_by(code: invite_code) : nil
   end
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index c1ebe760c5d90814cb5ac2b64c938ed55ebeee21..fb8615c3134dc5b6db94ddf648b7f7bda1717340 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -6,9 +6,10 @@ class Auth::SessionsController < Devise::SessionsController
   layout 'auth'
 
   skip_before_action :require_no_authentication, only: [:create]
-  skip_before_action :check_suspension, only: [:destroy]
+  skip_before_action :check_user_permissions, only: [:destroy]
   prepend_before_action :authenticate_with_two_factor, if: :two_factor_enabled?, only: [:create]
   before_action :set_instance_presenter, only: [:new]
+  before_action :set_body_classes
 
   def new
     Devise.omniauth_configs.each do |provider, config|
@@ -26,8 +27,10 @@ class Auth::SessionsController < Devise::SessionsController
   end
 
   def destroy
+    tmp_stored_location = stored_location_for(:user)
     super
     flash.delete(:notice)
+    store_location_for(:user, tmp_stored_location) if continue_after?
   end
 
   protected
@@ -109,6 +112,10 @@ class Auth::SessionsController < Devise::SessionsController
     @instance_presenter = InstancePresenter.new
   end
 
+  def set_body_classes
+    @body_classes = 'lighter'
+  end
+
   def home_paths(resource)
     paths = [about_path]
     if single_user_mode? && resource.is_a?(User)
@@ -116,4 +123,8 @@ class Auth::SessionsController < Devise::SessionsController
     end
     paths
   end
+
+  def continue_after?
+    truthy_param?(:continue)
+  end
 end
diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb
deleted file mode 100644
index 775d5f23fb32dfd1b337fe9f500e5324f27c0d1a..0000000000000000000000000000000000000000
--- a/app/controllers/authorize_follows_controller.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-class AuthorizeFollowsController < ApplicationController
-  layout 'modal'
-
-  before_action :authenticate_user!
-  before_action :set_body_classes
-
-  def show
-    @account = located_account || render(:error)
-  end
-
-  def create
-    @account = follow_attempt.try(:target_account)
-
-    if @account.nil?
-      render :error
-    else
-      render :success
-    end
-  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
-    render :error
-  end
-
-  private
-
-  def follow_attempt
-    FollowService.new.call(current_account, acct_without_prefix)
-  end
-
-  def located_account
-    if acct_param_is_url?
-      account_from_remote_fetch
-    else
-      account_from_remote_follow
-    end
-  end
-
-  def account_from_remote_fetch
-    FetchRemoteAccountService.new.call(acct_without_prefix)
-  end
-
-  def account_from_remote_follow
-    ResolveAccountService.new.call(acct_without_prefix)
-  end
-
-  def acct_param_is_url?
-    parsed_uri.path && %w(http https).include?(parsed_uri.scheme)
-  end
-
-  def parsed_uri
-    Addressable::URI.parse(acct_without_prefix).normalize
-  end
-
-  def acct_without_prefix
-    acct_params.gsub(/\Aacct:/, '')
-  end
-
-  def acct_params
-    params.fetch(:acct, '')
-  end
-
-  def set_body_classes
-    @body_classes = 'modal-layout'
-  end
-end
diff --git a/app/controllers/authorize_interactions_controller.rb b/app/controllers/authorize_interactions_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e27366ea363880921f4c21d6fe1f1a18ea330f4c
--- /dev/null
+++ b/app/controllers/authorize_interactions_controller.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+class AuthorizeInteractionsController < ApplicationController
+  include Authorization
+
+  layout 'modal'
+
+  before_action :authenticate_user!
+  before_action :set_body_classes
+  before_action :set_resource
+
+  def show
+    if @resource.is_a?(Account)
+      render :show
+    elsif @resource.is_a?(Status)
+      redirect_to web_url("statuses/#{@resource.id}")
+    else
+      render :error
+    end
+  end
+
+  def create
+    if @resource.is_a?(Account) && FollowService.new.call(current_account, @resource)
+      render :success
+    else
+      render :error
+    end
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
+    render :error
+  end
+
+  private
+
+  def set_resource
+    @resource = located_resource || render(:error)
+    authorize(@resource, :show?) if @resource.is_a?(Status)
+  end
+
+  def located_resource
+    if uri_param_is_url?
+      ResolveURLService.new.call(uri_param)
+    else
+      account_from_remote_follow
+    end
+  end
+
+  def account_from_remote_follow
+    ResolveAccountService.new.call(uri_param)
+  end
+
+  def uri_param_is_url?
+    parsed_uri.path && %w(http https).include?(parsed_uri.scheme)
+  end
+
+  def parsed_uri
+    Addressable::URI.parse(uri_param).normalize
+  end
+
+  def uri_param
+    params[:uri] || params.fetch(:acct, '').gsub(/\Aacct:/, '')
+  end
+
+  def set_body_classes
+    @body_classes = 'modal-layout'
+  end
+end
diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb
index 5b9981aa26ef80f416660e6fdfdc69d69886d772..6c27ef330b90b8a40499d1a84ba5edb4373f82ed 100644
--- a/app/controllers/concerns/account_controller_concern.rb
+++ b/app/controllers/concerns/account_controller_concern.rb
@@ -8,6 +8,7 @@ module AccountControllerConcern
   included do
     layout 'public'
     before_action :set_account
+    before_action :set_instance_presenter
     before_action :set_link_headers
     before_action :check_account_suspension
   end
@@ -18,6 +19,10 @@ module AccountControllerConcern
     @account = Account.find_local!(params[:account_username])
   end
 
+  def set_instance_presenter
+    @instance_presenter = InstancePresenter.new
+  end
+
   def set_link_headers
     response.headers['Link'] = LinkHeader.new(
       [
diff --git a/app/controllers/concerns/remote_account_controller_concern.rb b/app/controllers/concerns/remote_account_controller_concern.rb
deleted file mode 100644
index e1791064244303d121eba26f3883a7d199500c8b..0000000000000000000000000000000000000000
--- a/app/controllers/concerns/remote_account_controller_concern.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module RemoteAccountControllerConcern
-  extend ActiveSupport::Concern
-
-  included do
-    layout 'public'
-    before_action :set_account
-    before_action :check_account_suspension
-  end
-
-  private
-
-  def set_account
-    @account = Account.find_remote!(params[:acct])
-  end
-
-  def check_account_suspension
-    gone if @account.suspended?
-  end
-end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 4d77fa43241963d32074b93e6dcee2268fd5eb5c..91566c4fad95ca2401af4022047fd1ea579cdc11 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -22,6 +22,12 @@ module SignatureVerification
       return
     end
 
+    if request.headers['Date'].present? && !matches_time_window?
+      @signature_verification_failure_reason = 'Signed request date outside acceptable time window'
+      @signed_request_account = nil
+      return
+    end
+
     raw_signature    = request.headers['Signature']
     signature_params = {}
 
@@ -37,7 +43,13 @@ module SignatureVerification
       return
     end
 
-    account = account_from_key_id(signature_params['keyId'])
+    account_stoplight = Stoplight("source:#{request.ip}") { account_from_key_id(signature_params['keyId']) }
+      .with_fallback { nil }
+      .with_threshold(1)
+      .with_cool_off_time(5.minutes.seconds)
+      .with_error_handler { |error, handle| error.is_a?(HTTP::Error) ? handle.call(error) : raise(error) }
+
+    account = account_stoplight.run
 
     if account.nil?
       @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
@@ -48,23 +60,26 @@ module SignatureVerification
     signature             = Base64.decode64(signature_params['signature'])
     compare_signed_string = build_signed_string(signature_params['headers'])
 
-    if account.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, signature, compare_signed_string)
-      @signed_request_account = account
-      @signed_request_account
-    elsif account.possibly_stale?
-      account = account.refresh!
+    return account unless verify_signature(account, signature, compare_signed_string).nil?
 
-      if account.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, signature, compare_signed_string)
-        @signed_request_account = account
-        @signed_request_account
-      else
-        @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri}"
-        @signed_request_account = nil
-      end
-    else
-      @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri}"
+    account_stoplight = Stoplight("source:#{request.ip}") { account.possibly_stale? ? account.refresh! : account_refresh_key(account) }
+      .with_fallback { nil }
+      .with_threshold(1)
+      .with_cool_off_time(5.minutes.seconds)
+      .with_error_handler { |error, handle| error.is_a?(HTTP::Error) ? handle.call(error) : raise(error) }
+
+    account = account_stoplight.run
+
+    if account.nil?
+      @signature_verification_failure_reason = "Public key not found for key #{signature_params['keyId']}"
       @signed_request_account = nil
+      return
     end
+
+    return account unless verify_signature(account, signature, compare_signed_string).nil?
+
+    @signature_verification_failure_reason = "Verification failed for #{account.username}@#{account.domain} #{account.uri}"
+    @signed_request_account = nil
   end
 
   def request_body
@@ -73,10 +88,19 @@ module SignatureVerification
 
   private
 
+  def verify_signature(account, signature, compare_signed_string)
+    if account.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, signature, compare_signed_string)
+      @signed_request_account = account
+      @signed_request_account
+    end
+  rescue OpenSSL::PKey::RSAError
+    nil
+  end
+
   def build_signed_string(signed_headers)
     signed_headers = 'date' if signed_headers.blank?
 
-    signed_headers.split(' ').map do |signed_header|
+    signed_headers.downcase.split(' ').map do |signed_header|
       if signed_header == Request::REQUEST_TARGET
         "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
       elsif signed_header == 'digest'
@@ -89,12 +113,12 @@ module SignatureVerification
 
   def matches_time_window?
     begin
-      time_sent = DateTime.httpdate(request.headers['Date'])
+      time_sent = Time.httpdate(request.headers['Date'])
     rescue ArgumentError
       return false
     end
 
-    (Time.now.utc - time_sent).abs <= 30
+    (Time.now.utc - time_sent).abs <= 12.hours
   end
 
   def body_digest
@@ -119,4 +143,9 @@ module SignatureVerification
       account
     end
   end
+
+  def account_refresh_key(account)
+    return if account.local? || !account.activitypub?
+    ActivityPub::FetchRemoteAccountService.new.call(account.uri, only_key: true)
+  end
 end
diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..31e501609d809738ebf56af4166fda4b72a64947
--- /dev/null
+++ b/app/controllers/custom_css_controller.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CustomCssController < ApplicationController
+  before_action :set_cache_headers
+
+  def show
+    skip_session!
+    render plain: Setting.custom_css || '', content_type: 'text/css'
+  end
+end
diff --git a/app/controllers/directories_controller.rb b/app/controllers/directories_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ff7ff4a428154fb8b178689a73339d47f8164155
--- /dev/null
+++ b/app/controllers/directories_controller.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class DirectoriesController < ApplicationController
+  layout 'public'
+
+  before_action :check_enabled
+  before_action :set_instance_presenter
+  before_action :set_tag, only: :show
+  before_action :set_tags
+  before_action :set_accounts
+
+  def index
+    render :index
+  end
+
+  def show
+    render :index
+  end
+
+  private
+
+  def check_enabled
+    return not_found unless Setting.profile_directory
+  end
+
+  def set_tag
+    @tag = Tag.discoverable.find_by!(name: params[:id].downcase)
+  end
+
+  def set_tags
+    @tags = Tag.discoverable.limit(30).reject { |tag| tag.cached_sample_accounts.empty? }
+  end
+
+  def set_accounts
+    @accounts = Account.discoverable.page(params[:page]).per(40).tap do |query|
+      query.merge!(Account.tagged_with(@tag.id)) if @tag
+    end
+  end
+
+  def set_instance_presenter
+    @instance_presenter = InstancePresenter.new
+  end
+end
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb
index c9725ccc0d2d26a384a84dd4ed06e72050eb37d2..5d306e6005f1ee8eb244f09b9709b2a0821a6d23 100644
--- a/app/controllers/emojis_controller.rb
+++ b/app/controllers/emojis_controller.rb
@@ -9,7 +9,7 @@ class EmojisController < ApplicationController
       format.json do
         skip_session!
 
-        render_cached_json(['activitypub', 'emoji', @emoji.cache_key], content_type: 'application/activity+json') do
+        render_cached_json(['activitypub', 'emoji', @emoji], content_type: 'application/activity+json') do
           ActiveModelSerializers::SerializableResource.new(@emoji, serializer: ActivityPub::EmojiSerializer, adapter: ActivityPub::Adapter)
         end
       end
diff --git a/app/controllers/filters_controller.rb b/app/controllers/filters_controller.rb
index 03403a1ba104233a200cc9d36221158bfba9905c..d2e0fb73907f243bbae10be4b3bd6e2ce20c74ec 100644
--- a/app/controllers/filters_controller.rb
+++ b/app/controllers/filters_controller.rb
@@ -7,6 +7,7 @@ class FiltersController < ApplicationController
 
   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
@@ -52,6 +53,10 @@ class FiltersController < ApplicationController
   end
 
   def resource_params
-    params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, context: [])
+    params.require(:custom_filter).permit(:phrase, :expires_in, :irreversible, :whole_word, context: [])
+  end
+
+  def set_body_classes
+    @body_classes = 'admin'
   end
 end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index b71424107bc30df13944ed50109057e66d0a8834..b5d6460f9fc1a2dfca8a904a661a5db55b924e89 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -58,7 +58,7 @@ class HomeController < ApplicationController
     if request.path.start_with?('/web')
       new_user_session_path
     elsif single_user_mode?
-      short_account_path(Account.first)
+      short_account_path(Account.local.where(suspended: false).first)
     else
       about_path
     end
diff --git a/app/controllers/intents_controller.rb b/app/controllers/intents_controller.rb
index 56129d69aff4bfbd78825536743b7c578ababdf1..9f41cf48ac3183fe49414c6aa96418608e5e86e0 100644
--- a/app/controllers/intents_controller.rb
+++ b/app/controllers/intents_controller.rb
@@ -8,7 +8,7 @@ class IntentsController < ApplicationController
     if uri.scheme == 'web+mastodon'
       case uri.host
       when 'follow'
-        return redirect_to authorize_follow_path(acct: uri.query_values['uri'].gsub(/\Aacct:/, ''))
+        return redirect_to authorize_interaction_path(uri: uri.query_values['uri'].gsub(/\Aacct:/, ''))
       when 'share'
         return redirect_to share_path(text: uri.query_values['text'])
       end
diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 5c30313f498a0614bff920a06d61e8b5e73c021a..fdb3a0962a2ac4f53f7ec443be4ea60c3e33c771 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -6,6 +6,7 @@ class InvitesController < ApplicationController
   layout 'admin'
 
   before_action :authenticate_user!
+  before_action :set_body_classes
 
   def index
     authorize :invite, :create?
@@ -38,10 +39,14 @@ class InvitesController < ApplicationController
   private
 
   def invites
-    Invite.where(user: current_user)
+    Invite.where(user: current_user).order(id: :desc)
   end
 
   def resource_params
     params.require(:invite).permit(:max_uses, :expires_in, :autofollow)
   end
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
 end
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
index 88c7232dd848b5e704c86222771fd75e2d65f629..8e1624ce1b449b627f227df85a616c8f021dbb81 100644
--- a/app/controllers/media_controller.rb
+++ b/app/controllers/media_controller.rb
@@ -6,12 +6,17 @@ class MediaController < ApplicationController
   before_action :set_media_attachment
   before_action :verify_permitted_status!
 
+  content_security_policy only: :player do |p|
+    p.frame_ancestors(false)
+  end
+
   def show
     redirect_to @media_attachment.file.url(:original)
   end
 
   def player
     @body_classes = 'player'
+    response.headers['X-Frame-Options'] = 'ALLOWALL'
     raise ActiveRecord::RecordNotFound unless @media_attachment.video? || @media_attachment.gifv?
   end
 
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index e9cdf9fa8afbe692c76bb0f52ce37ad2df658517..cebbdc4d08b02bb1f31dc4bf5568a1aa22882624 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -13,4 +13,18 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
   def store_current_location
     store_location_for(:user, request.url)
   end
+
+  def render_success
+    if skip_authorization? || (matching_token? && !truthy_param?('force_login'))
+      redirect_or_render authorize_response
+    elsif Doorkeeper.configuration.api_only
+      render json: pre_auth
+    else
+      render :new
+    end
+  end
+
+  def truthy_param?(key)
+    ActiveModel::Type::Boolean.new.cast(params[key])
+  end
 end
diff --git a/app/controllers/remote_follow_controller.rb b/app/controllers/remote_follow_controller.rb
index cd61fd7639a410b828a21c03cbd16e9feee23568..8ba331cd16ca51e777c218b5f52b670c2aa2c866 100644
--- a/app/controllers/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@@ -42,5 +42,6 @@ class RemoteFollowController < ApplicationController
 
   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
new file mode 100644
index 0000000000000000000000000000000000000000..cc6993c52b22236dd4b95a4aa698c5e5527e8eed
--- /dev/null
+++ b/app/controllers/remote_interaction_controller.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class RemoteInteractionController < ApplicationController
+  include Authorization
+
+  layout 'modal'
+
+  before_action :set_interaction_type
+  before_action :set_status
+  before_action :set_body_classes
+
+  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] }
+  end
+
+  def set_status
+    @status = Status.find(params[:id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    # Reraise in order to get a 404
+    raise ActiveRecord::RecordNotFound
+  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/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index 2a4962311573c55e379c0d2e0aa8b3b28bce8303..ed3f82a8e06e693e8107c0fbdf2211d7ec48a3a0 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::ApplicationsController < ApplicationController
+class Settings::ApplicationsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
diff --git a/app/controllers/settings/base_controller.rb b/app/controllers/settings/base_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9bb14afa2d65d6be17ed665c26c675ef8aa5f717
--- /dev/null
+++ b/app/controllers/settings/base_controller.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Settings::BaseController < ApplicationController
+  before_action :set_body_classes
+
+  private
+
+  def set_body_classes
+    @body_classes = 'admin'
+  end
+end
diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index 80002b995e58a20eff26ee9257b3fc32957aa406..dd19aadf636b6fd35541efdc4552ccf0e6b66bd9 100644
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::DeletesController < ApplicationController
+class Settings::DeletesController < Settings::BaseController
   layout 'admin'
 
   before_action :check_enabled_deletion
diff --git a/app/controllers/settings/exports/blocked_domains_controller.rb b/app/controllers/settings/exports/blocked_domains_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6676ce340148f9488398f78612d311f59bec2c29
--- /dev/null
+++ b/app/controllers/settings/exports/blocked_domains_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Settings
+  module Exports
+    class BlockedDomainsController < ApplicationController
+      include ExportControllerConcern
+
+      def index
+        send_export_file
+      end
+
+      private
+
+      def export_data
+        @export.to_blocked_domains_csv
+      end
+    end
+  end
+end
diff --git a/app/controllers/settings/exports/lists_controller.rb b/app/controllers/settings/exports/lists_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cf5a9de44b33bd3bd3c1cea91fbc4a79a345a9c1
--- /dev/null
+++ b/app/controllers/settings/exports/lists_controller.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Settings
+  module Exports
+    class ListsController < ApplicationController
+      include ExportControllerConcern
+
+      def index
+        send_export_file
+      end
+
+      private
+
+      def export_data
+        @export.to_lists_csv
+      end
+    end
+  end
+end
diff --git a/app/controllers/settings/exports_controller.rb b/app/controllers/settings/exports_controller.rb
index 869e11d3bf601782e24bc534d312a95486abb574..0135f21890dd0e81bd0bbd9290b669603e1388f1 100644
--- a/app/controllers/settings/exports_controller.rb
+++ b/app/controllers/settings/exports_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::ExportsController < ApplicationController
+class Settings::ExportsController < Settings::BaseController
   include Authorization
 
   layout 'admin'
diff --git a/app/controllers/settings/follower_domains_controller.rb b/app/controllers/settings/follower_domains_controller.rb
index a128bd1361f7f89785660805b500657d14a8b9f0..ce8ec985d62b5772a09f0ce3ee058b4b1606fd35 100644
--- a/app/controllers/settings/follower_domains_controller.rb
+++ b/app/controllers/settings/follower_domains_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::FollowerDomainsController < ApplicationController
+class Settings::FollowerDomainsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
diff --git a/app/controllers/settings/imports_controller.rb b/app/controllers/settings/imports_controller.rb
index 0db13d1ca640586d8970a476ad352b996c96d762..38f2e39c1d179ceb3c357d29f0f313c8bb43e646 100644
--- a/app/controllers/settings/imports_controller.rb
+++ b/app/controllers/settings/imports_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::ImportsController < ApplicationController
+class Settings::ImportsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
diff --git a/app/controllers/settings/migrations_controller.rb b/app/controllers/settings/migrations_controller.rb
index bc6436b87aff6f6967350eb8013f7866be17d45e..59eb48779c142bd274d138be83936661b74042e7 100644
--- a/app/controllers/settings/migrations_controller.rb
+++ b/app/controllers/settings/migrations_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::MigrationsController < ApplicationController
+class Settings::MigrationsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb
index ce2530c54163ac8096e0144cd52097ff66222fd1..da8a03d96491d815c2844ed4fb8ef74c8dda2f94 100644
--- a/app/controllers/settings/notifications_controller.rb
+++ b/app/controllers/settings/notifications_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::NotificationsController < ApplicationController
+class Settings::NotificationsController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
@@ -25,7 +25,7 @@ class Settings::NotificationsController < ApplicationController
 
   def user_settings_params
     params.require(:user).permit(
-      notification_emails: %i(follow follow_request reblog favourite mention digest),
+      notification_emails: %i(follow follow_request reblog favourite mention digest report),
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
   end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index e2cb131671d3e3ab70b3867aa093f601338142c6..41df3bde2fcda328a4ef003543aca4ba602486c3 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::PreferencesController < ApplicationController
+class Settings::PreferencesController < Settings::BaseController
   layout 'admin'
 
   before_action :authenticate_user!
@@ -40,13 +40,15 @@ class Settings::PreferencesController < ApplicationController
       :setting_boost_modal,
       :setting_delete_modal,
       :setting_auto_play_gif,
-      :setting_display_sensitive_media,
+      :setting_display_media,
+      :setting_expand_spoilers,
       :setting_reduce_motion,
       :setting_system_font_ui,
       :setting_noindex,
       :setting_theme,
       :setting_hide_network,
-      notification_emails: %i(follow follow_request reblog favourite mention digest),
+      :setting_aggregate_reblogs,
+      notification_emails: %i(follow follow_request reblog favourite mention digest report),
       interactions: %i(must_be_follower must_be_following)
     )
   end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index fe265c81d29250a9c9d404a52b69a2417f0e702a..db9081fdf012a7029456c5c51ff3b1e072ad3ea1 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::ProfilesController < ApplicationController
+class Settings::ProfilesController < Settings::BaseController
   include ObfuscateFilename
 
   layout 'admin'
@@ -28,7 +28,7 @@ class Settings::ProfilesController < ApplicationController
   private
 
   def account_params
-    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, fields_attributes: [:name, :value])
+    params.require(:account).permit(:display_name, :note, :avatar, :header, :locked, :bot, :discoverable, fields_attributes: [:name, :value])
   end
 
   def set_account
diff --git a/app/controllers/settings/sessions_controller.rb b/app/controllers/settings/sessions_controller.rb
index 0da1b027b8e439395e7069aa0569526453d74dea..11b150ffd3ae0f5da9038e717eb9353f15740824 100644
--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Settings::SessionsController < ApplicationController
+class Settings::SessionsController < Settings::BaseController
   before_action :set_session, only: :destroy
 
   def destroy
diff --git a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
index 8d534960d4bf0c86fc23dc062ee940514c72bae1..d87117a50a846c3a31023db36c2ef47cc63020a4 100644
--- a/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module TwoFactorAuthentication
-    class ConfirmationsController < ApplicationController
+    class ConfirmationsController < BaseController
       layout 'admin'
 
       before_action :authenticate_user!
diff --git a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
index e591e9502d9025d2600d6f93f11e4f7b5ae57a47..c78166c6542e722b09091f2338c272f62145cb10 100644
--- a/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
@@ -2,7 +2,7 @@
 
 module Settings
   module TwoFactorAuthentication
-    class RecoveryCodesController < ApplicationController
+    class RecoveryCodesController < BaseController
       layout 'admin'
 
       before_action :authenticate_user!
diff --git a/app/controllers/settings/two_factor_authentications_controller.rb b/app/controllers/settings/two_factor_authentications_controller.rb
index 863cc7351b7e20fe3ba8568e0d344a9b0315dbe9..e12c4307468653c19c5a0c5e8c7cd5dc6d2792f5 100644
--- a/app/controllers/settings/two_factor_authentications_controller.rb
+++ b/app/controllers/settings/two_factor_authentications_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Settings
-  class TwoFactorAuthenticationsController < ApplicationController
+  class TwoFactorAuthenticationsController < BaseController
     layout 'admin'
 
     before_action :authenticate_user!
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index b8534182291c04901d766e06149b29a2e4d02fb2..15d59fd89345cdc408377586f166a6262b5a5455 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -12,15 +12,22 @@ class StatusesController < ApplicationController
 
   before_action :set_account
   before_action :set_status
+  before_action :set_instance_presenter
   before_action :set_link_headers
   before_action :check_account_suspension
   before_action :redirect_to_original, only: [:show]
   before_action :set_referrer_policy_header, only: [:show]
   before_action :set_cache_headers
 
+  content_security_policy only: :embed do |p|
+    p.frame_ancestors(false)
+  end
+
   def show
     respond_to do |format|
       format.html do
+        @body_classes = 'with-modals'
+
         set_ancestors
         set_descendants
 
@@ -30,7 +37,7 @@ class StatusesController < ApplicationController
       format.json do
         skip_session! unless @stream_entry.hidden?
 
-        render_cached_json(['activitypub', 'note', @status.cache_key], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do
+        render_cached_json(['activitypub', 'note', @status], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do
           ActiveModelSerializers::SerializableResource.new(@status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter)
         end
       end
@@ -40,7 +47,7 @@ class StatusesController < ApplicationController
   def activity
     skip_session!
 
-    render_cached_json(['activitypub', 'activity', @status.cache_key], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do
+    render_cached_json(['activitypub', 'activity', @status], content_type: 'application/activity+json', public: !@stream_entry.hidden?) do
       ActiveModelSerializers::SerializableResource.new(@status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter)
     end
   end
@@ -51,18 +58,20 @@ class StatusesController < ApplicationController
     skip_session!
     expires_in 180, public: true
     response.headers['X-Frame-Options'] = 'ALLOWALL'
+    @autoplay = ActiveModel::Type::Boolean.new.cast(params[:autoplay])
 
     render 'stream_entries/embed', layout: 'embedded'
   end
 
   private
 
-  def create_descendant_thread(depth, statuses)
+  def create_descendant_thread(starting_depth, statuses)
+    depth = starting_depth + statuses.size
     if depth < DESCENDANTS_DEPTH_LIMIT
-      { statuses: statuses }
+      { statuses: statuses, starting_depth: starting_depth }
     else
       next_status = statuses.pop
-      { statuses: statuses, next_status: next_status }
+      { statuses: statuses, starting_depth: starting_depth, next_status: next_status }
     end
   end
 
@@ -93,16 +102,19 @@ class StatusesController < ApplicationController
     @descendant_threads = []
 
     if descendants.present?
-      statuses = [descendants.first]
-      depth    = 1
+      statuses       = [descendants.first]
+      starting_depth = 0
 
       descendants.drop(1).each_with_index do |descendant, index|
         if descendants[index].id == descendant.in_reply_to_id
-          depth += 1
           statuses << descendant
         else
-          @descendant_threads << create_descendant_thread(depth, statuses)
+          @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]
 
@@ -111,18 +123,16 @@ class StatusesController < ApplicationController
             end
 
             if index.present?
-              depth += index - statuses.size
+              starting_depth = descendant_thread[:starting_depth] + index + 1
               break
             end
-
-            depth -= statuses.size
           end
 
           statuses = [descendant]
         end
       end
 
-      @descendant_threads << create_descendant_thread(depth, statuses)
+      @descendant_threads << create_descendant_thread(starting_depth, statuses)
     end
 
     @max_descendant_thread_id = @descendant_threads.pop[:statuses].first.id if descendants.size >= DESCENDANTS_LIMIT
@@ -148,6 +158,10 @@ class StatusesController < ApplicationController
     raise ActiveRecord::RecordNotFound
   end
 
+  def set_instance_presenter
+    @instance_presenter = InstancePresenter.new
+  end
+
   def check_account_suspension
     gone if @account.suspended?
   end
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 014a5c9b8dd64be7ab48e6a84d43461e9476cd97..4694c823a42c80968de3351f1f8b90c35a0c0160 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -3,6 +3,8 @@
 class TagsController < ApplicationController
   PAGE_SIZE = 20
 
+  layout 'public'
+
   before_action :set_body_classes
   before_action :set_instance_presenter
 
@@ -16,14 +18,15 @@ class TagsController < ApplicationController
       end
 
       format.rss do
-        @statuses = Status.as_tag_timeline(@tag).limit(PAGE_SIZE)
+        @statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none)).limit(PAGE_SIZE)
         @statuses = cache_collection(@statuses, Status)
 
         render xml: RSS::TagSerializer.render(@tag, @statuses)
       end
 
       format.json do
-        @statuses = Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(PAGE_SIZE, params[:max_id])
+        @statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, params[:local])
+                                       .paginate_by_max_id(PAGE_SIZE, params[:max_id])
         @statuses = cache_collection(@statuses, Status)
 
         render json: collection_presenter,
@@ -37,7 +40,7 @@ class TagsController < ApplicationController
   private
 
   def set_body_classes
-    @body_classes = 'tag-body'
+    @body_classes = 'with-modals'
   end
 
   def set_instance_presenter
@@ -46,7 +49,7 @@ class TagsController < ApplicationController
 
   def collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: tag_url(@tag),
+      id: tag_url(@tag, params.slice(:any, :all, :none)),
       type: :ordered,
       size: @tag.statuses.count,
       items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb
index 49e764cefd6512eff86d0d5ee217e36c64c2f3ba..40b2a5289224bec355be02624dcb8d44843f2394 100644
--- a/app/helpers/admin/account_moderation_notes_helper.rb
+++ b/app/helpers/admin/account_moderation_notes_helper.rb
@@ -2,7 +2,9 @@
 
 module Admin::AccountModerationNotesHelper
   def admin_account_link_to(account)
-    link_to admin_account_path(account.id), class: name_tag_classes(account) do
+    return if account.nil?
+
+    link_to 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'),
@@ -11,7 +13,9 @@ module Admin::AccountModerationNotesHelper
   end
 
   def admin_account_inline_link_to(account)
-    link_to admin_account_path(account.id), class: name_tag_classes(account, true) do
+    return if account.nil?
+
+    link_to admin_account_path(account.id), class: name_tag_classes(account, true), title: account.acct do
       content_tag(:span, account.acct, class: 'username')
     end
   end
@@ -20,7 +24,7 @@ module Admin::AccountModerationNotesHelper
 
   def name_tag_classes(account, inline = false)
     classes = [inline ? 'inline-name-tag' : 'name-tag']
-    classes << 'suspended' if account.suspended?
+    classes << 'suspended' if account.suspended? || (account.local? && account.user.nil?)
     classes.join(' ')
   end
 end
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 4c663211e718da0e12df68e4f0dfc0ce2cfd53ab..359d60b60e29484703be2fee8b72e24403deda09 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -23,6 +23,8 @@ module Admin::ActionLogsHelper
       link_to record.domain, "https://#{record.domain}"
     when 'Status'
       link_to record.account.acct, TagManager.instance.url_for(record)
+    when 'AccountWarning'
+      link_to record.target_account.acct, admin_account_path(record.target_account_id)
     end
   end
 
@@ -33,8 +35,13 @@ module Admin::ActionLogsHelper
     when 'DomainBlock', 'EmailDomainBlock'
       link_to attributes['domain'], "https://#{attributes['domain']}"
     when 'Status'
-      tmp_status = Status.new(attributes)
-      link_to tmp_status.account&.acct || "##{tmp_status.account_id}", TagManager.instance.url_for(tmp_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)
+      else
+        I18n.t('admin.action_logs.deleted_status')
+      end
     end
   end
 
@@ -77,6 +84,8 @@ module Admin::ActionLogsHelper
       'envelope'
     when 'Status'
       'pencil'
+    when 'AccountWarning'
+      'warning'
     end
   end
 
@@ -88,7 +97,7 @@ module Admin::ActionLogsHelper
       opposite_verbs?(log) ? 'negative' : 'positive'
     when :update, :reset_password, :disable_2fa, :memorialize, :change_email
       'neutral'
-    when :demote, :silence, :disable, :suspend, :remove_avatar, :reopen
+    when :demote, :silence, :disable, :suspend, :remove_avatar, :remove_header, :reopen
       'negative'
     when :destroy
       opposite_verbs?(log) ? 'positive' : 'negative'
@@ -100,6 +109,6 @@ module Admin::ActionLogsHelper
   private
 
   def opposite_verbs?(log)
-    %w(DomainBlock EmailDomainBlock).include?(log.target_type)
+    %w(DomainBlock EmailDomainBlock AccountWarning).include?(log.target_type)
   end
 end
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 359c43d0e353b42357d5c2dd6f92dd4b64828f40..97beb587fce1496b4b0fb8c2e4882ba79304ad7f 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 module Admin::FilterHelper
-  ACCOUNT_FILTERS      = %i(local remote by_domain silenced suspended recent username display_name email ip staff).freeze
+  ACCOUNT_FILTERS      = %i(local remote by_domain active silenced suspended username display_name email ip staff).freeze
   REPORT_FILTERS       = %i(resolved account_id target_account_id).freeze
   INVITE_FILTER        = %i(available expired).freeze
   CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze
+  TAGS_FILTERS         = %i(hidden).freeze
+  INSTANCES_FILTERS    = %i(limited).freeze
 
-  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS
+  FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS + INVITE_FILTER + CUSTOM_EMOJI_FILTERS + TAGS_FILTERS + INSTANCES_FILTERS
 
   def filter_link_to(text, link_to_params, link_class_params = link_to_params)
     new_url = filtered_url_for(link_to_params)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 327901e4e2d0e782080d6a511448cc45bc5c9fb0..5097a0953e84bf1a5d966ccb08ec96d7293588f1 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,8 +7,8 @@ module ApplicationHelper
     follow
   ).freeze
 
-  def active_nav_class(path)
-    current_page?(path) ? 'active' : ''
+  def active_nav_class(*paths)
+    paths.any? { |path| current_page?(path) } ? 'active' : ''
   end
 
   def active_link_to(label, path, **options)
@@ -27,11 +27,6 @@ module ApplicationHelper
     Setting.open_deletion
   end
 
-  def add_rtl_body_class(other_classes)
-    other_classes = "#{other_classes} rtl" if locale_direction == 'rtl'
-    other_classes
-  end
-
   def locale_direction
     if [:ar, :fa, :he].include?(I18n.locale)
       'rtl'
@@ -74,7 +69,36 @@ module ApplicationHelper
     tag(:meta, content: content, property: property)
   end
 
-  def react_component(name, props = {})
-    content_tag(:div, nil, data: { component: name.to_s.camelcase, props: Oj.dump(props) })
+  def react_component(name, props = {}, &block)
+    if block.nil?
+      content_tag(:div, nil, data: { component: name.to_s.camelcase, props: Oj.dump(props) })
+    else
+      content_tag(:div, data: { component: name.to_s.camelcase, props: Oj.dump(props) }, &block)
+    end
+  end
+
+  def body_classes
+    output = (@body_classes || '').split(' ')
+    output << "theme-#{current_theme.parameterize}"
+    output << 'system-font' if current_account&.user&.setting_system_font_ui
+    output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')
+    output << 'rtl' if locale_direction == 'rtl'
+    output.reject(&:blank?).join(' ')
+  end
+
+  def cdn_host
+    Rails.configuration.action_controller.asset_host
+  end
+
+  def cdn_host?
+    cdn_host.present?
+  end
+
+  def storage_host
+    "https://#{ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST']}"
+  end
+
+  def storage_host?
+    ENV['S3_ALIAS_HOST'].present? || ENV['S3_CLOUDFRONT_HOST'].present?
   end
 end
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index d3c6b13a65ea0afbeb047e6464f9bd50f98821b0..9b3f1380b149b99d702e92cb5755f366f453859d 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -6,4 +6,54 @@ module HomeHelper
       locale: I18n.locale,
     }
   end
+
+  def account_link_to(account, button = '', size: 36, path: nil)
+    content_tag(:div, class: 'account') do
+      content_tag(:div, class: 'account__wrapper') do
+        section = if account.nil?
+                    content_tag(:div, class: 'account__display-name') do
+                      content_tag(:div, class: 'account__avatar-wrapper') do
+                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})")
+                      end +
+                        content_tag(:span, class: 'display-name') do
+                          content_tag(:strong, t('about.contact_missing')) +
+                            content_tag(:span, t('about.contact_unavailable'), class: 'display-name__account')
+                        end
+                    end
+                  else
+                    link_to(path || TagManager.instance.url_for(account), class: 'account__display-name') do
+                      content_tag(:div, class: 'account__avatar-wrapper') do
+                        content_tag(:div, '', class: 'account__avatar', style: "width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px; background-image: url(#{full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)})")
+                      end +
+                        content_tag(:span, class: 'display-name') do
+                          content_tag(:bdi) do
+                            content_tag(:strong, display_name(account, custom_emojify: true), class: 'display-name__html emojify')
+                          end +
+                            content_tag(:span, "@#{account.acct}", class: 'display-name__account')
+                        end
+                    end
+                  end
+
+        section + button
+      end
+    end
+  end
+
+  def obscured_counter(count)
+    if count <= 0
+      0
+    elsif count == 1
+      1
+    else
+      '1+'
+    end
+  end
+
+  def custom_field_classes(field)
+    if field.verified?
+      'verified'
+    else
+      'emojify'
+    end
+  end
 end
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index 9d2b6cf00d28024db7c3cb4a5fd9a9b152fd66cf..5323972723ee324dd59f33a812235e6d7ce8c5c0 100644
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -73,8 +73,10 @@ module JsonLdHelper
     end
   end
 
-  def body_to_json(body)
-    body.is_a?(String) ? Oj.load(body, mode: :strict) : body
+  def body_to_json(body, compare_id: nil)
+    json = body.is_a?(String) ? Oj.load(body, mode: :strict) : body
+    return if compare_id.present? && json['id'] != compare_id
+    json
   rescue Oj::ParseError
     nil
   end
diff --git a/app/helpers/mailer_helper.rb b/app/helpers/mailer_helper.rb
deleted file mode 100644
index b7e3a8da38c482db3b9ce3a2f3d0a88987b72198..0000000000000000000000000000000000000000
--- a/app/helpers/mailer_helper.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-module MailerHelper
-end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 740f7bf77135120d41c246146567ef57d0740f43..0e957e94655a4b3ef38490c75b80e8785e02fe6a 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -4,9 +4,12 @@ module SettingsHelper
   HUMAN_LOCALES = {
     en: 'English',
     ar: 'Ø§Ù„Ø¹Ø±Ø¨ÙŠØ©',
+    ast: 'l\'asturianu',
     bg: 'Ð‘ÑŠÐ»Ð³Ð°Ñ€ÑÐºÐ¸',
     ca: 'CatalÃ ',
     co: 'Corsu',
+    cs: 'ÄŒeÅ¡tina',
+    cy: 'Cymraeg',
     da: 'Dansk',
     de: 'Deutsch',
     el: 'Î•Î»Î»Î·Î½Î¹ÎºÎ¬',
@@ -25,19 +28,23 @@ module SettingsHelper
     io: 'Ido',
     it: 'Italiano',
     ja: 'æ—¥æœ¬èªž',
+    ka: 'áƒ¥áƒáƒ áƒ—áƒ£áƒšáƒ˜',
     ko: 'í•œêµì–´',
+    ml: 'à´®à´²à´¯à´¾à´³à´‚',
     nl: 'Nederlands',
     no: 'Norsk',
     oc: 'Occitan',
     pl: 'Polszczyzna',
     pt: 'PortuguÃªs',
     'pt-BR': 'PortuguÃªs do Brasil',
+    ro: 'Limba romÃ¢nÄƒ',
     ru: 'Ð ÑƒÑÑÐºÐ¸Ð¹',
-    sk: 'Slovensky',
+    sk: 'SlovenÄina',
     sl: 'SlovenÅ¡Äina',
     sr: 'Ð¡Ñ€Ð¿ÑÐºÐ¸',
     'sr-Latn': 'Srpski (latinica)',
     sv: 'Svenska',
+    ta: 'à®¤à®®à®¿à®´à¯',
     te: 'à°¤à±†à°²à±à°—à±',
     th: 'à¸ à¸²à¸©à¸²à¹„à¸—à¸¢',
     tr: 'TÃ¼rkÃ§e',
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index a91a2893556834024faf70c9c347c8af7612e194..033d435c49780920e2902d23ab06491bb61de2bd 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -12,21 +12,69 @@ module StreamEntriesHelper
     end
   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([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), 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([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.unfollow')])
+        end
+      elsif !(account.memorial? || account.moved?)
+        link_to account_follow_path(account), class: 'button logo-button', data: { method: :post } do
+          safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), 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([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.follow')])
+      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 (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
+    end
+  end
+
+  def link_to_more(url)
+    link_to t('statuses.show_more'), url, class: 'load-more load-gap'
+  end
+
+  def nothing_here(extra_classes = '')
+    content_tag(:div, class: "nothing-here #{extra_classes}") do
+      t('accounts.nothing_here')
+    end
+  end
+
   def account_description(account)
     prepend_str = [
       [
         number_to_human(account.statuses_count, strip_insignificant_zeros: true),
-        I18n.t('accounts.posts'),
+        I18n.t('accounts.posts', count: account.statuses_count),
       ].join(' '),
 
       [
         number_to_human(account.following_count, strip_insignificant_zeros: true),
-        I18n.t('accounts.following'),
+        I18n.t('accounts.following', count: account.following_count),
       ].join(' '),
 
       [
         number_to_human(account.followers_count, strip_insignificant_zeros: true),
-        I18n.t('accounts.followers'),
+        I18n.t('accounts.followers', count: account.followers_count),
       ].join(' '),
     ].join(', ')
 
@@ -67,7 +115,7 @@ module StreamEntriesHelper
   end
 
   def acct(account)
-    if embedded_view? && account.local?
+    if account.local?
       "@#{account.acct}@#{Rails.configuration.x.local_domain}"
     else
       "@#{account.acct}"
diff --git a/app/javascript/images/icon_flag.svg b/app/javascript/images/icon_flag.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3939c9d2b3702c0630b8cc17ab6de33ef641298e
--- /dev/null
+++ b/app/javascript/images/icon_flag.svg
@@ -0,0 +1,4 @@
+<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/mailer/icon_warning.png b/app/javascript/images/mailer/icon_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..7baaac61cb82648d9acc63fdbdd4a8aaa7249e8b
Binary files /dev/null and b/app/javascript/images/mailer/icon_warning.png differ
diff --git a/app/javascript/images/screen_federation.svg b/app/javascript/images/screen_federation.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7019a7356a65394cdebcb226e6ccc1667a75061d
--- /dev/null
+++ b/app/javascript/images/screen_federation.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000000000000000000000000000000..7bcdd0afd573f6984b90bf8f39def7041b478013
--- /dev/null
+++ b/app/javascript/images/screen_hello.svg
@@ -0,0 +1 @@
+<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
new file mode 100644
index 0000000000000000000000000000000000000000..66a36f97804aadff16c4ff107dda424decc25740
--- /dev/null
+++ b/app/javascript/images/screen_interactions.svg
@@ -0,0 +1 @@
+<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/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index c9e4afcfc3d8e51b61c0f5274bbc80cf95092954..d4a824e2c9d646c4030b9c09715408e3df05a710 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -30,6 +30,14 @@ export const ACCOUNT_UNMUTE_REQUEST = 'ACCOUNT_UNMUTE_REQUEST';
 export const ACCOUNT_UNMUTE_SUCCESS = 'ACCOUNT_UNMUTE_SUCCESS';
 export const ACCOUNT_UNMUTE_FAIL    = 'ACCOUNT_UNMUTE_FAIL';
 
+export const ACCOUNT_PIN_REQUEST = 'ACCOUNT_PIN_REQUEST';
+export const ACCOUNT_PIN_SUCCESS = 'ACCOUNT_PIN_SUCCESS';
+export const ACCOUNT_PIN_FAIL    = 'ACCOUNT_PIN_FAIL';
+
+export const ACCOUNT_UNPIN_REQUEST = 'ACCOUNT_UNPIN_REQUEST';
+export const ACCOUNT_UNPIN_SUCCESS = 'ACCOUNT_UNPIN_SUCCESS';
+export const ACCOUNT_UNPIN_FAIL    = 'ACCOUNT_UNPIN_FAIL';
+
 export const FOLLOWERS_FETCH_REQUEST = 'FOLLOWERS_FETCH_REQUEST';
 export const FOLLOWERS_FETCH_SUCCESS = 'FOLLOWERS_FETCH_SUCCESS';
 export const FOLLOWERS_FETCH_FAIL    = 'FOLLOWERS_FETCH_FAIL';
@@ -137,12 +145,14 @@ export function fetchAccountFail(id, error) {
 export function followAccount(id, reblogs = true) {
   return (dispatch, getState) => {
     const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
-    dispatch(followAccountRequest(id));
+    const locked = getState().getIn(['accounts', id, 'locked'], false);
+
+    dispatch(followAccountRequest(id, locked));
 
     api(getState).post(`/api/v1/accounts/${id}/follow`, { reblogs }).then(response => {
       dispatch(followAccountSuccess(response.data, alreadyFollowing));
     }).catch(error => {
-      dispatch(followAccountFail(error));
+      dispatch(followAccountFail(error, locked));
     });
   };
 };
@@ -159,10 +169,12 @@ export function unfollowAccount(id) {
   };
 };
 
-export function followAccountRequest(id) {
+export function followAccountRequest(id, locked) {
   return {
     type: ACCOUNT_FOLLOW_REQUEST,
     id,
+    locked,
+    skipLoading: true,
   };
 };
 
@@ -171,13 +183,16 @@ export function followAccountSuccess(relationship, alreadyFollowing) {
     type: ACCOUNT_FOLLOW_SUCCESS,
     relationship,
     alreadyFollowing,
+    skipLoading: true,
   };
 };
 
-export function followAccountFail(error) {
+export function followAccountFail(error, locked) {
   return {
     type: ACCOUNT_FOLLOW_FAIL,
     error,
+    locked,
+    skipLoading: true,
   };
 };
 
@@ -185,6 +200,7 @@ export function unfollowAccountRequest(id) {
   return {
     type: ACCOUNT_UNFOLLOW_REQUEST,
     id,
+    skipLoading: true,
   };
 };
 
@@ -193,6 +209,7 @@ export function unfollowAccountSuccess(relationship, statuses) {
     type: ACCOUNT_UNFOLLOW_SUCCESS,
     relationship,
     statuses,
+    skipLoading: true,
   };
 };
 
@@ -200,6 +217,7 @@ export function unfollowAccountFail(error) {
   return {
     type: ACCOUNT_UNFOLLOW_FAIL,
     error,
+    skipLoading: true,
   };
 };
 
@@ -694,3 +712,69 @@ export function rejectFollowRequestFail(id, error) {
     error,
   };
 };
+
+export function pinAccount(id) {
+  return (dispatch, getState) => {
+    dispatch(pinAccountRequest(id));
+
+    api(getState).post(`/api/v1/accounts/${id}/pin`).then(response => {
+      dispatch(pinAccountSuccess(response.data));
+    }).catch(error => {
+      dispatch(pinAccountFail(error));
+    });
+  };
+};
+
+export function unpinAccount(id) {
+  return (dispatch, getState) => {
+    dispatch(unpinAccountRequest(id));
+
+    api(getState).post(`/api/v1/accounts/${id}/unpin`).then(response => {
+      dispatch(unpinAccountSuccess(response.data));
+    }).catch(error => {
+      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,
+  };
+};
diff --git a/app/javascript/mastodon/actions/cards.js b/app/javascript/mastodon/actions/cards.js
deleted file mode 100644
index baf04833a2c97810d370cec64db2a9c374f4ab6e..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/actions/cards.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import api from '../api';
-
-export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST';
-export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS';
-export const STATUS_CARD_FETCH_FAIL    = 'STATUS_CARD_FETCH_FAIL';
-
-export function fetchStatusCard(id) {
-  return (dispatch, getState) => {
-    if (getState().getIn(['cards', id], null) !== null) {
-      return;
-    }
-
-    dispatch(fetchStatusCardRequest(id));
-
-    api(getState).get(`/api/v1/statuses/${id}/card`).then(response => {
-      if (!response.data.url) {
-        return;
-      }
-
-      dispatch(fetchStatusCardSuccess(id, response.data));
-    }).catch(error => {
-      dispatch(fetchStatusCardFail(id, error));
-    });
-  };
-};
-
-export function fetchStatusCardRequest(id) {
-  return {
-    type: STATUS_CARD_FETCH_REQUEST,
-    id,
-    skipLoading: true,
-  };
-};
-
-export function fetchStatusCardSuccess(id, card) {
-  return {
-    type: STATUS_CARD_FETCH_SUCCESS,
-    id,
-    card,
-    skipLoading: true,
-  };
-};
-
-export function fetchStatusCardFail(id, error) {
-  return {
-    type: STATUS_CARD_FETCH_FAIL,
-    id,
-    error,
-    skipLoading: true,
-    skipAlert: true,
-  };
-};
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index fe3e831d5fc621ee2c8bab495f23113792a4f76b..a4352faaba63746cd28cf22faab7c1c6799cb5ed 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -56,7 +56,7 @@ export function changeCompose(text) {
   };
 };
 
-export function replyCompose(status, router) {
+export function replyCompose(status, routerHistory) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_REPLY,
@@ -64,7 +64,7 @@ export function replyCompose(status, router) {
     });
 
     if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
+      routerHistory.push('/statuses/new');
     }
   };
 };
@@ -81,7 +81,7 @@ export function resetCompose() {
   };
 };
 
-export function mentionCompose(account, router) {
+export function mentionCompose(account, routerHistory) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_MENTION,
@@ -89,12 +89,12 @@ export function mentionCompose(account, router) {
     });
 
     if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
+      routerHistory.push('/statuses/new');
     }
   };
 };
 
-export function directCompose(account, router) {
+export function directCompose(account, routerHistory) {
   return (dispatch, getState) => {
     dispatch({
       type: COMPOSE_DIRECT,
@@ -102,12 +102,12 @@ export function directCompose(account, router) {
     });
 
     if (!getState().getIn(['compose', 'mounted'])) {
-      router.push('/statuses/new');
+      routerHistory.push('/statuses/new');
     }
   };
 };
 
-export function submitCompose() {
+export function submitCompose(routerHistory) {
   return function (dispatch, getState) {
     const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
@@ -130,24 +130,31 @@ export function submitCompose() {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
       },
     }).then(function (response) {
-      dispatch(insertIntoTagHistory(response.data.tags));
+      if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
+        routerHistory.push('/timelines/direct');
+      } else if (routerHistory && routerHistory.location.pathname === '/statuses/new' && window.history.state) {
+        routerHistory.goBack();
+      }
+
+      dispatch(insertIntoTagHistory(response.data.tags, status));
       dispatch(submitComposeSuccess({ ...response.data }));
 
-      // To make the app more responsive, immediately get the status into the columns
+      // To make the app more responsive, immediately push the status
+      // into the columns
 
-      const insertIfOnline = (timelineId) => {
+      const insertIfOnline = timelineId => {
         if (getState().getIn(['timelines', timelineId, 'items', 0]) !== null) {
           dispatch(updateTimeline(timelineId, { ...response.data }));
         }
       };
 
-      insertIfOnline('home');
+      if (response.data.visibility !== 'direct') {
+        insertIfOnline('home');
+      }
 
       if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
         insertIfOnline('community');
         insertIfOnline('public');
-      } else if (response.data.visibility === 'direct') {
-        insertIfOnline('direct');
       }
     }).catch(function (error) {
       dispatch(submitComposeFail(error));
@@ -390,13 +397,13 @@ export function hydrateCompose() {
   };
 }
 
-function insertIntoTagHistory(tags) {
+function insertIntoTagHistory(recognizedTags, text) {
   return (dispatch, getState) => {
     const state = getState();
     const oldHistory = state.getIn(['compose', 'tagHistory']);
     const me = state.getIn(['meta', 'me']);
-    const names = tags.map(({ name }) => name);
-    const intersectedOldHistory = oldHistory.filter(name => !names.includes(name));
+    const names = recognizedTags.map(tag => text.match(new RegExp(`#${tag.name}`, 'i'))[0].slice(1));
+    const intersectedOldHistory = oldHistory.filter(name => names.findIndex(newName => newName.toLowerCase() === name.toLowerCase()) === -1);
 
     names.push(...intersectedOldHistory.toJS());
 
diff --git a/app/javascript/mastodon/actions/conversations.js b/app/javascript/mastodon/actions/conversations.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c2ea968060c8b32b097ce609ef5e04f670ff2e3
--- /dev/null
+++ b/app/javascript/mastodon/actions/conversations.js
@@ -0,0 +1,81 @@
+import api, { getLinks } from '../api';
+import {
+  importFetchedAccounts,
+  importFetchedStatuses,
+  importFetchedStatus,
+} from './importer';
+
+export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
+export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';
+
+export const CONVERSATIONS_FETCH_REQUEST = 'CONVERSATIONS_FETCH_REQUEST';
+export const CONVERSATIONS_FETCH_SUCCESS = 'CONVERSATIONS_FETCH_SUCCESS';
+export const CONVERSATIONS_FETCH_FAIL    = 'CONVERSATIONS_FETCH_FAIL';
+export const CONVERSATIONS_UPDATE        = 'CONVERSATIONS_UPDATE';
+
+export const CONVERSATIONS_READ = 'CONVERSATIONS_READ';
+
+export const mountConversations = () => ({
+  type: CONVERSATIONS_MOUNT,
+});
+
+export const unmountConversations = () => ({
+  type: CONVERSATIONS_UNMOUNT,
+});
+
+export const markConversationRead = conversationId => (dispatch, getState) => {
+  dispatch({
+    type: CONVERSATIONS_READ,
+    id: conversationId,
+  });
+
+  api(getState).post(`/api/v1/conversations/${conversationId}/read`);
+};
+
+export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
+  dispatch(expandConversationsRequest());
+
+  const params = { max_id: maxId };
+
+  if (!maxId) {
+    params.since_id = getState().getIn(['conversations', 'items', 0, 'last_status']);
+  }
+
+  api(getState).get('/api/v1/conversations', { params })
+    .then(response => {
+      const next = getLinks(response).refs.find(link => link.rel === 'next');
+
+      dispatch(importFetchedAccounts(response.data.reduce((aggr, item) => aggr.concat(item.accounts), [])));
+      dispatch(importFetchedStatuses(response.data.map(item => item.last_status).filter(x => !!x)));
+      dispatch(expandConversationsSuccess(response.data, next ? next.uri : null));
+    })
+    .catch(err => dispatch(expandConversationsFail(err)));
+};
+
+export const expandConversationsRequest = () => ({
+  type: CONVERSATIONS_FETCH_REQUEST,
+});
+
+export const expandConversationsSuccess = (conversations, next) => ({
+  type: CONVERSATIONS_FETCH_SUCCESS,
+  conversations,
+  next,
+});
+
+export const expandConversationsFail = error => ({
+  type: CONVERSATIONS_FETCH_FAIL,
+  error,
+});
+
+export const updateConversations = conversation => dispatch => {
+  dispatch(importFetchedAccounts(conversation.accounts));
+
+  if (conversation.last_status) {
+    dispatch(importFetchedStatus(conversation.last_status));
+  }
+
+  dispatch({
+    type: CONVERSATIONS_UPDATE,
+    conversation,
+  });
+};
diff --git a/app/javascript/mastodon/actions/custom_emojis.js b/app/javascript/mastodon/actions/custom_emojis.js
index aa37bc42308f415ec903ae43f27388d3aacbf095..7b7d0091b56919d26d872f92e4d4502902140b7c 100644
--- a/app/javascript/mastodon/actions/custom_emojis.js
+++ b/app/javascript/mastodon/actions/custom_emojis.js
@@ -19,6 +19,7 @@ export function fetchCustomEmojis() {
 export function fetchCustomEmojisRequest() {
   return {
     type: CUSTOM_EMOJIS_FETCH_REQUEST,
+    skipLoading: true,
   };
 };
 
@@ -26,6 +27,7 @@ export function fetchCustomEmojisSuccess(custom_emojis) {
   return {
     type: CUSTOM_EMOJIS_FETCH_SUCCESS,
     custom_emojis,
+    skipLoading: true,
   };
 };
 
@@ -33,5 +35,6 @@ export function fetchCustomEmojisFail(error) {
   return {
     type: CUSTOM_EMOJIS_FETCH_FAIL,
     error,
+    skipLoading: true,
   };
 };
diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index 47e2df76ba5cc914b35eb33259a2f14b2fe5a323..0445a5e10c6f72753935cdf2fa4fbed3f4650fd7 100644
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -128,7 +128,7 @@ export function expandDomainBlocks() {
   return (dispatch, getState) => {
     const url = getState().getIn(['domain_lists', 'blocks', 'next']);
 
-    if (url === null) {
+    if (!url) {
       return;
     }
 
diff --git a/app/javascript/mastodon/actions/dropdown_menu.js b/app/javascript/mastodon/actions/dropdown_menu.js
index 217ba4e74a58a8140c1cb6c2ee53f19ce969ea18..14f2939c78db9cdfdd25612176a917f50876200d 100644
--- a/app/javascript/mastodon/actions/dropdown_menu.js
+++ b/app/javascript/mastodon/actions/dropdown_menu.js
@@ -1,8 +1,8 @@
 export const DROPDOWN_MENU_OPEN = 'DROPDOWN_MENU_OPEN';
 export const DROPDOWN_MENU_CLOSE = 'DROPDOWN_MENU_CLOSE';
 
-export function openDropdownMenu(id, placement) {
-  return { type: DROPDOWN_MENU_OPEN, id, placement };
+export function openDropdownMenu(id, placement, keyboard) {
+  return { type: DROPDOWN_MENU_OPEN, id, placement, keyboard };
 }
 
 export function closeDropdownMenu(id) {
diff --git a/app/javascript/mastodon/actions/favourites.js b/app/javascript/mastodon/actions/favourites.js
index 124cf8c44e36fc34840a00919c3f153d28d874dd..9448b1efe7eae93a64212d91cadde348cb7f086f 100644
--- a/app/javascript/mastodon/actions/favourites.js
+++ b/app/javascript/mastodon/actions/favourites.js
@@ -30,6 +30,7 @@ export function fetchFavouritedStatuses() {
 export function fetchFavouritedStatusesRequest() {
   return {
     type: FAVOURITED_STATUSES_FETCH_REQUEST,
+    skipLoading: true,
   };
 };
 
@@ -38,6 +39,7 @@ export function fetchFavouritedStatusesSuccess(statuses, next) {
     type: FAVOURITED_STATUSES_FETCH_SUCCESS,
     statuses,
     next,
+    skipLoading: true,
   };
 };
 
@@ -45,6 +47,7 @@ export function fetchFavouritedStatusesFail(error) {
   return {
     type: FAVOURITED_STATUSES_FETCH_FAIL,
     error,
+    skipLoading: true,
   };
 };
 
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 10a39e0504d6592d6c082c181e58899d744254e9..34a4150facb90c521a9e82f8142d20ebb2507a67 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -1,6 +1,7 @@
 import escapeTextContentForBrowser from 'escape-html';
 import emojify from '../../features/emoji/emoji';
 import { unescapeHTML } from '../../utils/html';
+import { expandSpoilers } from '../../initial_state';
 
 const domParser = new DOMParser();
 
@@ -13,7 +14,7 @@ export function normalizeAccount(account) {
   account = { ...account };
 
   const emojiMap = makeEmojiMap(account);
-  const displayName = account.display_name.length === 0 ? account.username : account.display_name;
+  const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
 
   account.display_name_html = emojify(escapeTextContentForBrowser(displayName), emojiMap);
   account.note_emojified = emojify(account.note, emojiMap);
@@ -57,7 +58,7 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
     normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
-    normalStatus.hidden       = spoilerText.length > 0 || normalStatus.sensitive;
+    normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
   }
 
   return normalStatus;
diff --git a/app/javascript/mastodon/actions/lists.js b/app/javascript/mastodon/actions/lists.js
index 12cb1715997ee4bafdbede05cc27345202810489..d736bacef4805770713765b24ca29cae1a5d7598 100644
--- a/app/javascript/mastodon/actions/lists.js
+++ b/app/javascript/mastodon/actions/lists.js
@@ -42,6 +42,13 @@ export const LIST_EDITOR_REMOVE_REQUEST = 'LIST_EDITOR_REMOVE_REQUEST';
 export const LIST_EDITOR_REMOVE_SUCCESS = 'LIST_EDITOR_REMOVE_SUCCESS';
 export const LIST_EDITOR_REMOVE_FAIL    = 'LIST_EDITOR_REMOVE_FAIL';
 
+export const LIST_ADDER_RESET = 'LIST_ADDER_RESET';
+export const LIST_ADDER_SETUP = 'LIST_ADDER_SETUP';
+
+export const LIST_ADDER_LISTS_FETCH_REQUEST = 'LIST_ADDER_LISTS_FETCH_REQUEST';
+export const LIST_ADDER_LISTS_FETCH_SUCCESS = 'LIST_ADDER_LISTS_FETCH_SUCCESS';
+export const LIST_ADDER_LISTS_FETCH_FAIL    = 'LIST_ADDER_LISTS_FETCH_FAIL';
+
 export const fetchList = id => (dispatch, getState) => {
   if (getState().getIn(['lists', id])) {
     return;
@@ -316,3 +323,50 @@ export const removeFromListFail = (listId, accountId, error) => ({
   accountId,
   error,
 });
+
+export const resetListAdder = () => ({
+  type: LIST_ADDER_RESET,
+});
+
+export const setupListAdder = accountId => (dispatch, getState) => {
+  dispatch({
+    type: LIST_ADDER_SETUP,
+    account: getState().getIn(['accounts', accountId]),
+  });
+  dispatch(fetchLists());
+  dispatch(fetchAccountLists(accountId));
+};
+
+export const fetchAccountLists = accountId => (dispatch, getState) => {
+  dispatch(fetchAccountListsRequest(accountId));
+
+  api(getState).get(`/api/v1/accounts/${accountId}/lists`)
+    .then(({ data }) => dispatch(fetchAccountListsSuccess(accountId, data)))
+    .catch(err => dispatch(fetchAccountListsFail(accountId, err)));
+};
+
+export const fetchAccountListsRequest = id => ({
+  type:LIST_ADDER_LISTS_FETCH_REQUEST,
+  id,
+});
+
+export const fetchAccountListsSuccess = (id, lists) => ({
+  type: LIST_ADDER_LISTS_FETCH_SUCCESS,
+  id,
+  lists,
+});
+
+export const fetchAccountListsFail = (id, err) => ({
+  type: LIST_ADDER_LISTS_FETCH_FAIL,
+  id,
+  err,
+});
+
+export const addToListAdder = listId => (dispatch, getState) => {
+  dispatch(addToList(listId, getState().getIn(['listAdder', 'accountId'])));
+};
+
+export const removeFromListAdder = listId => (dispatch, getState) => {
+  dispatch(removeFromList(listId, getState().getIn(['listAdder', 'accountId'])));
+};
+
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index ad6430b823dcb595b021d0d308a9a0369f088902..4c145febc4fc1e9f2c32180588a923b6c4434d7f 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -8,6 +8,7 @@ import {
   importFetchedStatuses,
 } from './importer';
 import { defineMessages } from 'react-intl';
+import { List as ImmutableList } from 'immutable';
 import { unescapeHTML } from '../utils/html';
 import { getFilters, regexFromFilters } from '../selectors';
 
@@ -18,6 +19,8 @@ export const NOTIFICATIONS_EXPAND_REQUEST = 'NOTIFICATIONS_EXPAND_REQUEST';
 export const NOTIFICATIONS_EXPAND_SUCCESS = 'NOTIFICATIONS_EXPAND_SUCCESS';
 export const NOTIFICATIONS_EXPAND_FAIL    = 'NOTIFICATIONS_EXPAND_FAIL';
 
+export const NOTIFICATIONS_FILTER_SET = 'NOTIFICATIONS_FILTER_SET';
+
 export const NOTIFICATIONS_CLEAR      = 'NOTIFICATIONS_CLEAR';
 export const NOTIFICATIONS_SCROLL_TOP = 'NOTIFICATIONS_SCROLL_TOP';
 
@@ -88,11 +91,18 @@ 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', 'favourite', 'reblog', 'mention']);
+  return allTypes.filterNot(item => item === filter).toJS();
+};
+
 const noOp = () => {};
 
 export function expandNotifications({ maxId } = {}, 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();
@@ -101,14 +111,16 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
 
     const params = {
       max_id: maxId,
-      exclude_types: excludeTypesFromSettings(getState()),
+      exclude_types: activeFilter === 'all'
+        ? excludeTypesFromSettings(getState())
+        : excludeTypesFromFilter(activeFilter),
     };
 
     if (!maxId && notifications.get('items').size > 0) {
-      params.since_id = notifications.getIn(['items', 0]);
+      params.since_id = notifications.getIn(['items', 0, 'id']);
     }
 
-    dispatch(expandNotificationsRequest());
+    dispatch(expandNotificationsRequest(isLoadingMore));
 
     api(getState).get('/api/v1/notifications', { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
@@ -116,34 +128,37 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
       dispatch(importFetchedAccounts(response.data.map(item => item.account)));
       dispatch(importFetchedStatuses(response.data.map(item => item.status).filter(status => !!status)));
 
-      dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null));
+      dispatch(expandNotificationsSuccess(response.data, next ? next.uri : null, isLoadingMore));
       fetchRelatedRelationships(dispatch, response.data);
       done();
     }).catch(error => {
-      dispatch(expandNotificationsFail(error));
+      dispatch(expandNotificationsFail(error, isLoadingMore));
       done();
     });
   };
 };
 
-export function expandNotificationsRequest() {
+export function expandNotificationsRequest(isLoadingMore) {
   return {
     type: NOTIFICATIONS_EXPAND_REQUEST,
+    skipLoading: !isLoadingMore,
   };
 };
 
-export function expandNotificationsSuccess(notifications, next) {
+export function expandNotificationsSuccess(notifications, next, isLoadingMore) {
   return {
     type: NOTIFICATIONS_EXPAND_SUCCESS,
     notifications,
     next,
+    skipLoading: !isLoadingMore,
   };
 };
 
-export function expandNotificationsFail(error) {
+export function expandNotificationsFail(error, isLoadingMore) {
   return {
     type: NOTIFICATIONS_EXPAND_FAIL,
     error,
+    skipLoading: !isLoadingMore,
   };
 };
 
@@ -163,3 +178,14 @@ export function scrollTopNotifications(top) {
     top,
   };
 };
+
+export function setFilter (filterType) {
+  return dispatch => {
+    dispatch({
+      type: NOTIFICATIONS_FILTER_SET,
+      path: ['notifications', 'quickFilter', 'active'],
+      value: filterType,
+    });
+    dispatch(expandNotifications());
+  };
+};
diff --git a/app/javascript/mastodon/actions/onboarding.js b/app/javascript/mastodon/actions/onboarding.js
index a161c50efed4858811d93ba44a92d600ac40fd8a..a1dd3a731eddc1ceda9a76d05ed5f7feff7bf74f 100644
--- a/app/javascript/mastodon/actions/onboarding.js
+++ b/app/javascript/mastodon/actions/onboarding.js
@@ -1,14 +1,8 @@
-import { openModal } from './modal';
 import { changeSetting, saveSettings } from './settings';
 
-export function showOnboardingOnce() {
-  return (dispatch, getState) => {
-    const alreadySeen = getState().getIn(['settings', 'onboarded']);
+export const INTRODUCTION_VERSION = 20181216044202;
 
-    if (!alreadySeen) {
-      dispatch(openModal('ONBOARDING'));
-      dispatch(changeSetting(['onboarded'], true));
-      dispatch(saveSettings());
-    }
-  };
+export const closeOnboarding = () => dispatch => {
+  dispatch(changeSetting(['introductionVersion'], INTRODUCTION_VERSION));
+  dispatch(saveSettings());
 };
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 3e1e5f2709685642d7f6849255ff2ed0e5d4b28f..e7c89b4ba8a4c49fc44e9ad0264ccd1d82cdd329 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -3,7 +3,6 @@ import openDB from '../storage/db';
 import { evictStatus } from '../storage/modifier';
 
 import { deleteFromTimelines } from './timelines';
-import { fetchStatusCard } from './cards';
 import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
@@ -86,7 +85,6 @@ export function fetchStatus(id) {
     const skipLoading = getState().getIn(['statuses', id], null) !== null;
 
     dispatch(fetchContext(id));
-    dispatch(fetchStatusCard(id));
 
     if (skipLoading) {
       return;
@@ -140,7 +138,7 @@ export function redraft(status) {
   };
 };
 
-export function deleteStatus(id, withRedraft = false) {
+export function deleteStatus(id, router, withRedraft = false) {
   return (dispatch, getState) => {
     const status = getState().getIn(['statuses', id]);
 
@@ -153,6 +151,10 @@ export function deleteStatus(id, withRedraft = false) {
 
       if (withRedraft) {
         dispatch(redraft(status));
+
+        if (!getState().getIn(['compose', 'mounted'])) {
+          router.push('/statuses/new');
+        }
       }
     }).catch(error => {
       dispatch(deleteStatusFail(id, error));
diff --git a/app/javascript/mastodon/actions/streaming.js b/app/javascript/mastodon/actions/streaming.js
index 32fc67e67f76bdae9560f2cbfad01af0da03489b..cd319709d82b602d8008a67332fdfe724b306ff1 100644
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -6,12 +6,13 @@ import {
   disconnectTimeline,
 } from './timelines';
 import { updateNotifications, expandNotifications } from './notifications';
+import { updateConversations } from './conversations';
 import { fetchFilters } from './filters';
 import { getLocale } from '../locales';
 
 const { messages } = getLocale();
 
-export function connectTimelineStream (timelineId, path, pollingRefresh = null) {
+export function connectTimelineStream (timelineId, path, pollingRefresh = null, accept = null) {
 
   return connectStream (path, pollingRefresh, (dispatch, getState) => {
     const locale = getState().getIn(['meta', 'locale']);
@@ -23,7 +24,7 @@ export function connectTimelineStream (timelineId, path, pollingRefresh = null)
       onReceive (data) {
         switch(data.event) {
         case 'update':
-          dispatch(updateTimeline(timelineId, JSON.parse(data.payload)));
+          dispatch(updateTimeline(timelineId, JSON.parse(data.payload), accept));
           break;
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));
@@ -31,6 +32,9 @@ export function connectTimelineStream (timelineId, path, pollingRefresh = null)
         case 'notification':
           dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
           break;
+        case 'conversation':
+          dispatch(updateConversations(JSON.parse(data.payload)));
+          break;
         case 'filters_changed':
           dispatch(fetchFilters());
           break;
@@ -47,6 +51,6 @@ const refreshHomeTimelineAndNotification = (dispatch, done) => {
 export const connectUserStream      = () => connectTimelineStream('home', 'user', refreshHomeTimelineAndNotification);
 export const connectCommunityStream = ({ onlyMedia } = {}) => connectTimelineStream(`community${onlyMedia ? ':media' : ''}`, `public:local${onlyMedia ? ':media' : ''}`);
 export const connectPublicStream    = ({ onlyMedia } = {}) => connectTimelineStream(`public${onlyMedia ? ':media' : ''}`, `public${onlyMedia ? ':media' : ''}`);
-export const connectHashtagStream   = tag => connectTimelineStream(`hashtag:${tag}`, `hashtag&tag=${tag}`);
+export const connectHashtagStream   = (id, tag, accept) => connectTimelineStream(`hashtag:${id}`, `hashtag&tag=${tag}`, null, accept);
 export const connectDirectStream    = () => connectTimelineStream('direct', 'direct');
 export const connectListStream      = id => connectTimelineStream(`list:${id}`, `list&list=${id}`);
diff --git a/app/javascript/mastodon/actions/suggestions.js b/app/javascript/mastodon/actions/suggestions.js
new file mode 100644
index 0000000000000000000000000000000000000000..b15bd916ba6a255718f9d20c658ff08ca5c83203
--- /dev/null
+++ b/app/javascript/mastodon/actions/suggestions.js
@@ -0,0 +1,52 @@
+import api from '../api';
+import { importFetchedAccounts } from './importer';
+
+export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
+export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
+export const SUGGESTIONS_FETCH_FAIL    = 'SUGGESTIONS_FETCH_FAIL';
+
+export const SUGGESTIONS_DISMISS = 'SUGGESTIONS_DISMISS';
+
+export function fetchSuggestions() {
+  return (dispatch, getState) => {
+    dispatch(fetchSuggestionsRequest());
+
+    api(getState).get('/api/v1/suggestions').then(response => {
+      dispatch(importFetchedAccounts(response.data));
+      dispatch(fetchSuggestionsSuccess(response.data));
+    }).catch(error => dispatch(fetchSuggestionsFail(error)));
+  };
+};
+
+export function fetchSuggestionsRequest() {
+  return {
+    type: SUGGESTIONS_FETCH_REQUEST,
+    skipLoading: true,
+  };
+};
+
+export function fetchSuggestionsSuccess(accounts) {
+  return {
+    type: SUGGESTIONS_FETCH_SUCCESS,
+    accounts,
+    skipLoading: true,
+  };
+};
+
+export function fetchSuggestionsFail(error) {
+  return {
+    type: SUGGESTIONS_FETCH_FAIL,
+    error,
+    skipLoading: true,
+    skipAlert: true,
+  };
+};
+
+export const dismissSuggestion = accountId => (dispatch, getState) => {
+  dispatch({
+    type: SUGGESTIONS_DISMISS,
+    id: accountId,
+  });
+
+  api(getState).delete(`/api/v1/suggestions/${accountId}`);
+};
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index 11a199db6ae0f9ce6cfbf185c031e56ebe5fa35d..6e7bd027cb782d1037b6b11be719fdf487fbf1fa 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -4,6 +4,7 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
+export const TIMELINE_CLEAR   = 'TIMELINE_CLEAR';
 
 export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
 export const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS';
@@ -13,9 +14,11 @@ export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';
 
 export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
 
-export function updateTimeline(timeline, status) {
-  return (dispatch, getState) => {
-    const references = status.reblog ? getState().get('statuses').filter((item, itemId) => (itemId === status.reblog.id || item.get('reblog') === status.reblog.id)).map((_, itemId) => itemId) : [];
+export function updateTimeline(timeline, status, accept) {
+  return dispatch => {
+    if (typeof accept === 'function' && !accept(status)) {
+      return;
+    }
 
     dispatch(importFetchedStatus(status));
 
@@ -23,7 +26,6 @@ export function updateTimeline(timeline, status) {
       type: TIMELINE_UPDATE,
       timeline,
       status,
-      references,
     });
   };
 };
@@ -44,30 +46,45 @@ export function deleteFromTimelines(id) {
   };
 };
 
+export function clearTimeline(timeline) {
+  return (dispatch) => {
+    dispatch({ type: TIMELINE_CLEAR, timeline });
+  };
+};
+
 const noOp = () => {};
 
+const parseTags = (tags = {}, mode) => {
+  return (tags[mode] || []).map((tag) => {
+    return tag.value;
+  });
+};
+
 export function expandTimeline(timelineId, path, params = {}, done = noOp) {
   return (dispatch, getState) => {
     const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
+    const isLoadingMore = !!params.max_id;
 
     if (timeline.get('isLoading')) {
       done();
       return;
     }
 
-    if (!params.max_id && timeline.get('items', ImmutableList()).size > 0) {
+    if (!params.max_id && !params.pinned && timeline.get('items', ImmutableList()).size > 0) {
       params.since_id = timeline.getIn(['items', 0]);
     }
 
-    dispatch(expandTimelineRequest(timelineId));
+    const isLoadingRecent = !!params.since_id;
+
+    dispatch(expandTimelineRequest(timelineId, isLoadingMore));
 
     api(getState).get(path, { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
       dispatch(importFetchedStatuses(response.data));
-      dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206));
+      dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206, isLoadingRecent, isLoadingMore));
       done();
     }).catch(error => {
-      dispatch(expandTimelineFail(timelineId, error));
+      dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
       done();
     });
   };
@@ -76,35 +93,45 @@ export function expandTimeline(timelineId, path, params = {}, done = noOp) {
 export const expandHomeTimeline            = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
 export const expandPublicTimeline          = ({ maxId, onlyMedia } = {}, done = noOp) => expandTimeline(`public${onlyMedia ? ':media' : ''}`, '/api/v1/timelines/public', { 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 expandDirectTimeline          = ({ maxId } = {}, done = noOp) => expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId }, 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 expandAccountMediaTimeline    = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true });
-export const expandHashtagTimeline         = (hashtag, { maxId } = {}, done = noOp) => expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, { max_id: maxId }, done);
 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 } = {}, done = noOp) => {
+  return expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, {
+    max_id: maxId,
+    any:    parseTags(tags, 'any'),
+    all:    parseTags(tags, 'all'),
+    none:   parseTags(tags, 'none'),
+  }, done);
+};
 
-export function expandTimelineRequest(timeline) {
+export function expandTimelineRequest(timeline, isLoadingMore) {
   return {
     type: TIMELINE_EXPAND_REQUEST,
     timeline,
+    skipLoading: !isLoadingMore,
   };
 };
 
-export function expandTimelineSuccess(timeline, statuses, next, partial) {
+export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadingRecent, isLoadingMore) {
   return {
     type: TIMELINE_EXPAND_SUCCESS,
     timeline,
     statuses,
     next,
     partial,
+    isLoadingRecent,
+    skipLoading: !isLoadingMore,
   };
 };
 
-export function expandTimelineFail(timeline, error) {
+export function expandTimelineFail(timeline, error, isLoadingMore) {
   return {
     type: TIMELINE_EXPAND_FAIL,
     timeline,
     error,
+    skipLoading: !isLoadingMore,
   };
 };
 
diff --git a/app/javascript/mastodon/api.js b/app/javascript/mastodon/api.js
index 0be08d7fdd8fdd8dc4805376eddbe10f5ccd543d..4be3eadb022e5b0d512135b662566bc1e043cc3d 100644
--- a/app/javascript/mastodon/api.js
+++ b/app/javascript/mastodon/api.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
+import LinkHeader from 'http-link-header';
 import ready from './ready';
-import LinkHeader from './link_header';
 
 export const getLinks = response => {
   const value = response.headers.link;
diff --git a/app/javascript/mastodon/common.js b/app/javascript/mastodon/common.js
new file mode 100644
index 0000000000000000000000000000000000000000..fba21316a77dc9c75dd7deea6e84b2b553d541dc
--- /dev/null
+++ b/app/javascript/mastodon/common.js
@@ -0,0 +1,12 @@
+import Rails from 'rails-ujs';
+
+export function start() {
+  require('font-awesome/css/font-awesome.css');
+  require.context('../images/', true);
+
+  try {
+    Rails.start();
+  } catch (e) {
+    // If called twice
+  }
+};
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap
new file mode 100644
index 0000000000000000000000000000000000000000..1c37278483c579471a67404c8e69f5e0e265ff18
--- /dev/null
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/autosuggest_emoji-test.js.snap
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`<AutosuggestEmoji /> renders emoji with custom url 1`] = `
+<div
+  className="autosuggest-emoji"
+>
+  <img
+    alt="foobar"
+    className="emojione"
+    src="http://example.com/emoji.png"
+  />
+  :foobar:
+</div>
+`;
+
+exports[`<AutosuggestEmoji /> renders native emoji 1`] = `
+<div
+  className="autosuggest-emoji"
+>
+  <img
+    alt="ðŸ’™"
+    className="emojione"
+    src="/emoji/1f499.svg"
+  />
+  :foobar:
+</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 c3f018d90e507d86a89df3bbdc3405d373598bfa..5c04e09799f022cf9a30a19bc841dcc9731b0360 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
@@ -3,7 +3,6 @@
 exports[`<Button /> adds class "button-secondary" if props.secondary given 1`] = `
 <button
   className="button button-secondary"
-  disabled={undefined}
   onClick={[Function]}
   style={
     Object {
@@ -18,7 +17,6 @@ exports[`<Button /> adds class "button-secondary" if props.secondary given 1`] =
 exports[`<Button /> renders a button element 1`] = `
 <button
   className="button"
-  disabled={undefined}
   onClick={[Function]}
   style={
     Object {
@@ -48,7 +46,6 @@ exports[`<Button /> renders a disabled attribute if props.disabled given 1`] = `
 exports[`<Button /> renders class="button--block" if props.block given 1`] = `
 <button
   className="button button--block"
-  disabled={undefined}
   onClick={[Function]}
   style={
     Object {
@@ -63,7 +60,6 @@ exports[`<Button /> renders class="button--block" if props.block given 1`] = `
 exports[`<Button /> renders the children 1`] = `
 <button
   className="button"
-  disabled={undefined}
   onClick={[Function]}
   style={
     Object {
@@ -82,7 +78,6 @@ exports[`<Button /> renders the children 1`] = `
 exports[`<Button /> renders the given text 1`] = `
 <button
   className="button"
-  disabled={undefined}
   onClick={[Function]}
   style={
     Object {
@@ -99,7 +94,6 @@ exports[`<Button /> renders the given text 1`] = `
 exports[`<Button /> renders the props.text instead of children 1`] = `
 <button
   className="button"
-  disabled={undefined}
   onClick={[Function]}
   style={
     Object {
diff --git a/app/javascript/mastodon/components/__tests__/autosuggest_emoji-test.js b/app/javascript/mastodon/components/__tests__/autosuggest_emoji-test.js
new file mode 100644
index 0000000000000000000000000000000000000000..05616e444826cbaf4a8c65dfa30d3ef0f5e578a3
--- /dev/null
+++ b/app/javascript/mastodon/components/__tests__/autosuggest_emoji-test.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import AutosuggestEmoji from '../autosuggest_emoji';
+
+describe('<AutosuggestEmoji />', () => {
+  it('renders native emoji', () => {
+    const emoji = {
+      native: 'ðŸ’™',
+      colons: ':foobar:',
+    };
+    const component = renderer.create(<AutosuggestEmoji emoji={emoji} />);
+    const tree      = component.toJSON();
+
+    expect(tree).toMatchSnapshot();
+  });
+
+  it('renders emoji with custom url', () => {
+    const emoji = {
+      custom: true,
+      imageUrl: 'http://example.com/emoji.png',
+      native: 'foobar',
+      colons: ':foobar:',
+    };
+    const component = renderer.create(<AutosuggestEmoji emoji={emoji} />);
+    const tree      = component.toJSON();
+
+    expect(tree).toMatchSnapshot();
+  });
+});
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 8e6aa9d92b56a78a51aab12ea1a26a14e97a8170..206030c006bb34d48e2e9da2ec1dd1559c374f23 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -19,8 +19,8 @@ const messages = defineMessages({
   unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'Unmute notifications from @{name}' },
 });
 
-@injectIntl
-export default class Account extends ImmutablePureComponent {
+export default @injectIntl
+class Account extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -30,6 +30,9 @@ export default class Account extends ImmutablePureComponent {
     onMuteNotifications: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
     hidden: PropTypes.bool,
+    actionIcon: PropTypes.string,
+    actionTitle: PropTypes.string,
+    onActionClick: PropTypes.func,
   };
 
   handleFollow = () => {
@@ -52,8 +55,12 @@ export default class Account extends ImmutablePureComponent {
     this.props.onMuteNotifications(this.props.account, false);
   }
 
+  handleAction = () => {
+    this.props.onActionClick(this.props.account);
+  }
+
   render () {
-    const { account, intl, hidden } = this.props;
+    const { account, intl, hidden, onActionClick, actionIcon, actionTitle } = this.props;
 
     if (!account) {
       return <div />;
@@ -61,16 +68,18 @@ export default class Account extends ImmutablePureComponent {
 
     if (hidden) {
       return (
-        <div>
+        <Fragment>
           {account.get('display_name')}
           {account.get('username')}
-        </div>
+        </Fragment>
       );
     }
 
     let buttons;
 
-    if (account.get('id') !== me && account.get('relationship', null) !== null) {
+    if (onActionClick && actionIcon) {
+      buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
+    } else 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']);
diff --git a/app/javascript/mastodon/components/avatar_composite.js b/app/javascript/mastodon/components/avatar_composite.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a9a73c512e2cc0dc18649e331ea245c6bf913ca
--- /dev/null
+++ b/app/javascript/mastodon/components/avatar_composite.js
@@ -0,0 +1,96 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { autoPlayGif } from '../initial_state';
+
+export default class AvatarComposite extends React.PureComponent {
+
+  static propTypes = {
+    accounts: ImmutablePropTypes.list.isRequired,
+    animate: PropTypes.bool,
+    size: PropTypes.number.isRequired,
+  };
+
+  static defaultProps = {
+    animate: autoPlayGif,
+  };
+
+  renderItem (account, size, index) {
+    const { animate } = this.props;
+
+    let width  = 50;
+    let height = 100;
+    let top    = 'auto';
+    let left   = 'auto';
+    let bottom = 'auto';
+    let right  = 'auto';
+
+    if (size === 1) {
+      width = 100;
+    }
+
+    if (size === 4 || (size === 3 && index > 0)) {
+      height = 50;
+    }
+
+    if (size === 2) {
+      if (index === 0) {
+        right = '2px';
+      } else {
+        left = '2px';
+      }
+    } else if (size === 3) {
+      if (index === 0) {
+        right = '2px';
+      } else if (index > 0) {
+        left = '2px';
+      }
+
+      if (index === 1) {
+        bottom = '2px';
+      } else if (index > 1) {
+        top = '2px';
+      }
+    } else if (size === 4) {
+      if (index === 0 || index === 2) {
+        right = '2px';
+      }
+
+      if (index === 1 || index === 3) {
+        left = '2px';
+      }
+
+      if (index < 2) {
+        bottom = '2px';
+      } else {
+        top = '2px';
+      }
+    }
+
+    const style = {
+      left: left,
+      top: top,
+      right: right,
+      bottom: bottom,
+      width: `${width}%`,
+      height: `${height}%`,
+      backgroundSize: 'cover',
+      backgroundImage: `url(${account.get(animate ? 'avatar' : 'avatar_static')})`,
+    };
+
+    return (
+      <div key={account.get('id')} style={style} />
+    );
+  }
+
+  render() {
+    const { accounts, size } = this.props;
+
+    return (
+      <div className='account__avatar-composite' style={{ width: `${size}px`, height: `${size}px` }}>
+        {accounts.take(4).map((account, i) => this.renderItem(account, accounts.size, i))}
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js
index e81236d265f2696b17822272def564dd96c83bf2..d453874636ed50261fabca67f0a61e2907111b06 100644
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@@ -7,6 +7,7 @@ export default class Column extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
+    label: PropTypes.string,
   };
 
   scrollTop () {
@@ -40,10 +41,10 @@ export default class Column extends React.PureComponent {
   }
 
   render () {
-    const { children } = this.props;
+    const { label, children } = this.props;
 
     return (
-      <div role='region' className='column' ref={this.setRef}>
+      <div role='region' aria-label={label} className='column' ref={this.setRef}>
         {children}
       </div>
     );
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 56453aeacfea87f0a83467570b046c09cea938fb..f68e4155ebbc83df779f2e764d96d52d5059a1a5 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -10,8 +10,8 @@ const messages = defineMessages({
   moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
 });
 
-@injectIntl
-export default class ColumnHeader extends React.PureComponent {
+export default @injectIntl
+class ColumnHeader extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -37,6 +37,14 @@ export default class ColumnHeader extends React.PureComponent {
     animating: false,
   };
 
+  historyBack = () => {
+    if (window.history && window.history.length === 1) {
+      this.context.router.history.push('/');
+    } else {
+      this.context.router.history.goBack();
+    }
+  }
+
   handleToggleClick = (e) => {
     e.stopPropagation();
     this.setState({ collapsed: !this.state.collapsed, animating: true });
@@ -55,16 +63,22 @@ export default class ColumnHeader extends React.PureComponent {
   }
 
   handleBackClick = () => {
-    if (window.history && window.history.length === 1) this.context.router.history.push('/');
-    else this.context.router.history.goBack();
+    this.historyBack();
   }
 
   handleTransitionEnd = () => {
     this.setState({ animating: false });
   }
 
+  handlePin = () => {
+    if (!this.props.pinned) {
+      this.historyBack();
+    }
+    this.props.onPin();
+  }
+
   render () {
-    const { title, icon, active, children, pinned, onPin, multiColumn, extraButton, showBackButton, intl: { formatMessage } } = this.props;
+    const { title, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage } } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -95,7 +109,7 @@ export default class ColumnHeader extends React.PureComponent {
     }
 
     if (multiColumn && pinned) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-times' /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
+      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><i className='fa fa fa-times' /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
 
       moveButtons = (
         <div key='move-buttons' className='column-header__setting-arrows'>
@@ -104,7 +118,7 @@ export default class ColumnHeader extends React.PureComponent {
         </div>
       );
     } else if (multiColumn) {
-      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
+      pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><i className='fa fa fa-plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
     }
 
     if (!pinned && (multiColumn || showBackButton)) {
diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js
index a1c56ae359b63f50f81f73ae2ae0b7799b9fecc3..acddf77c54361806b5c695c1c2540940daf245a3 100644
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -1,18 +1,36 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';
 
 export default class DisplayName extends React.PureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
+    others: ImmutablePropTypes.list,
+    localDomain: PropTypes.string,
   };
 
   render () {
-    const displayNameHtml = { __html: this.props.account.get('display_name_html') };
+    const { account, others, localDomain } = this.props;
+    const displayNameHtml = { __html: account.get('display_name_html') };
+
+    let suffix;
+
+    if (others && others.size > 1) {
+      suffix = `+${others.size}`;
+    } else {
+      let acct = account.get('acct');
+
+      if (acct.indexOf('@') === -1 && localDomain) {
+        acct = `${acct}@${localDomain}`;
+      }
+
+      suffix = <span className='display-name__account'>@{acct}</span>;
+    }
 
     return (
       <span className='display-name'>
-        <bdi><strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /></bdi> <span className='display-name__account'>@{this.props.account.get('acct')}</span>
+        <bdi><strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /></bdi> {suffix}
       </span>
     );
   }
diff --git a/app/javascript/mastodon/components/domain.js b/app/javascript/mastodon/components/domain.js
index f657cb8d2d34434603982c22b0d447d469497506..24f80e7888a61ca38b9f3723bd530a85b4061312 100644
--- a/app/javascript/mastodon/components/domain.js
+++ b/app/javascript/mastodon/components/domain.js
@@ -8,8 +8,8 @@ const messages = defineMessages({
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
 });
 
-@injectIntl
-export default class Account extends ImmutablePureComponent {
+export default @injectIntl
+class Account extends ImmutablePureComponent {
 
   static propTypes = {
     domain: PropTypes.string,
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 0a6e7c62721fda680e6f04ec6311e14cc3f0ef4e..91b65a02fb60da2e1c9f896bc01bd030504f2197 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -23,6 +23,7 @@ class DropdownMenu extends React.PureComponent {
     placement: PropTypes.string,
     arrowOffsetLeft: PropTypes.string,
     arrowOffsetTop: PropTypes.string,
+    openedViaKeyboard: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -42,13 +43,15 @@ class DropdownMenu extends React.PureComponent {
 
   componentDidMount () {
     document.addEventListener('click', this.handleDocumentClick, false);
+    document.addEventListener('keydown', this.handleKeyDown, false);
     document.addEventListener('touchend', this.handleDocumentClick, listenerOptions);
-    if (this.focusedItem) this.focusedItem.focus();
+    if (this.focusedItem && this.props.openedViaKeyboard) this.focusedItem.focus();
     this.setState({ mounted: true });
   }
 
   componentWillUnmount () {
     document.removeEventListener('click', this.handleDocumentClick, false);
+    document.removeEventListener('keydown', this.handleKeyDown, false);
     document.removeEventListener('touchend', this.handleDocumentClick, listenerOptions);
   }
 
@@ -62,13 +65,10 @@ class DropdownMenu extends React.PureComponent {
 
   handleKeyDown = e => {
     const items = Array.from(this.node.getElementsByTagName('a'));
-    const index = items.indexOf(e.currentTarget);
+    const index = items.indexOf(document.activeElement);
     let element;
 
     switch(e.key) {
-    case 'Enter':
-      this.handleClick(e);
-      break;
     case 'ArrowDown':
       element = items[index+1];
       if (element) {
@@ -96,6 +96,12 @@ class DropdownMenu extends React.PureComponent {
     }
   }
 
+  handleItemKeyDown = e => {
+    if (e.key === 'Enter') {
+      this.handleClick(e);
+    }
+  }
+
   handleClick = e => {
     const i = Number(e.currentTarget.getAttribute('data-index'));
     const { action, to } = this.props.items[i];
@@ -120,7 +126,7 @@ class DropdownMenu extends React.PureComponent {
 
     return (
       <li className='dropdown-menu__item' key={`${text}-${i}`}>
-        <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyDown={this.handleKeyDown} data-index={i}>
+        <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' ref={i === 0 ? this.setFocusRef : null} onClick={this.handleClick} onKeyDown={this.handleItemKeyDown} data-index={i}>
           {text}
         </a>
       </li>
@@ -137,7 +143,7 @@ class DropdownMenu extends React.PureComponent {
           // 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='dropdown-menu' style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} ref={this.setRef}>
+          <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>
@@ -170,6 +176,7 @@ export default class Dropdown extends React.PureComponent {
     onClose: PropTypes.func.isRequired,
     dropdownPlacement: PropTypes.string,
     openDropdownId: PropTypes.number,
+    openedViaKeyboard: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -180,14 +187,14 @@ export default class Dropdown extends React.PureComponent {
     id: id++,
   };
 
-  handleClick = ({ target }) => {
+  handleClick = ({ target, type }) => {
     if (this.state.id === this.props.openDropdownId) {
       this.handleClose();
     } else {
       const { top } = target.getBoundingClientRect();
       const placement = top * 2 < innerHeight ? 'bottom' : 'top';
 
-      this.props.onOpen(this.state.id, this.handleItemClick, placement);
+      this.props.onOpen(this.state.id, this.handleItemClick, placement, type !== 'click');
     }
   }
 
@@ -197,6 +204,11 @@ export default class Dropdown extends React.PureComponent {
 
   handleKeyDown = e => {
     switch(e.key) {
+    case ' ':
+    case 'Enter':
+      this.handleClick(e);
+      e.preventDefault();
+      break;
     case 'Escape':
       this.handleClose();
       break;
@@ -226,8 +238,14 @@ export default class Dropdown extends React.PureComponent {
     return this.target;
   }
 
+  componentWillUnmount = () => {
+    if (this.state.id === this.props.openDropdownId) {
+      this.handleClose();
+    }
+  }
+
   render () {
-    const { icon, items, size, title, disabled, dropdownPlacement, openDropdownId } = this.props;
+    const { icon, items, size, title, disabled, dropdownPlacement, openDropdownId, openedViaKeyboard } = this.props;
     const open = this.state.id === openDropdownId;
 
     return (
@@ -243,7 +261,7 @@ export default class Dropdown extends React.PureComponent {
         />
 
         <Overlay show={open} placement={dropdownPlacement} target={this.findTarget}>
-          <DropdownMenu items={items} onClose={this.handleClose} />
+          <DropdownMenu items={items} onClose={this.handleClose} openedViaKeyboard={openedViaKeyboard} />
         </Overlay>
       </div>
     );
diff --git a/app/javascript/mastodon/components/extended_video_player.js b/app/javascript/mastodon/components/extended_video_player.js
index 9e2f6835a8bdf9c2827ccf965ab9081d98ae0ee5..009c0d559ad67e60e0789c03aacf1be84ad69a2a 100644
--- a/app/javascript/mastodon/components/extended_video_player.js
+++ b/app/javascript/mastodon/components/extended_video_player.js
@@ -50,6 +50,7 @@ export default class ExtendedVideoPlayer extends React.PureComponent {
           role='button'
           tabIndex='0'
           aria-label={alt}
+          title={alt}
           muted={muted}
           controls={controls}
           loop={!controls}
diff --git a/app/javascript/mastodon/components/hashtag.js b/app/javascript/mastodon/components/hashtag.js
index a407df31e352430b23183a728836b7ac2e477a11..f091d7893e6631e0f6c12983f8a139854d78051a 100644
--- a/app/javascript/mastodon/components/hashtag.js
+++ b/app/javascript/mastodon/components/hashtag.js
@@ -1,16 +1,16 @@
 import React from 'react';
 import { Sparklines, SparklinesCurve } from 'react-sparklines';
-import { Link } from 'react-router-dom';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import Permalink from './permalink';
 import { shortNumberFormat } from '../utils/numbers';
 
 const Hashtag = ({ hashtag }) => (
   <div className='trends__item'>
     <div className='trends__item__name'>
-      <Link to={`/timelines/tag/${hashtag.get('name')}`}>
+      <Permalink href={hashtag.get('url')} to={`/timelines/tag/${hashtag.get('name')}`}>
         #<span>{hashtag.get('name')}</span>
-      </Link>
+      </Permalink>
 
       <FormattedMessage id='trends.count_by_accounts' defaultMessage='{count} {rawCount, plural, one {person} other {people}} talking' values={{ rawCount: hashtag.getIn(['history', 0, 'accounts']), count: <strong>{shortNumberFormat(hashtag.getIn(['history', 0, 'accounts']))}</strong> }} />
     </div>
diff --git a/app/javascript/mastodon/components/intersection_observer_article.js b/app/javascript/mastodon/components/intersection_observer_article.js
index e2ce9ec9651b819346f232a4eb34d17455ffd355..de2203a4bc4c6975bf5f29d4ad5a8ecb118c3e4a 100644
--- a/app/javascript/mastodon/components/intersection_observer_article.js
+++ b/app/javascript/mastodon/components/intersection_observer_article.js
@@ -109,7 +109,7 @@ export default class IntersectionObserverArticle extends React.Component {
       return (
         <article
           ref={this.handleRef}
-          aria-posinset={index}
+          aria-posinset={index + 1}
           aria-setsize={listLength}
           style={{ height: `${this.height || cachedHeight}px`, opacity: 0, overflow: 'hidden' }}
           data-id={id}
@@ -121,7 +121,7 @@ export default class IntersectionObserverArticle extends React.Component {
     }
 
     return (
-      <article ref={this.handleRef} aria-posinset={index} aria-setsize={listLength} data-id={id} tabIndex='0'>
+      <article ref={this.handleRef} aria-posinset={index + 1} aria-setsize={listLength} data-id={id} tabIndex='0'>
         {children && React.cloneElement(children, { hidden: false })}
       </article>
     );
diff --git a/app/javascript/mastodon/components/load_gap.js b/app/javascript/mastodon/components/load_gap.js
index 012303ae1ebe1b5a8a207e1c2460bc8d7403d5a4..ed4d445d0d3edc398d4563fa879818ddad35231b 100644
--- a/app/javascript/mastodon/components/load_gap.js
+++ b/app/javascript/mastodon/components/load_gap.js
@@ -6,8 +6,8 @@ const messages = defineMessages({
   load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
 });
 
-@injectIntl
-export default class LoadGap extends React.PureComponent {
+export default @injectIntl
+class LoadGap extends React.PureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 1d351279f2be3fa79dac58ea5ea52f34987b0cd3..c507920d0ee34aeeebdb0079c76990279dae234c 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -6,7 +6,7 @@ import IconButton from './icon_button';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { isIOS } from '../is_mobile';
 import classNames from 'classnames';
-import { autoPlayGif, displaySensitiveMedia } from '../initial_state';
+import { autoPlayGif, displayMedia } from '../initial_state';
 
 const messages = defineMessages({
   toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
@@ -50,7 +50,11 @@ class Item extends React.PureComponent {
   handleClick = (e) => {
     const { index, onClick } = this.props;
 
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      if (this.hoverToPlay()) {
+        e.target.pause();
+        e.target.currentTime = 0;
+      }
       e.preventDefault();
       onClick(index);
     }
@@ -154,6 +158,7 @@ class Item extends React.PureComponent {
           <video
             className='media-gallery__item-gifv-thumbnail'
             aria-label={attachment.get('description')}
+            title={attachment.get('description')}
             role='application'
             src={attachment.get('url')}
             onClick={this.handleClick}
@@ -178,8 +183,8 @@ class Item extends React.PureComponent {
 
 }
 
-@injectIntl
-export default class MediaGallery extends React.PureComponent {
+export default @injectIntl
+class MediaGallery extends React.PureComponent {
 
   static propTypes = {
     sensitive: PropTypes.bool,
@@ -196,7 +201,7 @@ export default class MediaGallery extends React.PureComponent {
   };
 
   state = {
-    visible: !this.props.sensitive || displaySensitiveMedia,
+    visible: displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all',
   };
 
   componentWillReceiveProps (nextProps) {
diff --git a/app/javascript/mastodon/components/modal_root.js b/app/javascript/mastodon/components/modal_root.js
index 114f74937d281cb5e8c0d2b01dcea5127a1aa017..ef1156571f149fe38235fe9711b1cf7776b413a4 100644
--- a/app/javascript/mastodon/components/modal_root.js
+++ b/app/javascript/mastodon/components/modal_root.js
@@ -33,13 +33,15 @@ export default class ModalRoot extends React.PureComponent {
     } else if (!nextProps.children) {
       this.setState({ revealed: false });
     }
+    if (!nextProps.children && !!this.props.children) {
+      this.activeElement.focus();
+      this.activeElement = null;
+    }
   }
 
   componentDidUpdate (prevProps) {
     if (!this.props.children && !!prevProps.children) {
       this.getSiblings().forEach(sibling => sibling.removeAttribute('inert'));
-      this.activeElement.focus();
-      this.activeElement = null;
     }
     if (this.props.children) {
       requestAnimationFrame(() => {
diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js
index 3c8db709269cde2142cb3f314da7aafe612e6aaf..57d99dd199d75db223ac4acdfacd6cf6fa4cf8d1 100644
--- a/app/javascript/mastodon/components/relative_timestamp.js
+++ b/app/javascript/mastodon/components/relative_timestamp.js
@@ -60,8 +60,34 @@ const getUnitDelay = units => {
   }
 };
 
-@injectIntl
-export default class RelativeTimestamp extends React.Component {
+export const timeAgoString = (intl, date, now, year) => {
+  const delta = now - date.getTime();
+
+  let relativeTime;
+
+  if (delta < 10 * SECOND) {
+    relativeTime = intl.formatMessage(messages.just_now);
+  } else if (delta < 7 * DAY) {
+    if (delta < MINUTE) {
+      relativeTime = intl.formatMessage(messages.seconds, { number: Math.floor(delta / SECOND) });
+    } else if (delta < HOUR) {
+      relativeTime = intl.formatMessage(messages.minutes, { number: Math.floor(delta / MINUTE) });
+    } else if (delta < DAY) {
+      relativeTime = intl.formatMessage(messages.hours, { number: Math.floor(delta / HOUR) });
+    } else {
+      relativeTime = intl.formatMessage(messages.days, { number: Math.floor(delta / DAY) });
+    }
+  } else if (date.getFullYear() === year) {
+    relativeTime = intl.formatDate(date, shortDateFormatOptions);
+  } else {
+    relativeTime = intl.formatDate(date, { ...shortDateFormatOptions, year: 'numeric' });
+  }
+
+  return relativeTime;
+};
+
+export default @injectIntl
+class RelativeTimestamp extends React.Component {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -121,28 +147,8 @@ export default class RelativeTimestamp extends React.Component {
   render () {
     const { timestamp, intl, year } = this.props;
 
-    const date  = new Date(timestamp);
-    const delta = this.state.now - date.getTime();
-
-    let relativeTime;
-
-    if (delta < 10 * SECOND) {
-      relativeTime = intl.formatMessage(messages.just_now);
-    } else if (delta < 7 * DAY) {
-      if (delta < MINUTE) {
-        relativeTime = intl.formatMessage(messages.seconds, { number: Math.floor(delta / SECOND) });
-      } else if (delta < HOUR) {
-        relativeTime = intl.formatMessage(messages.minutes, { number: Math.floor(delta / MINUTE) });
-      } else if (delta < DAY) {
-        relativeTime = intl.formatMessage(messages.hours, { number: Math.floor(delta / HOUR) });
-      } else {
-        relativeTime = intl.formatMessage(messages.days, { number: Math.floor(delta / DAY) });
-      }
-    } else if (date.getFullYear() === year) {
-      relativeTime = intl.formatDate(date, shortDateFormatOptions);
-    } else {
-      relativeTime = intl.formatDate(date, { ...shortDateFormatOptions, year: 'numeric' });
-    }
+    const date         = new Date(timestamp);
+    const relativeTime = timeAgoString(intl, date, this.state.now, year);
 
     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 4b433f32c38d953ced4786b2d601084d20dfefd0..fec06e26373357cd6002176c4860af2a693a69fc 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -8,6 +8,9 @@ import { throttle } from 'lodash';
 import { List as ImmutableList } from 'immutable';
 import classNames from 'classnames';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../features/ui/util/fullscreen';
+import LoadingIndicator from './loading_indicator';
+
+const MOUSE_IDLE_DELAY = 300;
 
 export default class ScrollableList extends PureComponent {
 
@@ -23,6 +26,7 @@ export default class ScrollableList extends PureComponent {
     trackScroll: PropTypes.bool,
     shouldUpdateScroll: PropTypes.func,
     isLoading: PropTypes.bool,
+    showLoading: PropTypes.bool,
     hasMore: PropTypes.bool,
     prepend: PropTypes.node,
     alwaysPrepend: PropTypes.bool,
@@ -45,7 +49,7 @@ export default class ScrollableList extends PureComponent {
       const { scrollTop, scrollHeight, clientHeight } = this.node;
       const offset = scrollHeight - scrollTop - clientHeight;
 
-      if (400 > offset && this.props.onLoadMore && !this.props.isLoading) {
+      if (400 > offset && this.props.onLoadMore && this.props.hasMore && !this.props.isLoading) {
         this.props.onLoadMore();
       }
 
@@ -54,14 +58,72 @@ export default class ScrollableList extends PureComponent {
       } else if (this.props.onScroll) {
         this.props.onScroll();
       }
+
+      if (!this.lastScrollWasSynthetic) {
+        // If the last scroll wasn't caused by setScrollTop(), assume it was
+        // intentional and cancel any pending scroll reset on mouse idle
+        this.scrollToTopOnMouseIdle = false;
+      }
+      this.lastScrollWasSynthetic = false;
+    }
+  }, 150, {
+    trailing: true,
+  });
+
+  mouseIdleTimer = null;
+  mouseMovedRecently = false;
+  lastScrollWasSynthetic = false;
+  scrollToTopOnMouseIdle = false;
+
+  setScrollTop = newScrollTop => {
+    if (this.node.scrollTop !== newScrollTop) {
+      this.lastScrollWasSynthetic = true;
+      this.node.scrollTop = newScrollTop;
     }
+  };
+
+  clearMouseIdleTimer = () => {
+    if (this.mouseIdleTimer === null) {
+      return;
+    }
+
+    clearTimeout(this.mouseIdleTimer);
+    this.mouseIdleTimer = null;
+  };
+
+  handleMouseMove = throttle(() => {
+    // As long as the mouse keeps moving, clear and restart the idle timer.
+    this.clearMouseIdleTimer();
+    this.mouseIdleTimer = setTimeout(this.handleMouseIdle, MOUSE_IDLE_DELAY);
+
+    if (!this.mouseMovedRecently && this.node.scrollTop === 0) {
+      // Only set if we just started moving and are scrolled to the top.
+      this.scrollToTopOnMouseIdle = true;
+    }
+
+    // Save setting this flag for last, so we can do the comparison above.
+    this.mouseMovedRecently = true;
+  }, MOUSE_IDLE_DELAY / 2);
+
+  handleWheel = throttle(() => {
+    this.scrollToTopOnMouseIdle = false;
   }, 150, {
     trailing: true,
   });
 
+  handleMouseIdle = () => {
+    if (this.scrollToTopOnMouseIdle) {
+      this.setScrollTop(0);
+    }
+
+    this.mouseMovedRecently = false;
+    this.scrollToTopOnMouseIdle = false;
+  }
+
   componentDidMount () {
     this.attachScrollListener();
     this.attachIntersectionObserver();
+
     attachFullscreenListener(this.onFullScreenChange);
 
     // Handle initial scroll posiiton
@@ -72,7 +134,8 @@ export default class ScrollableList extends PureComponent {
     const someItemInserted = React.Children.count(prevProps.children) > 0 &&
       React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
       this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
-    if (someItemInserted && this.node.scrollTop > 0) {
+
+    if (someItemInserted && (this.node.scrollTop > 0 || this.mouseMovedRecently)) {
       return this.node.scrollHeight - this.node.scrollTop;
     } else {
       return null;
@@ -83,15 +146,12 @@ export default class ScrollableList extends PureComponent {
     // Reset the scroll position when a new child comes in in order not to
     // jerk the scrollbar around if you're already scrolled down the page.
     if (snapshot !== null) {
-      const newScrollTop = this.node.scrollHeight - snapshot;
-
-      if (this.node.scrollTop !== newScrollTop) {
-        this.node.scrollTop = newScrollTop;
-      }
+      this.setScrollTop(this.node.scrollHeight - snapshot);
     }
   }
 
   componentWillUnmount () {
+    this.clearMouseIdleTimer();
     this.detachScrollListener();
     this.detachIntersectionObserver();
     detachFullscreenListener(this.onFullScreenChange);
@@ -114,20 +174,24 @@ export default class ScrollableList extends PureComponent {
 
   attachScrollListener () {
     this.node.addEventListener('scroll', this.handleScroll);
+    this.node.addEventListener('wheel', this.handleWheel);
   }
 
   detachScrollListener () {
     this.node.removeEventListener('scroll', this.handleScroll);
+    this.node.removeEventListener('wheel', this.handleWheel);
   }
 
   getFirstChildKey (props) {
     const { children } = props;
-    let firstChild = children;
+    let firstChild     = children;
+
     if (children instanceof ImmutableList) {
       firstChild = children.get(0);
     } else if (Array.isArray(children)) {
       firstChild = children[0];
     }
+
     return firstChild && firstChild.key;
   }
 
@@ -135,22 +199,34 @@ export default class ScrollableList extends PureComponent {
     this.node = c;
   }
 
-  handleLoadMore = (e) => {
+  handleLoadMore = e => {
     e.preventDefault();
     this.props.onLoadMore();
   }
 
   render () {
-    const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
+    const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
     const { fullscreen } = this.state;
     const childrenCount = React.Children.count(children);
 
-    const loadMore     = (hasMore && childrenCount > 0 && onLoadMore) ? <LoadMore visible={!isLoading} onClick={this.handleLoadMore} /> : null;
+    const loadMore     = (hasMore && onLoadMore) ? <LoadMore visible={!isLoading} onClick={this.handleLoadMore} /> : null;
     let scrollableArea = null;
 
-    if (isLoading || childrenCount > 0 || !emptyMessage) {
+    if (showLoading) {
+      scrollableArea = (
+        <div className='scrollable scrollable--flex' ref={this.setRef}>
+          <div role='feed' className='item-list'>
+            {prepend}
+          </div>
+
+          <div className='scrollable__append'>
+            <LoadingIndicator />
+          </div>
+        </div>
+      );
+    } else if (isLoading || childrenCount > 0 || hasMore || !emptyMessage) {
       scrollableArea = (
-        <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
+        <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} onMouseMove={this.handleMouseMove}>
           <div role='feed' className='item-list'>
             {prepend}
 
@@ -173,10 +249,10 @@ export default class ScrollableList extends PureComponent {
       );
     } else {
       scrollableArea = (
-        <div style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
+        <div className={classNames('scrollable scrollable--flex', { fullscreen })} ref={this.setRef}>
           {alwaysPrepend && prepend}
 
-          <div className='empty-column-indicator' ref={this.setRef}>
+          <div className='empty-column-indicator'>
             {emptyMessage}
           </div>
         </div>
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 922b609eceae5762d4bd0d847c47ec0472dfef2f..20d838500967f3c2d2e75c117ab2b46141b5510b 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -3,12 +3,14 @@ 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';
 import StatusActionBar from './status_action_bar';
 import AttachmentList from './attachment_list';
-import { FormattedMessage } from 'react-intl';
+import Card from '../features/status/components/card';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { MediaGallery, Video } from '../features/ui/util/async-components';
 import { HotKeys } from 'react-hotkeys';
@@ -18,7 +20,25 @@ import classNames from 'classnames';
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 
-export default class Status extends ImmutablePureComponent {
+export const textForScreenReader = (intl, status, rebloggedByText = false) => {
+  const displayName = status.getIn(['account', 'display_name']);
+
+  const values = [
+    displayName.length === 0 ? status.getIn(['account', 'acct']).split('@')[0] : displayName,
+    status.get('spoiler_text') && status.get('hidden') ? status.get('spoiler_text') : status.get('search_index').slice(status.get('spoiler_text').length),
+    intl.formatDate(status.get('created_at'), { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
+    status.getIn(['account', 'acct']),
+  ];
+
+  if (rebloggedByText) {
+    values.push(rebloggedByText);
+  }
+
+  return values.join(', ');
+};
+
+export default @injectIntl
+class Status extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -27,6 +47,8 @@ export default class Status extends ImmutablePureComponent {
   static propTypes = {
     status: ImmutablePropTypes.map,
     account: ImmutablePropTypes.map,
+    otherAccounts: ImmutablePropTypes.list,
+    onClick: PropTypes.func,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
@@ -42,8 +64,10 @@ export default class Status extends ImmutablePureComponent {
     onToggleHidden: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
+    unread: PropTypes.bool,
     onMoveUp: PropTypes.func,
     onMoveDown: PropTypes.func,
+    showThread: PropTypes.bool,
   };
 
   // Avoid checking props that are functions (and whose equality will always
@@ -53,9 +77,14 @@ export default class Status extends ImmutablePureComponent {
     'account',
     'muted',
     'hidden',
-  ]
+  ];
 
   handleClick = () => {
+    if (this.props.onClick) {
+      this.props.onClick();
+      return;
+    }
+
     if (!this.context.router) {
       return;
     }
@@ -65,7 +94,7 @@ export default class Status extends ImmutablePureComponent {
   }
 
   handleAccountClick = (e) => {
-    if (this.context.router && e.button === 0) {
+    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       const id = e.currentTarget.getAttribute('data-id');
       e.preventDefault();
       this.context.router.history.push(`/accounts/${id}`);
@@ -138,9 +167,9 @@ export default class Status extends ImmutablePureComponent {
 
   render () {
     let media = null;
-    let statusAvatar, prepend;
+    let statusAvatar, prepend, rebloggedByText;
 
-    const { hidden, featured } = this.props;
+    const { intl, hidden, featured, otherAccounts, unread, showThread } = this.props;
 
     let { status, account, ...other } = this.props;
 
@@ -189,6 +218,8 @@ export default class Status extends ImmutablePureComponent {
         </div>
       );
 
+      rebloggedByText = intl.formatMessage({ id: 'status.reblogged_by', defaultMessage: '{name} boosted' }, { name: status.getIn(['account', 'acct']) });
+
       account = status.get('account');
       status  = status.get('reblog');
     }
@@ -210,6 +241,7 @@ export default class Status extends ImmutablePureComponent {
               <Component
                 preview={video.get('preview_url')}
                 src={video.get('url')}
+                alt={video.get('description')}
                 width={239}
                 height={110}
                 inline
@@ -226,11 +258,21 @@ export default class Status extends ImmutablePureComponent {
           </Bundle>
         );
       }
+    } else if (status.get('spoiler_text').length === 0 && status.get('card')) {
+      media = (
+        <Card
+          onOpenMedia={this.props.onOpenMedia}
+          card={status.get('card')}
+          compact
+        />
+      );
     }
 
-    if (account === undefined || account === null) {
+    if (otherAccounts) {
+      statusAvatar = <AvatarComposite accounts={otherAccounts} size={48} />;
+    } else if (account === undefined || account === null) {
       statusAvatar = <Avatar account={status.get('account')} size={48} />;
-    }else{
+    } else {
       statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
     }
 
@@ -248,10 +290,10 @@ export default class Status extends ImmutablePureComponent {
 
     return (
       <HotKeys handlers={handlers}>
-        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null}>
+        <div className={classNames('status__wrapper', `status__wrapper-${status.get('visibility')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), read: unread === false, focusable: !this.props.muted })} tabIndex={this.props.muted ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText, !status.get('hidden'))}>
           {prepend}
 
-          <div className={classNames('status', `status-${status.get('visibility')}`, { muted: this.props.muted })} data-id={status.get('id')}>
+          <div className={classNames('status', `status-${status.get('visibility')}`, { 'status-reply': !!status.get('in_reply_to_id'), muted: this.props.muted, read: unread === false })} data-id={status.get('id')}>
             <div className='status__info'>
               <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
 
@@ -260,14 +302,20 @@ export default class Status extends ImmutablePureComponent {
                   {statusAvatar}
                 </div>
 
-                <DisplayName account={status.get('account')} />
+                <DisplayName account={status.get('account')} others={otherAccounts} />
               </a>
             </div>
 
-            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
+            <StatusContent status={status} onClick={this.handleClick} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} collapsable />
 
             {media}
 
+            {showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) && (
+              <button className='status__content__read-more-button' onClick={this.handleClick}>
+                <FormattedMessage id='status.show_thread' defaultMessage='Show thread' />
+              </button>
+            )}
+
             <StatusActionBar status={status} account={account} {...other} />
           </div>
         </div>
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 0ae21e3f0428b0d7e70c54a22eeae843d1088551..0995a14904c29ccd76a186738a98ecd07f929d47 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -5,7 +5,7 @@ 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 } from '../initial_state';
+import { me, isStaff } from '../initial_state';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -30,10 +30,22 @@ const messages = defineMessages({
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
   embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  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' },
 });
 
-@injectIntl
-export default class StatusActionBar extends ImmutablePureComponent {
+const obfuscatedCount = count => {
+  if (count < 0) {
+    return 0;
+  } else if (count <= 1) {
+    return count;
+  } else {
+    return '1+';
+  }
+};
+
+export default @injectIntl
+class StatusActionBar extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -86,11 +98,11 @@ export default class StatusActionBar extends ImmutablePureComponent {
   }
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status);
+    this.props.onDelete(this.props.status, this.context.router.history);
   }
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, true);
+    this.props.onDelete(this.props.status, this.context.router.history, true);
   }
 
   handlePinClick = () => {
@@ -172,6 +184,11 @@ export default class StatusActionBar extends ImmutablePureComponent {
       menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick });
       menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick });
       menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
+      if (isStaff) {
+        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')}` });
+      }
     }
 
     if (status.get('visibility') === 'direct') {
@@ -194,7 +211,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
 
     return (
       <div className='status__action-bar'>
-        <IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
+        <div className='status__action-bar__counter'><IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} onClick={this.handleReplyClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('replies_count'))}</span></div>
         <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
         {shareButton}
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 4ae3b5608e45aa3f5839707d2e52b5fc011d182b..d8f18bd027c10c8cd445644e80f7c6d6d0220f14 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -6,6 +6,8 @@ import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
 import classnames from 'classnames';
 
+const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
+
 export default class StatusContent extends React.PureComponent {
 
   static contextTypes = {
@@ -17,10 +19,12 @@ export default class StatusContent extends React.PureComponent {
     expanded: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
     onClick: PropTypes.func,
+    collapsable: PropTypes.bool,
   };
 
   state = {
     hidden: true,
+    collapsed: null, //  `collapsed: null` indicates that an element doesn't need collapsing, while `true` or `false` indicates that it does (and is/isn't).
   };
 
   _updateStatusLinks () {
@@ -55,6 +59,16 @@ export default class StatusContent extends React.PureComponent {
       link.setAttribute('target', '_blank');
       link.setAttribute('rel', 'noopener');
     }
+
+    if (
+      this.props.collapsable
+      && this.props.onClick
+      && this.state.collapsed === null
+      && node.clientHeight > MAX_HEIGHT
+      && this.props.status.get('spoiler_text').length === 0
+    ) {
+      this.setState({ collapsed: true });
+    }
   }
 
   componentDidMount () {
@@ -66,7 +80,7 @@ export default class StatusContent extends React.PureComponent {
   }
 
   onMentionClick = (mention, e) => {
-    if (this.context.router && e.button === 0) {
+    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${mention.get('id')}`);
     }
@@ -75,7 +89,7 @@ export default class StatusContent extends React.PureComponent {
   onHashtagClick = (hashtag, e) => {
     hashtag = hashtag.replace(/^#/, '').toLowerCase();
 
-    if (this.context.router && e.button === 0) {
+    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/timelines/tag/${hashtag}`);
     }
@@ -115,6 +129,11 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  handleCollapsedClick = (e) => {
+    e.preventDefault();
+    this.setState({ collapsed: !this.state.collapsed });
+  }
+
   setRef = (c) => {
     this.node = c;
   }
@@ -134,12 +153,19 @@ export default class StatusContent extends React.PureComponent {
     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': this.state.collapsed === true,
     });
 
     if (isRtl(status.get('search_index'))) {
       directionStyle.direction = 'rtl';
     }
 
+    const readMoreButton = (
+      <button className='status__content__read-more-button' onClick={this.props.onClick} key='read-more'>
+        <FormattedMessage id='status.read_more' defaultMessage='Read more' /><i className='fa fa-fw fa-angle-right' />
+      </button>
+    );
+
     if (status.get('spoiler_text').length > 0) {
       let mentionsPlaceholder = '';
 
@@ -169,17 +195,24 @@ export default class StatusContent extends React.PureComponent {
         </div>
       );
     } else if (this.props.onClick) {
-      return (
+      const output = [
         <div
           ref={this.setRef}
           tabIndex='0'
+          key='content'
           className={classNames}
           style={directionStyle}
+          dangerouslySetInnerHTML={content}
           onMouseDown={this.handleMouseDown}
           onMouseUp={this.handleMouseUp}
-          dangerouslySetInnerHTML={content}
-        />
-      );
+        />,
+      ];
+
+      if (this.state.collapsed) {
+        output.push(readMoreButton);
+      }
+
+      return output;
     } else {
       return (
         <div
diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 68c9eef54a8ee81c22d1f63d34beb0af65f909b4..e417f9a2b96a170b9ce2e400d4873883a38be218 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -1,12 +1,12 @@
 import { debounce } from 'lodash';
 import React from 'react';
+import { FormattedMessage } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import StatusContainer from '../containers/status_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import LoadGap from './load_gap';
 import ScrollableList from './scrollable_list';
-import { FormattedMessage } from 'react-intl';
 
 export default class StatusList extends ImmutablePureComponent {
 
@@ -25,7 +25,7 @@ export default class StatusList extends ImmutablePureComponent {
     prepend: PropTypes.node,
     emptyMessage: PropTypes.node,
     alwaysPrepend: PropTypes.bool,
-    timelineId: PropTypes.string.isRequired,
+    timelineId: PropTypes.string,
   };
 
   static defaultProps = {
@@ -55,7 +55,7 @@ export default class StatusList extends ImmutablePureComponent {
   }
 
   handleLoadOlder = debounce(() => {
-    this.props.onLoadMore(this.props.statusIds.last());
+    this.props.onLoadMore(this.props.statusIds.size > 0 ? this.props.statusIds.last() : undefined);
   }, 300, { leading: true })
 
   _selectChild (index) {
@@ -71,7 +71,7 @@ export default class StatusList extends ImmutablePureComponent {
   }
 
   render () {
-    const { statusIds, featuredStatusIds, onLoadMore, timelineId, ...other }  = this.props;
+    const { statusIds, featuredStatusIds, shouldUpdateScroll, onLoadMore, timelineId, ...other }  = this.props;
     const { isLoading, isPartial } = other;
 
     if (isPartial) {
@@ -104,6 +104,7 @@ export default class StatusList extends ImmutablePureComponent {
           onMoveUp={this.handleMoveUp}
           onMoveDown={this.handleMoveDown}
           contextType={timelineId}
+          showThread
         />
       ))
     ) : null;
@@ -117,12 +118,13 @@ export default class StatusList extends ImmutablePureComponent {
           onMoveUp={this.handleMoveUp}
           onMoveDown={this.handleMoveDown}
           contextType={timelineId}
+          showThread
         />
       )).concat(scrollableContent);
     }
 
     return (
-      <ScrollableList {...other} onLoadMore={onLoadMore && this.handleLoadOlder} ref={this.setRef}>
+      <ScrollableList {...other} showLoading={isLoading && statusIds.size === 0} onLoadMore={onLoadMore && this.handleLoadOlder} shouldUpdateScroll={shouldUpdateScroll} ref={this.setRef}>
         {scrollableContent}
       </ScrollableList>
     );
diff --git a/app/javascript/mastodon/containers/domain_container.js b/app/javascript/mastodon/containers/domain_container.js
index 52d5c16138c227a69e9b942fe7d3c8f441ecd9b3..813178bbf662f2da01c7cc1079dfda41b2a41eab 100644
--- a/app/javascript/mastodon/containers/domain_container.js
+++ b/app/javascript/mastodon/containers/domain_container.js
@@ -10,8 +10,7 @@ const messages = defineMessages({
 });
 
 const makeMapStateToProps = () => {
-  const mapStateToProps = (state, { }) => ({
-  });
+  const mapStateToProps = () => ({});
 
   return mapStateToProps;
 };
diff --git a/app/javascript/mastodon/containers/dropdown_menu_container.js b/app/javascript/mastodon/containers/dropdown_menu_container.js
index 7cbcdcd35728f2b2cf82840a00d02d2d2545f6fd..73c8a1e530e7b0b8e285b2e7d3cca9c91c3659c4 100644
--- a/app/javascript/mastodon/containers/dropdown_menu_container.js
+++ b/app/javascript/mastodon/containers/dropdown_menu_container.js
@@ -8,15 +8,16 @@ const mapStateToProps = state => ({
   isModalOpen: state.get('modal').modalType === 'ACTIONS',
   dropdownPlacement: state.getIn(['dropdown_menu', 'placement']),
   openDropdownId: state.getIn(['dropdown_menu', 'openId']),
+  openedViaKeyboard: state.getIn(['dropdown_menu', 'keyboard']),
 });
 
 const mapDispatchToProps = (dispatch, { status, items }) => ({
-  onOpen(id, onItemClick, dropdownPlacement) {
+  onOpen(id, onItemClick, dropdownPlacement, keyboard) {
     dispatch(isUserTouching() ? openModal('ACTIONS', {
       status,
       actions: items,
       onClick: onItemClick,
-    }) : openDropdownMenu(id, dropdownPlacement));
+    }) : openDropdownMenu(id, dropdownPlacement, keyboard));
   },
   onClose(id) {
     dispatch(closeModal());
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index b29898d3b27a1fa483144284bc6cf86784c37942..2912540a00f189e6c68238d0b9c5ffb7af90a932 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -1,11 +1,12 @@
 import React from 'react';
-import { Provider } from 'react-redux';
+import { Provider, connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import configureStore from '../store/configureStore';
-import { showOnboardingOnce } from '../actions/onboarding';
+import { INTRODUCTION_VERSION } from '../actions/onboarding';
 import { BrowserRouter, Route } from 'react-router-dom';
 import { ScrollContext } from 'react-router-scroll-4';
 import UI from '../features/ui';
+import Introduction from '../features/introduction';
 import { fetchCustomEmojis } from '../actions/custom_emojis';
 import { hydrateStore } from '../actions/store';
 import { connectUserStream } from '../actions/streaming';
@@ -18,34 +19,47 @@ addLocaleData(localeData);
 
 export const store = configureStore();
 const hydrateAction = hydrateStore(initialState);
-store.dispatch(hydrateAction);
 
-// load custom emojis
+store.dispatch(hydrateAction);
 store.dispatch(fetchCustomEmojis());
 
-export default class Mastodon extends React.PureComponent {
+const mapStateToProps = state => ({
+  showIntroduction: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
+});
+
+@connect(mapStateToProps)
+class MastodonMount extends React.PureComponent {
 
   static propTypes = {
-    locale: PropTypes.string.isRequired,
+    showIntroduction: PropTypes.bool,
   };
 
-  componentDidMount() {
-    this.disconnect = store.dispatch(connectUserStream());
+  render () {
+    const { showIntroduction } = this.props;
 
-    // Desktop notifications
-    // Ask after 1 minute
-    if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') {
-      window.setTimeout(() => Notification.requestPermission(), 60 * 1000);
+    if (showIntroduction) {
+      return <Introduction />;
     }
 
-    // Protocol handler
-    // Ask after 5 minutes
-    if (typeof navigator.registerProtocolHandler !== 'undefined') {
-      const handlerUrl = window.location.protocol + '//' + window.location.host + '/intent?uri=%s';
-      window.setTimeout(() => navigator.registerProtocolHandler('web+mastodon', handlerUrl, 'Mastodon'), 5 * 60 * 1000);
-    }
+    return (
+      <BrowserRouter basename='/web'>
+        <ScrollContext>
+          <Route path='/' component={UI} />
+        </ScrollContext>
+      </BrowserRouter>
+    );
+  }
+
+}
 
-    store.dispatch(showOnboardingOnce());
+export default class Mastodon extends React.PureComponent {
+
+  static propTypes = {
+    locale: PropTypes.string.isRequired,
+  };
+
+  componentDidMount() {
+    this.disconnect = store.dispatch(connectUserStream());
   }
 
   componentWillUnmount () {
@@ -61,11 +75,7 @@ export default class Mastodon extends React.PureComponent {
     return (
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
-          <BrowserRouter basename='/web'>
-            <ScrollContext>
-              <Route path='/' component={UI} />
-            </ScrollContext>
-          </BrowserRouter>
+          <MastodonMount />
         </Provider>
       </IntlProvider>
     );
diff --git a/app/javascript/mastodon/containers/media_container.js b/app/javascript/mastodon/containers/media_container.js
index 1700fba05a9b6bfd03e798624bf994543b6b472e..43bb394035c57d66cdfef81d52ca2e8d6d9d7121 100644
--- a/app/javascript/mastodon/containers/media_container.js
+++ b/app/javascript/mastodon/containers/media_container.js
@@ -29,19 +29,19 @@ export default class MediaContainer extends PureComponent {
   };
 
   handleOpenMedia = (media, index) => {
-    document.body.classList.add('media-standalone__body');
+    document.body.classList.add('with-modals--active');
     this.setState({ media, index });
   }
 
   handleOpenVideo = (video, time) => {
     const media = ImmutableList([video]);
 
-    document.body.classList.add('media-standalone__body');
+    document.body.classList.add('with-modals--active');
     this.setState({ media, time });
   }
 
   handleCloseMedia = () => {
-    document.body.classList.remove('media-standalone__body');
+    document.body.classList.remove('with-modals--active');
     this.setState({ media: null, index: null, time: null });
   }
 
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index eb6329fdcdd2f461c1ea33145bedb2e8eb4f354d..b3555c76e550977cc3ae45bfa35789159bf09078 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -34,8 +34,10 @@ const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
   redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.' },
+  redraftMessage: { id: 'confirmations.redraft.message', 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.' },
   blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
 const makeMapStateToProps = () => {
@@ -51,7 +53,18 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onReply (status, router) {
-    dispatch(replyCompose(status, router));
+    dispatch((_, getState) => {
+      let state = getState();
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.replyMessage),
+          confirm: intl.formatMessage(messages.replyConfirm),
+          onConfirm: () => dispatch(replyCompose(status, router)),
+        }));
+      } else {
+        dispatch(replyCompose(status, router));
+      }
+    });
   },
 
   onModalReblog (status) {
@@ -93,14 +106,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }));
   },
 
-  onDelete (status, withRedraft = false) {
+  onDelete (status, history, withRedraft = false) {
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), withRedraft));
+      dispatch(deleteStatus(status.get('id'), history, withRedraft));
     } else {
       dispatch(openModal('CONFIRM', {
         message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
         confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-        onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
+        onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
       }));
     }
   },
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 69726a4167784b2adf781451eb372dc80cb1eef4..8ed4c917ab1510810a5936fefddc744b40f8e67e 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -2,9 +2,9 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
-import { Link } from 'react-router-dom';
+import { NavLink } from 'react-router-dom';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { me } from '../../../initial_state';
+import { me, isStaff  } from '../../../initial_state';
 import { shortNumberFormat } from '../../../utils/numbers';
 
 const messages = defineMessages({
@@ -32,10 +32,14 @@ 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' },
+  endorse: { id: 'account.endorse', defaultMessage: 'Feature on profile' },
+  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}' },
 });
 
-@injectIntl
-export default class ActionBar extends React.PureComponent {
+export default @injectIntl
+class ActionBar extends React.PureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -48,6 +52,8 @@ export default class ActionBar extends React.PureComponent {
     onMute: PropTypes.func.isRequired,
     onBlockDomain: PropTypes.func.isRequired,
     onUnblockDomain: PropTypes.func.isRequired,
+    onEndorseToggle: PropTypes.func.isRequired,
+    onAddToList: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
 
@@ -57,6 +63,13 @@ export default class ActionBar extends React.PureComponent {
     });
   }
 
+  isStatusesPageActive = (match, location) => {
+    if (!match) {
+      return false;
+    }
+    return !location.pathname.match(/\/(followers|following)\/?$/);
+  }
+
   render () {
     const { account, intl } = this.props;
 
@@ -93,6 +106,10 @@ export default class ActionBar extends React.PureComponent {
         } else {
           menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
         }
+
+        menu.push({ text: intl.formatMessage(account.getIn(['relationship', 'endorsed']) ? messages.unendorse : messages.endorse), action: this.props.onEndorseToggle });
+        menu.push({ text: intl.formatMessage(messages.add_or_remove_from_list), action: this.props.onAddToList });
+        menu.push(null);
       }
 
       if (account.getIn(['relationship', 'muting'])) {
@@ -135,26 +152,31 @@ export default class ActionBar extends React.PureComponent {
       }
     }
 
+    if (account.get('id') !== me && isStaff) {
+      menu.push(null);
+      menu.push({ text: intl.formatMessage(messages.admin_account, { name: account.get('username') }), href: `/admin/accounts/${account.get('id')}` });
+    }
+
     return (
       <div>
         {extraInfo}
 
         <div className='account__action-bar'>
           <div className='account__action-bar-links'>
-            <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
-              <span><FormattedMessage id='account.posts' defaultMessage='Toots' /></span>
+            <NavLink isActive={this.isStatusesPageActive} activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}`} title={intl.formatNumber(account.get('statuses_count'))}>
+              <FormattedMessage id='account.posts' defaultMessage='Toots' />
               <strong>{shortNumberFormat(account.get('statuses_count'))}</strong>
-            </Link>
+            </NavLink>
 
-            <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
-              <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span>
+            <NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`} title={intl.formatNumber(account.get('following_count'))}>
+              <FormattedMessage id='account.follows' defaultMessage='Follows' />
               <strong>{shortNumberFormat(account.get('following_count'))}</strong>
-            </Link>
+            </NavLink>
 
-            <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
-              <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span>
+            <NavLink exact activeClassName='active' className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`} title={intl.formatNumber(account.get('followers_count'))}>
+              <FormattedMessage id='account.followers' defaultMessage='Followers' />
               <strong>{shortNumberFormat(account.get('followers_count'))}</strong>
-            </Link>
+            </NavLink>
           </div>
 
           <div className='account__action-bar-dropdown'>
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index dd2cd406b546de5ca6011341970d9da211982e0d..2ab25cde44777cdd3096d37a973f7b02530369be 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -15,8 +15,19 @@ const messages = defineMessages({
   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' },
+  linkVerifiedOn: { id: 'account.link_verified_on', defaultMessage: 'Ownership of this link was checked on {date}' },
+  account_locked: { id: 'account.locked_info', defaultMessage: 'This account privacy status is set to locked. The owner manually reviews who can follow them.' },
 });
 
+const dateFormatOptions = {
+  month: 'short',
+  day: 'numeric',
+  year: 'numeric',
+  hour12: false,
+  hour: '2-digit',
+  minute: '2-digit',
+};
+
 class Avatar extends ImmutablePureComponent {
 
   static propTypes = {
@@ -65,8 +76,8 @@ class Avatar extends ImmutablePureComponent {
 
 }
 
-@injectIntl
-export default class Header extends ImmutablePureComponent {
+export default @injectIntl
+class Header extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map,
@@ -104,7 +115,9 @@ export default class Header extends ImmutablePureComponent {
     }
 
     if (me !== account.get('id')) {
-      if (account.getIn(['relationship', 'requested'])) {
+      if (!account.get('relationship')) { // Wait until the relationship is loaded
+        actionBtn = '';
+      } else if (account.getIn(['relationship', 'requested'])) {
         actionBtn = (
           <div className='account--action-button'>
             <IconButton size={26} active icon='hourglass' title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />
@@ -136,7 +149,7 @@ export default class Header extends ImmutablePureComponent {
     }
 
     if (account.get('locked')) {
-      lockedIcon = <i className='fa fa-lock' />;
+      lockedIcon = <i className='fa fa-lock' title={intl.formatMessage(messages.account_locked)} />;
     }
 
     const content         = { __html: account.get('note_emojified') };
@@ -145,7 +158,7 @@ export default class Header extends ImmutablePureComponent {
     const badge           = account.get('bot') ? (<div className='roles'><div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div></div>) : null;
 
     return (
-      <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}>
+      <div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${autoPlayGif ? account.get('header') : account.get('header_static')})` }}>
         <div>
           <Avatar account={account} />
 
@@ -161,7 +174,10 @@ export default class Header extends ImmutablePureComponent {
               {fields.map((pair, i) => (
                 <dl key={i}>
                   <dt dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }} title={pair.get('name')} />
-                  <dd dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} title={pair.get('value_plain')} />
+
+                  <dd className={pair.get('verified_at') && 'verified'} title={pair.get('value_plain')}>
+                    {pair.get('verified_at') && <span title={intl.formatMessage(messages.linkVerifiedOn, { date: intl.formatDate(pair.get('verified_at'), dateFormatOptions) })}><i className='fa fa-check verified__mark' /></span>} <span dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }} />
+                  </dd>
                 </dl>
               ))}
             </div>
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 f7a802dc7949cd71542134e8157f9838152934c1..7c330c4303b6f150656c50fb542c95e3f7ed8826 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,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Permalink from '../../../components/permalink';
-import { displaySensitiveMedia } from '../../../initial_state';
+import { displayMedia } from '../../../initial_state';
 
 export default class MediaItem extends ImmutablePureComponent {
 
@@ -11,7 +11,7 @@ export default class MediaItem extends ImmutablePureComponent {
   };
 
   state = {
-    visible: !this.props.media.getIn(['status', 'sensitive']) || displaySensitiveMedia,
+    visible: displayMedia !== 'hide_all' && !this.props.media.getIn(['status', 'sensitive']) || displayMedia === 'show_all',
   };
 
   handleClick = () => {
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index 5f564d3a9d22206d2c4de0507e8855eb0fa84284..96051818b89665cb45873e728913b97dd38f7629 100644
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -23,6 +23,7 @@ const mapStateToProps = (state, props) => ({
 class LoadMoreMedia extends ImmutablePureComponent {
 
   static propTypes = {
+    shouldUpdateScroll: PropTypes.func,
     maxId: PropTypes.string,
     onLoadMore: PropTypes.func.isRequired,
   };
@@ -35,15 +36,15 @@ class LoadMoreMedia extends ImmutablePureComponent {
     return (
       <LoadMore
         disabled={this.props.disabled}
-        onLoadMore={this.handleLoadMore}
+        onClick={this.handleLoadMore}
       />
     );
   }
 
 }
 
-@connect(mapStateToProps)
-export default class AccountGallery extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class AccountGallery extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -67,7 +68,7 @@ export default class AccountGallery extends ImmutablePureComponent {
 
   handleScrollToBottom = () => {
     if (this.props.hasMore) {
-      this.handleLoadMore(this.props.medias.last().getIn(['status', 'id']));
+      this.handleLoadMore(this.props.medias.size > 0 ? this.props.medias.last().getIn(['status', 'id']) : undefined);
     }
   }
 
@@ -90,7 +91,7 @@ export default class AccountGallery extends ImmutablePureComponent {
   }
 
   render () {
-    const { medias, isLoading, hasMore } = this.props;
+    const { medias, shouldUpdateScroll, isLoading, hasMore } = this.props;
 
     let loadOlder = null;
 
@@ -102,23 +103,24 @@ export default class AccountGallery extends ImmutablePureComponent {
       );
     }
 
-    if (!isLoading && medias.size > 0 && hasMore) {
-      loadOlder = <LoadMore onClick={this.handleLoadOlder} />;
+    if (hasMore && !(isLoading && medias.size === 0)) {
+      loadOlder = <LoadMore visible={!isLoading} onClick={this.handleLoadOlder} />;
     }
 
     return (
       <Column>
         <ColumnBackButton />
 
-        <ScrollContainer scrollKey='account_gallery'>
-          <div className='scrollable' onScroll={this.handleScroll}>
+        <ScrollContainer scrollKey='account_gallery' shouldUpdateScroll={shouldUpdateScroll}>
+          <div className='scrollable scrollable--flex' onScroll={this.handleScroll}>
             <HeaderContainer accountId={this.props.params.accountId} />
 
-            <div className='account-gallery__container'>
+            <div role='feed' className='account-gallery__container'>
               {medias.map((media, index) => media === null ? (
                 <LoadMoreMedia
                   key={'more:' + medias.getIn(index + 1, 'id')}
                   maxId={index > 0 ? medias.getIn(index - 1, 'id') : null}
+                  onLoadMore={this.handleLoadMore}
                 />
               ) : (
                 <MediaItem
@@ -128,6 +130,12 @@ export default class AccountGallery extends ImmutablePureComponent {
               ))}
               {loadOlder}
             </div>
+
+            {isLoading && medias.size === 0 && (
+              <div className='scrollable__append'>
+                <LoadingIndicator />
+              </div>
+            )}
           </div>
         </ScrollContainer>
       </Column>
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index 1ae5126e60f552eebe64ac4c7f03e0dc642f9d9d..779e116e04d79b50b7fbdcdc2e84d49632398c78 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -22,6 +22,8 @@ export default class Header extends ImmutablePureComponent {
     onMute: PropTypes.func.isRequired,
     onBlockDomain: PropTypes.func.isRequired,
     onUnblockDomain: PropTypes.func.isRequired,
+    onEndorseToggle: PropTypes.func.isRequired,
+    onAddToList: PropTypes.func.isRequired,
     hideTabs: PropTypes.bool,
   };
 
@@ -73,6 +75,14 @@ export default class Header extends ImmutablePureComponent {
     this.props.onUnblockDomain(domain);
   }
 
+  handleEndorseToggle = () => {
+    this.props.onEndorseToggle(this.props.account);
+  }
+
+  handleAddToList = () => {
+    this.props.onAddToList(this.props.account);
+  }
+
   render () {
     const { account, hideTabs } = this.props;
 
@@ -100,6 +110,8 @@ export default class Header extends ImmutablePureComponent {
           onMute={this.handleMute}
           onBlockDomain={this.handleBlockDomain}
           onUnblockDomain={this.handleUnblockDomain}
+          onEndorseToggle={this.handleEndorseToggle}
+          onAddToList={this.handleAddToList}
         />
 
         {!hideTabs && (
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 7681430b789175665dd92078ddd12a9dceefff1c..0fd79d036879d7641f257c16601a094fda6f520e 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -8,6 +8,8 @@ import {
   blockAccount,
   unblockAccount,
   unmuteAccount,
+  pinAccount,
+  unpinAccount,
 } from '../../../actions/accounts';
 import {
   mentionCompose,
@@ -82,6 +84,14 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
+  onEndorseToggle (account) {
+    if (account.getIn(['relationship', 'endorsed'])) {
+      dispatch(unpinAccount(account.get('id')));
+    } else {
+      dispatch(pinAccount(account.get('id')));
+    }
+  },
+
   onReport (account) {
     dispatch(initReport(account));
   },
@@ -106,6 +116,12 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(unblockDomain(domain));
   },
 
+  onAddToList(account){
+    dispatch(openModal('LIST_ADDER', {
+      accountId: account.get('id'),
+    }));
+  },
+
 });
 
 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 d329bac5c191177975589888892215ddaabd6078..afc484c607b9e9c663a884a0cd7a331273f95c97 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -11,6 +11,7 @@ import HeaderContainer from './containers/header_container';
 import ColumnBackButton from '../../components/column_back_button';
 import { List as ImmutableList } from 'immutable';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import { FormattedMessage } from 'react-intl';
 
 const mapStateToProps = (state, { params: { accountId }, withReplies = false }) => {
   const path = withReplies ? `${accountId}:with_replies` : accountId;
@@ -23,12 +24,13 @@ const mapStateToProps = (state, { params: { accountId }, withReplies = false })
   };
 };
 
-@connect(mapStateToProps)
-export default class AccountTimeline extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class AccountTimeline extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     statusIds: ImmutablePropTypes.list,
     featuredStatusIds: ImmutablePropTypes.list,
     isLoading: PropTypes.bool,
@@ -61,7 +63,7 @@ export default class AccountTimeline extends ImmutablePureComponent {
   }
 
   render () {
-    const { statusIds, featuredStatusIds, isLoading, hasMore } = this.props;
+    const { shouldUpdateScroll, statusIds, featuredStatusIds, isLoading, hasMore } = this.props;
 
     if (!statusIds && isLoading) {
       return (
@@ -77,12 +79,15 @@ export default class AccountTimeline extends ImmutablePureComponent {
 
         <StatusList
           prepend={<HeaderContainer accountId={this.props.params.accountId} />}
+          alwaysPrepend
           scrollKey='account_timeline'
           statusIds={statusIds}
           featuredStatusIds={featuredStatusIds}
           isLoading={isLoading}
           hasMore={hasMore}
           onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={<FormattedMessage id='empty_column.account_timeline' defaultMessage='No toots here!' />}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index 14a512ae8cff28734b982831a1820055a5ea165e..ca7ce6f8ea395dc8829a5a3e3e11f1fffbcf4c9a 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -1,15 +1,16 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { debounce } from 'lodash';
 import PropTypes from 'prop-types';
 import LoadingIndicator from '../../components/loading_indicator';
-import { ScrollContainer } from 'react-router-scroll-4';
 import Column from '../ui/components/column';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountContainer from '../../containers/account_container';
 import { fetchBlocks, expandBlocks } from '../../actions/blocks';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
   heading: { id: 'column.blocks', defaultMessage: 'Blocked users' },
@@ -19,13 +20,14 @@ const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'blocks', 'items']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Blocks extends ImmutablePureComponent {
+class Blocks extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
     intl: PropTypes.object.isRequired,
   };
@@ -34,16 +36,12 @@ export default class Blocks extends ImmutablePureComponent {
     this.props.dispatch(fetchBlocks());
   }
 
-  handleScroll = (e) => {
-    const { scrollTop, scrollHeight, clientHeight } = e.target;
-
-    if (scrollTop === scrollHeight - clientHeight) {
-      this.props.dispatch(expandBlocks());
-    }
-  }
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandBlocks());
+  }, 300, { leading: true });
 
   render () {
-    const { intl, accountIds } = this.props;
+    const { intl, accountIds, shouldUpdateScroll } = this.props;
 
     if (!accountIds) {
       return (
@@ -53,16 +51,21 @@ export default class Blocks extends ImmutablePureComponent {
       );
     }
 
+    const emptyMessage = <FormattedMessage id='empty_column.blocks' defaultMessage="You haven't blocked any users yet." />;
+
     return (
       <Column icon='ban' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
-        <ScrollContainer scrollKey='blocks'>
-          <div className='scrollable' onScroll={this.handleScroll}>
-            {accountIds.map(id =>
-              <AccountContainer key={id} id={id} />
-            )}
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='blocks'
+          onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} />
+          )}
+        </ScrollableList>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/community_timeline/components/column_settings.js b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
index f4325f58d31bf94ad055d53a7b188d6d11511ff5..8250190a7adf1ebbc6aa88a24d22de8392d7cd7a 100644
--- a/app/javascript/mastodon/features/community_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
@@ -4,8 +4,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import SettingToggle from '../../notifications/components/setting_toggle';
 
-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index eb9ad97a2bd1bd35ae73a42cb8cf497260d91db6..7d26c98b0d30de457d75ddc02bed8ea626c7d609 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -25,9 +25,9 @@ const mapStateToProps = (state, { onlyMedia, columnId }) => {
   };
 };
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class CommunityTimeline extends React.PureComponent {
+class CommunityTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -39,6 +39,7 @@ export default class CommunityTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     columnId: PropTypes.string,
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,
@@ -100,11 +101,11 @@ export default class CommunityTimeline extends React.PureComponent {
   }
 
   render () {
-    const { intl, hasUnread, columnId, multiColumn, onlyMedia } = this.props;
+    const { intl, shouldUpdateScroll, hasUnread, columnId, multiColumn, onlyMedia } = this.props;
     const pinned = !!columnId;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='users'
           active={hasUnread}
@@ -124,6 +125,7 @@ export default class CommunityTimeline extends React.PureComponent {
           timelineId={`community${onlyMedia ? ':media' : ''}`}
           onLoadMore={this.handleLoadMore}
           emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/compose/components/action_bar.js b/app/javascript/mastodon/features/compose/components/action_bar.js
index daee18552ac29b7c02f721225a96b7cca0de3e63..95d6eeb06d03a657e2721ed5666838e960aacd74 100644
--- a/app/javascript/mastodon/features/compose/components/action_bar.js
+++ b/app/javascript/mastodon/features/compose/components/action_bar.js
@@ -17,8 +17,8 @@ const messages = defineMessages({
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
 });
 
-@injectIntl
-export default class ActionBar extends React.PureComponent {
+export default @injectIntl
+class ActionBar extends React.PureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 1a1c57ba8143e8516214f84e7cca633223ccdaf0..16ed044024dba0136eb82a789f536d8b73af32b4 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -27,8 +27,12 @@ const messages = defineMessages({
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
 });
 
-@injectIntl
-export default class ComposeForm extends ImmutablePureComponent {
+export default @injectIntl
+class ComposeForm extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -42,6 +46,7 @@ export default class ComposeForm extends ImmutablePureComponent {
     caretPosition: PropTypes.number,
     preselectDate: PropTypes.instanceOf(Date),
     is_submitting: PropTypes.bool,
+    is_changing_upload: PropTypes.bool,
     is_uploading: PropTypes.bool,
     onChange: PropTypes.func.isRequired,
     onSubmit: PropTypes.func.isRequired,
@@ -77,14 +82,14 @@ export default class ComposeForm extends ImmutablePureComponent {
     }
 
     // Submit disabled:
-    const { is_submitting, is_uploading, anyMedia } = this.props;
+    const { is_submitting, is_changing_upload, is_uploading, anyMedia } = this.props;
     const fulltext = [this.props.spoiler_text, countableText(this.props.text)].join('');
 
-    if (is_submitting || is_uploading || length(fulltext) > 65535 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
+    if (is_submitting || is_uploading || is_changing_upload || length(fulltext) > 65535 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
       return;
     }
 
-    this.props.onSubmit();
+    this.props.onSubmit(this.context.router ? this.context.router.history : null);
   }
 
   onSuggestionsClearRequested = () => {
@@ -156,7 +161,7 @@ export default class ComposeForm extends ImmutablePureComponent {
     const { intl, onPaste, showSearch, anyMedia } = this.props;
     const disabled = this.props.is_submitting;
     const text     = [this.props.spoiler_text, countableText(this.props.text)].join('');
-    const disabledButton = disabled || this.props.is_uploading || length(text) > 65535 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
+    const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > 65535 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
     let publishText = '';
 
     if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
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 4fc32db8a4d5debd12de66c6fead3b2a9473ff9f..c1429c756fdbefb2e802592c543fb418a5adb951 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -261,6 +261,7 @@ class EmojiPickerMenu extends React.PureComponent {
           skin={skinTone}
           showPreview={false}
           backgroundImageFn={backgroundImageFn}
+          autoFocus
           emojiTooltip
         />
 
@@ -277,8 +278,8 @@ class EmojiPickerMenu extends React.PureComponent {
 
 }
 
-@injectIntl
-export default class EmojiPickerDropdown extends React.PureComponent {
+export default @injectIntl
+class EmojiPickerDropdown extends React.PureComponent {
 
   static propTypes = {
     custom_emojis: ImmutablePropTypes.list,
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index a772c1c953b750c525a41c5332087fef2a16fdd7..5698765d94f2b55e54ac9f328f2df6f08235c3dd 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -28,6 +28,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
     style: PropTypes.object,
     items: PropTypes.array.isRequired,
     value: PropTypes.string.isRequired,
+    placement: PropTypes.string.isRequired,
     onClose: PropTypes.func.isRequired,
     onChange: PropTypes.func.isRequired,
   };
@@ -119,7 +120,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
 
   render () {
     const { mounted } = this.state;
-    const { style, items, value } = this.props;
+    const { style, items, placement, value } = this.props;
 
     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 }) }}>
@@ -127,7 +128,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
           // 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='privacy-dropdown__dropdown' style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} role='listbox' ref={this.setRef}>
+          <div className={`privacy-dropdown__dropdown ${placement}`} style={{ ...style, opacity: opacity, transform: mounted ? `scale(${scaleX}, ${scaleY})` : null }} role='listbox' ref={this.setRef}>
             {items.map(item => (
               <div role='option' tabIndex='0' key={item.value} data-index={item.value} onKeyDown={this.handleKeyDown} onClick={this.handleClick} className={classNames('privacy-dropdown__option', { active: item.value === value })} aria-selected={item.value === value} ref={item.value === value ? this.setFocusRef : null}>
                 <div className='privacy-dropdown__option__icon'>
@@ -148,8 +149,8 @@ class PrivacyDropdownMenu extends React.PureComponent {
 
 }
 
-@injectIntl
-export default class PrivacyDropdown extends React.PureComponent {
+export default @injectIntl
+class PrivacyDropdown extends React.PureComponent {
 
   static propTypes = {
     isUserTouching: PropTypes.func,
@@ -163,7 +164,7 @@ export default class PrivacyDropdown extends React.PureComponent {
 
   state = {
     open: false,
-    placement: null,
+    placement: 'bottom',
   };
 
   handleToggle = ({ target }) => {
@@ -226,7 +227,7 @@ export default class PrivacyDropdown extends React.PureComponent {
     const valueOption = this.options.find(item => item.value === value);
 
     return (
-      <div className={classNames('privacy-dropdown', { active: open })} onKeyDown={this.handleKeyDown}>
+      <div className={classNames('privacy-dropdown', placement, { active: open })} onKeyDown={this.handleKeyDown}>
         <div className={classNames('privacy-dropdown__value', { active: this.options.indexOf(valueOption) === 0 })}>
           <IconButton
             className='privacy-dropdown__value-icon'
@@ -247,6 +248,7 @@ export default class PrivacyDropdown extends React.PureComponent {
             value={value}
             onClose={this.handleClose}
             onChange={this.handleChange}
+            placement={placement}
           />
         </Overlay>
       </div>
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 5b4b81eac7f060a06ba963c26bf8ed5e1ad51399..142223f3d8a223d3d6f29dc76038d858d16706b4 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -12,8 +12,8 @@ const messages = defineMessages({
   cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
 });
 
-@injectIntl
-export default class ReplyIndicator extends ImmutablePureComponent {
+export default @injectIntl
+class ReplyIndicator extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -30,7 +30,7 @@ export default class ReplyIndicator extends ImmutablePureComponent {
   }
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
index 71c0a203f0d033fe037322680a2b48686dc5f8cb..d203d87800930e908d54d97df0dffd7f0cfb56bd 100644
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@@ -43,8 +43,8 @@ class SearchPopout extends React.PureComponent {
 
 }
 
-@injectIntl
-export default class Search extends React.PureComponent {
+export default @injectIntl
+class Search extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string.isRequired,
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index c351b84bb3ee5fff991f2d45bd5075867a181860..f0ddf6d7144bf9b35f7ff2a2e3012520a26472fd 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -1,19 +1,56 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import AccountContainer from '../../../containers/account_container';
 import StatusContainer from '../../../containers/status_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Hashtag from '../../../components/hashtag';
 
-export default class SearchResults extends ImmutablePureComponent {
+const messages = defineMessages({
+  dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
+});
+
+export default @injectIntl
+class SearchResults extends ImmutablePureComponent {
 
   static propTypes = {
     results: ImmutablePropTypes.map.isRequired,
+    suggestions: ImmutablePropTypes.list.isRequired,
+    fetchSuggestions: PropTypes.func.isRequired,
+    dismissSuggestion: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
   };
 
+  componentDidMount () {
+    this.props.fetchSuggestions();
+  }
+
   render () {
-    const { results } = this.props;
+    const { intl, results, suggestions, dismissSuggestion } = this.props;
+
+    if (results.isEmpty() && !suggestions.isEmpty()) {
+      return (
+        <div className='search-results'>
+          <div className='trends'>
+            <div className='trends__header'>
+              <i className='fa fa-user-plus fa-fw' />
+              <FormattedMessage id='suggestions.header' defaultMessage='You might be interested inâ€¦' />
+            </div>
+
+            {suggestions && suggestions.map(accountId => (
+              <AccountContainer
+                key={accountId}
+                id={accountId}
+                actionIcon='times'
+                actionTitle={intl.formatMessage(messages.dismissSuggestion)}
+                onActionClick={dismissSuggestion}
+              />
+            ))}
+          </div>
+        </div>
+      );
+    }
 
     let accounts, statuses, hashtags;
     let count = 0;
diff --git a/app/javascript/mastodon/features/compose/components/upload.js b/app/javascript/mastodon/features/compose/components/upload.js
index bfa2b47271a6b59f3860f66cae4b9cb9357d2506..a1e99dcbbdbca3346ec4e90d428fb7590d7ae0c7 100644
--- a/app/javascript/mastodon/features/compose/components/upload.js
+++ b/app/javascript/mastodon/features/compose/components/upload.js
@@ -11,8 +11,12 @@ const messages = defineMessages({
   description: { id: 'upload_form.description', defaultMessage: 'Describe for the visually impaired' },
 });
 
-@injectIntl
-export default class Upload extends ImmutablePureComponent {
+export default @injectIntl
+class Upload extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
@@ -20,6 +24,7 @@ export default class Upload extends ImmutablePureComponent {
     onUndo: PropTypes.func.isRequired,
     onDescriptionChange: PropTypes.func.isRequired,
     onOpenFocalPoint: PropTypes.func.isRequired,
+    onSubmit: PropTypes.func.isRequired,
   };
 
   state = {
@@ -28,11 +33,24 @@ export default class Upload extends ImmutablePureComponent {
     dirtyDescription: null,
   };
 
-  handleUndoClick = () => {
+  handleKeyDown = (e) => {
+    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
+      this.handleSubmit();
+    }
+  }
+
+  handleSubmit = () => {
+    this.handleInputBlur();
+    this.props.onSubmit(this.context.router.history);
+  }
+
+  handleUndoClick = e => {
+    e.stopPropagation();
     this.props.onUndo(this.props.media.get('id'));
   }
 
-  handleFocalPointClick = () => {
+  handleFocalPointClick = e => {
+    e.stopPropagation();
     this.props.onOpenFocalPoint(this.props.media.get('id'));
   }
 
@@ -52,6 +70,10 @@ export default class Upload extends ImmutablePureComponent {
     this.setState({ focused: true });
   }
 
+  handleClick = () => {
+    this.setState({ focused: true });
+  }
+
   handleInputBlur = () => {
     const { dirtyDescription } = this.state;
 
@@ -72,7 +94,7 @@ export default class Upload extends ImmutablePureComponent {
     const y = ((focusY / -2) + .5) * 100;
 
     return (
-      <div className='compose-form__upload' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
+      <div className='compose-form__upload' tabIndex='0' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} onClick={this.handleClick} role='button'>
         <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}%` }}>
@@ -93,6 +115,7 @@ export default class Upload extends ImmutablePureComponent {
                     onFocus={this.handleInputFocus}
                     onChange={this.handleInputChange}
                     onBlur={this.handleInputBlur}
+                    onKeyDown={this.handleKeyDown}
                   />
                 </label>
               </div>
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index 70b28a2baeb27fbd9b742c16e9533c226704aa47..b6fe770eada75e214e62980d4026aa7e37aaa45e 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -7,7 +7,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
 const messages = defineMessages({
-  upload: { id: 'upload_button.label', defaultMessage: 'Add media' },
+  upload: { id: 'upload_button.label', defaultMessage: 'Add media (JPEG, PNG, GIF, WebM, MP4, MOV)' },
 });
 
 const makeMapStateToProps = () => {
@@ -23,9 +23,9 @@ const iconStyle = {
   lineHeight: '27px',
 };
 
-@connect(makeMapStateToProps)
+export default @connect(makeMapStateToProps)
 @injectIntl
-export default class UploadButton extends ImmutablePureComponent {
+class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
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 3822dd711fe32e0eaa2c610bab0b89faaa1b8091..b4a1c4b44462e4a37dcd7f8dfb7cdf206ddaf4f6 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -22,6 +22,7 @@ const mapStateToProps = state => ({
   caretPosition: state.getIn(['compose', 'caretPosition']),
   preselectDate: state.getIn(['compose', 'preselectDate']),
   is_submitting: state.getIn(['compose', 'is_submitting']),
+  is_changing_upload: state.getIn(['compose', 'is_changing_upload']),
   is_uploading: state.getIn(['compose', 'is_uploading']),
   showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
   anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
@@ -33,8 +34,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(changeCompose(text));
   },
 
-  onSubmit () {
-    dispatch(submitCompose());
+  onSubmit (router) {
+    dispatch(submitCompose(router));
   },
 
   onClearSuggestions () {
diff --git a/app/javascript/mastodon/features/compose/containers/search_results_container.js b/app/javascript/mastodon/features/compose/containers/search_results_container.js
index 16d95d417e4a501126a16fb55afa795133a04911..f9637861ae7b437c632f10f0967590f0e98df3b3 100644
--- a/app/javascript/mastodon/features/compose/containers/search_results_container.js
+++ b/app/javascript/mastodon/features/compose/containers/search_results_container.js
@@ -1,8 +1,15 @@
 import { connect } from 'react-redux';
 import SearchResults from '../components/search_results';
+import { fetchSuggestions, dismissSuggestion } from '../../../actions/suggestions';
 
 const mapStateToProps = state => ({
   results: state.getIn(['search', 'results']),
+  suggestions: state.getIn(['suggestions', 'items']),
 });
 
-export default connect(mapStateToProps)(SearchResults);
+const mapDispatchToProps = dispatch => ({
+  fetchSuggestions: () => dispatch(fetchSuggestions()),
+  dismissSuggestion: account => dispatch(dismissSuggestion(account.get('id'))),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(SearchResults);
diff --git a/app/javascript/mastodon/features/compose/containers/upload_container.js b/app/javascript/mastodon/features/compose/containers/upload_container.js
index d6b57e5ffbbaadf995c7fcb306adbfe758602036..b6d81f03ac6d9cf387f3e23d296f59f1d3c1b596 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_container.js
@@ -2,6 +2,7 @@ import { connect } from 'react-redux';
 import Upload from '../components/upload';
 import { undoUploadCompose, changeUploadCompose } from '../../../actions/compose';
 import { openModal } from '../../../actions/modal';
+import { submitCompose } from '../../../actions/compose';
 
 const mapStateToProps = (state, { id }) => ({
   media: state.getIn(['compose', 'media_attachments']).find(item => item.get('id') === id),
@@ -21,6 +22,10 @@ const mapDispatchToProps = dispatch => ({
     dispatch(openModal('FOCAL_POINT', { id }));
   },
 
+  onSubmit (router) {
+    dispatch(submitCompose(router));
+  },
+
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(Upload);
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index df1ec491500de1c1b14280e1f5c2cac5ce2a1a9a..d76cd76e61be2bdd3816e2cdb81217a007fe7bdc 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -13,6 +13,7 @@ import spring from 'react-motion/lib/spring';
 import SearchResultsContainer from './containers/search_results_container';
 import { changeComposing } from '../../actions/compose';
 import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
+import { mascot } from '../../initial_state';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -22,6 +23,7 @@ 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' },
 });
 
 const mapStateToProps = (state, ownProps) => ({
@@ -29,9 +31,9 @@ const mapStateToProps = (state, ownProps) => ({
   showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage,
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Compose extends React.PureComponent {
+class Compose extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -95,7 +97,7 @@ export default class Compose extends React.PureComponent {
     }
 
     return (
-      <div className='drawer'>
+      <div className='drawer' role='region' aria-label={intl.formatMessage(messages.compose)}>
         {header}
 
         {(multiColumn || isSearchPage) && <SearchContainer /> }
@@ -106,7 +108,7 @@ export default class Compose extends React.PureComponent {
             <ComposeFormContainer />
             {multiColumn && (
               <div className='drawer__inner__mastodon'>
-                <img alt='' draggable='false' src={elephantUIPlane} />
+                <img alt='' draggable='false' src={mascot || elephantUIPlane} />
               </div>
             )}
           </div>}
diff --git a/app/javascript/mastodon/features/compose/util/url_regex.js b/app/javascript/mastodon/features/compose/util/url_regex.js
index d5e39e0d5137cf031bb779f702185a8a34954132..7f1e176207b0bc1e6d556cba9d6cd768bf369149 100644
--- a/app/javascript/mastodon/features/compose/util/url_regex.js
+++ b/app/javascript/mastodon/features/compose/util/url_regex.js
@@ -170,7 +170,7 @@ export const urlRegex = (function() {
       ')'                                   +
     '\\)',
     'i');
-  // Valid end-of-path chracters (so /foo. does not gobble the period).
+  // Valid end-of-path characters (so /foo. does not gobble the period).
   // 1. Allow =&# for empty URL parameters and other URL-join artifacts
   regexen.validUrlPathEndingChars = regexSupplant(/[^#{spaces_group}\(\)\?!\*';:=\,\.\$%\[\]#{pd}~&\|@]|(?:#{validUrlBalancedParens})/i);
   // Allow @ in a url, but only in the middle. Catch things like http://example.com/@user/
diff --git a/app/javascript/mastodon/features/direct_timeline/components/column_settings.js b/app/javascript/mastodon/features/direct_timeline/components/column_settings.js
index a992b27bbdb458007d9b66e8653adce6dcf04985..b629c128dd8ae898eaa774d60bf9b998b8eb828f 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/direct_timeline/components/column_settings.js
@@ -9,8 +9,8 @@ const messages = defineMessages({
   settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });
 
-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.js b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
new file mode 100644
index 0000000000000000000000000000000000000000..ffcd6d2811af8ac082a4cee79051e5073f2377c8
--- /dev/null
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.js
@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import StatusContainer from '../../../containers/status_container';
+
+export default class Conversation extends ImmutablePureComponent {
+
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
+  static propTypes = {
+    conversationId: PropTypes.string.isRequired,
+    accounts: ImmutablePropTypes.list.isRequired,
+    lastStatusId: PropTypes.string,
+    unread:PropTypes.bool.isRequired,
+    onMoveUp: PropTypes.func,
+    onMoveDown: PropTypes.func,
+    markRead: PropTypes.func.isRequired,
+  };
+
+  handleClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
+    const { lastStatusId, unread, markRead } = this.props;
+
+    if (unread) {
+      markRead();
+    }
+
+    this.context.router.history.push(`/statuses/${lastStatusId}`);
+  }
+
+  handleHotkeyMoveUp = () => {
+    this.props.onMoveUp(this.props.conversationId);
+  }
+
+  handleHotkeyMoveDown = () => {
+    this.props.onMoveDown(this.props.conversationId);
+  }
+
+  render () {
+    const { accounts, lastStatusId, unread } = this.props;
+
+    if (lastStatusId === null) {
+      return null;
+    }
+
+    return (
+      <StatusContainer
+        id={lastStatusId}
+        unread={unread}
+        otherAccounts={accounts}
+        onMoveUp={this.handleHotkeyMoveUp}
+        onMoveDown={this.handleHotkeyMoveDown}
+        onClick={this.handleClick}
+      />
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
new file mode 100644
index 0000000000000000000000000000000000000000..635c03c1d129c4d0e64eb74f06e0cf51bdd407bf
--- /dev/null
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import ConversationContainer from '../containers/conversation_container';
+import ScrollableList from '../../../components/scrollable_list';
+import { debounce } from 'lodash';
+
+export default class ConversationsList extends ImmutablePureComponent {
+
+  static propTypes = {
+    conversations: ImmutablePropTypes.list.isRequired,
+    hasMore: PropTypes.bool,
+    isLoading: PropTypes.bool,
+    onLoadMore: PropTypes.func,
+    shouldUpdateScroll: PropTypes.func,
+  };
+
+  getCurrentIndex = id => this.props.conversations.findIndex(x => x.get('id') === id)
+
+  handleMoveUp = id => {
+    const elementIndex = this.getCurrentIndex(id) - 1;
+    this._selectChild(elementIndex);
+  }
+
+  handleMoveDown = id => {
+    const elementIndex = this.getCurrentIndex(id) + 1;
+    this._selectChild(elementIndex);
+  }
+
+  _selectChild (index) {
+    const element = this.node.node.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
+
+    if (element) {
+      element.focus();
+    }
+  }
+
+  setRef = c => {
+    this.node = c;
+  }
+
+  handleLoadOlder = debounce(() => {
+    const last = this.props.conversations.last();
+
+    if (last && last.get('last_status')) {
+      this.props.onLoadMore(last.get('last_status'));
+    }
+  }, 300, { leading: true })
+
+  render () {
+    const { conversations, onLoadMore, ...other } = this.props;
+
+    return (
+      <ScrollableList {...other} onLoadMore={onLoadMore && this.handleLoadOlder} scrollKey='direct' ref={this.setRef}>
+        {conversations.map(item => (
+          <ConversationContainer
+            key={item.get('id')}
+            conversationId={item.get('id')}
+            onMoveUp={this.handleMoveUp}
+            onMoveDown={this.handleMoveDown}
+          />
+        ))}
+      </ScrollableList>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..bd6f6bfb0176ce45ff43f85c883f06bf4e03f6c4
--- /dev/null
+++ b/app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+import Conversation from '../components/conversation';
+import { markConversationRead } from '../../../actions/conversations';
+
+const mapStateToProps = (state, { conversationId }) => {
+  const conversation = state.getIn(['conversations', 'items']).find(x => x.get('id') === conversationId);
+
+  return {
+    accounts: conversation.get('accounts').map(accountId => state.getIn(['accounts', accountId], null)),
+    unread: conversation.get('unread'),
+    lastStatusId: conversation.get('last_status', null),
+  };
+};
+
+const mapDispatchToProps = (dispatch, { conversationId }) => ({
+  markRead: () => dispatch(markConversationRead(conversationId)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(Conversation);
diff --git a/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..57e17d96f7c58d50da2f8f0c474283ee871a8556
--- /dev/null
+++ b/app/javascript/mastodon/features/direct_timeline/containers/conversations_list_container.js
@@ -0,0 +1,15 @@
+import { connect } from 'react-redux';
+import ConversationsList from '../components/conversations_list';
+import { expandConversations } from '../../../actions/conversations';
+
+const mapStateToProps = state => ({
+  conversations: state.getIn(['conversations', 'items']),
+  isLoading: state.getIn(['conversations', 'isLoading'], true),
+  hasMore: state.getIn(['conversations', 'hasMore'], false),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onLoadMore: maxId => dispatch(expandConversations({ maxId })),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ConversationsList);
diff --git a/app/javascript/mastodon/features/direct_timeline/index.js b/app/javascript/mastodon/features/direct_timeline/index.js
index 63dc41d9e77849e6f3a5892d62287cc5ed3aa048..d202f3bfd904d86255010f995615399fe4978f41 100644
--- a/app/javascript/mastodon/features/direct_timeline/index.js
+++ b/app/javascript/mastodon/features/direct_timeline/index.js
@@ -1,28 +1,25 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import StatusListContainer from '../ui/containers/status_list_container';
 import Column from '../../components/column';
 import ColumnHeader from '../../components/column_header';
-import { expandDirectTimeline } from '../../actions/timelines';
+import { mountConversations, unmountConversations, expandConversations } from '../../actions/conversations';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connectDirectStream } from '../../actions/streaming';
+import ConversationsListContainer from './containers/conversations_list_container';
 
 const messages = defineMessages({
   title: { id: 'column.direct', defaultMessage: 'Direct messages' },
 });
 
-const mapStateToProps = state => ({
-  hasUnread: state.getIn(['timelines', 'direct', 'unread']) > 0,
-});
-
-@connect(mapStateToProps)
+export default @connect()
 @injectIntl
-export default class DirectTimeline extends React.PureComponent {
+class DirectTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     columnId: PropTypes.string,
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,
@@ -51,11 +48,14 @@ export default class DirectTimeline extends React.PureComponent {
   componentDidMount () {
     const { dispatch } = this.props;
 
-    dispatch(expandDirectTimeline());
+    dispatch(mountConversations());
+    dispatch(expandConversations());
     this.disconnect = dispatch(connectDirectStream());
   }
 
   componentWillUnmount () {
+    this.props.dispatch(unmountConversations());
+
     if (this.disconnect) {
       this.disconnect();
       this.disconnect = null;
@@ -67,15 +67,15 @@ export default class DirectTimeline extends React.PureComponent {
   }
 
   handleLoadMore = maxId => {
-    this.props.dispatch(expandDirectTimeline({ maxId }));
+    this.props.dispatch(expandConversations({ maxId }));
   }
 
   render () {
-    const { intl, hasUnread, columnId, multiColumn } = this.props;
+    const { intl, hasUnread, columnId, multiColumn, shouldUpdateScroll } = this.props;
     const pinned = !!columnId;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='envelope'
           active={hasUnread}
@@ -87,12 +87,13 @@ export default class DirectTimeline extends React.PureComponent {
           multiColumn={multiColumn}
         />
 
-        <StatusListContainer
+        <ConversationsListContainer
           trackScroll={!pinned}
           scrollKey={`direct_timeline-${columnId}`}
           timelineId='direct'
           onLoadMore={this.handleLoadMore}
           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." />}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/domain_blocks/index.js b/app/javascript/mastodon/features/domain_blocks/index.js
index b8a942d6c26da70c59e4294f1b4b8587935487d4..5c1bd11610ca7a70c065322a73e483843a4df127 100644
--- a/app/javascript/mastodon/features/domain_blocks/index.js
+++ b/app/javascript/mastodon/features/domain_blocks/index.js
@@ -1,15 +1,15 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { debounce } from 'lodash';
 import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import DomainContainer from '../../containers/domain_container';
 import { fetchDomainBlocks, expandDomainBlocks } from '../../actions/domain_blocks';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { debounce } from 'lodash';
 import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
@@ -21,13 +21,14 @@ const mapStateToProps = state => ({
   domains: state.getIn(['domain_lists', 'blocks', 'items']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Blocks extends ImmutablePureComponent {
+class Blocks extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     domains: ImmutablePropTypes.orderedSet,
     intl: PropTypes.object.isRequired,
   };
@@ -41,7 +42,7 @@ export default class Blocks extends ImmutablePureComponent {
   }, 300, { leading: true });
 
   render () {
-    const { intl, domains } = this.props;
+    const { intl, domains, shouldUpdateScroll } = this.props;
 
     if (!domains) {
       return (
@@ -51,10 +52,17 @@ export default class Blocks extends ImmutablePureComponent {
       );
     }
 
+    const emptyMessage = <FormattedMessage id='empty_column.domain_blocks' defaultMessage='There are no hidden domains yet.' />;
+
     return (
       <Column icon='minus-circle' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
-        <ScrollableList scrollKey='domain_blocks' onLoadMore={this.handleLoadMore}>
+        <ScrollableList
+          scrollKey='domain_blocks'
+          onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
           {domains.map(domain =>
             <DomainContainer key={domain} domain={domain} />
           )}
diff --git a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
index d91b4849754e1c54715d2ad32b9eb871c86bbda0..c8425c4c6db63e3a0fd2de969daf8a090179f465 100644
--- a/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
+++ b/app/javascript/mastodon/features/emoji/__tests__/emoji-test.js
@@ -73,5 +73,10 @@ describe('emoji', () => {
       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.svg" />');
+    });
   });
 });
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index 0f005dd5040d130f893da285831b1ab29dd7eee1..988cea2530d1e6f7a9b799dc4c3141343eba3583 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -62,6 +62,10 @@ const emojify = (str, customEmojis = {}) => {
       const title = shortCode ? `:${shortCode}:` : '';
       replacement = `<img draggable="false" class="emojione" alt="${match}" title="${title}" src="${assetHost}/emoji/${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;
     str = str.slice(rend);
diff --git a/app/javascript/mastodon/features/emoji/emoji_map.json b/app/javascript/mastodon/features/emoji/emoji_map.json
index 13753ba84cc83b157d829c8e6c4d375b63e27b4a..d46dc82ad89c6aae2b6b4a75229f01d92efc02de 100644
--- a/app/javascript/mastodon/features/emoji/emoji_map.json
+++ b/app/javascript/mastodon/features/emoji/emoji_map.json
@@ -1 +1 @@
-{"ðŸ˜€":"1f600","ðŸ˜":"1f601","ðŸ˜‚":"1f602","ðŸ¤£":"1f923","ðŸ˜ƒ":"1f603","ðŸ˜„":"1f604","ðŸ˜…":"1f605","ðŸ˜†":"1f606","ðŸ˜‰":"1f609","ðŸ˜Š":"1f60a","ðŸ˜‹":"1f60b","ðŸ˜Ž":"1f60e","ðŸ˜":"1f60d","ðŸ˜˜":"1f618","ðŸ˜—":"1f617","ðŸ˜™":"1f619","ðŸ˜š":"1f61a","â˜º":"263a","ðŸ™‚":"1f642","ðŸ¤—":"1f917","ðŸ¤©":"1f929","ðŸ¤”":"1f914","ðŸ¤¨":"1f928","ðŸ˜":"1f610","ðŸ˜‘":"1f611","ðŸ˜¶":"1f636","ðŸ™„":"1f644","ðŸ˜":"1f60f","ðŸ˜£":"1f623","ðŸ˜¥":"1f625","ðŸ˜®":"1f62e","ðŸ¤":"1f910","ðŸ˜¯":"1f62f","ðŸ˜ª":"1f62a","ðŸ˜«":"1f62b","ðŸ˜´":"1f634","ðŸ˜Œ":"1f60c","ðŸ˜›":"1f61b","ðŸ˜œ":"1f61c","ðŸ˜":"1f61d","ðŸ¤¤":"1f924","ðŸ˜’":"1f612","ðŸ˜“":"1f613","ðŸ˜”":"1f614","ðŸ˜•":"1f615","ðŸ™ƒ":"1f643","ðŸ¤‘":"1f911","ðŸ˜²":"1f632","â˜¹":"2639","ðŸ™":"1f641","ðŸ˜–":"1f616","ðŸ˜ž":"1f61e","ðŸ˜Ÿ":"1f61f","ðŸ˜¤":"1f624","ðŸ˜¢":"1f622","ðŸ˜":"1f62d","ðŸ˜¦":"1f626","ðŸ˜§":"1f627","ðŸ˜¨":"1f628","ðŸ˜©":"1f629","ðŸ¤¯":"1f92f","ðŸ˜¬":"1f62c","ðŸ˜°":"1f630","ðŸ˜±":"1f631","ðŸ˜³":"1f633","ðŸ¤ª":"1f92a","ðŸ˜µ":"1f635","ðŸ˜¡":"1f621","ðŸ˜ ":"1f620","ðŸ¤¬":"1f92c","ðŸ˜·":"1f637","ðŸ¤’":"1f912","ðŸ¤•":"1f915","ðŸ¤¢":"1f922","ðŸ¤®":"1f92e","ðŸ¤§":"1f927","ðŸ˜‡":"1f607","ðŸ¤ ":"1f920","ðŸ¤¡":"1f921","ðŸ¤¥":"1f925","ðŸ¤«":"1f92b","ðŸ¤":"1f92d","ðŸ§":"1f9d0","ðŸ¤“":"1f913","ðŸ˜ˆ":"1f608","ðŸ‘¿":"1f47f","ðŸ‘¹":"1f479","ðŸ‘º":"1f47a","ðŸ’€":"1f480","â˜ ":"2620","ðŸ‘»":"1f47b","ðŸ‘½":"1f47d","ðŸ‘¾":"1f47e","ðŸ¤–":"1f916","ðŸ’©":"1f4a9","ðŸ˜º":"1f63a","ðŸ˜¸":"1f638","ðŸ˜¹":"1f639","ðŸ˜»":"1f63b","ðŸ˜¼":"1f63c","ðŸ˜½":"1f63d","ðŸ™€":"1f640","ðŸ˜¿":"1f63f","ðŸ˜¾":"1f63e","ðŸ™ˆ":"1f648","ðŸ™‰":"1f649","ðŸ™Š":"1f64a","ðŸ‘¶":"1f476","ðŸ§’":"1f9d2","ðŸ‘¦":"1f466","ðŸ‘§":"1f467","ðŸ§‘":"1f9d1","ðŸ‘¨":"1f468","ðŸ‘©":"1f469","ðŸ§“":"1f9d3","ðŸ‘´":"1f474","ðŸ‘µ":"1f475","ðŸ‘®":"1f46e","ðŸ•µ":"1f575","ðŸ’‚":"1f482","ðŸ‘·":"1f477","ðŸ¤´":"1f934","ðŸ‘¸":"1f478","ðŸ‘³":"1f473","ðŸ‘²":"1f472","ðŸ§•":"1f9d5","ðŸ§”":"1f9d4","ðŸ‘±":"1f471","ðŸ¤µ":"1f935","ðŸ‘°":"1f470","ðŸ¤°":"1f930","ðŸ¤±":"1f931","ðŸ‘¼":"1f47c","ðŸŽ…":"1f385","ðŸ¤¶":"1f936","ðŸ§™":"1f9d9","ðŸ§š":"1f9da","ðŸ§›":"1f9db","ðŸ§œ":"1f9dc","ðŸ§":"1f9dd","ðŸ§ž":"1f9de","ðŸ§Ÿ":"1f9df","ðŸ™":"1f64d","ðŸ™Ž":"1f64e","ðŸ™…":"1f645","ðŸ™†":"1f646","ðŸ’":"1f481","ðŸ™‹":"1f64b","ðŸ™‡":"1f647","ðŸ¤¦":"1f926","ðŸ¤·":"1f937","ðŸ’†":"1f486","ðŸ’‡":"1f487","ðŸš¶":"1f6b6","ðŸƒ":"1f3c3","ðŸ’ƒ":"1f483","ðŸ•º":"1f57a","ðŸ‘¯":"1f46f","ðŸ§–":"1f9d6","ðŸ§—":"1f9d7","ðŸ§˜":"1f9d8","ðŸ›€":"1f6c0","ðŸ›Œ":"1f6cc","ðŸ•´":"1f574","ðŸ—£":"1f5e3","ðŸ‘¤":"1f464","ðŸ‘¥":"1f465","ðŸ¤º":"1f93a","ðŸ‡":"1f3c7","â›·":"26f7","ðŸ‚":"1f3c2","ðŸŒ":"1f3cc","ðŸ„":"1f3c4","ðŸš£":"1f6a3","ðŸŠ":"1f3ca","â›¹":"26f9","ðŸ‹":"1f3cb","ðŸš´":"1f6b4","ðŸšµ":"1f6b5","ðŸŽ":"1f3ce","ðŸ":"1f3cd","ðŸ¤¸":"1f938","ðŸ¤¼":"1f93c","ðŸ¤½":"1f93d","ðŸ¤¾":"1f93e","ðŸ¤¹":"1f939","ðŸ‘«":"1f46b","ðŸ‘¬":"1f46c","ðŸ‘":"1f46d","ðŸ’":"1f48f","ðŸ’‘":"1f491","ðŸ‘ª":"1f46a","ðŸ¤³":"1f933","ðŸ’ª":"1f4aa","ðŸ‘ˆ":"1f448","ðŸ‘‰":"1f449","â˜":"261d","ðŸ‘†":"1f446","ðŸ–•":"1f595","ðŸ‘‡":"1f447","âœŒ":"270c","ðŸ¤ž":"1f91e","ðŸ––":"1f596","ðŸ¤˜":"1f918","ðŸ¤™":"1f919","ðŸ–":"1f590","âœ‹":"270b","ðŸ‘Œ":"1f44c","ðŸ‘":"1f44d","ðŸ‘Ž":"1f44e","âœŠ":"270a","ðŸ‘Š":"1f44a","ðŸ¤›":"1f91b","ðŸ¤œ":"1f91c","ðŸ¤š":"1f91a","ðŸ‘‹":"1f44b","ðŸ¤Ÿ":"1f91f","âœ":"270d","ðŸ‘":"1f44f","ðŸ‘":"1f450","ðŸ™Œ":"1f64c","ðŸ¤²":"1f932","ðŸ™":"1f64f","ðŸ¤":"1f91d","ðŸ’…":"1f485","ðŸ‘‚":"1f442","ðŸ‘ƒ":"1f443","ðŸ‘£":"1f463","ðŸ‘€":"1f440","ðŸ‘":"1f441","ðŸ§ ":"1f9e0","ðŸ‘…":"1f445","ðŸ‘„":"1f444","ðŸ’‹":"1f48b","ðŸ’˜":"1f498","â¤":"2764","ðŸ’“":"1f493","ðŸ’”":"1f494","ðŸ’•":"1f495","ðŸ’–":"1f496","ðŸ’—":"1f497","ðŸ’™":"1f499","ðŸ’š":"1f49a","ðŸ’›":"1f49b","ðŸ§¡":"1f9e1","ðŸ’œ":"1f49c","ðŸ–¤":"1f5a4","ðŸ’":"1f49d","ðŸ’ž":"1f49e","ðŸ’Ÿ":"1f49f","â£":"2763","ðŸ’Œ":"1f48c","ðŸ’¤":"1f4a4","ðŸ’¢":"1f4a2","ðŸ’£":"1f4a3","ðŸ’¥":"1f4a5","ðŸ’¦":"1f4a6","ðŸ’¨":"1f4a8","ðŸ’«":"1f4ab","ðŸ’¬":"1f4ac","ðŸ—¨":"1f5e8","ðŸ—¯":"1f5ef","ðŸ’":"1f4ad","ðŸ•³":"1f573","ðŸ‘“":"1f453","ðŸ•¶":"1f576","ðŸ‘”":"1f454","ðŸ‘•":"1f455","ðŸ‘–":"1f456","ðŸ§£":"1f9e3","ðŸ§¤":"1f9e4","ðŸ§¥":"1f9e5","ðŸ§¦":"1f9e6","ðŸ‘—":"1f457","ðŸ‘˜":"1f458","ðŸ‘™":"1f459","ðŸ‘š":"1f45a","ðŸ‘›":"1f45b","ðŸ‘œ":"1f45c","ðŸ‘":"1f45d","ðŸ›":"1f6cd","ðŸŽ’":"1f392","ðŸ‘ž":"1f45e","ðŸ‘Ÿ":"1f45f","ðŸ‘ ":"1f460","ðŸ‘¡":"1f461","ðŸ‘¢":"1f462","ðŸ‘‘":"1f451","ðŸ‘’":"1f452","ðŸŽ©":"1f3a9","ðŸŽ“":"1f393","ðŸ§¢":"1f9e2","â›‘":"26d1","ðŸ“¿":"1f4ff","ðŸ’„":"1f484","ðŸ’":"1f48d","ðŸ’Ž":"1f48e","ðŸµ":"1f435","ðŸ’":"1f412","ðŸ¦":"1f98d","ðŸ¶":"1f436","ðŸ•":"1f415","ðŸ©":"1f429","ðŸº":"1f43a","ðŸ¦Š":"1f98a","ðŸ±":"1f431","ðŸˆ":"1f408","ðŸ¦":"1f981","ðŸ¯":"1f42f","ðŸ…":"1f405","ðŸ†":"1f406","ðŸ´":"1f434","ðŸŽ":"1f40e","ðŸ¦„":"1f984","ðŸ¦“":"1f993","ðŸ¦Œ":"1f98c","ðŸ®":"1f42e","ðŸ‚":"1f402","ðŸƒ":"1f403","ðŸ„":"1f404","ðŸ·":"1f437","ðŸ–":"1f416","ðŸ—":"1f417","ðŸ½":"1f43d","ðŸ":"1f40f","ðŸ‘":"1f411","ðŸ":"1f410","ðŸª":"1f42a","ðŸ«":"1f42b","ðŸ¦’":"1f992","ðŸ˜":"1f418","ðŸ¦":"1f98f","ðŸ":"1f42d","ðŸ":"1f401","ðŸ€":"1f400","ðŸ¹":"1f439","ðŸ°":"1f430","ðŸ‡":"1f407","ðŸ¿":"1f43f","ðŸ¦”":"1f994","ðŸ¦‡":"1f987","ðŸ»":"1f43b","ðŸ¨":"1f428","ðŸ¼":"1f43c","ðŸ¾":"1f43e","ðŸ¦ƒ":"1f983","ðŸ”":"1f414","ðŸ“":"1f413","ðŸ£":"1f423","ðŸ¤":"1f424","ðŸ¥":"1f425","ðŸ¦":"1f426","ðŸ§":"1f427","ðŸ•Š":"1f54a","ðŸ¦…":"1f985","ðŸ¦†":"1f986","ðŸ¦‰":"1f989","ðŸ¸":"1f438","ðŸŠ":"1f40a","ðŸ¢":"1f422","ðŸ¦Ž":"1f98e","ðŸ":"1f40d","ðŸ²":"1f432","ðŸ‰":"1f409","ðŸ¦•":"1f995","ðŸ¦–":"1f996","ðŸ³":"1f433","ðŸ‹":"1f40b","ðŸ¬":"1f42c","ðŸŸ":"1f41f","ðŸ ":"1f420","ðŸ¡":"1f421","ðŸ¦ˆ":"1f988","ðŸ™":"1f419","ðŸš":"1f41a","ðŸ¦€":"1f980","ðŸ¦":"1f990","ðŸ¦‘":"1f991","ðŸŒ":"1f40c","ðŸ¦‹":"1f98b","ðŸ›":"1f41b","ðŸœ":"1f41c","ðŸ":"1f41d","ðŸž":"1f41e","ðŸ¦—":"1f997","ðŸ•·":"1f577","ðŸ•¸":"1f578","ðŸ¦‚":"1f982","ðŸ’":"1f490","ðŸŒ¸":"1f338","ðŸ’®":"1f4ae","ðŸµ":"1f3f5","ðŸŒ¹":"1f339","ðŸ¥€":"1f940","ðŸŒº":"1f33a","ðŸŒ»":"1f33b","ðŸŒ¼":"1f33c","ðŸŒ·":"1f337","ðŸŒ±":"1f331","ðŸŒ²":"1f332","ðŸŒ³":"1f333","ðŸŒ´":"1f334","ðŸŒµ":"1f335","ðŸŒ¾":"1f33e","ðŸŒ¿":"1f33f","â˜˜":"2618","ðŸ€":"1f340","ðŸ":"1f341","ðŸ‚":"1f342","ðŸƒ":"1f343","ðŸ‡":"1f347","ðŸˆ":"1f348","ðŸ‰":"1f349","ðŸŠ":"1f34a","ðŸ‹":"1f34b","ðŸŒ":"1f34c","ðŸ":"1f34d","ðŸŽ":"1f34e","ðŸ":"1f34f","ðŸ":"1f350","ðŸ‘":"1f351","ðŸ’":"1f352","ðŸ“":"1f353","ðŸ¥":"1f95d","ðŸ…":"1f345","ðŸ¥¥":"1f965","ðŸ¥‘":"1f951","ðŸ†":"1f346","ðŸ¥”":"1f954","ðŸ¥•":"1f955","ðŸŒ½":"1f33d","ðŸŒ¶":"1f336","ðŸ¥’":"1f952","ðŸ¥¦":"1f966","ðŸ„":"1f344","ðŸ¥œ":"1f95c","ðŸŒ°":"1f330","ðŸž":"1f35e","ðŸ¥":"1f950","ðŸ¥–":"1f956","ðŸ¥¨":"1f968","ðŸ¥ž":"1f95e","ðŸ§€":"1f9c0","ðŸ–":"1f356","ðŸ—":"1f357","ðŸ¥©":"1f969","ðŸ¥“":"1f953","ðŸ”":"1f354","ðŸŸ":"1f35f","ðŸ•":"1f355","ðŸŒ":"1f32d","ðŸ¥ª":"1f96a","ðŸŒ®":"1f32e","ðŸŒ¯":"1f32f","ðŸ¥™":"1f959","ðŸ¥š":"1f95a","ðŸ³":"1f373","ðŸ¥˜":"1f958","ðŸ²":"1f372","ðŸ¥£":"1f963","ðŸ¥—":"1f957","ðŸ¿":"1f37f","ðŸ¥«":"1f96b","ðŸ±":"1f371","ðŸ˜":"1f358","ðŸ™":"1f359","ðŸš":"1f35a","ðŸ›":"1f35b","ðŸœ":"1f35c","ðŸ":"1f35d","ðŸ ":"1f360","ðŸ¢":"1f362","ðŸ£":"1f363","ðŸ¤":"1f364","ðŸ¥":"1f365","ðŸ¡":"1f361","ðŸ¥Ÿ":"1f95f","ðŸ¥ ":"1f960","ðŸ¥¡":"1f961","ðŸ¦":"1f366","ðŸ§":"1f367","ðŸ¨":"1f368","ðŸ©":"1f369","ðŸª":"1f36a","ðŸŽ‚":"1f382","ðŸ°":"1f370","ðŸ¥§":"1f967","ðŸ«":"1f36b","ðŸ¬":"1f36c","ðŸ":"1f36d","ðŸ®":"1f36e","ðŸ¯":"1f36f","ðŸ¼":"1f37c","ðŸ¥›":"1f95b","â˜•":"2615","ðŸµ":"1f375","ðŸ¶":"1f376","ðŸ¾":"1f37e","ðŸ·":"1f377","ðŸ¸":"1f378","ðŸ¹":"1f379","ðŸº":"1f37a","ðŸ»":"1f37b","ðŸ¥‚":"1f942","ðŸ¥ƒ":"1f943","ðŸ¥¤":"1f964","ðŸ¥¢":"1f962","ðŸ½":"1f37d","ðŸ´":"1f374","ðŸ¥„":"1f944","ðŸ”ª":"1f52a","ðŸº":"1f3fa","ðŸŒ":"1f30d","ðŸŒŽ":"1f30e","ðŸŒ":"1f30f","ðŸŒ":"1f310","ðŸ—º":"1f5fa","ðŸ—¾":"1f5fe","ðŸ”":"1f3d4","â›°":"26f0","ðŸŒ‹":"1f30b","ðŸ—»":"1f5fb","ðŸ•":"1f3d5","ðŸ–":"1f3d6","ðŸœ":"1f3dc","ðŸ":"1f3dd","ðŸž":"1f3de","ðŸŸ":"1f3df","ðŸ›":"1f3db","ðŸ—":"1f3d7","ðŸ˜":"1f3d8","ðŸ™":"1f3d9","ðŸš":"1f3da","ðŸ ":"1f3e0","ðŸ¡":"1f3e1","ðŸ¢":"1f3e2","ðŸ£":"1f3e3","ðŸ¤":"1f3e4","ðŸ¥":"1f3e5","ðŸ¦":"1f3e6","ðŸ¨":"1f3e8","ðŸ©":"1f3e9","ðŸª":"1f3ea","ðŸ«":"1f3eb","ðŸ¬":"1f3ec","ðŸ":"1f3ed","ðŸ¯":"1f3ef","ðŸ°":"1f3f0","ðŸ’’":"1f492","ðŸ—¼":"1f5fc","ðŸ—½":"1f5fd","â›ª":"26ea","ðŸ•Œ":"1f54c","ðŸ•":"1f54d","â›©":"26e9","ðŸ•‹":"1f54b","â›²":"26f2","â›º":"26fa","ðŸŒ":"1f301","ðŸŒƒ":"1f303","ðŸŒ„":"1f304","ðŸŒ…":"1f305","ðŸŒ†":"1f306","ðŸŒ‡":"1f307","ðŸŒ‰":"1f309","â™¨":"2668","ðŸŒŒ":"1f30c","ðŸŽ ":"1f3a0","ðŸŽ¡":"1f3a1","ðŸŽ¢":"1f3a2","ðŸ’ˆ":"1f488","ðŸŽª":"1f3aa","ðŸŽ":"1f3ad","ðŸ–¼":"1f5bc","ðŸŽ¨":"1f3a8","ðŸŽ°":"1f3b0","ðŸš‚":"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","ðŸšš":"1f69a","ðŸš›":"1f69b","ðŸšœ":"1f69c","ðŸš²":"1f6b2","ðŸ›´":"1f6f4","ðŸ›µ":"1f6f5","ðŸš":"1f68f","ðŸ›£":"1f6e3","ðŸ›¤":"1f6e4","â›½":"26fd","ðŸš¨":"1f6a8","ðŸš¥":"1f6a5","ðŸš¦":"1f6a6","ðŸš§":"1f6a7","ðŸ›‘":"1f6d1","âš“":"2693","â›µ":"26f5","ðŸ›¶":"1f6f6","ðŸš¤":"1f6a4","ðŸ›³":"1f6f3","â›´":"26f4","ðŸ›¥":"1f6e5","ðŸš¢":"1f6a2","âœˆ":"2708","ðŸ›©":"1f6e9","ðŸ›«":"1f6eb","ðŸ›¬":"1f6ec","ðŸ’º":"1f4ba","ðŸš":"1f681","ðŸšŸ":"1f69f","ðŸš ":"1f6a0","ðŸš¡":"1f6a1","ðŸ›°":"1f6f0","ðŸš€":"1f680","ðŸ›¸":"1f6f8","ðŸ›Ž":"1f6ce","ðŸšª":"1f6aa","ðŸ›":"1f6cf","ðŸ›‹":"1f6cb","ðŸš½":"1f6bd","ðŸš¿":"1f6bf","ðŸ›":"1f6c1","âŒ›":"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","â":"2b50","ðŸŒŸ":"1f31f","ðŸŒ ":"1f320","â˜":"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","âœ¨":"2728","ðŸŽˆ":"1f388","ðŸŽ‰":"1f389","ðŸŽŠ":"1f38a","ðŸŽ‹":"1f38b","ðŸŽ":"1f38d","ðŸŽŽ":"1f38e","ðŸŽ":"1f38f","ðŸŽ":"1f390","ðŸŽ‘":"1f391","ðŸŽ€":"1f380","ðŸŽ":"1f381","ðŸŽ—":"1f397","ðŸŽŸ":"1f39f","ðŸŽ«":"1f3ab","ðŸŽ–":"1f396","ðŸ†":"1f3c6","ðŸ…":"1f3c5","ðŸ¥‡":"1f947","ðŸ¥ˆ":"1f948","ðŸ¥‰":"1f949","âš½":"26bd","âš¾":"26be","ðŸ€":"1f3c0","ðŸ":"1f3d0","ðŸˆ":"1f3c8","ðŸ‰":"1f3c9","ðŸŽ¾":"1f3be","ðŸŽ±":"1f3b1","ðŸŽ³":"1f3b3","ðŸ":"1f3cf","ðŸ‘":"1f3d1","ðŸ’":"1f3d2","ðŸ“":"1f3d3","ðŸ¸":"1f3f8","ðŸ¥Š":"1f94a","ðŸ¥‹":"1f94b","ðŸ¥…":"1f945","ðŸŽ¯":"1f3af","â›³":"26f3","â›¸":"26f8","ðŸŽ£":"1f3a3","ðŸŽ½":"1f3bd","ðŸŽ¿":"1f3bf","ðŸ›·":"1f6f7","ðŸ¥Œ":"1f94c","ðŸŽ®":"1f3ae","ðŸ•¹":"1f579","ðŸŽ²":"1f3b2","â™ ":"2660","â™¥":"2665","â™¦":"2666","â™£":"2663","ðŸƒ":"1f0cf","ðŸ€„":"1f004","ðŸŽ´":"1f3b4","ðŸ”‡":"1f507","ðŸ”ˆ":"1f508","ðŸ”‰":"1f509","ðŸ”Š":"1f50a","ðŸ“¢":"1f4e2","ðŸ“£":"1f4e3","ðŸ“¯":"1f4ef","ðŸ””":"1f514","ðŸ”•":"1f515","ðŸŽ¼":"1f3bc","ðŸŽµ":"1f3b5","ðŸŽ¶":"1f3b6","ðŸŽ™":"1f399","ðŸŽš":"1f39a","ðŸŽ›":"1f39b","ðŸŽ¤":"1f3a4","ðŸŽ§":"1f3a7","ðŸ“»":"1f4fb","ðŸŽ·":"1f3b7","ðŸŽ¸":"1f3b8","ðŸŽ¹":"1f3b9","ðŸŽº":"1f3ba","ðŸŽ»":"1f3bb","ðŸ¥":"1f941","ðŸ“±":"1f4f1","ðŸ“²":"1f4f2","â˜Ž":"260e","ðŸ“ž":"1f4de","ðŸ“Ÿ":"1f4df","ðŸ“ ":"1f4e0","ðŸ”‹":"1f50b","ðŸ”Œ":"1f50c","ðŸ’»":"1f4bb","ðŸ–¥":"1f5a5","ðŸ–¨":"1f5a8","âŒ¨":"2328","ðŸ–±":"1f5b1","ðŸ–²":"1f5b2","ðŸ’½":"1f4bd","ðŸ’¾":"1f4be","ðŸ’¿":"1f4bf","ðŸ“€":"1f4c0","ðŸŽ¥":"1f3a5","ðŸŽž":"1f39e","ðŸ“½":"1f4fd","ðŸŽ¬":"1f3ac","ðŸ“º":"1f4fa","ðŸ“·":"1f4f7","ðŸ“¸":"1f4f8","ðŸ“¹":"1f4f9","ðŸ“¼":"1f4fc","ðŸ”":"1f50d","ðŸ”Ž":"1f50e","ðŸ”¬":"1f52c","ðŸ”":"1f52d","ðŸ“¡":"1f4e1","ðŸ•¯":"1f56f","ðŸ’¡":"1f4a1","ðŸ”¦":"1f526","ðŸ®":"1f3ee","ðŸ“”":"1f4d4","ðŸ“•":"1f4d5","ðŸ“–":"1f4d6","ðŸ“—":"1f4d7","ðŸ“˜":"1f4d8","ðŸ“™":"1f4d9","ðŸ“š":"1f4da","ðŸ““":"1f4d3","ðŸ“’":"1f4d2","ðŸ“ƒ":"1f4c3","ðŸ“œ":"1f4dc","ðŸ“„":"1f4c4","ðŸ“°":"1f4f0","ðŸ—ž":"1f5de","ðŸ“‘":"1f4d1","ðŸ”–":"1f516","ðŸ·":"1f3f7","ðŸ’°":"1f4b0","ðŸ’´":"1f4b4","ðŸ’µ":"1f4b5","ðŸ’¶":"1f4b6","ðŸ’·":"1f4b7","ðŸ’¸":"1f4b8","ðŸ’³":"1f4b3","ðŸ’¹":"1f4b9","ðŸ’±":"1f4b1","ðŸ’²":"1f4b2","âœ‰":"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","â›":"26cf","âš’":"2692","ðŸ› ":"1f6e0","ðŸ—¡":"1f5e1","âš”":"2694","ðŸ”«":"1f52b","ðŸ¹":"1f3f9","ðŸ›¡":"1f6e1","ðŸ”§":"1f527","ðŸ”©":"1f529","âš™":"2699","ðŸ—œ":"1f5dc","âš—":"2697","âš–":"2696","ðŸ”—":"1f517","â›“":"26d3","ðŸ’‰":"1f489","ðŸ’Š":"1f48a","ðŸš¬":"1f6ac","âš°":"26b0","âš±":"26b1","ðŸ—¿":"1f5ff","ðŸ›¢":"1f6e2","ðŸ”®":"1f52e","ðŸ›’":"1f6d2","ðŸ§":"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","âš•":"2695","â™»":"267b","âšœ":"269c","ðŸ”±":"1f531","ðŸ“›":"1f4db","ðŸ”°":"1f530","â•":"2b55","âœ…":"2705","â˜‘":"2611","âœ”":"2714","âœ–":"2716","âŒ":"274c","âŽ":"274e","âž•":"2795","âž–":"2796","âž—":"2797","âž°":"27b0","âž¿":"27bf","ã€½":"303d","âœ³":"2733","âœ´":"2734","â‡":"2747","â€¼":"203c","â‰":"2049","â“":"2753","â”":"2754","â•":"2755","â—":"2757","ã€°":"3030","Â©":"a9","Â®":"ae","â„¢":"2122","ðŸ”Ÿ":"1f51f","ðŸ’¯":"1f4af","ðŸ” ":"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","â–ª":"25aa","â–«":"25ab","â—»":"25fb","â—¼":"25fc","â—½":"25fd","â—¾":"25fe","â¬›":"2b1b","â¬œ":"2b1c","ðŸ”¶":"1f536","ðŸ”·":"1f537","ðŸ”¸":"1f538","ðŸ”¹":"1f539","ðŸ”º":"1f53a","ðŸ”»":"1f53b","ðŸ’ ":"1f4a0","ðŸ”˜":"1f518","ðŸ”²":"1f532","ðŸ”³":"1f533","âšª":"26aa","âš«":"26ab","ðŸ”´":"1f534","ðŸ”µ":"1f535","ðŸ":"1f3c1","ðŸš©":"1f6a9","ðŸŽŒ":"1f38c","ðŸ´":"1f3f4","ðŸ³":"1f3f3","â˜ºï¸":"263a","â˜¹ï¸":"2639","â˜ ï¸":"2620","ðŸ‘¶ðŸ»":"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","ðŸ‘¨ðŸ»":"1f468-1f3fb","ðŸ‘¨ðŸ¼":"1f468-1f3fc","ðŸ‘¨ðŸ½":"1f468-1f3fd","ðŸ‘¨ðŸ¾":"1f468-1f3fe","ðŸ‘¨ðŸ¿":"1f468-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","ðŸ‘®ðŸ»":"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","ðŸ‘·ðŸ»":"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","ðŸ§”ðŸ»":"1f9d4-1f3fb","ðŸ§”ðŸ¼":"1f9d4-1f3fc","ðŸ§”ðŸ½":"1f9d4-1f3fd","ðŸ§”ðŸ¾":"1f9d4-1f3fe","ðŸ§”ðŸ¿":"1f9d4-1f3ff","ðŸ‘±ðŸ»":"1f471-1f3fb","ðŸ‘±ðŸ¼":"1f471-1f3fc","ðŸ‘±ðŸ½":"1f471-1f3fd","ðŸ‘±ðŸ¾":"1f471-1f3fe","ðŸ‘±ðŸ¿":"1f471-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","ðŸ§™ðŸ»":"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","ðŸ™ðŸ»":"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","ðŸ™‡ðŸ»":"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","ðŸ’†ðŸ»":"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","ðŸƒðŸ»":"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","ðŸ§–ðŸ»":"1f9d6-1f3fb","ðŸ§–ðŸ¼":"1f9d6-1f3fc","ðŸ§–ðŸ½":"1f9d6-1f3fd","ðŸ§–ðŸ¾":"1f9d6-1f3fe","ðŸ§–ðŸ¿":"1f9d6-1f3ff","ðŸ§—ðŸ»":"1f9d7-1f3fb","ðŸ§—ðŸ¼":"1f9d7-1f3fc","ðŸ§—ðŸ½":"1f9d7-1f3fd","ðŸ§—ðŸ¾":"1f9d7-1f3fe","ðŸ§—ðŸ¿":"1f9d7-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","ðŸ•´ï¸":"1f574","ðŸ•´ðŸ»":"1f574-1f3fb","ðŸ•´ðŸ¼":"1f574-1f3fc","ðŸ•´ðŸ½":"1f574-1f3fd","ðŸ•´ðŸ¾":"1f574-1f3fe","ðŸ•´ðŸ¿":"1f574-1f3ff","ðŸ—£ï¸":"1f5e3","ðŸ‡ðŸ»":"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","ðŸŽï¸":"1f3ce","ðŸï¸":"1f3cd","ðŸ¤¸ðŸ»":"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","ðŸ¤³ðŸ»":"1f933-1f3fb","ðŸ¤³ðŸ¼":"1f933-1f3fc","ðŸ¤³ðŸ½":"1f933-1f3fd","ðŸ¤³ðŸ¾":"1f933-1f3fe","ðŸ¤³ðŸ¿":"1f933-1f3ff","ðŸ’ªðŸ»":"1f4aa-1f3fb","ðŸ’ªðŸ¼":"1f4aa-1f3fc","ðŸ’ªðŸ½":"1f4aa-1f3fd","ðŸ’ªðŸ¾":"1f4aa-1f3fe","ðŸ’ªðŸ¿":"1f4aa-1f3ff","ðŸ‘ˆðŸ»":"1f448-1f3fb","ðŸ‘ˆðŸ¼":"1f448-1f3fc","ðŸ‘ˆðŸ½":"1f448-1f3fd","ðŸ‘ˆðŸ¾":"1f448-1f3fe","ðŸ‘ˆðŸ¿":"1f448-1f3ff","ðŸ‘‰ðŸ»":"1f449-1f3fb","ðŸ‘‰ðŸ¼":"1f449-1f3fc","ðŸ‘‰ðŸ½":"1f449-1f3fd","ðŸ‘‰ðŸ¾":"1f449-1f3fe","ðŸ‘‰ðŸ¿":"1f449-1f3ff","â˜ï¸":"261d","â˜ðŸ»":"261d-1f3fb","â˜ðŸ¼":"261d-1f3fc","â˜ðŸ½":"261d-1f3fd","â˜ðŸ¾":"261d-1f3fe","â˜ðŸ¿":"261d-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","âœŒï¸":"270c","âœŒðŸ»":"270c-1f3fb","âœŒðŸ¼":"270c-1f3fc","âœŒðŸ½":"270c-1f3fd","âœŒðŸ¾":"270c-1f3fe","âœŒðŸ¿":"270c-1f3ff","ðŸ¤žðŸ»":"1f91e-1f3fb","ðŸ¤žðŸ¼":"1f91e-1f3fc","ðŸ¤žðŸ½":"1f91e-1f3fd","ðŸ¤žðŸ¾":"1f91e-1f3fe","ðŸ¤žðŸ¿":"1f91e-1f3ff","ðŸ––ðŸ»":"1f596-1f3fb","ðŸ––ðŸ¼":"1f596-1f3fc","ðŸ––ðŸ½":"1f596-1f3fd","ðŸ––ðŸ¾":"1f596-1f3fe","ðŸ––ðŸ¿":"1f596-1f3ff","ðŸ¤˜ðŸ»":"1f918-1f3fb","ðŸ¤˜ðŸ¼":"1f918-1f3fc","ðŸ¤˜ðŸ½":"1f918-1f3fd","ðŸ¤˜ðŸ¾":"1f918-1f3fe","ðŸ¤˜ðŸ¿":"1f918-1f3ff","ðŸ¤™ðŸ»":"1f919-1f3fb","ðŸ¤™ðŸ¼":"1f919-1f3fc","ðŸ¤™ðŸ½":"1f919-1f3fd","ðŸ¤™ðŸ¾":"1f919-1f3fe","ðŸ¤™ðŸ¿":"1f919-1f3ff","ðŸ–ï¸":"1f590","ðŸ–ðŸ»":"1f590-1f3fb","ðŸ–ðŸ¼":"1f590-1f3fc","ðŸ–ðŸ½":"1f590-1f3fd","ðŸ–ðŸ¾":"1f590-1f3fe","ðŸ–ðŸ¿":"1f590-1f3ff","âœ‹ðŸ»":"270b-1f3fb","âœ‹ðŸ¼":"270b-1f3fc","âœ‹ðŸ½":"270b-1f3fd","âœ‹ðŸ¾":"270b-1f3fe","âœ‹ðŸ¿":"270b-1f3ff","ðŸ‘ŒðŸ»":"1f44c-1f3fb","ðŸ‘ŒðŸ¼":"1f44c-1f3fc","ðŸ‘ŒðŸ½":"1f44c-1f3fd","ðŸ‘ŒðŸ¾":"1f44c-1f3fe","ðŸ‘ŒðŸ¿":"1f44c-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","ðŸ¤šðŸ»":"1f91a-1f3fb","ðŸ¤šðŸ¼":"1f91a-1f3fc","ðŸ¤šðŸ½":"1f91a-1f3fd","ðŸ¤šðŸ¾":"1f91a-1f3fe","ðŸ¤šðŸ¿":"1f91a-1f3ff","ðŸ‘‹ðŸ»":"1f44b-1f3fb","ðŸ‘‹ðŸ¼":"1f44b-1f3fc","ðŸ‘‹ðŸ½":"1f44b-1f3fd","ðŸ‘‹ðŸ¾":"1f44b-1f3fe","ðŸ‘‹ðŸ¿":"1f44b-1f3ff","ðŸ¤ŸðŸ»":"1f91f-1f3fb","ðŸ¤ŸðŸ¼":"1f91f-1f3fc","ðŸ¤ŸðŸ½":"1f91f-1f3fd","ðŸ¤ŸðŸ¾":"1f91f-1f3fe","ðŸ¤ŸðŸ¿":"1f91f-1f3ff","âœï¸":"270d","âœðŸ»":"270d-1f3fb","âœðŸ¼":"270d-1f3fc","âœðŸ½":"270d-1f3fd","âœðŸ¾":"270d-1f3fe","âœðŸ¿":"270d-1f3ff","ðŸ‘ðŸ»":"1f44f-1f3fb","ðŸ‘ðŸ¼":"1f44f-1f3fc","ðŸ‘ðŸ½":"1f44f-1f3fd","ðŸ‘ðŸ¾":"1f44f-1f3fe","ðŸ‘ðŸ¿":"1f44f-1f3ff","ðŸ‘ðŸ»":"1f450-1f3fb","ðŸ‘ðŸ¼":"1f450-1f3fc","ðŸ‘ðŸ½":"1f450-1f3fd","ðŸ‘ðŸ¾":"1f450-1f3fe","ðŸ‘ðŸ¿":"1f450-1f3ff","ðŸ™ŒðŸ»":"1f64c-1f3fb","ðŸ™ŒðŸ¼":"1f64c-1f3fc","ðŸ™ŒðŸ½":"1f64c-1f3fd","ðŸ™ŒðŸ¾":"1f64c-1f3fe","ðŸ™ŒðŸ¿":"1f64c-1f3ff","ðŸ¤²ðŸ»":"1f932-1f3fb","ðŸ¤²ðŸ¼":"1f932-1f3fc","ðŸ¤²ðŸ½":"1f932-1f3fd","ðŸ¤²ðŸ¾":"1f932-1f3fe","ðŸ¤²ðŸ¿":"1f932-1f3ff","ðŸ™ðŸ»":"1f64f-1f3fb","ðŸ™ðŸ¼":"1f64f-1f3fc","ðŸ™ðŸ½":"1f64f-1f3fd","ðŸ™ðŸ¾":"1f64f-1f3fe","ðŸ™ðŸ¿":"1f64f-1f3ff","ðŸ’…ðŸ»":"1f485-1f3fb","ðŸ’…ðŸ¼":"1f485-1f3fc","ðŸ’…ðŸ½":"1f485-1f3fd","ðŸ’…ðŸ¾":"1f485-1f3fe","ðŸ’…ðŸ¿":"1f485-1f3ff","ðŸ‘‚ðŸ»":"1f442-1f3fb","ðŸ‘‚ðŸ¼":"1f442-1f3fc","ðŸ‘‚ðŸ½":"1f442-1f3fd","ðŸ‘‚ðŸ¾":"1f442-1f3fe","ðŸ‘‚ðŸ¿":"1f442-1f3ff","ðŸ‘ƒðŸ»":"1f443-1f3fb","ðŸ‘ƒðŸ¼":"1f443-1f3fc","ðŸ‘ƒðŸ½":"1f443-1f3fd","ðŸ‘ƒðŸ¾":"1f443-1f3fe","ðŸ‘ƒðŸ¿":"1f443-1f3ff","ðŸ‘ï¸":"1f441","â¤ï¸":"2764","â£ï¸":"2763","ðŸ—¨ï¸":"1f5e8","ðŸ—¯ï¸":"1f5ef","ðŸ•³ï¸":"1f573","ðŸ•¶ï¸":"1f576","ðŸ›ï¸":"1f6cd","â›‘ï¸":"26d1","ðŸ¿ï¸":"1f43f","ðŸ•Šï¸":"1f54a","ðŸ•·ï¸":"1f577","ðŸ•¸ï¸":"1f578","ðŸµï¸":"1f3f5","â˜˜ï¸":"2618","ðŸŒ¶ï¸":"1f336","ðŸ½ï¸":"1f37d","ðŸ—ºï¸":"1f5fa","ðŸ”ï¸":"1f3d4","â›°ï¸":"26f0","ðŸ•ï¸":"1f3d5","ðŸ–ï¸":"1f3d6","ðŸœï¸":"1f3dc","ðŸï¸":"1f3dd","ðŸžï¸":"1f3de","ðŸŸï¸":"1f3df","ðŸ›ï¸":"1f3db","ðŸ—ï¸":"1f3d7","ðŸ˜ï¸":"1f3d8","ðŸ™ï¸":"1f3d9","ðŸšï¸":"1f3da","â›©ï¸":"26e9","â™¨ï¸":"2668","ðŸ–¼ï¸":"1f5bc","ðŸ›£ï¸":"1f6e3","ðŸ›¤ï¸":"1f6e4","ðŸ›³ï¸":"1f6f3","â›´ï¸":"26f4","ðŸ›¥ï¸":"1f6e5","âœˆï¸":"2708","ðŸ›©ï¸":"1f6e9","ðŸ›°ï¸":"1f6f0","ðŸ›Žï¸":"1f6ce","ðŸ›ï¸":"1f6cf","ðŸ›‹ï¸":"1f6cb","â±ï¸":"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","ðŸŽ™ï¸":"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","âš—ï¸":"2697","âš–ï¸":"2696","â›“ï¸":"26d3","âš°ï¸":"26b0","âš±ï¸":"26b1","ðŸ›¢ï¸":"1f6e2","âš ï¸":"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","âš•ï¸":"2695","â™»ï¸":"267b","âšœï¸":"269c","â˜‘ï¸":"2611","âœ”ï¸":"2714","âœ–ï¸":"2716","ã€½ï¸":"303d","âœ³ï¸":"2733","âœ´ï¸":"2734","â‡ï¸":"2747","â€¼ï¸":"203c","â‰ï¸":"2049","ã€°ï¸":"3030","Â©ï¸":"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","â–ªï¸":"25aa","â–«ï¸":"25ab","â—»ï¸":"25fb","â—¼ï¸":"25fc","ðŸ³ï¸":"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","ðŸ‘¨â€âš•":"1f468-200d-2695-fe0f","ðŸ‘©â€âš•":"1f469-200d-2695-fe0f","ðŸ‘¨â€ðŸŽ“":"1f468-200d-1f393","ðŸ‘©â€ðŸŽ“":"1f469-200d-1f393","ðŸ‘¨â€ðŸ«":"1f468-200d-1f3eb","ðŸ‘©â€ðŸ«":"1f469-200d-1f3eb","ðŸ‘¨â€âš–":"1f468-200d-2696-fe0f","ðŸ‘©â€âš–":"1f469-200d-2696-fe0f","ðŸ‘¨â€ðŸŒ¾":"1f468-200d-1f33e","ðŸ‘©â€ðŸŒ¾":"1f469-200d-1f33e","ðŸ‘¨â€ðŸ³":"1f468-200d-1f373","ðŸ‘©â€ðŸ³":"1f469-200d-1f373","ðŸ‘¨â€ðŸ”§":"1f468-200d-1f527","ðŸ‘©â€ðŸ”§":"1f469-200d-1f527","ðŸ‘¨â€ðŸ":"1f468-200d-1f3ed","ðŸ‘©â€ðŸ":"1f469-200d-1f3ed","ðŸ‘¨â€ðŸ’¼":"1f468-200d-1f4bc","ðŸ‘©â€ðŸ’¼":"1f469-200d-1f4bc","ðŸ‘¨â€ðŸ”¬":"1f468-200d-1f52c","ðŸ‘©â€ðŸ”¬":"1f469-200d-1f52c","ðŸ‘¨â€ðŸ’»":"1f468-200d-1f4bb","ðŸ‘©â€ðŸ’»":"1f469-200d-1f4bb","ðŸ‘¨â€ðŸŽ¤":"1f468-200d-1f3a4","ðŸ‘©â€ðŸŽ¤":"1f469-200d-1f3a4","ðŸ‘¨â€ðŸŽ¨":"1f468-200d-1f3a8","ðŸ‘©â€ðŸŽ¨":"1f469-200d-1f3a8","ðŸ‘¨â€âœˆ":"1f468-200d-2708-fe0f","ðŸ‘©â€âœˆ":"1f469-200d-2708-fe0f","ðŸ‘¨â€ðŸš€":"1f468-200d-1f680","ðŸ‘©â€ðŸš€":"1f469-200d-1f680","ðŸ‘¨â€ðŸš’":"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","ðŸ‘±â€â™‚":"1f471-200d-2642-fe0f","ðŸ‘±â€â™€":"1f471-200d-2640-fe0f","ðŸ§™â€â™€":"1f9d9-200d-2640-fe0f","ðŸ§™â€â™‚":"1f9d9-200d-2642-fe0f","ðŸ§šâ€â™€":"1f9da-200d-2640-fe0f","ðŸ§šâ€â™‚":"1f9da-200d-2642-fe0f","ðŸ§›â€â™€":"1f9db-200d-2640-fe0f","ðŸ§›â€â™‚":"1f9db-200d-2642-fe0f","ðŸ§œâ€â™€":"1f9dc-200d-2640-fe0f","ðŸ§œâ€â™‚":"1f9dc-200d-2642-fe0f","ðŸ§â€â™€":"1f9dd-200d-2640-fe0f","ðŸ§â€â™‚":"1f9dd-200d-2642-fe0f","ðŸ§žâ€â™€":"1f9de-200d-2640-fe0f","ðŸ§žâ€â™‚":"1f9de-200d-2642-fe0f","ðŸ§Ÿâ€â™€":"1f9df-200d-2640-fe0f","ðŸ§Ÿâ€â™‚":"1f9df-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","ðŸ™‡â€â™‚":"1f647-200d-2642-fe0f","ðŸ™‡â€â™€":"1f647-200d-2640-fe0f","ðŸ¤¦â€â™‚":"1f926-200d-2642-fe0f","ðŸ¤¦â€â™€":"1f926-200d-2640-fe0f","ðŸ¤·â€â™‚":"1f937-200d-2642-fe0f","ðŸ¤·â€â™€":"1f937-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","ðŸƒâ€â™‚":"1f3c3-200d-2642-fe0f","ðŸƒâ€â™€":"1f3c3-200d-2640-fe0f","ðŸ‘¯â€â™‚":"1f46f-200d-2642-fe0f","ðŸ‘¯â€â™€":"1f46f-200d-2640-fe0f","ðŸ§–â€â™€":"1f9d6-200d-2640-fe0f","ðŸ§–â€â™‚":"1f9d6-200d-2642-fe0f","ðŸ§—â€â™€":"1f9d7-200d-2640-fe0f","ðŸ§—â€â™‚":"1f9d7-200d-2642-fe0f","ðŸ§˜â€â™€":"1f9d8-200d-2640-fe0f","ðŸ§˜â€â™‚":"1f9d8-200d-2642-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","ðŸ‘¨â€ðŸ‘¦":"1f468-200d-1f466","ðŸ‘¨â€ðŸ‘§":"1f468-200d-1f467","ðŸ‘©â€ðŸ‘¦":"1f469-200d-1f466","ðŸ‘©â€ðŸ‘§":"1f469-200d-1f467","ðŸ‘â€ðŸ—¨":"1f441-200d-1f5e8","#ï¸âƒ£":"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","ðŸ‘¨â€âš•ï¸":"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","ðŸ‘¨ðŸ»â€ðŸŽ“":"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","ðŸ‘¨ðŸ»â€ðŸ«":"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","ðŸ‘¨â€âš–ï¸":"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","ðŸ‘¨ðŸ»â€ðŸŒ¾":"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","ðŸ‘¨ðŸ»â€ðŸ³":"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","ðŸ‘¨ðŸ»â€ðŸ”§":"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","ðŸ‘¨ðŸ»â€ðŸ":"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","ðŸ‘¨ðŸ»â€ðŸ’¼":"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","ðŸ‘¨ðŸ»â€ðŸ”¬":"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","ðŸ‘¨ðŸ»â€ðŸ’»":"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","ðŸ‘¨ðŸ»â€ðŸŽ¤":"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","ðŸ‘¨ðŸ»â€ðŸŽ¨":"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","ðŸ‘¨â€âœˆï¸":"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","ðŸ‘¨ðŸ»â€ðŸš€":"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","ðŸ‘¨ðŸ»â€ðŸš’":"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","ðŸ‘±â€â™‚ï¸":"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","ðŸ‘±â€â™€ï¸":"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","ðŸ§™â€â™€ï¸":"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","ðŸ§™â€â™‚ï¸":"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","ðŸ§šâ€â™€ï¸":"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","ðŸ§šâ€â™‚ï¸":"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","ðŸ§›â€â™€ï¸":"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","ðŸ§›â€â™‚ï¸":"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","ðŸ§œâ€â™€ï¸":"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","ðŸ§œâ€â™‚ï¸":"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","ðŸ§â€â™€ï¸":"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","ðŸ§â€â™‚ï¸":"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","ðŸ§žâ€â™€ï¸":"1f9de-200d-2640-fe0f","ðŸ§žâ€â™‚ï¸":"1f9de-200d-2642-fe0f","ðŸ§Ÿâ€â™€ï¸":"1f9df-200d-2640-fe0f","ðŸ§Ÿâ€â™‚ï¸":"1f9df-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","ðŸ™‡â€â™‚ï¸":"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","ðŸ’†â€â™‚ï¸":"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","ðŸƒâ€â™‚ï¸":"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-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","ðŸ§–â€â™‚ï¸":"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","ðŸ§—â€â™€ï¸":"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","ðŸ§—â€â™‚ï¸":"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","ðŸ§˜â€â™€ï¸":"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","ðŸ§˜â€â™‚ï¸":"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","ðŸŒâ€â™‚ï¸":"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","ðŸ‘â€ðŸ—¨ï¸":"1f441-200d-1f5e8","ðŸ‘ï¸â€ðŸ—¨":"1f441-200d-1f5e8","ðŸ³ï¸â€ðŸŒˆ":"1f3f3-fe0f-200d-1f308","ðŸ‘¨ðŸ»â€âš•ï¸":"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","ðŸ‘¨ðŸ»â€âš–ï¸":"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","ðŸ‘¨ðŸ»â€âœˆï¸":"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","ðŸ‘±ðŸ»â€â™‚ï¸":"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","ðŸ‘±ðŸ»â€â™€ï¸":"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","ðŸ§™ðŸ»â€â™€ï¸":"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","ðŸ§™ðŸ»â€â™‚ï¸":"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","ðŸ§šðŸ»â€â™€ï¸":"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","ðŸ§šðŸ»â€â™‚ï¸":"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","ðŸ§›ðŸ»â€â™€ï¸":"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","ðŸ§›ðŸ»â€â™‚ï¸":"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","ðŸ§œðŸ»â€â™€ï¸":"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","ðŸ§œðŸ»â€â™‚ï¸":"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","ðŸ§ðŸ»â€â™€ï¸":"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","ðŸ§ðŸ»â€â™‚ï¸":"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","ðŸ™ðŸ»â€â™‚ï¸":"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","ðŸ™‡ðŸ»â€â™‚ï¸":"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","ðŸ’†ðŸ»â€â™‚ï¸":"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","ðŸƒðŸ»â€â™‚ï¸":"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-2640-fe0f","ðŸ§–ðŸ¼â€â™€ï¸":"1f9d6-1f3fc-200d-2640-fe0f","ðŸ§–ðŸ½â€â™€ï¸":"1f9d6-1f3fd-200d-2640-fe0f","ðŸ§–ðŸ¾â€â™€ï¸":"1f9d6-1f3fe-200d-2640-fe0f","ðŸ§–ðŸ¿â€â™€ï¸":"1f9d6-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","ðŸ§—ðŸ»â€â™€ï¸":"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","ðŸ§—ðŸ»â€â™‚ï¸":"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","ðŸ§˜ðŸ»â€â™€ï¸":"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","ðŸ§˜ðŸ»â€â™‚ï¸":"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","ðŸŒï¸â€â™‚ï¸":"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","ðŸ‘©â€â¤â€ðŸ‘¨":"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","ðŸ‘ï¸â€ðŸ—¨ï¸":"1f441-200d-1f5e8","ðŸ‘©â€â¤ï¸â€ðŸ‘¨":"1f469-200d-2764-fe0f-200d-1f468","ðŸ‘¨â€â¤ï¸â€ðŸ‘¨":"1f468-200d-2764-fe0f-200d-1f468","ðŸ‘©â€â¤ï¸â€ðŸ‘©":"1f469-200d-2764-fe0f-200d-1f469","ðŸ‘©â€â¤â€ðŸ’‹â€ðŸ‘¨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","ðŸ‘¨â€â¤â€ðŸ’‹â€ðŸ‘¨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","ðŸ‘©â€â¤â€ðŸ’‹â€ðŸ‘©":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","ðŸ‘¨â€ðŸ‘©â€ðŸ‘§â€ðŸ‘¦":"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"}
\ No newline at end of file
+{"ðŸ˜€":"1f600","ðŸ˜":"1f601","ðŸ˜‚":"1f602","ðŸ¤£":"1f923","ðŸ˜ƒ":"1f603","ðŸ˜„":"1f604","ðŸ˜…":"1f605","ðŸ˜†":"1f606","ðŸ˜‰":"1f609","ðŸ˜Š":"1f60a","ðŸ˜‹":"1f60b","ðŸ˜Ž":"1f60e","ðŸ˜":"1f60d","ðŸ˜˜":"1f618","ðŸ¥°":"1f970","ðŸ˜—":"1f617","ðŸ˜™":"1f619","ðŸ˜š":"1f61a","â˜º":"263a","ðŸ™‚":"1f642","ðŸ¤—":"1f917","ðŸ¤©":"1f929","ðŸ¤”":"1f914","ðŸ¤¨":"1f928","ðŸ˜":"1f610","ðŸ˜‘":"1f611","ðŸ˜¶":"1f636","ðŸ™„":"1f644","ðŸ˜":"1f60f","ðŸ˜£":"1f623","ðŸ˜¥":"1f625","ðŸ˜®":"1f62e","ðŸ¤":"1f910","ðŸ˜¯":"1f62f","ðŸ˜ª":"1f62a","ðŸ˜«":"1f62b","ðŸ˜´":"1f634","ðŸ˜Œ":"1f60c","ðŸ˜›":"1f61b","ðŸ˜œ":"1f61c","ðŸ˜":"1f61d","ðŸ¤¤":"1f924","ðŸ˜’":"1f612","ðŸ˜“":"1f613","ðŸ˜”":"1f614","ðŸ˜•":"1f615","ðŸ™ƒ":"1f643","ðŸ¤‘":"1f911","ðŸ˜²":"1f632","â˜¹":"2639","ðŸ™":"1f641","ðŸ˜–":"1f616","ðŸ˜ž":"1f61e","ðŸ˜Ÿ":"1f61f","ðŸ˜¤":"1f624","ðŸ˜¢":"1f622","ðŸ˜":"1f62d","ðŸ˜¦":"1f626","ðŸ˜§":"1f627","ðŸ˜¨":"1f628","ðŸ˜©":"1f629","ðŸ¤¯":"1f92f","ðŸ˜¬":"1f62c","ðŸ˜°":"1f630","ðŸ˜±":"1f631","ðŸ¥µ":"1f975","ðŸ¥¶":"1f976","ðŸ˜³":"1f633","ðŸ¤ª":"1f92a","ðŸ˜µ":"1f635","ðŸ˜¡":"1f621","ðŸ˜ ":"1f620","ðŸ¤¬":"1f92c","ðŸ˜·":"1f637","ðŸ¤’":"1f912","ðŸ¤•":"1f915","ðŸ¤¢":"1f922","ðŸ¤®":"1f92e","ðŸ¤§":"1f927","ðŸ˜‡":"1f607","ðŸ¤ ":"1f920","ðŸ¥³":"1f973","ðŸ¥´":"1f974","ðŸ¥º":"1f97a","ðŸ¤¥":"1f925","ðŸ¤«":"1f92b","ðŸ¤":"1f92d","ðŸ§":"1f9d0","ðŸ¤“":"1f913","ðŸ˜ˆ":"1f608","ðŸ‘¿":"1f47f","ðŸ¤¡":"1f921","ðŸ‘¹":"1f479","ðŸ‘º":"1f47a","ðŸ’€":"1f480","â˜ ":"2620","ðŸ‘»":"1f47b","ðŸ‘½":"1f47d","ðŸ‘¾":"1f47e","ðŸ¤–":"1f916","ðŸ’©":"1f4a9","ðŸ˜º":"1f63a","ðŸ˜¸":"1f638","ðŸ˜¹":"1f639","ðŸ˜»":"1f63b","ðŸ˜¼":"1f63c","ðŸ˜½":"1f63d","ðŸ™€":"1f640","ðŸ˜¿":"1f63f","ðŸ˜¾":"1f63e","ðŸ™ˆ":"1f648","ðŸ™‰":"1f649","ðŸ™Š":"1f64a","ðŸ»":"1f3fb","ðŸ¼":"1f3fc","ðŸ½":"1f3fd","ðŸ¾":"1f3fe","ðŸ¿":"1f3ff","ðŸ‘¶":"1f476","ðŸ§’":"1f9d2","ðŸ‘¦":"1f466","ðŸ‘§":"1f467","ðŸ§‘":"1f9d1","ðŸ‘¨":"1f468","ðŸ‘©":"1f469","ðŸ§“":"1f9d3","ðŸ‘´":"1f474","ðŸ‘µ":"1f475","ðŸ‘®":"1f46e","ðŸ•µ":"1f575","ðŸ’‚":"1f482","ðŸ‘·":"1f477","ðŸ¤´":"1f934","ðŸ‘¸":"1f478","ðŸ‘³":"1f473","ðŸ‘²":"1f472","ðŸ§•":"1f9d5","ðŸ§”":"1f9d4","ðŸ‘±":"1f471","ðŸ¤µ":"1f935","ðŸ‘°":"1f470","ðŸ¤°":"1f930","ðŸ¤±":"1f931","ðŸ‘¼":"1f47c","ðŸŽ…":"1f385","ðŸ¤¶":"1f936","ðŸ¦¸":"1f9b8","ðŸ¦¹":"1f9b9","ðŸ§™":"1f9d9","ðŸ§š":"1f9da","ðŸ§›":"1f9db","ðŸ§œ":"1f9dc","ðŸ§":"1f9dd","ðŸ§ž":"1f9de","ðŸ§Ÿ":"1f9df","ðŸ™":"1f64d","ðŸ™Ž":"1f64e","ðŸ™…":"1f645","ðŸ™†":"1f646","ðŸ’":"1f481","ðŸ™‹":"1f64b","ðŸ™‡":"1f647","ðŸ¤¦":"1f926","ðŸ¤·":"1f937","ðŸ’†":"1f486","ðŸ’‡":"1f487","ðŸš¶":"1f6b6","ðŸƒ":"1f3c3","ðŸ’ƒ":"1f483","ðŸ•º":"1f57a","ðŸ‘¯":"1f46f","ðŸ§–":"1f9d6","ðŸ§—":"1f9d7","ðŸ§˜":"1f9d8","ðŸ›€":"1f6c0","ðŸ›Œ":"1f6cc","ðŸ•´":"1f574","ðŸ—£":"1f5e3","ðŸ‘¤":"1f464","ðŸ‘¥":"1f465","ðŸ¤º":"1f93a","ðŸ‡":"1f3c7","â›·":"26f7","ðŸ‚":"1f3c2","ðŸŒ":"1f3cc","ðŸ„":"1f3c4","ðŸš£":"1f6a3","ðŸŠ":"1f3ca","â›¹":"26f9","ðŸ‹":"1f3cb","ðŸš´":"1f6b4","ðŸšµ":"1f6b5","ðŸŽ":"1f3ce","ðŸ":"1f3cd","ðŸ¤¸":"1f938","ðŸ¤¼":"1f93c","ðŸ¤½":"1f93d","ðŸ¤¾":"1f93e","ðŸ¤¹":"1f939","ðŸ‘«":"1f46b","ðŸ‘¬":"1f46c","ðŸ‘":"1f46d","ðŸ’":"1f48f","ðŸ’‘":"1f491","ðŸ‘ª":"1f46a","ðŸ¤³":"1f933","ðŸ’ª":"1f4aa","ðŸ¦µ":"1f9b5","ðŸ¦¶":"1f9b6","ðŸ‘ˆ":"1f448","ðŸ‘‰":"1f449","â˜":"261d","ðŸ‘†":"1f446","ðŸ–•":"1f595","ðŸ‘‡":"1f447","âœŒ":"270c","ðŸ¤ž":"1f91e","ðŸ––":"1f596","ðŸ¤˜":"1f918","ðŸ¤™":"1f919","ðŸ–":"1f590","âœ‹":"270b","ðŸ‘Œ":"1f44c","ðŸ‘":"1f44d","ðŸ‘Ž":"1f44e","âœŠ":"270a","ðŸ‘Š":"1f44a","ðŸ¤›":"1f91b","ðŸ¤œ":"1f91c","ðŸ¤š":"1f91a","ðŸ‘‹":"1f44b","ðŸ¤Ÿ":"1f91f","âœ":"270d","ðŸ‘":"1f44f","ðŸ‘":"1f450","ðŸ™Œ":"1f64c","ðŸ¤²":"1f932","ðŸ™":"1f64f","ðŸ¤":"1f91d","ðŸ’…":"1f485","ðŸ‘‚":"1f442","ðŸ‘ƒ":"1f443","ðŸ‘£":"1f463","ðŸ‘€":"1f440","ðŸ‘":"1f441","ðŸ§ ":"1f9e0","ðŸ¦´":"1f9b4","ðŸ¦·":"1f9b7","ðŸ‘…":"1f445","ðŸ‘„":"1f444","ðŸ’‹":"1f48b","ðŸ’˜":"1f498","â¤":"2764","ðŸ’“":"1f493","ðŸ’”":"1f494","ðŸ’•":"1f495","ðŸ’–":"1f496","ðŸ’—":"1f497","ðŸ’™":"1f499","ðŸ’š":"1f49a","ðŸ’›":"1f49b","ðŸ§¡":"1f9e1","ðŸ’œ":"1f49c","ðŸ–¤":"1f5a4","ðŸ’":"1f49d","ðŸ’ž":"1f49e","ðŸ’Ÿ":"1f49f","â£":"2763","ðŸ’Œ":"1f48c","ðŸ’¤":"1f4a4","ðŸ’¢":"1f4a2","ðŸ’£":"1f4a3","ðŸ’¥":"1f4a5","ðŸ’¦":"1f4a6","ðŸ’¨":"1f4a8","ðŸ’«":"1f4ab","ðŸ’¬":"1f4ac","ðŸ—¨":"1f5e8","ðŸ—¯":"1f5ef","ðŸ’":"1f4ad","ðŸ•³":"1f573","ðŸ‘“":"1f453","ðŸ•¶":"1f576","ðŸ¥½":"1f97d","ðŸ¥¼":"1f97c","ðŸ‘”":"1f454","ðŸ‘•":"1f455","ðŸ‘–":"1f456","ðŸ§£":"1f9e3","ðŸ§¤":"1f9e4","ðŸ§¥":"1f9e5","ðŸ§¦":"1f9e6","ðŸ‘—":"1f457","ðŸ‘˜":"1f458","ðŸ‘™":"1f459","ðŸ‘š":"1f45a","ðŸ‘›":"1f45b","ðŸ‘œ":"1f45c","ðŸ‘":"1f45d","ðŸ›":"1f6cd","ðŸŽ’":"1f392","ðŸ‘ž":"1f45e","ðŸ‘Ÿ":"1f45f","ðŸ¥¾":"1f97e","ðŸ¥¿":"1f97f","ðŸ‘ ":"1f460","ðŸ‘¡":"1f461","ðŸ‘¢":"1f462","ðŸ‘‘":"1f451","ðŸ‘’":"1f452","ðŸŽ©":"1f3a9","ðŸŽ“":"1f393","ðŸ§¢":"1f9e2","â›‘":"26d1","ðŸ“¿":"1f4ff","ðŸ’„":"1f484","ðŸ’":"1f48d","ðŸ’Ž":"1f48e","ðŸµ":"1f435","ðŸ’":"1f412","ðŸ¦":"1f98d","ðŸ¶":"1f436","ðŸ•":"1f415","ðŸ©":"1f429","ðŸº":"1f43a","ðŸ¦Š":"1f98a","ðŸ¦":"1f99d","ðŸ±":"1f431","ðŸˆ":"1f408","ðŸ¦":"1f981","ðŸ¯":"1f42f","ðŸ…":"1f405","ðŸ†":"1f406","ðŸ´":"1f434","ðŸŽ":"1f40e","ðŸ¦„":"1f984","ðŸ¦“":"1f993","ðŸ¦Œ":"1f98c","ðŸ®":"1f42e","ðŸ‚":"1f402","ðŸƒ":"1f403","ðŸ„":"1f404","ðŸ·":"1f437","ðŸ–":"1f416","ðŸ—":"1f417","ðŸ½":"1f43d","ðŸ":"1f40f","ðŸ‘":"1f411","ðŸ":"1f410","ðŸª":"1f42a","ðŸ«":"1f42b","ðŸ¦™":"1f999","ðŸ¦’":"1f992","ðŸ˜":"1f418","ðŸ¦":"1f98f","ðŸ¦›":"1f99b","ðŸ":"1f42d","ðŸ":"1f401","ðŸ€":"1f400","ðŸ¹":"1f439","ðŸ°":"1f430","ðŸ‡":"1f407","ðŸ¿":"1f43f","ðŸ¦”":"1f994","ðŸ¦‡":"1f987","ðŸ»":"1f43b","ðŸ¨":"1f428","ðŸ¼":"1f43c","ðŸ¦˜":"1f998","ðŸ¦¡":"1f9a1","ðŸ¾":"1f43e","ðŸ¦ƒ":"1f983","ðŸ”":"1f414","ðŸ“":"1f413","ðŸ£":"1f423","ðŸ¤":"1f424","ðŸ¥":"1f425","ðŸ¦":"1f426","ðŸ§":"1f427","ðŸ•Š":"1f54a","ðŸ¦…":"1f985","ðŸ¦†":"1f986","ðŸ¦¢":"1f9a2","ðŸ¦‰":"1f989","ðŸ¦š":"1f99a","ðŸ¦œ":"1f99c","ðŸ¸":"1f438","ðŸŠ":"1f40a","ðŸ¢":"1f422","ðŸ¦Ž":"1f98e","ðŸ":"1f40d","ðŸ²":"1f432","ðŸ‰":"1f409","ðŸ¦•":"1f995","ðŸ¦–":"1f996","ðŸ³":"1f433","ðŸ‹":"1f40b","ðŸ¬":"1f42c","ðŸŸ":"1f41f","ðŸ ":"1f420","ðŸ¡":"1f421","ðŸ¦ˆ":"1f988","ðŸ™":"1f419","ðŸš":"1f41a","ðŸ¦€":"1f980","ðŸ¦ž":"1f99e","ðŸ¦":"1f990","ðŸ¦‘":"1f991","ðŸŒ":"1f40c","ðŸ¦‹":"1f98b","ðŸ›":"1f41b","ðŸœ":"1f41c","ðŸ":"1f41d","ðŸž":"1f41e","ðŸ¦—":"1f997","ðŸ•·":"1f577","ðŸ•¸":"1f578","ðŸ¦‚":"1f982","ðŸ¦Ÿ":"1f99f","ðŸ¦ ":"1f9a0","ðŸ’":"1f490","ðŸŒ¸":"1f338","ðŸ’®":"1f4ae","ðŸµ":"1f3f5","ðŸŒ¹":"1f339","ðŸ¥€":"1f940","ðŸŒº":"1f33a","ðŸŒ»":"1f33b","ðŸŒ¼":"1f33c","ðŸŒ·":"1f337","ðŸŒ±":"1f331","ðŸŒ²":"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","ðŸ¥":"1f95d","ðŸ…":"1f345","ðŸ¥¥":"1f965","ðŸ¥‘":"1f951","ðŸ†":"1f346","ðŸ¥”":"1f954","ðŸ¥•":"1f955","ðŸŒ½":"1f33d","ðŸŒ¶":"1f336","ðŸ¥’":"1f952","ðŸ¥¬":"1f96c","ðŸ¥¦":"1f966","ðŸ„":"1f344","ðŸ¥œ":"1f95c","ðŸŒ°":"1f330","ðŸž":"1f35e","ðŸ¥":"1f950","ðŸ¥–":"1f956","ðŸ¥¨":"1f968","ðŸ¥¯":"1f96f","ðŸ¥ž":"1f95e","ðŸ§€":"1f9c0","ðŸ–":"1f356","ðŸ—":"1f357","ðŸ¥©":"1f969","ðŸ¥“":"1f953","ðŸ”":"1f354","ðŸŸ":"1f35f","ðŸ•":"1f355","ðŸŒ":"1f32d","ðŸ¥ª":"1f96a","ðŸŒ®":"1f32e","ðŸŒ¯":"1f32f","ðŸ¥™":"1f959","ðŸ¥š":"1f95a","ðŸ³":"1f373","ðŸ¥˜":"1f958","ðŸ²":"1f372","ðŸ¥£":"1f963","ðŸ¥—":"1f957","ðŸ¿":"1f37f","ðŸ§‚":"1f9c2","ðŸ¥«":"1f96b","ðŸ±":"1f371","ðŸ˜":"1f358","ðŸ™":"1f359","ðŸš":"1f35a","ðŸ›":"1f35b","ðŸœ":"1f35c","ðŸ":"1f35d","ðŸ ":"1f360","ðŸ¢":"1f362","ðŸ£":"1f363","ðŸ¤":"1f364","ðŸ¥":"1f365","ðŸ¥®":"1f96e","ðŸ¡":"1f361","ðŸ¥Ÿ":"1f95f","ðŸ¥ ":"1f960","ðŸ¥¡":"1f961","ðŸ¦":"1f366","ðŸ§":"1f367","ðŸ¨":"1f368","ðŸ©":"1f369","ðŸª":"1f36a","ðŸŽ‚":"1f382","ðŸ°":"1f370","ðŸ§":"1f9c1","ðŸ¥§":"1f967","ðŸ«":"1f36b","ðŸ¬":"1f36c","ðŸ":"1f36d","ðŸ®":"1f36e","ðŸ¯":"1f36f","ðŸ¼":"1f37c","ðŸ¥›":"1f95b","â˜•":"2615","ðŸµ":"1f375","ðŸ¶":"1f376","ðŸ¾":"1f37e","ðŸ·":"1f377","ðŸ¸":"1f378","ðŸ¹":"1f379","ðŸº":"1f37a","ðŸ»":"1f37b","ðŸ¥‚":"1f942","ðŸ¥ƒ":"1f943","ðŸ¥¤":"1f964","ðŸ¥¢":"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","ðŸ˜":"1f3d8","ðŸš":"1f3da","ðŸ ":"1f3e0","ðŸ¡":"1f3e1","ðŸ¢":"1f3e2","ðŸ£":"1f3e3","ðŸ¤":"1f3e4","ðŸ¥":"1f3e5","ðŸ¦":"1f3e6","ðŸ¨":"1f3e8","ðŸ©":"1f3e9","ðŸª":"1f3ea","ðŸ«":"1f3eb","ðŸ¬":"1f3ec","ðŸ":"1f3ed","ðŸ¯":"1f3ef","ðŸ°":"1f3f0","ðŸ’’":"1f492","ðŸ—¼":"1f5fc","ðŸ—½":"1f5fd","â›ª":"26ea","ðŸ•Œ":"1f54c","ðŸ•":"1f54d","â›©":"26e9","ðŸ•‹":"1f54b","â›²":"26f2","â›º":"26fa","ðŸŒ":"1f301","ðŸŒƒ":"1f303","ðŸ™":"1f3d9","ðŸŒ„":"1f304","ðŸŒ…":"1f305","ðŸŒ†":"1f306","ðŸŒ‡":"1f307","ðŸŒ‰":"1f309","â™¨":"2668","ðŸŒŒ":"1f30c","ðŸŽ ":"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","ðŸšš":"1f69a","ðŸš›":"1f69b","ðŸšœ":"1f69c","ðŸš²":"1f6b2","ðŸ›´":"1f6f4","ðŸ›¹":"1f6f9","ðŸ›µ":"1f6f5","ðŸš":"1f68f","ðŸ›£":"1f6e3","ðŸ›¤":"1f6e4","ðŸ›¢":"1f6e2","â›½":"26fd","ðŸš¨":"1f6a8","ðŸš¥":"1f6a5","ðŸš¦":"1f6a6","ðŸ›‘":"1f6d1","ðŸš§":"1f6a7","âš“":"2693","â›µ":"26f5","ðŸ›¶":"1f6f6","ðŸš¤":"1f6a4","ðŸ›³":"1f6f3","â›´":"26f4","ðŸ›¥":"1f6e5","ðŸš¢":"1f6a2","âœˆ":"2708","ðŸ›©":"1f6e9","ðŸ›«":"1f6eb","ðŸ›¬":"1f6ec","ðŸ’º":"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","â":"2b50","ðŸŒŸ":"1f31f","ðŸŒ ":"1f320","â˜":"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","ðŸŽ½":"1f3bd","ðŸŽ¿":"1f3bf","ðŸ›·":"1f6f7","ðŸ¥Œ":"1f94c","ðŸŽ¯":"1f3af","ðŸŽ±":"1f3b1","ðŸ”®":"1f52e","ðŸ§¿":"1f9ff","ðŸŽ®":"1f3ae","ðŸ•¹":"1f579","ðŸŽ°":"1f3b0","ðŸŽ²":"1f3b2","ðŸ§©":"1f9e9","ðŸ§¸":"1f9f8","â™ ":"2660","â™¥":"2665","â™¦":"2666","â™£":"2663","â™Ÿ":"265f","ðŸƒ":"1f0cf","ðŸ€„":"1f004","ðŸŽ´":"1f3b4","ðŸŽ":"1f3ad","ðŸ–¼":"1f5bc","ðŸŽ¨":"1f3a8","ðŸ§µ":"1f9f5","ðŸ§¶":"1f9f6","ðŸ”‡":"1f507","ðŸ”ˆ":"1f508","ðŸ”‰":"1f509","ðŸ”Š":"1f50a","ðŸ“¢":"1f4e2","ðŸ“£":"1f4e3","ðŸ“¯":"1f4ef","ðŸ””":"1f514","ðŸ”•":"1f515","ðŸŽ¼":"1f3bc","ðŸŽµ":"1f3b5","ðŸŽ¶":"1f3b6","ðŸŽ™":"1f399","ðŸŽš":"1f39a","ðŸŽ›":"1f39b","ðŸŽ¤":"1f3a4","ðŸŽ§":"1f3a7","ðŸ“»":"1f4fb","ðŸŽ·":"1f3b7","ðŸŽ¸":"1f3b8","ðŸŽ¹":"1f3b9","ðŸŽº":"1f3ba","ðŸŽ»":"1f3bb","ðŸ¥":"1f941","ðŸ“±":"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","ðŸ“”":"1f4d4","ðŸ“•":"1f4d5","ðŸ“–":"1f4d6","ðŸ“—":"1f4d7","ðŸ“˜":"1f4d8","ðŸ“™":"1f4d9","ðŸ“š":"1f4da","ðŸ““":"1f4d3","ðŸ“’":"1f4d2","ðŸ“ƒ":"1f4c3","ðŸ“œ":"1f4dc","ðŸ“„":"1f4c4","ðŸ“°":"1f4f0","ðŸ—ž":"1f5de","ðŸ“‘":"1f4d1","ðŸ”–":"1f516","ðŸ·":"1f3f7","ðŸ’°":"1f4b0","ðŸ’´":"1f4b4","ðŸ’µ":"1f4b5","ðŸ’¶":"1f4b6","ðŸ’·":"1f4b7","ðŸ’¸":"1f4b8","ðŸ’³":"1f4b3","ðŸ§¾":"1f9fe","ðŸ’¹":"1f4b9","ðŸ’±":"1f4b1","ðŸ’²":"1f4b2","âœ‰":"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","â›":"26cf","âš’":"2692","ðŸ› ":"1f6e0","ðŸ—¡":"1f5e1","âš”":"2694","ðŸ”«":"1f52b","ðŸ¹":"1f3f9","ðŸ›¡":"1f6e1","ðŸ”§":"1f527","ðŸ”©":"1f529","âš™":"2699","ðŸ—œ":"1f5dc","âš–":"2696","ðŸ”—":"1f517","â›“":"26d3","ðŸ§°":"1f9f0","ðŸ§²":"1f9f2","âš—":"2697","ðŸ§ª":"1f9ea","ðŸ§«":"1f9eb","ðŸ§¬":"1f9ec","ðŸ”¬":"1f52c","ðŸ”":"1f52d","ðŸ“¡":"1f4e1","ðŸ’‰":"1f489","ðŸ’Š":"1f48a","ðŸšª":"1f6aa","ðŸ›":"1f6cf","ðŸ›‹":"1f6cb","ðŸš½":"1f6bd","ðŸš¿":"1f6bf","ðŸ›":"1f6c1","ðŸ§´":"1f9f4","ðŸ§·":"1f9f7","ðŸ§¹":"1f9f9","ðŸ§º":"1f9fa","ðŸ§»":"1f9fb","ðŸ§¼":"1f9fc","ðŸ§½":"1f9fd","ðŸ§¯":"1f9ef","ðŸ›’":"1f6d2","ðŸš¬":"1f6ac","âš°":"26b0","âš±":"26b1","ðŸ—¿":"1f5ff","ðŸ§":"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","âš•":"2695","â™¾":"267e","â™»":"267b","âšœ":"269c","ðŸ”±":"1f531","ðŸ“›":"1f4db","ðŸ”°":"1f530","â•":"2b55","âœ…":"2705","â˜‘":"2611","âœ”":"2714","âœ–":"2716","âŒ":"274c","âŽ":"274e","âž•":"2795","âž–":"2796","âž—":"2797","âž°":"27b0","âž¿":"27bf","ã€½":"303d","âœ³":"2733","âœ´":"2734","â‡":"2747","â€¼":"203c","â‰":"2049","â“":"2753","â”":"2754","â•":"2755","â—":"2757","ã€°":"3030","Â©":"a9","Â®":"ae","â„¢":"2122","ðŸ”Ÿ":"1f51f","ðŸ’¯":"1f4af","ðŸ” ":"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","â–ª":"25aa","â–«":"25ab","â—»":"25fb","â—¼":"25fc","â—½":"25fd","â—¾":"25fe","â¬›":"2b1b","â¬œ":"2b1c","ðŸ”¶":"1f536","ðŸ”·":"1f537","ðŸ”¸":"1f538","ðŸ”¹":"1f539","ðŸ”º":"1f53a","ðŸ”»":"1f53b","ðŸ’ ":"1f4a0","ðŸ”˜":"1f518","ðŸ”²":"1f532","ðŸ”³":"1f533","âšª":"26aa","âš«":"26ab","ðŸ”´":"1f534","ðŸ”µ":"1f535","ðŸ":"1f3c1","ðŸš©":"1f6a9","ðŸŽŒ":"1f38c","ðŸ´":"1f3f4","ðŸ³":"1f3f3","â˜ºï¸":"263a","â˜¹ï¸":"2639","â˜ ï¸":"2620","ðŸ‘¶ðŸ»":"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","ðŸ‘¨ðŸ»":"1f468-1f3fb","ðŸ‘¨ðŸ¼":"1f468-1f3fc","ðŸ‘¨ðŸ½":"1f468-1f3fd","ðŸ‘¨ðŸ¾":"1f468-1f3fe","ðŸ‘¨ðŸ¿":"1f468-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","ðŸ‘®ðŸ»":"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","ðŸ‘·ðŸ»":"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","ðŸ§”ðŸ»":"1f9d4-1f3fb","ðŸ§”ðŸ¼":"1f9d4-1f3fc","ðŸ§”ðŸ½":"1f9d4-1f3fd","ðŸ§”ðŸ¾":"1f9d4-1f3fe","ðŸ§”ðŸ¿":"1f9d4-1f3ff","ðŸ‘±ðŸ»":"1f471-1f3fb","ðŸ‘±ðŸ¼":"1f471-1f3fc","ðŸ‘±ðŸ½":"1f471-1f3fd","ðŸ‘±ðŸ¾":"1f471-1f3fe","ðŸ‘±ðŸ¿":"1f471-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","ðŸ™ðŸ»":"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","ðŸ™‡ðŸ»":"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","ðŸ’†ðŸ»":"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","ðŸƒðŸ»":"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","ðŸ§–ðŸ»":"1f9d6-1f3fb","ðŸ§–ðŸ¼":"1f9d6-1f3fc","ðŸ§–ðŸ½":"1f9d6-1f3fd","ðŸ§–ðŸ¾":"1f9d6-1f3fe","ðŸ§–ðŸ¿":"1f9d6-1f3ff","ðŸ§—ðŸ»":"1f9d7-1f3fb","ðŸ§—ðŸ¼":"1f9d7-1f3fc","ðŸ§—ðŸ½":"1f9d7-1f3fd","ðŸ§—ðŸ¾":"1f9d7-1f3fe","ðŸ§—ðŸ¿":"1f9d7-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","ðŸ•´ï¸":"1f574","ðŸ•´ðŸ»":"1f574-1f3fb","ðŸ•´ðŸ¼":"1f574-1f3fc","ðŸ•´ðŸ½":"1f574-1f3fd","ðŸ•´ðŸ¾":"1f574-1f3fe","ðŸ•´ðŸ¿":"1f574-1f3ff","ðŸ—£ï¸":"1f5e3","ðŸ‡ðŸ»":"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","ðŸŽï¸":"1f3ce","ðŸï¸":"1f3cd","ðŸ¤¸ðŸ»":"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","ðŸ¤³ðŸ»":"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","ðŸ‘ˆðŸ»":"1f448-1f3fb","ðŸ‘ˆðŸ¼":"1f448-1f3fc","ðŸ‘ˆðŸ½":"1f448-1f3fd","ðŸ‘ˆðŸ¾":"1f448-1f3fe","ðŸ‘ˆðŸ¿":"1f448-1f3ff","ðŸ‘‰ðŸ»":"1f449-1f3fb","ðŸ‘‰ðŸ¼":"1f449-1f3fc","ðŸ‘‰ðŸ½":"1f449-1f3fd","ðŸ‘‰ðŸ¾":"1f449-1f3fe","ðŸ‘‰ðŸ¿":"1f449-1f3ff","â˜ï¸":"261d","â˜ðŸ»":"261d-1f3fb","â˜ðŸ¼":"261d-1f3fc","â˜ðŸ½":"261d-1f3fd","â˜ðŸ¾":"261d-1f3fe","â˜ðŸ¿":"261d-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","âœŒï¸":"270c","âœŒðŸ»":"270c-1f3fb","âœŒðŸ¼":"270c-1f3fc","âœŒðŸ½":"270c-1f3fd","âœŒðŸ¾":"270c-1f3fe","âœŒðŸ¿":"270c-1f3ff","ðŸ¤žðŸ»":"1f91e-1f3fb","ðŸ¤žðŸ¼":"1f91e-1f3fc","ðŸ¤žðŸ½":"1f91e-1f3fd","ðŸ¤žðŸ¾":"1f91e-1f3fe","ðŸ¤žðŸ¿":"1f91e-1f3ff","ðŸ––ðŸ»":"1f596-1f3fb","ðŸ––ðŸ¼":"1f596-1f3fc","ðŸ––ðŸ½":"1f596-1f3fd","ðŸ––ðŸ¾":"1f596-1f3fe","ðŸ––ðŸ¿":"1f596-1f3ff","ðŸ¤˜ðŸ»":"1f918-1f3fb","ðŸ¤˜ðŸ¼":"1f918-1f3fc","ðŸ¤˜ðŸ½":"1f918-1f3fd","ðŸ¤˜ðŸ¾":"1f918-1f3fe","ðŸ¤˜ðŸ¿":"1f918-1f3ff","ðŸ¤™ðŸ»":"1f919-1f3fb","ðŸ¤™ðŸ¼":"1f919-1f3fc","ðŸ¤™ðŸ½":"1f919-1f3fd","ðŸ¤™ðŸ¾":"1f919-1f3fe","ðŸ¤™ðŸ¿":"1f919-1f3ff","ðŸ–ï¸":"1f590","ðŸ–ðŸ»":"1f590-1f3fb","ðŸ–ðŸ¼":"1f590-1f3fc","ðŸ–ðŸ½":"1f590-1f3fd","ðŸ–ðŸ¾":"1f590-1f3fe","ðŸ–ðŸ¿":"1f590-1f3ff","âœ‹ðŸ»":"270b-1f3fb","âœ‹ðŸ¼":"270b-1f3fc","âœ‹ðŸ½":"270b-1f3fd","âœ‹ðŸ¾":"270b-1f3fe","âœ‹ðŸ¿":"270b-1f3ff","ðŸ‘ŒðŸ»":"1f44c-1f3fb","ðŸ‘ŒðŸ¼":"1f44c-1f3fc","ðŸ‘ŒðŸ½":"1f44c-1f3fd","ðŸ‘ŒðŸ¾":"1f44c-1f3fe","ðŸ‘ŒðŸ¿":"1f44c-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","ðŸ¤šðŸ»":"1f91a-1f3fb","ðŸ¤šðŸ¼":"1f91a-1f3fc","ðŸ¤šðŸ½":"1f91a-1f3fd","ðŸ¤šðŸ¾":"1f91a-1f3fe","ðŸ¤šðŸ¿":"1f91a-1f3ff","ðŸ‘‹ðŸ»":"1f44b-1f3fb","ðŸ‘‹ðŸ¼":"1f44b-1f3fc","ðŸ‘‹ðŸ½":"1f44b-1f3fd","ðŸ‘‹ðŸ¾":"1f44b-1f3fe","ðŸ‘‹ðŸ¿":"1f44b-1f3ff","ðŸ¤ŸðŸ»":"1f91f-1f3fb","ðŸ¤ŸðŸ¼":"1f91f-1f3fc","ðŸ¤ŸðŸ½":"1f91f-1f3fd","ðŸ¤ŸðŸ¾":"1f91f-1f3fe","ðŸ¤ŸðŸ¿":"1f91f-1f3ff","âœï¸":"270d","âœðŸ»":"270d-1f3fb","âœðŸ¼":"270d-1f3fc","âœðŸ½":"270d-1f3fd","âœðŸ¾":"270d-1f3fe","âœðŸ¿":"270d-1f3ff","ðŸ‘ðŸ»":"1f44f-1f3fb","ðŸ‘ðŸ¼":"1f44f-1f3fc","ðŸ‘ðŸ½":"1f44f-1f3fd","ðŸ‘ðŸ¾":"1f44f-1f3fe","ðŸ‘ðŸ¿":"1f44f-1f3ff","ðŸ‘ðŸ»":"1f450-1f3fb","ðŸ‘ðŸ¼":"1f450-1f3fc","ðŸ‘ðŸ½":"1f450-1f3fd","ðŸ‘ðŸ¾":"1f450-1f3fe","ðŸ‘ðŸ¿":"1f450-1f3ff","ðŸ™ŒðŸ»":"1f64c-1f3fb","ðŸ™ŒðŸ¼":"1f64c-1f3fc","ðŸ™ŒðŸ½":"1f64c-1f3fd","ðŸ™ŒðŸ¾":"1f64c-1f3fe","ðŸ™ŒðŸ¿":"1f64c-1f3ff","ðŸ¤²ðŸ»":"1f932-1f3fb","ðŸ¤²ðŸ¼":"1f932-1f3fc","ðŸ¤²ðŸ½":"1f932-1f3fd","ðŸ¤²ðŸ¾":"1f932-1f3fe","ðŸ¤²ðŸ¿":"1f932-1f3ff","ðŸ™ðŸ»":"1f64f-1f3fb","ðŸ™ðŸ¼":"1f64f-1f3fc","ðŸ™ðŸ½":"1f64f-1f3fd","ðŸ™ðŸ¾":"1f64f-1f3fe","ðŸ™ðŸ¿":"1f64f-1f3ff","ðŸ’…ðŸ»":"1f485-1f3fb","ðŸ’…ðŸ¼":"1f485-1f3fc","ðŸ’…ðŸ½":"1f485-1f3fd","ðŸ’…ðŸ¾":"1f485-1f3fe","ðŸ’…ðŸ¿":"1f485-1f3ff","ðŸ‘‚ðŸ»":"1f442-1f3fb","ðŸ‘‚ðŸ¼":"1f442-1f3fc","ðŸ‘‚ðŸ½":"1f442-1f3fd","ðŸ‘‚ðŸ¾":"1f442-1f3fe","ðŸ‘‚ðŸ¿":"1f442-1f3ff","ðŸ‘ƒðŸ»":"1f443-1f3fb","ðŸ‘ƒðŸ¼":"1f443-1f3fc","ðŸ‘ƒðŸ½":"1f443-1f3fd","ðŸ‘ƒðŸ¾":"1f443-1f3fe","ðŸ‘ƒðŸ¿":"1f443-1f3ff","ðŸ‘ï¸":"1f441","â¤ï¸":"2764","â£ï¸":"2763","ðŸ—¨ï¸":"1f5e8","ðŸ—¯ï¸":"1f5ef","ðŸ•³ï¸":"1f573","ðŸ•¶ï¸":"1f576","ðŸ›ï¸":"1f6cd","â›‘ï¸":"26d1","ðŸ¿ï¸":"1f43f","ðŸ•Šï¸":"1f54a","ðŸ•·ï¸":"1f577","ðŸ•¸ï¸":"1f578","ðŸµï¸":"1f3f5","â˜˜ï¸":"2618","ðŸŒ¶ï¸":"1f336","ðŸ½ï¸":"1f37d","ðŸ—ºï¸":"1f5fa","ðŸ”ï¸":"1f3d4","â›°ï¸":"26f0","ðŸ•ï¸":"1f3d5","ðŸ–ï¸":"1f3d6","ðŸœï¸":"1f3dc","ðŸï¸":"1f3dd","ðŸžï¸":"1f3de","ðŸŸï¸":"1f3df","ðŸ›ï¸":"1f3db","ðŸ—ï¸":"1f3d7","ðŸ˜ï¸":"1f3d8","ðŸšï¸":"1f3da","â›©ï¸":"26e9","ðŸ™ï¸":"1f3d9","â™¨ï¸":"2668","ðŸ›£ï¸":"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","ðŸŽ™ï¸":"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","âš•ï¸":"2695","â™¾ï¸":"267e","â™»ï¸":"267b","âšœï¸":"269c","â˜‘ï¸":"2611","âœ”ï¸":"2714","âœ–ï¸":"2716","ã€½ï¸":"303d","âœ³ï¸":"2733","âœ´ï¸":"2734","â‡ï¸":"2747","â€¼ï¸":"203c","â‰ï¸":"2049","ã€°ï¸":"3030","Â©ï¸":"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","â–ªï¸":"25aa","â–«ï¸":"25ab","â—»ï¸":"25fb","â—¼ï¸":"25fc","ðŸ³ï¸":"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","ðŸ‘¨â€âš•":"1f468-200d-2695-fe0f","ðŸ‘©â€âš•":"1f469-200d-2695-fe0f","ðŸ‘¨â€ðŸŽ“":"1f468-200d-1f393","ðŸ‘©â€ðŸŽ“":"1f469-200d-1f393","ðŸ‘¨â€ðŸ«":"1f468-200d-1f3eb","ðŸ‘©â€ðŸ«":"1f469-200d-1f3eb","ðŸ‘¨â€âš–":"1f468-200d-2696-fe0f","ðŸ‘©â€âš–":"1f469-200d-2696-fe0f","ðŸ‘¨â€ðŸŒ¾":"1f468-200d-1f33e","ðŸ‘©â€ðŸŒ¾":"1f469-200d-1f33e","ðŸ‘¨â€ðŸ³":"1f468-200d-1f373","ðŸ‘©â€ðŸ³":"1f469-200d-1f373","ðŸ‘¨â€ðŸ”§":"1f468-200d-1f527","ðŸ‘©â€ðŸ”§":"1f469-200d-1f527","ðŸ‘¨â€ðŸ":"1f468-200d-1f3ed","ðŸ‘©â€ðŸ":"1f469-200d-1f3ed","ðŸ‘¨â€ðŸ’¼":"1f468-200d-1f4bc","ðŸ‘©â€ðŸ’¼":"1f469-200d-1f4bc","ðŸ‘¨â€ðŸ”¬":"1f468-200d-1f52c","ðŸ‘©â€ðŸ”¬":"1f469-200d-1f52c","ðŸ‘¨â€ðŸ’»":"1f468-200d-1f4bb","ðŸ‘©â€ðŸ’»":"1f469-200d-1f4bb","ðŸ‘¨â€ðŸŽ¤":"1f468-200d-1f3a4","ðŸ‘©â€ðŸŽ¤":"1f469-200d-1f3a4","ðŸ‘¨â€ðŸŽ¨":"1f468-200d-1f3a8","ðŸ‘©â€ðŸŽ¨":"1f469-200d-1f3a8","ðŸ‘¨â€âœˆ":"1f468-200d-2708-fe0f","ðŸ‘©â€âœˆ":"1f469-200d-2708-fe0f","ðŸ‘¨â€ðŸš€":"1f468-200d-1f680","ðŸ‘©â€ðŸš€":"1f469-200d-1f680","ðŸ‘¨â€ðŸš’":"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","ðŸ‘±â€â™‚":"1f471-200d-2642-fe0f","ðŸ‘±â€â™€":"1f471-200d-2640-fe0f","ðŸ‘¨â€ðŸ¦°":"1f468-200d-1f9b0","ðŸ‘©â€ðŸ¦°":"1f469-200d-1f9b0","ðŸ‘¨â€ðŸ¦±":"1f468-200d-1f9b1","ðŸ‘©â€ðŸ¦±":"1f469-200d-1f9b1","ðŸ‘¨â€ðŸ¦²":"1f468-200d-1f9b2","ðŸ‘©â€ðŸ¦²":"1f469-200d-1f9b2","ðŸ‘¨â€ðŸ¦³":"1f468-200d-1f9b3","ðŸ‘©â€ðŸ¦³":"1f469-200d-1f9b3","ðŸ¦¸â€â™€":"1f9b8-200d-2640-fe0f","ðŸ¦¸â€â™‚":"1f9b8-200d-2642-fe0f","ðŸ¦¹â€â™€":"1f9b9-200d-2640-fe0f","ðŸ¦¹â€â™‚":"1f9b9-200d-2642-fe0f","ðŸ§™â€â™€":"1f9d9-200d-2640-fe0f","ðŸ§™â€â™‚":"1f9d9-200d-2642-fe0f","ðŸ§šâ€â™€":"1f9da-200d-2640-fe0f","ðŸ§šâ€â™‚":"1f9da-200d-2642-fe0f","ðŸ§›â€â™€":"1f9db-200d-2640-fe0f","ðŸ§›â€â™‚":"1f9db-200d-2642-fe0f","ðŸ§œâ€â™€":"1f9dc-200d-2640-fe0f","ðŸ§œâ€â™‚":"1f9dc-200d-2642-fe0f","ðŸ§â€â™€":"1f9dd-200d-2640-fe0f","ðŸ§â€â™‚":"1f9dd-200d-2642-fe0f","ðŸ§žâ€â™€":"1f9de-200d-2640-fe0f","ðŸ§žâ€â™‚":"1f9de-200d-2642-fe0f","ðŸ§Ÿâ€â™€":"1f9df-200d-2640-fe0f","ðŸ§Ÿâ€â™‚":"1f9df-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","ðŸ™‡â€â™‚":"1f647-200d-2642-fe0f","ðŸ™‡â€â™€":"1f647-200d-2640-fe0f","ðŸ¤¦â€â™‚":"1f926-200d-2642-fe0f","ðŸ¤¦â€â™€":"1f926-200d-2640-fe0f","ðŸ¤·â€â™‚":"1f937-200d-2642-fe0f","ðŸ¤·â€â™€":"1f937-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","ðŸƒâ€â™‚":"1f3c3-200d-2642-fe0f","ðŸƒâ€â™€":"1f3c3-200d-2640-fe0f","ðŸ‘¯â€â™‚":"1f46f-200d-2642-fe0f","ðŸ‘¯â€â™€":"1f46f-200d-2640-fe0f","ðŸ§–â€â™€":"1f9d6-200d-2640-fe0f","ðŸ§–â€â™‚":"1f9d6-200d-2642-fe0f","ðŸ§—â€â™€":"1f9d7-200d-2640-fe0f","ðŸ§—â€â™‚":"1f9d7-200d-2642-fe0f","ðŸ§˜â€â™€":"1f9d8-200d-2640-fe0f","ðŸ§˜â€â™‚":"1f9d8-200d-2642-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","ðŸ‘¨â€ðŸ‘¦":"1f468-200d-1f466","ðŸ‘¨â€ðŸ‘§":"1f468-200d-1f467","ðŸ‘©â€ðŸ‘¦":"1f469-200d-1f466","ðŸ‘©â€ðŸ‘§":"1f469-200d-1f467","ðŸ‘â€ðŸ—¨":"1f441-200d-1f5e8","#ï¸âƒ£":"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","ðŸ´â€â˜ ":"1f3f4-200d-2620-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","ðŸ‘¨ðŸ»â€ðŸŽ“":"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","ðŸ‘¨ðŸ»â€ðŸ«":"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","ðŸ‘¨â€âš–ï¸":"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","ðŸ‘¨ðŸ»â€ðŸŒ¾":"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","ðŸ‘¨ðŸ»â€ðŸ³":"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","ðŸ‘¨ðŸ»â€ðŸ”§":"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","ðŸ‘¨ðŸ»â€ðŸ":"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","ðŸ‘¨ðŸ»â€ðŸ’¼":"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","ðŸ‘¨ðŸ»â€ðŸ”¬":"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","ðŸ‘¨ðŸ»â€ðŸ’»":"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","ðŸ‘¨ðŸ»â€ðŸŽ¤":"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","ðŸ‘¨ðŸ»â€ðŸŽ¨":"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","ðŸ‘¨â€âœˆï¸":"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","ðŸ‘¨ðŸ»â€ðŸš€":"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","ðŸ‘¨ðŸ»â€ðŸš’":"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","ðŸ‘±â€â™‚ï¸":"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","ðŸ‘±â€â™€ï¸":"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","ðŸ‘¨ðŸ»â€ðŸ¦°":"1f468-1f3fb-200d-1f9b0","ðŸ‘¨ðŸ¼â€ðŸ¦°":"1f468-1f3fc-200d-1f9b0","ðŸ‘¨ðŸ½â€ðŸ¦°":"1f468-1f3fd-200d-1f9b0","ðŸ‘¨ðŸ¾â€ðŸ¦°":"1f468-1f3fe-200d-1f9b0","ðŸ‘¨ðŸ¿â€ðŸ¦°":"1f468-1f3ff-200d-1f9b0","ðŸ‘©ðŸ»â€ðŸ¦°":"1f469-1f3fb-200d-1f9b0","ðŸ‘©ðŸ¼â€ðŸ¦°":"1f469-1f3fc-200d-1f9b0","ðŸ‘©ðŸ½â€ðŸ¦°":"1f469-1f3fd-200d-1f9b0","ðŸ‘©ðŸ¾â€ðŸ¦°":"1f469-1f3fe-200d-1f9b0","ðŸ‘©ðŸ¿â€ðŸ¦°":"1f469-1f3ff-200d-1f9b0","ðŸ‘¨ðŸ»â€ðŸ¦±":"1f468-1f3fb-200d-1f9b1","ðŸ‘¨ðŸ¼â€ðŸ¦±":"1f468-1f3fc-200d-1f9b1","ðŸ‘¨ðŸ½â€ðŸ¦±":"1f468-1f3fd-200d-1f9b1","ðŸ‘¨ðŸ¾â€ðŸ¦±":"1f468-1f3fe-200d-1f9b1","ðŸ‘¨ðŸ¿â€ðŸ¦±":"1f468-1f3ff-200d-1f9b1","ðŸ‘©ðŸ»â€ðŸ¦±":"1f469-1f3fb-200d-1f9b1","ðŸ‘©ðŸ¼â€ðŸ¦±":"1f469-1f3fc-200d-1f9b1","ðŸ‘©ðŸ½â€ðŸ¦±":"1f469-1f3fd-200d-1f9b1","ðŸ‘©ðŸ¾â€ðŸ¦±":"1f469-1f3fe-200d-1f9b1","ðŸ‘©ðŸ¿â€ðŸ¦±":"1f469-1f3ff-200d-1f9b1","ðŸ‘¨ðŸ»â€ðŸ¦²":"1f468-1f3fb-200d-1f9b2","ðŸ‘¨ðŸ¼â€ðŸ¦²":"1f468-1f3fc-200d-1f9b2","ðŸ‘¨ðŸ½â€ðŸ¦²":"1f468-1f3fd-200d-1f9b2","ðŸ‘¨ðŸ¾â€ðŸ¦²":"1f468-1f3fe-200d-1f9b2","ðŸ‘¨ðŸ¿â€ðŸ¦²":"1f468-1f3ff-200d-1f9b2","ðŸ‘©ðŸ»â€ðŸ¦²":"1f469-1f3fb-200d-1f9b2","ðŸ‘©ðŸ¼â€ðŸ¦²":"1f469-1f3fc-200d-1f9b2","ðŸ‘©ðŸ½â€ðŸ¦²":"1f469-1f3fd-200d-1f9b2","ðŸ‘©ðŸ¾â€ðŸ¦²":"1f469-1f3fe-200d-1f9b2","ðŸ‘©ðŸ¿â€ðŸ¦²":"1f469-1f3ff-200d-1f9b2","ðŸ‘¨ðŸ»â€ðŸ¦³":"1f468-1f3fb-200d-1f9b3","ðŸ‘¨ðŸ¼â€ðŸ¦³":"1f468-1f3fc-200d-1f9b3","ðŸ‘¨ðŸ½â€ðŸ¦³":"1f468-1f3fd-200d-1f9b3","ðŸ‘¨ðŸ¾â€ðŸ¦³":"1f468-1f3fe-200d-1f9b3","ðŸ‘¨ðŸ¿â€ðŸ¦³":"1f468-1f3ff-200d-1f9b3","ðŸ‘©ðŸ»â€ðŸ¦³":"1f469-1f3fb-200d-1f9b3","ðŸ‘©ðŸ¼â€ðŸ¦³":"1f469-1f3fc-200d-1f9b3","ðŸ‘©ðŸ½â€ðŸ¦³":"1f469-1f3fd-200d-1f9b3","ðŸ‘©ðŸ¾â€ðŸ¦³":"1f469-1f3fe-200d-1f9b3","ðŸ‘©ðŸ¿â€ðŸ¦³":"1f469-1f3ff-200d-1f9b3","ðŸ¦¸â€â™€ï¸":"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","ðŸ¦¸â€â™‚ï¸":"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","ðŸ¦¹â€â™€ï¸":"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","ðŸ¦¹â€â™‚ï¸":"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","ðŸ§™â€â™€ï¸":"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","ðŸ§™â€â™‚ï¸":"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","ðŸ§šâ€â™€ï¸":"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","ðŸ§šâ€â™‚ï¸":"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","ðŸ§›â€â™€ï¸":"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","ðŸ§›â€â™‚ï¸":"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","ðŸ§œâ€â™€ï¸":"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","ðŸ§œâ€â™‚ï¸":"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","ðŸ§â€â™€ï¸":"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","ðŸ§â€â™‚ï¸":"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","ðŸ§žâ€â™€ï¸":"1f9de-200d-2640-fe0f","ðŸ§žâ€â™‚ï¸":"1f9de-200d-2642-fe0f","ðŸ§Ÿâ€â™€ï¸":"1f9df-200d-2640-fe0f","ðŸ§Ÿâ€â™‚ï¸":"1f9df-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","ðŸ™‡â€â™‚ï¸":"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","ðŸ’†â€â™‚ï¸":"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","ðŸƒâ€â™‚ï¸":"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-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","ðŸ§–â€â™‚ï¸":"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","ðŸ§—â€â™€ï¸":"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","ðŸ§—â€â™‚ï¸":"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","ðŸ§˜â€â™€ï¸":"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","ðŸ§˜â€â™‚ï¸":"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","ðŸŒâ€â™‚ï¸":"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","ðŸ‘â€ðŸ—¨ï¸":"1f441-200d-1f5e8","ðŸ‘ï¸â€ðŸ—¨":"1f441-200d-1f5e8","ðŸ³ï¸â€ðŸŒˆ":"1f3f3-fe0f-200d-1f308","ðŸ´â€â˜ ï¸":"1f3f4-200d-2620-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","ðŸ‘¨ðŸ»â€âš–ï¸":"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","ðŸ‘¨ðŸ»â€âœˆï¸":"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","ðŸ‘±ðŸ»â€â™‚ï¸":"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","ðŸ‘±ðŸ»â€â™€ï¸":"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","ðŸ¦¸ðŸ»â€â™€ï¸":"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","ðŸ¦¸ðŸ»â€â™‚ï¸":"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","ðŸ¦¹ðŸ»â€â™€ï¸":"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","ðŸ¦¹ðŸ»â€â™‚ï¸":"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","ðŸ§™ðŸ»â€â™€ï¸":"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","ðŸ§™ðŸ»â€â™‚ï¸":"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","ðŸ§šðŸ»â€â™€ï¸":"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","ðŸ§šðŸ»â€â™‚ï¸":"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","ðŸ§›ðŸ»â€â™€ï¸":"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","ðŸ§›ðŸ»â€â™‚ï¸":"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","ðŸ§œðŸ»â€â™€ï¸":"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","ðŸ§œðŸ»â€â™‚ï¸":"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","ðŸ§ðŸ»â€â™€ï¸":"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","ðŸ§ðŸ»â€â™‚ï¸":"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","ðŸ™ðŸ»â€â™‚ï¸":"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","ðŸ™‡ðŸ»â€â™‚ï¸":"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","ðŸ’†ðŸ»â€â™‚ï¸":"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","ðŸƒðŸ»â€â™‚ï¸":"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-2640-fe0f","ðŸ§–ðŸ¼â€â™€ï¸":"1f9d6-1f3fc-200d-2640-fe0f","ðŸ§–ðŸ½â€â™€ï¸":"1f9d6-1f3fd-200d-2640-fe0f","ðŸ§–ðŸ¾â€â™€ï¸":"1f9d6-1f3fe-200d-2640-fe0f","ðŸ§–ðŸ¿â€â™€ï¸":"1f9d6-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","ðŸ§—ðŸ»â€â™€ï¸":"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","ðŸ§—ðŸ»â€â™‚ï¸":"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","ðŸ§˜ðŸ»â€â™€ï¸":"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","ðŸ§˜ðŸ»â€â™‚ï¸":"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","ðŸŒï¸â€â™‚ï¸":"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","ðŸ‘©â€â¤â€ðŸ‘¨":"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","ðŸ‘ï¸â€ðŸ—¨ï¸":"1f441-200d-1f5e8","ðŸ‘©â€â¤ï¸â€ðŸ‘¨":"1f469-200d-2764-fe0f-200d-1f468","ðŸ‘¨â€â¤ï¸â€ðŸ‘¨":"1f468-200d-2764-fe0f-200d-1f468","ðŸ‘©â€â¤ï¸â€ðŸ‘©":"1f469-200d-2764-fe0f-200d-1f469","ðŸ‘©â€â¤â€ðŸ’‹â€ðŸ‘¨":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f468","ðŸ‘¨â€â¤â€ðŸ’‹â€ðŸ‘¨":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","ðŸ‘©â€â¤â€ðŸ’‹â€ðŸ‘©":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","ðŸ‘¨â€ðŸ‘©â€ðŸ‘§â€ðŸ‘¦":"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"}
\ 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 36351ec022d0c58a1e4c0c8445317a7ebdea72f5..164fdcc0b8a69f599a63d9128095f9b9c89c095e 100644
--- a/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
+++ b/app/javascript/mastodon/features/emoji/emoji_mart_search_light.js
@@ -2,7 +2,7 @@
 // https://github.com/missive/emoji-mart/blob/5f2ffcc/src/utils/emoji-index.js
 
 import data from './emoji_mart_data_light';
-import { getData, getSanitizedData, intersect } from './emoji_utils';
+import { getData, getSanitizedData, uniq, intersect } from './emoji_utils';
 
 let originalPool = {};
 let index = {};
@@ -103,7 +103,7 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo
       }
     }
 
-    allResults = values.map((value) => {
+    const searchValue = (value) => {
       let aPool = pool,
         aIndex = index,
         length = 0;
@@ -150,15 +150,23 @@ function search(value, { emojisToShowFilter, maxResults, include, exclude, custo
       }
 
       return aIndex.results;
-    }).filter(a => a);
+    };
 
-    if (allResults.length > 1) {
-      results = intersect.apply(null, allResults);
-    } else if (allResults.length) {
-      results = allResults[0];
+    if (values.length > 1) {
+      results = searchValue(value);
     } else {
       results = [];
     }
+
+    allResults = values.map(searchValue).filter(a => a);
+
+    if (allResults.length > 1) {
+      allResults = intersect.apply(null, allResults);
+    } else if (allResults.length) {
+      allResults = allResults[0];
+    }
+
+    results = uniq(results.concat(allResults));
   }
 
   if (results) {
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 6f1c863b43c6cbf6b86ae098abb8b9a3708ee1e5..fa9401b90ea16ff523129b50ce998ead6db4b988 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -7,7 +7,7 @@ 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 } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { debounce } from 'lodash';
 
@@ -21,12 +21,13 @@ const mapStateToProps = state => ({
   hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Favourites extends ImmutablePureComponent {
+class Favourites extends ImmutablePureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     statusIds: ImmutablePropTypes.list.isRequired,
     intl: PropTypes.object.isRequired,
     columnId: PropTypes.string,
@@ -67,11 +68,13 @@ export default class Favourites extends ImmutablePureComponent {
   }, 300, { leading: true })
 
   render () {
-    const { intl, statusIds, columnId, multiColumn, hasMore, isLoading } = this.props;
+    const { intl, shouldUpdateScroll, 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." />;
+
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.heading)}>
         <ColumnHeader
           icon='star'
           title={intl.formatMessage(messages.heading)}
@@ -90,6 +93,8 @@ export default class Favourites extends ImmutablePureComponent {
           hasMore={hasMore}
           isLoading={isLoading}
           onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index 6f113beb431a499e89196649cdcb4321d4a65bce..d1ac229a279148e4a60a1e0fcc978220d92b634f 100644
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -1,25 +1,27 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import LoadingIndicator from '../../components/loading_indicator';
 import { fetchFavourites } from '../../actions/interactions';
-import { ScrollContainer } from 'react-router-scroll-4';
+import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../containers/account_container';
 import Column from '../ui/components/column';
 import ColumnBackButton from '../../components/column_back_button';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const mapStateToProps = (state, props) => ({
   accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
 });
 
-@connect(mapStateToProps)
-export default class Favourites extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class Favourites extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
   };
 
@@ -34,7 +36,7 @@ export default class Favourites extends ImmutablePureComponent {
   }
 
   render () {
-    const { accountIds } = this.props;
+    const { shouldUpdateScroll, accountIds } = this.props;
 
     if (!accountIds) {
       return (
@@ -44,15 +46,21 @@ export default 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.' />;
+
     return (
       <Column>
         <ColumnBackButton />
 
-        <ScrollContainer scrollKey='favourites'>
-          <div className='scrollable'>
-            {accountIds.map(id => <AccountContainer key={id} id={id} withNote={false} />)}
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='favourites'
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} withNote={false} />
+          )}
+        </ScrollableList>
       </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 4fc5638d95780b793d8c341ed306abfa074e204c..a3b524db1d4398dbc3a394d354568185dc2c2b98 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -13,8 +13,8 @@ const messages = defineMessages({
   reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });
 
-@injectIntl
-export default class AccountAuthorize extends ImmutablePureComponent {
+export default @injectIntl
+class AccountAuthorize extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index eae821f9250569d0433f435089ea41d384a9b82d..56ae8764b42dd6c7f56ae24a4136da505bc6f442 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -1,15 +1,16 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { debounce } from 'lodash';
 import LoadingIndicator from '../../components/loading_indicator';
-import { ScrollContainer } from 'react-router-scroll-4';
 import Column from '../ui/components/column';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountAuthorizeContainer from './containers/account_authorize_container';
 import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
   heading: { id: 'column.follow_requests', defaultMessage: 'Follow requests' },
@@ -19,13 +20,14 @@ const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class FollowRequests extends ImmutablePureComponent {
+class FollowRequests extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
     intl: PropTypes.object.isRequired,
   };
@@ -34,16 +36,12 @@ export default class FollowRequests extends ImmutablePureComponent {
     this.props.dispatch(fetchFollowRequests());
   }
 
-  handleScroll = (e) => {
-    const { scrollTop, scrollHeight, clientHeight } = e.target;
-
-    if (scrollTop === scrollHeight - clientHeight) {
-      this.props.dispatch(expandFollowRequests());
-    }
-  }
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandFollowRequests());
+  }, 300, { leading: true });
 
   render () {
-    const { intl, accountIds } = this.props;
+    const { intl, shouldUpdateScroll, accountIds } = this.props;
 
     if (!accountIds) {
       return (
@@ -53,17 +51,21 @@ export default class FollowRequests extends ImmutablePureComponent {
       );
     }
 
+    const emptyMessage = <FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />;
+
     return (
       <Column icon='users' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
-
-        <ScrollContainer scrollKey='follow_requests'>
-          <div className='scrollable' onScroll={this.handleScroll}>
-            {accountIds.map(id =>
-              <AccountAuthorizeContainer key={id} id={id} />
-            )}
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='follow_requests'
+          onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountAuthorizeContainer key={id} id={id} />
+          )}
+        </ScrollableList>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index 919a89332b12fe9ac3a2131d90fd9f19e06e04fc..ce56f270ca361836efaf76bcb30120f6d835de06 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -1,32 +1,34 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { debounce } from 'lodash';
 import LoadingIndicator from '../../components/loading_indicator';
 import {
   fetchAccount,
   fetchFollowers,
   expandFollowers,
 } from '../../actions/accounts';
-import { ScrollContainer } from 'react-router-scroll-4';
+import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../containers/account_container';
 import Column from '../ui/components/column';
 import HeaderContainer from '../account_timeline/containers/header_container';
-import LoadMore from '../../components/load_more';
 import ColumnBackButton from '../../components/column_back_button';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const mapStateToProps = (state, props) => ({
   accountIds: state.getIn(['user_lists', 'followers', props.params.accountId, 'items']),
   hasMore: !!state.getIn(['user_lists', 'followers', props.params.accountId, 'next']),
 });
 
-@connect(mapStateToProps)
-export default class Followers extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class Followers extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
     hasMore: PropTypes.bool,
   };
@@ -43,23 +45,12 @@ export default class Followers extends ImmutablePureComponent {
     }
   }
 
-  handleScroll = (e) => {
-    const { scrollTop, scrollHeight, clientHeight } = e.target;
-
-    if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
-      this.props.dispatch(expandFollowers(this.props.params.accountId));
-    }
-  }
-
-  handleLoadMore = (e) => {
-    e.preventDefault();
+  handleLoadMore = debounce(() => {
     this.props.dispatch(expandFollowers(this.props.params.accountId));
-  }
+  }, 300, { leading: true });
 
   render () {
-    const { accountIds, hasMore } = this.props;
-
-    let loadMore = null;
+    const { shouldUpdateScroll, accountIds, hasMore } = this.props;
 
     if (!accountIds) {
       return (
@@ -69,23 +60,25 @@ export default class Followers extends ImmutablePureComponent {
       );
     }
 
-    if (hasMore) {
-      loadMore = <LoadMore onClick={this.handleLoadMore} />;
-    }
+    const emptyMessage = <FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />;
 
     return (
       <Column>
         <ColumnBackButton />
 
-        <ScrollContainer scrollKey='followers'>
-          <div className='scrollable' onScroll={this.handleScroll}>
-            <div className='followers'>
-              <HeaderContainer accountId={this.props.params.accountId} hideTabs />
-              {accountIds.map(id => <AccountContainer key={id} id={id} withNote={false} />)}
-              {loadMore}
-            </div>
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='followers'
+          hasMore={hasMore}
+          onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
+          alwaysPrepend
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} withNote={false} />
+          )}
+        </ScrollableList>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 5719259d11114e6ef089e75a0d66cb9e93173e77..bda0438a0a582ac137329b6394ad2fa0d518498f 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -1,32 +1,34 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { debounce } from 'lodash';
 import LoadingIndicator from '../../components/loading_indicator';
 import {
   fetchAccount,
   fetchFollowing,
   expandFollowing,
 } from '../../actions/accounts';
-import { ScrollContainer } from 'react-router-scroll-4';
+import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../containers/account_container';
 import Column from '../ui/components/column';
 import HeaderContainer from '../account_timeline/containers/header_container';
-import LoadMore from '../../components/load_more';
 import ColumnBackButton from '../../components/column_back_button';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const mapStateToProps = (state, props) => ({
   accountIds: state.getIn(['user_lists', 'following', props.params.accountId, 'items']),
   hasMore: !!state.getIn(['user_lists', 'following', props.params.accountId, 'next']),
 });
 
-@connect(mapStateToProps)
-export default class Following extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class Following extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
     hasMore: PropTypes.bool,
   };
@@ -43,23 +45,12 @@ export default class Following extends ImmutablePureComponent {
     }
   }
 
-  handleScroll = (e) => {
-    const { scrollTop, scrollHeight, clientHeight } = e.target;
-
-    if (scrollTop === scrollHeight - clientHeight && this.props.hasMore) {
-      this.props.dispatch(expandFollowing(this.props.params.accountId));
-    }
-  }
-
-  handleLoadMore = (e) => {
-    e.preventDefault();
+  handleLoadMore = debounce(() => {
     this.props.dispatch(expandFollowing(this.props.params.accountId));
-  }
+  }, 300, { leading: true });
 
   render () {
-    const { accountIds, hasMore } = this.props;
-
-    let loadMore = null;
+    const { shouldUpdateScroll, accountIds, hasMore } = this.props;
 
     if (!accountIds) {
       return (
@@ -69,23 +60,25 @@ export default class Following extends ImmutablePureComponent {
       );
     }
 
-    if (hasMore) {
-      loadMore = <LoadMore onClick={this.handleLoadMore} />;
-    }
+    const emptyMessage = <FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />;
 
     return (
       <Column>
         <ColumnBackButton />
 
-        <ScrollContainer scrollKey='following'>
-          <div className='scrollable' onScroll={this.handleScroll}>
-            <div className='following'>
-              <HeaderContainer accountId={this.props.params.accountId} hideTabs />
-              {accountIds.map(id => <AccountContainer key={id} id={id} withNote={false} />)}
-              {loadMore}
-            </div>
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='following'
+          hasMore={hasMore}
+          onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          prepend={<HeaderContainer accountId={this.props.params.accountId} hideTabs />}
+          alwaysPrepend
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} withNote={false} />
+          )}
+        </ScrollableList>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 99642c911578b63a197c934efb93d3aca61f4cbf..709a3aa96dfd3a0ad6a0f32e4421b8fa69e8a604 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -7,7 +7,7 @@ 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, invitesEnabled } from '../../initial_state';
+import { me, invitesEnabled, version, profile_directory } from '../../initial_state';
 import { fetchFollowRequests } from '../../actions/accounts';
 import { List as ImmutableList } from 'immutable';
 import { Link } from 'react-router-dom';
@@ -31,6 +31,8 @@ const messages = defineMessages({
   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 => ({
@@ -52,9 +54,9 @@ const badgeDisplay = (number, limit) => {
   }
 };
 
-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-export default class GettingStarted extends ImmutablePureComponent {
+class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -86,10 +88,29 @@ export default class GettingStarted extends ImmutablePureComponent {
         <ColumnSubheading key={i++} text={intl.formatMessage(messages.discover)} />,
         <ColumnLink key={i++} icon='users' text={intl.formatMessage(messages.community_timeline)} to='/timelines/public/local' />,
         <ColumnLink key={i++} icon='globe' text={intl.formatMessage(messages.public_timeline)} to='/timelines/public' />,
+      );
+
+      height += 34 + 48*2;
+
+      if (profile_directory) {
+        navItems.push(
+          <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} href='/explore' />
+        );
+
+        height += 48;
+      }
+
+      navItems.push(
         <ColumnSubheading key={i++} text={intl.formatMessage(messages.personal)} />
       );
 
-      height += 34*2 + 48*2;
+      height += 34;
+    } else if (profile_directory) {
+      navItems.push(
+        <ColumnLink key={i++} icon='address-book' text={intl.formatMessage(messages.profile_directory)} href='/explore' />
+      );
+
+      height += 48;
     }
 
     navItems.push(
@@ -115,7 +136,7 @@ export default class GettingStarted extends ImmutablePureComponent {
     }
 
     return (
-      <Column>
+      <Column label={intl.formatMessage(messages.menu)}>
         {multiColumn && <div className='column-header__wrapper'>
           <h1 className='column-header'>
             <button>
@@ -125,33 +146,35 @@ export default class GettingStarted extends ImmutablePureComponent {
           </h1>
         </div>}
 
-        <div className='getting-started__wrapper' style={{ height }}>
-          {!multiColumn && <NavigationBar account={myAccount} />}
-          {navItems}
-        </div>
-
-        {!multiColumn && <div className='flex-spacer' />}
-
-        <div className='getting-started getting-started__footer'>
-          <ul>
-            <li><a href='https://bridge.joinmastodon.org/' target='_blank'><FormattedMessage id='getting_started.find_friends' defaultMessage='Find friends from Twitter' /></a> Â· </li>
-            {invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> Â· </li>}
-            {multiColumn && <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>
-            <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this instance' /></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://github.com/tootsuite/documentation#documentation' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> Â· </li>
-            <li><a href='/auth/sign_out' data-method='delete'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
-          </ul>
-
-          <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: <a href='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>tootsuite/mastodon</a> }}
-            />
-          </p>
+        <div className='getting-started'>
+          <div className='getting-started__wrapper' style={{ height }}>
+            {!multiColumn && <NavigationBar account={myAccount} />}
+            {navItems}
+          </div>
+
+          {!multiColumn && <div className='flex-spacer' />}
+
+          <div className='getting-started__footer'>
+            <ul>
+              {invitesEnabled && <li><a href='/invites' target='_blank'><FormattedMessage id='getting_started.invite' defaultMessage='Invite people' /></a> Â· </li>}
+              {multiColumn && <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>
+              <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this instance' /></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' data-method='delete'><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
+            </ul>
+
+            <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='https://github.com/tootsuite/mastodon' rel='noopener' target='_blank'>tootsuite/mastodon</a> (v{version})</span> }}
+              />
+            </p>
+          </div>
         </div>
       </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
new file mode 100644
index 0000000000000000000000000000000000000000..9c9f62d8211ebcbf0f2a31551e3b0335be732e97
--- /dev/null
+++ b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js
@@ -0,0 +1,102 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { injectIntl, FormattedMessage } from 'react-intl';
+import Toggle from 'react-toggle';
+import AsyncSelect from 'react-select/lib/Async';
+
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {
+
+  static propTypes = {
+    settings: ImmutablePropTypes.map.isRequired,
+    onChange: PropTypes.func.isRequired,
+    onLoad: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  state = {
+    open: this.hasTags(),
+  };
+
+  hasTags () {
+    return ['all', 'any', 'none'].map(mode => this.tags(mode).length > 0).includes(true);
+  }
+
+  tags (mode) {
+    let tags = this.props.settings.getIn(['tags', mode]) || [];
+    if (tags.toJSON) {
+      return tags.toJSON();
+    } else {
+      return tags;
+    }
+  };
+
+  onSelect = (mode) => {
+    return (value) => {
+      this.props.onChange(['tags', mode], value);
+    };
+  };
+
+  onToggle = () => {
+    if (this.state.open && this.hasTags()) {
+      this.props.onChange('tags', {});
+    }
+    this.setState({ open: !this.state.open });
+  };
+
+  modeSelect (mode) {
+    return (
+      <div className='column-settings__section'>
+        {this.modeLabel(mode)}
+        <AsyncSelect
+          isMulti
+          autoFocus
+          value={this.tags(mode)}
+          settings={this.props.settings}
+          settingPath={['tags', mode]}
+          onChange={this.onSelect(mode)}
+          loadOptions={this.props.onLoad}
+          classNamePrefix='column-settings__hashtag-select'
+          name='tags'
+        />
+      </div>
+    );
+  }
+
+  modeLabel (mode) {
+    switch(mode) {
+    case 'any':  return <FormattedMessage id='hashtag.column_settings.tag_mode.any' defaultMessage='Any of these' />;
+    case 'all':  return <FormattedMessage id='hashtag.column_settings.tag_mode.all' defaultMessage='All of these' />;
+    case 'none': return <FormattedMessage id='hashtag.column_settings.tag_mode.none' defaultMessage='None of these' />;
+    }
+    return '';
+  };
+
+  render () {
+    return (
+      <div>
+        <div className='column-settings__row'>
+          <div className='setting-toggle'>
+            <Toggle
+              id='hashtag.column_settings.tag_toggle'
+              onChange={this.onToggle}
+              checked={this.state.open}
+            />
+            <span className='setting-toggle__label'>
+              <FormattedMessage id='hashtag.column_settings.tag_toggle' defaultMessage='Include additional tags in this column' />
+            </span>
+          </div>
+        </div>
+        {this.state.open &&
+          <div className='column-settings__hashtags'>
+            {this.modeSelect('any')}
+            {this.modeSelect('all')}
+            {this.modeSelect('none')}
+          </div>
+        }
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5098052ce23f1232a35947f5a41c70933e42ef0
--- /dev/null
+++ b/app/javascript/mastodon/features/hashtag_timeline/containers/column_settings_container.js
@@ -0,0 +1,31 @@
+import { connect } from 'react-redux';
+import ColumnSettings from '../components/column_settings';
+import { changeColumnParams } from '../../../actions/columns';
+import api from '../../../api';
+
+const mapStateToProps = (state, { columnId }) => {
+  const columns = state.getIn(['settings', 'columns']);
+  const index   = columns.findIndex(c => c.get('uuid') === columnId);
+
+  if (!(columnId && index >= 0)) {
+    return {};
+  }
+
+  return { settings: columns.get(index).get('params') };
+};
+
+const mapDispatchToProps = (dispatch, { columnId }) => ({
+  onChange (key, value) {
+    dispatch(changeColumnParams(columnId, key, value));
+  },
+
+  onLoad (value) {
+    return api().get('/api/v2/search', { params: { q: value } }).then(response => {
+      return (response.data.hashtags || []).map((tag) => {
+        return { value: tag.name, label: `#${tag.name}` };
+      });
+    });
+  },
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 374615ac7fd3381d44b8581b42c59ae193358e9f..c2e026d13611d97dca0fcf7d0bf24abb7fa1526c 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -4,22 +4,27 @@ import PropTypes from 'prop-types';
 import StatusListContainer from '../ui/containers/status_list_container';
 import Column from '../../components/column';
 import ColumnHeader from '../../components/column_header';
-import { expandHashtagTimeline } from '../../actions/timelines';
+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 { isEqual } from 'lodash';
 
 const mapStateToProps = (state, props) => ({
   hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0,
 });
 
-@connect(mapStateToProps)
-export default class HashtagTimeline extends React.PureComponent {
+export default @connect(mapStateToProps)
+class HashtagTimeline extends React.PureComponent {
+
+  disconnects = [];
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     columnId: PropTypes.string,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     hasUnread: PropTypes.bool,
     multiColumn: PropTypes.bool,
   };
@@ -34,6 +39,30 @@ export default class HashtagTimeline extends React.PureComponent {
     }
   }
 
+  title = () => {
+    let title = [this.props.params.id];
+    if (this.additionalFor('any')) {
+      title.push(' ', <FormattedMessage id='hashtag.column_header.tag_mode.any'  values={{ additional: this.additionalFor('any') }} defaultMessage='or {additional}' />);
+    }
+    if (this.additionalFor('all')) {
+      title.push(' ', <FormattedMessage id='hashtag.column_header.tag_mode.all'  values={{ additional: this.additionalFor('all') }} defaultMessage='and {additional}' />);
+    }
+    if (this.additionalFor('none')) {
+      title.push(' ', <FormattedMessage id='hashtag.column_header.tag_mode.none' values={{ additional: this.additionalFor('none') }} defaultMessage='without {additional}' />);
+    }
+    return title;
+  }
+
+  additionalFor = (mode) => {
+    const { tags } = this.props.params;
+
+    if (tags && (tags[mode] || []).length > 0) {
+      return tags[mode].map(tag => tag.value).join('/');
+    } else {
+      return '';
+    }
+  }
+
   handleMove = (dir) => {
     const { columnId, dispatch } = this.props;
     dispatch(moveColumn(columnId, dir));
@@ -43,30 +72,40 @@ export default class HashtagTimeline extends React.PureComponent {
     this.column.scrollTop();
   }
 
-  _subscribe (dispatch, id) {
-    this.disconnect = dispatch(connectHashtagStream(id));
+  _subscribe (dispatch, id, tags = {}) {
+    let any  = (tags.any || []).map(tag => tag.value);
+    let all  = (tags.all || []).map(tag => tag.value);
+    let none = (tags.none || []).map(tag => tag.value);
+
+    [id, ...any].map((tag) => {
+      this.disconnects.push(dispatch(connectHashtagStream(id, tag, (status) => {
+        let tags = status.tags.map(tag => tag.name);
+        return all.filter(tag => tags.includes(tag)).length === all.length &&
+               none.filter(tag => tags.includes(tag)).length === 0;
+      })));
+    });
   }
 
   _unsubscribe () {
-    if (this.disconnect) {
-      this.disconnect();
-      this.disconnect = null;
-    }
+    this.disconnects.map(disconnect => disconnect());
+    this.disconnects = [];
   }
 
   componentDidMount () {
     const { dispatch } = this.props;
-    const { id } = this.props.params;
+    const { id, tags } = this.props.params;
 
-    dispatch(expandHashtagTimeline(id));
-    this._subscribe(dispatch, id);
+    dispatch(expandHashtagTimeline(id, { tags }));
   }
 
   componentWillReceiveProps (nextProps) {
-    if (nextProps.params.id !== this.props.params.id) {
-      this.props.dispatch(expandHashtagTimeline(nextProps.params.id));
+    const { dispatch, params } = this.props;
+    const { id, tags } = nextProps.params;
+    if (id !== params.id || !isEqual(tags, params.tags)) {
       this._unsubscribe();
-      this._subscribe(this.props.dispatch, nextProps.params.id);
+      this._subscribe(dispatch, id, tags);
+      this.props.dispatch(clearTimeline(`hashtag:${id}`));
+      this.props.dispatch(expandHashtagTimeline(id, { tags }));
     }
   }
 
@@ -79,27 +118,30 @@ export default class HashtagTimeline extends React.PureComponent {
   }
 
   handleLoadMore = maxId => {
-    this.props.dispatch(expandHashtagTimeline(this.props.params.id, { maxId }));
+    const { id, tags } = this.props.params;
+    this.props.dispatch(expandHashtagTimeline(id, { maxId, tags }));
   }
 
   render () {
-    const { hasUnread, columnId, multiColumn } = this.props;
+    const { shouldUpdateScroll, hasUnread, columnId, multiColumn } = this.props;
     const { id } = this.props.params;
     const pinned = !!columnId;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={`#${id}`}>
         <ColumnHeader
           icon='hashtag'
           active={hasUnread}
-          title={id}
+          title={this.title()}
           onPin={this.handlePin}
           onMove={this.handleMove}
           onClick={this.handleHeaderClick}
           pinned={pinned}
           multiColumn={multiColumn}
           showBackButton
-        />
+        >
+          {columnId && <ColumnSettingsContainer columnId={columnId} />}
+        </ColumnHeader>
 
         <StatusListContainer
           trackScroll={!pinned}
@@ -107,6 +149,7 @@ export default class HashtagTimeline extends React.PureComponent {
           timelineId={`hashtag:${id}`}
           onLoadMore={this.handleLoadMore}
           emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index 932ac2049816e9702416cad6e902ced731c2e6c3..455e218817cfe717b0b484a980d405300fc05ab0 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -4,8 +4,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import SettingToggle from '../../notifications/components/setting_toggle';
 
-@injectIntl
-export default class ColumnSettings extends React.PureComponent {
+export default @injectIntl
+class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index db6bbdec13416788ec6eadeca4a6e33fe2be7787..3ffa7a681526c40f7474d1dccda53d7f5f37faa0 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -19,12 +19,13 @@ const mapStateToProps = state => ({
   isPartial: state.getIn(['timelines', 'home', 'items', 0], null) === null,
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class HomeTimeline extends React.PureComponent {
+class HomeTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     intl: PropTypes.object.isRequired,
     hasUnread: PropTypes.bool,
     isPartial: PropTypes.bool,
@@ -93,11 +94,11 @@ export default class HomeTimeline extends React.PureComponent {
   }
 
   render () {
-    const { intl, hasUnread, columnId, multiColumn } = this.props;
+    const { intl, shouldUpdateScroll, hasUnread, columnId, multiColumn } = this.props;
     const pinned = !!columnId;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='home'
           active={hasUnread}
@@ -117,6 +118,7 @@ export default class HomeTimeline extends React.PureComponent {
           onLoadMore={this.handleLoadMore}
           timelineId='home'
           emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage='Your home timeline is empty! Visit {public} or use search to get started and meet other users.' values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/introduction/index.js b/app/javascript/mastodon/features/introduction/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..e712b2f7d4ea3b8c960274e688c96811a08e5517
--- /dev/null
+++ b/app/javascript/mastodon/features/introduction/index.js
@@ -0,0 +1,196 @@
+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';
+
+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 tutorial!' /></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} 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 5ae7b34a2e6962e052a09590d1580084f1b0ad4e..ab1ac511e0397502290ffc9c5738da16de8de7d8 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.js
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.js
@@ -9,8 +9,8 @@ const messages = defineMessages({
   heading: { id: 'keyboard_shortcuts.heading', defaultMessage: 'Keyboard Shortcuts' },
 });
 
-@injectIntl
-export default class KeyboardShortcuts extends ImmutablePureComponent {
+export default @injectIntl
+class KeyboardShortcuts extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -40,6 +40,10 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><kbd>m</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.mention' defaultMessage='to mention author' /></td>
               </tr>
+              <tr>
+                <td><kbd>p</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.profile' defaultMessage="to open author's profile" /></td>
+              </tr>
               <tr>
                 <td><kbd>f</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.favourite' defaultMessage='to favourite' /></td>
@@ -49,7 +53,7 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to boost' /></td>
               </tr>
               <tr>
-                <td><kbd>enter</kbd></td>
+                <td><kbd>enter</kbd>, <kbd>o</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.enter' defaultMessage='to open status' /></td>
               </tr>
               <tr>
@@ -57,11 +61,11 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.toggle_hidden' defaultMessage='to show/hide text behind CW' /></td>
               </tr>
               <tr>
-                <td><kbd>up</kbd></td>
+                <td><kbd>up</kbd>, <kbd>k</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></td>
               </tr>
               <tr>
-                <td><kbd>down</kbd></td>
+                <td><kbd>down</kbd>, <kbd>j</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></td>
               </tr>
               <tr>
@@ -88,6 +92,54 @@ export default class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><kbd>esc</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.unfocus' defaultMessage='to un-focus compose textarea/search' /></td>
               </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>h</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.home' defaultMessage='to open home timeline' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>n</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.notifications' defaultMessage='to open notifications column' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>l</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.local' defaultMessage='to open local timeline' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>t</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.federated' defaultMessage='to open federated timeline' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>d</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.direct' defaultMessage='to open direct messages column' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>s</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.start' defaultMessage='to open "get started" column' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>f</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.favourites' defaultMessage='to open favourites list' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>p</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned toots list' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>u</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.my_profile' defaultMessage='to open your profile' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>b</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.blocked' defaultMessage='to open blocked users list' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>m</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.muted' defaultMessage='to open muted users list' /></td>
+              </tr>
+              <tr>
+                <td><kbd>g</kbd>+<kbd>r</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.requests' defaultMessage='to open follow requests list' /></td>
+              </tr>
               <tr>
                 <td><kbd>?</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.legend' defaultMessage='to display this legend' /></td>
diff --git a/app/javascript/mastodon/features/list_adder/components/account.js b/app/javascript/mastodon/features/list_adder/components/account.js
new file mode 100644
index 0000000000000000000000000000000000000000..1369aac0742c437a48cc2f2bf69b0d2bc5d38c13
--- /dev/null
+++ b/app/javascript/mastodon/features/list_adder/components/account.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { makeGetAccount } from '../../../selectors';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import Avatar from '../../../components/avatar';
+import DisplayName from '../../../components/display_name';
+import { injectIntl } from 'react-intl';
+
+const makeMapStateToProps = () => {
+  const getAccount = makeGetAccount();
+
+  const mapStateToProps = (state, { accountId }) => ({
+    account: getAccount(state, accountId),
+  });
+
+  return mapStateToProps;
+};
+
+
+export default @connect(makeMapStateToProps)
+@injectIntl
+class Account extends ImmutablePureComponent {
+
+  static propTypes = {
+    account: ImmutablePropTypes.map.isRequired,
+  };
+
+  render () {
+    const { account } = this.props;
+    return (
+      <div className='account'>
+        <div className='account__wrapper'>
+          <div className='account__display-name'>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/list_adder/components/list.js b/app/javascript/mastodon/features/list_adder/components/list.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb8eb7d7a91a85657fc1d91c27c6b9867832bce9
--- /dev/null
+++ b/app/javascript/mastodon/features/list_adder/components/list.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import IconButton from '../../../components/icon_button';
+import { defineMessages, injectIntl } from 'react-intl';
+import { removeFromListAdder, addToListAdder } from '../../../actions/lists';
+
+const messages = defineMessages({
+  remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' },
+  add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
+});
+
+const MapStateToProps = (state, { listId, added }) => ({
+  list: state.get('lists').get(listId),
+  added: typeof added === 'undefined' ? state.getIn(['listAdder', 'lists', 'items']).includes(listId) : added,
+});
+
+const mapDispatchToProps = (dispatch, { listId }) => ({
+  onRemove: () => dispatch(removeFromListAdder(listId)),
+  onAdd: () => dispatch(addToListAdder(listId)),
+});
+
+export default @connect(MapStateToProps, mapDispatchToProps)
+@injectIntl
+class List extends ImmutablePureComponent {
+
+  static propTypes = {
+    list: ImmutablePropTypes.map.isRequired,
+    intl: PropTypes.object.isRequired,
+    onRemove: PropTypes.func.isRequired,
+    onAdd: PropTypes.func.isRequired,
+    added: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    added: false,
+  };
+
+  render () {
+    const { list, intl, onRemove, onAdd, added } = this.props;
+
+    let button;
+
+    if (added) {
+      button = <IconButton icon='times' title={intl.formatMessage(messages.remove)} onClick={onRemove} />;
+    } else {
+      button = <IconButton icon='plus' title={intl.formatMessage(messages.add)} onClick={onAdd} />;
+    }
+
+    return (
+      <div className='list'>
+        <div className='list__wrapper'>
+          <div className='list__display-name'>
+            <i className='fa fa-fw fa-list-ul column-link__icon' />
+            {list.get('title')}
+          </div>
+
+          <div className='account__relationship'>
+            {button}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/list_adder/index.js b/app/javascript/mastodon/features/list_adder/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb8a15e8c7def8d12f008e462b53f882f18e7710
--- /dev/null
+++ b/app/javascript/mastodon/features/list_adder/index.js
@@ -0,0 +1,73 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { injectIntl } from 'react-intl';
+import { setupListAdder, resetListAdder } from '../../actions/lists';
+import { createSelector } from 'reselect';
+import List from './components/list';
+import Account from './components/account';
+import NewListForm from '../lists/components/new_list_form';
+// hack
+
+const getOrderedLists = createSelector([state => state.get('lists')], lists => {
+  if (!lists) {
+    return lists;
+  }
+
+  return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  listIds: getOrderedLists(state).map(list=>list.get('id')),
+});
+
+const mapDispatchToProps = dispatch => ({
+  onInitialize: accountId => dispatch(setupListAdder(accountId)),
+  onReset: () => dispatch(resetListAdder()),
+});
+
+export default @connect(mapStateToProps, mapDispatchToProps)
+@injectIntl
+class ListAdder extends ImmutablePureComponent {
+
+  static propTypes = {
+    accountId: PropTypes.string.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+    onInitialize: PropTypes.func.isRequired,
+    onReset: PropTypes.func.isRequired,
+    listIds: ImmutablePropTypes.list.isRequired,
+  };
+
+  componentDidMount () {
+    const { onInitialize, accountId } = this.props;
+    onInitialize(accountId);
+  }
+
+  componentWillUnmount () {
+    const { onReset } = this.props;
+    onReset();
+  }
+
+  render () {
+    const { accountId, listIds } = this.props;
+
+    return (
+      <div className='modal-root__modal list-adder'>
+        <div className='list-adder__account'>
+          <Account accountId={accountId} />
+        </div>
+
+        <NewListForm />
+
+
+        <div className='list-adder__lists'>
+          {listIds.map(ListId => <List key={ListId} listId={ListId} />)}
+        </div>
+      </div>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/list_editor/components/account.js b/app/javascript/mastodon/features/list_editor/components/account.js
index c78c58e244d7a44185affd92281097b1b9aaddd1..48085af43d1e7e4c89be728ed637fa56425cf38d 100644
--- a/app/javascript/mastodon/features/list_editor/components/account.js
+++ b/app/javascript/mastodon/features/list_editor/components/account.js
@@ -31,9 +31,9 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
   onAdd: () => dispatch(addToListEditor(accountId)),
 });
 
-@connect(makeMapStateToProps, mapDispatchToProps)
+export default @connect(makeMapStateToProps, mapDispatchToProps)
 @injectIntl
-export default class Account extends ImmutablePureComponent {
+class Account extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/list_editor/components/search.js b/app/javascript/mastodon/features/list_editor/components/search.js
index 45c4d0f2ecde5a7ec21825ec9d9efb7436c8c12b..f7617fe5876a262e78b84365b04b0742287aa093 100644
--- a/app/javascript/mastodon/features/list_editor/components/search.js
+++ b/app/javascript/mastodon/features/list_editor/components/search.js
@@ -19,9 +19,9 @@ const mapDispatchToProps = dispatch => ({
   onChange: value => dispatch(changeListSuggestions(value)),
 });
 
-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-export default class Search extends React.PureComponent {
+class Search extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/mastodon/features/list_editor/index.js b/app/javascript/mastodon/features/list_editor/index.js
index 65f7420de2de1a3f0efec758ad8f007b2bdf7aca..aab0cdd0c0cf3b49c8c1cfc283919a7d7d6e7059 100644
--- a/app/javascript/mastodon/features/list_editor/index.js
+++ b/app/javascript/mastodon/features/list_editor/index.js
@@ -22,9 +22,9 @@ const mapDispatchToProps = dispatch => ({
   onReset: () => dispatch(resetListEditor()),
 });
 
-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-export default class ListEditor extends ImmutablePureComponent {
+class ListEditor extends ImmutablePureComponent {
 
   static propTypes = {
     listId: PropTypes.string.isRequired,
diff --git a/app/javascript/mastodon/features/list_timeline/index.js b/app/javascript/mastodon/features/list_timeline/index.js
index f08e77b7a92d2dc14081ac9c7fd324f442674388..5b047ace483fdcb52948efb31801272e50130100 100644
--- a/app/javascript/mastodon/features/list_timeline/index.js
+++ b/app/javascript/mastodon/features/list_timeline/index.js
@@ -4,6 +4,7 @@ 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 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';
@@ -24,9 +25,9 @@ const mapStateToProps = (state, props) => ({
   hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class ListTimeline extends React.PureComponent {
+class ListTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -35,6 +36,7 @@ export default class ListTimeline extends React.PureComponent {
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     columnId: PropTypes.string,
     hasUnread: PropTypes.bool,
     multiColumn: PropTypes.bool,
@@ -112,7 +114,7 @@ export default class ListTimeline extends React.PureComponent {
   }
 
   render () {
-    const { hasUnread, columnId, multiColumn, list } = this.props;
+    const { shouldUpdateScroll, hasUnread, columnId, multiColumn, list } = this.props;
     const { id } = this.props.params;
     const pinned = !!columnId;
     const title  = list ? list.get('title') : id;
@@ -128,15 +130,14 @@ export default class ListTimeline extends React.PureComponent {
     } else if (list === false) {
       return (
         <Column>
-          <div className='scrollable'>
-            <MissingIndicator />
-          </div>
+          <ColumnBackButton />
+          <MissingIndicator />
         </Column>
       );
     }
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={title}>
         <ColumnHeader
           icon='list-ul'
           active={hasUnread}
@@ -166,6 +167,7 @@ export default class ListTimeline extends React.PureComponent {
           timelineId={`list:${id}`}
           onLoadMore={this.handleLoadMore}
           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.' />}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </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 eed6efc253a6b0ec12eda9a538f555dda67cd125..7392466401780ac0c80822d32cf9291cd54986f1 100644
--- a/app/javascript/mastodon/features/lists/components/new_list_form.js
+++ b/app/javascript/mastodon/features/lists/components/new_list_form.js
@@ -20,9 +20,9 @@ const mapDispatchToProps = dispatch => ({
   onSubmit: () => dispatch(submitListEditor(true)),
 });
 
-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-export default class NewListForm extends React.PureComponent {
+class NewListForm extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string.isRequired,
diff --git a/app/javascript/mastodon/features/lists/index.js b/app/javascript/mastodon/features/lists/index.js
index 018e5a9e33efb1f0aa319162c384a881fc66e722..24f40c16b6d95153b9d2aae6d351615e675bc53e 100644
--- a/app/javascript/mastodon/features/lists/index.js
+++ b/app/javascript/mastodon/features/lists/index.js
@@ -6,12 +6,13 @@ 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 } from 'react-intl';
+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 { createSelector } from 'reselect';
+import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
   heading: { id: 'column.lists', defaultMessage: 'Lists' },
@@ -30,9 +31,9 @@ const mapStateToProps = state => ({
   lists: getOrderedLists(state),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Lists extends ImmutablePureComponent {
+class Lists extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -46,7 +47,7 @@ export default class Lists extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, lists } = this.props;
+    const { intl, shouldUpdateScroll, lists } = this.props;
 
     if (!lists) {
       return (
@@ -56,19 +57,24 @@ export default 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 icon='list-ul' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
 
         <NewListForm />
 
-        <div className='scrollable'>
-          <ColumnSubheading text={intl.formatMessage(messages.subheading)} />
-
+        <ColumnSubheading text={intl.formatMessage(messages.subheading)} />
+        <ScrollableList
+          scrollKey='lists'
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
           {lists.map(list =>
             <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
           )}
-        </div>
+        </ScrollableList>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index bb351ece24665d31bc8c023377e6a45204df0a3d..f979ef72f90fd519189b0a073df36e96e142cb52 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -1,15 +1,16 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { debounce } from 'lodash';
 import LoadingIndicator from '../../components/loading_indicator';
-import { ScrollContainer } from 'react-router-scroll-4';
 import Column from '../ui/components/column';
 import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import AccountContainer from '../../containers/account_container';
 import { fetchMutes, expandMutes } from '../../actions/mutes';
-import { defineMessages, injectIntl } from 'react-intl';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const messages = defineMessages({
   heading: { id: 'column.mutes', defaultMessage: 'Muted users' },
@@ -19,13 +20,14 @@ const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'mutes', 'items']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Mutes extends ImmutablePureComponent {
+class Mutes extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
     intl: PropTypes.object.isRequired,
   };
@@ -34,16 +36,12 @@ export default class Mutes extends ImmutablePureComponent {
     this.props.dispatch(fetchMutes());
   }
 
-  handleScroll = (e) => {
-    const { scrollTop, scrollHeight, clientHeight } = e.target;
-
-    if (scrollTop === scrollHeight - clientHeight) {
-      this.props.dispatch(expandMutes());
-    }
-  }
+  handleLoadMore = debounce(() => {
+    this.props.dispatch(expandMutes());
+  }, 300, { leading: true });
 
   render () {
-    const { intl, accountIds } = this.props;
+    const { intl, shouldUpdateScroll, accountIds } = this.props;
 
     if (!accountIds) {
       return (
@@ -53,16 +51,21 @@ export default class Mutes extends ImmutablePureComponent {
       );
     }
 
+    const emptyMessage = <FormattedMessage id='empty_column.mutes' defaultMessage="You haven't muted any users yet." />;
+
     return (
       <Column icon='volume-off' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
-        <ScrollContainer scrollKey='mutes'>
-          <div className='scrollable mutes' onScroll={this.handleScroll}>
-            {accountIds.map(id =>
-              <AccountContainer key={id} id={id} />
-            )}
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='mutes'
+          onLoadMore={this.handleLoadMore}
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} />
+          )}
+        </ScrollableList>
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index d9638aaf35a958801501f74351cbf6f169091f96..a334fd63cc8fa7bf4c2c947d29efcabce05cefce 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -21,13 +21,14 @@ export default class ColumnSettings extends React.PureComponent {
   render () {
     const { settings, pushSettings, onChange, onClear } = this.props;
 
-    const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
-    const showStr  = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
-    const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
+    const filterShowStr = <FormattedMessage id='notifications.column_settings.filter_bar.show' defaultMessage='Show' />;
+    const filterAdvancedStr = <FormattedMessage id='notifications.column_settings.filter_bar.advanced' defaultMessage='Display all categories' />;
+    const alertStr  = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
+    const showStr   = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
+    const soundStr  = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
 
     const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
     const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
-    const pushMeta = showPushSettings && <FormattedMessage id='notifications.column_settings.push_meta' defaultMessage='This device' />;
 
     return (
       <div>
@@ -35,12 +36,22 @@ export default class ColumnSettings extends React.PureComponent {
           <ClearColumnButton onClick={onClear} />
         </div>
 
+        <div role='group' aria-labelledby='notifications-filter-bar'>
+          <span id='notifications-filter-bar' className='column-settings__section'>
+            <FormattedMessage id='notifications.column_settings.filter_bar.category' defaultMessage='Quick filter bar' />
+          </span>
+          <div className='column-settings__row'>
+            <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'show']} onChange={onChange} label={filterShowStr} />
+            <SettingToggle id='show-filter-bar' prefix='notifications' settings={settings} settingPath={['quickFilter', 'advanced']} onChange={onChange} label={filterAdvancedStr} />
+          </div>
+        </div>
+
         <div role='group' aria-labelledby='notifications-follow'>
           <span id='notifications-follow' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
 
           <div className='column-settings__row'>
             <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'follow']} onChange={onChange} label={alertStr} />
-            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'follow']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'follow']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow']} onChange={onChange} label={soundStr} />
           </div>
@@ -51,7 +62,7 @@ export default class ColumnSettings extends React.PureComponent {
 
           <div className='column-settings__row'>
             <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
-            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'favourite']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'favourite']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'favourite']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
           </div>
@@ -62,7 +73,7 @@ export default class ColumnSettings extends React.PureComponent {
 
           <div className='column-settings__row'>
             <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'mention']} onChange={onChange} label={alertStr} />
-            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'mention']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'mention']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'mention']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'mention']} onChange={onChange} label={soundStr} />
           </div>
@@ -73,7 +84,7 @@ export default class ColumnSettings extends React.PureComponent {
 
           <div className='column-settings__row'>
             <SettingToggle prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
-            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'reblog']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'reblog']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'reblog']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
           </div>
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.js b/app/javascript/mastodon/features/notifications/components/filter_bar.js
new file mode 100644
index 0000000000000000000000000000000000000000..f95a2c9dea695ad2f8b8d053e194a87c7072ce88
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/components/filter_bar.js
@@ -0,0 +1,93 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+
+const tooltips = defineMessages({
+  mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' },
+  favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' },
+  boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' },
+  follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' },
+});
+
+export default @injectIntl
+class FilterBar extends React.PureComponent {
+
+  static propTypes = {
+    selectFilter: PropTypes.func.isRequired,
+    selectedFilter: PropTypes.string.isRequired,
+    advancedMode: PropTypes.bool.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  onClick (notificationType) {
+    return () => this.props.selectFilter(notificationType);
+  }
+
+  render () {
+    const { selectedFilter, advancedMode, intl } = this.props;
+    const renderedElement = !advancedMode ? (
+      <div className='notification__filter-bar'>
+        <button
+          className={selectedFilter === 'all' ? 'active' : ''}
+          onClick={this.onClick('all')}
+        >
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </button>
+        <button
+          className={selectedFilter === 'mention' ? 'active' : ''}
+          onClick={this.onClick('mention')}
+        >
+          <FormattedMessage
+            id='notifications.filter.mentions'
+            defaultMessage='Mentions'
+          />
+        </button>
+      </div>
+    ) : (
+      <div className='notification__filter-bar'>
+        <button
+          className={selectedFilter === 'all' ? 'active' : ''}
+          onClick={this.onClick('all')}
+        >
+          <FormattedMessage
+            id='notifications.filter.all'
+            defaultMessage='All'
+          />
+        </button>
+        <button
+          className={selectedFilter === 'mention' ? 'active' : ''}
+          onClick={this.onClick('mention')}
+          title={intl.formatMessage(tooltips.mentions)}
+        >
+          <i className='fa fa-fw fa-at' />
+        </button>
+        <button
+          className={selectedFilter === 'favourite' ? 'active' : ''}
+          onClick={this.onClick('favourite')}
+          title={intl.formatMessage(tooltips.favourites)}
+        >
+          <i className='fa fa-fw fa-star' />
+        </button>
+        <button
+          className={selectedFilter === 'reblog' ? 'active' : ''}
+          onClick={this.onClick('reblog')}
+          title={intl.formatMessage(tooltips.boosts)}
+        >
+          <i className='fa fa-fw fa-retweet' />
+        </button>
+        <button
+          className={selectedFilter === 'follow' ? 'active' : ''}
+          onClick={this.onClick('follow')}
+          title={intl.formatMessage(tooltips.follows)}
+        >
+          <i className='fa fa-fw fa-user-plus' />
+        </button>
+      </div>
+    );
+    return renderedElement;
+  }
+
+}
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index f58224a8b4f3f4e88613ffa848ae4f61a69d2382..44da423adcd6fdc63a30ddef653477e4abf930b7 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -3,12 +3,21 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import StatusContainer from '../../../containers/status_container';
 import AccountContainer from '../../../containers/account_container';
-import { FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import Permalink from '../../../components/permalink';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 
-export default class Notification extends ImmutablePureComponent {
+const notificationForScreenReader = (intl, message, timestamp) => {
+  const output = [message];
+
+  output.push(intl.formatDate(timestamp, { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }));
+
+  return output.join(', ');
+};
+
+export default @injectIntl
+class Notification extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -20,6 +29,7 @@ export default class Notification extends ImmutablePureComponent {
     onMoveUp: PropTypes.func.isRequired,
     onMoveDown: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
   };
 
   handleMoveUp = () => {
@@ -65,16 +75,20 @@ export default class Notification extends ImmutablePureComponent {
     };
   }
 
-  renderFollow (account, link) {
+  renderFollow (notification, account, link) {
+    const { intl } = this.props;
+
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-follow focusable' tabIndex='0'>
+        <div className='notification notification-follow focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.follow', defaultMessage: '{name} followed you' }, { name: account.get('acct') }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <i className='fa fa-fw fa-user-plus' />
             </div>
 
-            <FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} />
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} />
+            </span>
           </div>
 
           <AccountContainer id={account.get('id')} withNote={false} hidden={this.props.hidden} />
@@ -97,14 +111,19 @@ export default class Notification extends ImmutablePureComponent {
   }
 
   renderFavourite (notification, link) {
+    const { intl } = this.props;
+
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-favourite focusable' tabIndex='0'>
+        <div className='notification notification-favourite focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.favourite', defaultMessage: '{name} favourited your status' }, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <i className='fa fa-fw fa-star star-icon' />
             </div>
-            <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
+            </span>
           </div>
 
           <StatusContainer id={notification.get('status')} account={notification.get('account')} muted withDismiss hidden={!!this.props.hidden} />
@@ -114,14 +133,19 @@ export default class Notification extends ImmutablePureComponent {
   }
 
   renderReblog (notification, link) {
+    const { intl } = this.props;
+
     return (
       <HotKeys handlers={this.getHandlers()}>
-        <div className='notification notification-reblog focusable' tabIndex='0'>
+        <div className='notification notification-reblog focusable' tabIndex='0' aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.reblog', defaultMessage: '{name} boosted your status' }, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <div className='notification__favourite-icon-wrapper'>
               <i className='fa fa-fw fa-retweet' />
             </div>
-            <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
+            </span>
           </div>
 
           <StatusContainer id={notification.get('status')} account={notification.get('account')} muted withDismiss hidden={this.props.hidden} />
@@ -138,7 +162,7 @@ export default class Notification extends ImmutablePureComponent {
 
     switch(notification.get('type')) {
     case 'follow':
-      return this.renderFollow(account, link);
+      return this.renderFollow(notification, account, link);
     case 'mention':
       return this.renderMention(notification);
     case 'favourite':
diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index ac2211e48bddb1556e44700ed481918c033b757d..7aec16d2ea71ed267e21e94c3c2648ab8d65eb27 100644
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -10,7 +10,6 @@ export default class SettingToggle extends React.PureComponent {
     settings: ImmutablePropTypes.map.isRequired,
     settingPath: PropTypes.array.isRequired,
     label: PropTypes.node.isRequired,
-    meta: PropTypes.node,
     onChange: PropTypes.func.isRequired,
   }
 
@@ -19,14 +18,13 @@ export default class SettingToggle extends React.PureComponent {
   }
 
   render () {
-    const { prefix, settings, settingPath, label, meta } = this.props;
+    const { prefix, settings, settingPath, label } = this.props;
     const id = ['setting-toggle', prefix, ...settingPath].filter(Boolean).join('-');
 
     return (
       <div className='setting-toggle'>
         <Toggle id={id} checked={settings.getIn(settingPath)} onChange={this.onChange} onKeyDown={this.onKeyDown} />
         <label htmlFor={id} className='setting-toggle__label'>{label}</label>
-        {meta && <span className='setting-meta__label'>{meta}</span>}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index e9cef0a7bc300cd584964228667edfef4c5ca546..a67f262953f6a6c2ef6b6b93a1cfee1698825f89 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -2,6 +2,7 @@ import { connect } from 'react-redux';
 import { defineMessages, injectIntl } from 'react-intl';
 import ColumnSettings from '../components/column_settings';
 import { changeSetting } from '../../../actions/settings';
+import { setFilter } from '../../../actions/notifications';
 import { clearNotifications } from '../../../actions/notifications';
 import { changeAlerts as changePushNotifications } from '../../../actions/push_notifications';
 import { openModal } from '../../../actions/modal';
@@ -21,6 +22,9 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   onChange (path, checked) {
     if (path[0] === 'push') {
       dispatch(changePushNotifications(path.slice(1), checked));
+    } else if (path[0] === 'quickFilter') {
+      dispatch(changeSetting(['notifications', ...path], checked));
+      dispatch(setFilter('all'));
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
     }
diff --git a/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d495c2908126a130e8306a11fe74c171f834564
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications/containers/filter_bar_container.js
@@ -0,0 +1,16 @@
+import { connect } from 'react-redux';
+import FilterBar from '../components/filter_bar';
+import { setFilter } from '../../../actions/notifications';
+
+const makeMapStateToProps = state => ({
+  selectedFilter: state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
+  advancedMode: state.getIn(['settings', 'notifications', 'quickFilter', 'advanced']),
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  selectFilter (newActiveFilter) {
+    dispatch(setFilter(newActiveFilter));
+  },
+});
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(FilterBar);
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index 94a46b833333776b12b4f3b822b834380cfe7c0a..9430b20505040a1d1023098b3c0c470d6d21f34e 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -9,6 +9,7 @@ import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import NotificationContainer from './containers/notification_container';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnSettingsContainer from './containers/column_settings_container';
+import FilterBarContainer from './containers/filter_bar_container';
 import { createSelector } from 'reselect';
 import { List as ImmutableList } from 'immutable';
 import { debounce } from 'lodash';
@@ -20,24 +21,36 @@ const messages = defineMessages({
 });
 
 const getNotifications = createSelector([
+  state => state.getIn(['settings', 'notifications', 'quickFilter', 'show']),
+  state => state.getIn(['settings', 'notifications', 'quickFilter', 'active']),
   state => ImmutableList(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()),
   state => state.getIn(['notifications', 'items']),
-], (excludedTypes, notifications) => notifications.filterNot(item => item !== null && excludedTypes.includes(item.get('type'))));
+], (showFilterBar, allowedType, excludedTypes, notifications) => {
+  if (!showFilterBar || allowedType === 'all') {
+    // used if user changed the notification settings after loading the notifications from the server
+    // otherwise a list of notifications will come pre-filtered from the backend
+    // we need to turn it off for FilterBar in order not to block ourselves from seeing a specific category
+    return notifications.filterNot(item => item !== null && excludedTypes.includes(item.get('type')));
+  }
+  return notifications.filter(item => item !== null && allowedType === item.get('type'));
+});
 
 const mapStateToProps = state => ({
+  showFilterBar: state.getIn(['settings', 'notifications', 'quickFilter', 'show']),
   notifications: getNotifications(state),
   isLoading: state.getIn(['notifications', 'isLoading'], true),
   isUnread: state.getIn(['notifications', 'unread']) > 0,
   hasMore: state.getIn(['notifications', 'hasMore']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class Notifications extends React.PureComponent {
+class Notifications extends React.PureComponent {
 
   static propTypes = {
     columnId: PropTypes.string,
     notifications: ImmutablePropTypes.list.isRequired,
+    showFilterBar: PropTypes.bool.isRequired,
     dispatch: PropTypes.func.isRequired,
     shouldUpdateScroll: PropTypes.func,
     intl: PropTypes.object.isRequired,
@@ -117,12 +130,16 @@ export default class Notifications extends React.PureComponent {
   }
 
   render () {
-    const { intl, notifications, shouldUpdateScroll, isLoading, isUnread, columnId, multiColumn, hasMore } = this.props;
+    const { intl, notifications, shouldUpdateScroll, isLoading, isUnread, columnId, multiColumn, hasMore, showFilterBar } = this.props;
     const pinned = !!columnId;
     const emptyMessage = <FormattedMessage id='empty_column.notifications' defaultMessage="You don't have any notifications yet. Interact with others to start the conversation." />;
 
     let scrollableContent = null;
 
+    const filterBarContainer = showFilterBar
+      ? (<FilterBarContainer />)
+      : null;
+
     if (isLoading && this.scrollableContent) {
       scrollableContent = this.scrollableContent;
     } else if (notifications.size > 0 || hasMore) {
@@ -153,6 +170,7 @@ export default class Notifications extends React.PureComponent {
         scrollKey={`notifications-${columnId}`}
         trackScroll={!pinned}
         isLoading={isLoading}
+        showLoading={isLoading && notifications.size === 0}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
         onLoadMore={this.handleLoadOlder}
@@ -165,7 +183,7 @@ export default class Notifications extends React.PureComponent {
     );
 
     return (
-      <Column ref={this.setColumnRef}>
+      <Column ref={this.setColumnRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='bell'
           active={isUnread}
@@ -178,7 +196,7 @@ export default class Notifications extends React.PureComponent {
         >
           <ColumnSettingsContainer />
         </ColumnHeader>
-
+        {filterBarContainer}
         {scrollContainer}
       </Column>
     );
diff --git a/app/javascript/mastodon/features/pinned_statuses/index.js b/app/javascript/mastodon/features/pinned_statuses/index.js
index b4a6c1e527ded4eba90b273b1ebcfd36053adfee..98cdbda3c492c0c6d3005ff532270fa38d98d5fb 100644
--- a/app/javascript/mastodon/features/pinned_statuses/index.js
+++ b/app/javascript/mastodon/features/pinned_statuses/index.js
@@ -18,12 +18,13 @@ const mapStateToProps = state => ({
   hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
 });
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class PinnedStatuses extends ImmutablePureComponent {
+class PinnedStatuses extends ImmutablePureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     statusIds: ImmutablePropTypes.list.isRequired,
     intl: PropTypes.object.isRequired,
     hasMore: PropTypes.bool.isRequired,
@@ -42,7 +43,7 @@ export default class PinnedStatuses extends ImmutablePureComponent {
   }
 
   render () {
-    const { intl, statusIds, hasMore } = this.props;
+    const { intl, shouldUpdateScroll, statusIds, hasMore } = this.props;
 
     return (
       <Column icon='thumb-tack' heading={intl.formatMessage(messages.heading)} ref={this.setRef}>
@@ -51,6 +52,7 @@ export default class PinnedStatuses extends ImmutablePureComponent {
           statusIds={statusIds}
           scrollKey='pinned_statuses'
           hasMore={hasMore}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index 2d5bb3baf75f520c1fb045ff236880fb1a3c450e..d640033ebb6f47b5b261e453ea457bb9cb0b00be 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -25,9 +25,9 @@ const mapStateToProps = (state, { onlyMedia, columnId }) => {
   };
 };
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
-export default class PublicTimeline extends React.PureComponent {
+class PublicTimeline extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -39,6 +39,7 @@ export default class PublicTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     intl: PropTypes.object.isRequired,
     columnId: PropTypes.string,
     multiColumn: PropTypes.bool,
@@ -99,19 +100,12 @@ export default class PublicTimeline extends React.PureComponent {
     dispatch(expandPublicTimeline({ maxId, onlyMedia }));
   }
 
-  handleSettingChanged = (key, checked) => {
-    const { columnId } = this.props;
-    if (!columnId && key[0] === 'other' && key[1] === 'onlyMedia') {
-      this.context.router.history.replace(`/timelines/public${checked ? '/media' : ''}`);
-    }
-  }
-
   render () {
-    const { intl, columnId, hasUnread, multiColumn, onlyMedia } = this.props;
+    const { intl, shouldUpdateScroll, columnId, hasUnread, multiColumn, onlyMedia } = this.props;
     const pinned = !!columnId;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='globe'
           active={hasUnread}
@@ -122,7 +116,7 @@ export default class PublicTimeline extends React.PureComponent {
           pinned={pinned}
           multiColumn={multiColumn}
         >
-          <ColumnSettingsContainer onChange={this.handleSettingChanged} columnId={columnId} />
+          <ColumnSettingsContainer columnId={columnId} />
         </ColumnHeader>
 
         <StatusListContainer
@@ -131,6 +125,7 @@ export default class PublicTimeline extends React.PureComponent {
           trackScroll={!pinned}
           scrollKey={`public_timeline-${columnId}`}
           emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other instances to fill it up' />}
+          shouldUpdateScroll={shouldUpdateScroll}
         />
       </Column>
     );
diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 579d6aaa02343b0271f4a72be620f94f48468792..c05d21c740451c9dd6753deea26ce0c373446150 100644
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -1,25 +1,27 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import LoadingIndicator from '../../components/loading_indicator';
 import { fetchReblogs } from '../../actions/interactions';
-import { ScrollContainer } from 'react-router-scroll-4';
+import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../containers/account_container';
 import Column from '../ui/components/column';
 import ColumnBackButton from '../../components/column_back_button';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ScrollableList from '../../components/scrollable_list';
 
 const mapStateToProps = (state, props) => ({
   accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
 });
 
-@connect(mapStateToProps)
-export default class Reblogs extends ImmutablePureComponent {
+export default @connect(mapStateToProps)
+class Reblogs extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
+    shouldUpdateScroll: PropTypes.func,
     accountIds: ImmutablePropTypes.list,
   };
 
@@ -34,7 +36,7 @@ export default class Reblogs extends ImmutablePureComponent {
   }
 
   render () {
-    const { accountIds } = this.props;
+    const { shouldUpdateScroll, accountIds } = this.props;
 
     if (!accountIds) {
       return (
@@ -44,15 +46,21 @@ export default 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.' />;
+
     return (
       <Column>
         <ColumnBackButton />
 
-        <ScrollContainer scrollKey='reblogs'>
-          <div className='scrollable reblogs'>
-            {accountIds.map(id => <AccountContainer key={id} id={id} withNote={false} />)}
-          </div>
-        </ScrollContainer>
+        <ScrollableList
+          scrollKey='reblogs'
+          shouldUpdateScroll={shouldUpdateScroll}
+          emptyMessage={emptyMessage}
+        >
+          {accountIds.map(id =>
+            <AccountContainer key={id} id={id} withNote={false} />
+          )}
+        </ScrollableList>
       </Column>
     );
   }
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 9ff75a082c2ed1b6eb0966e83e8849a1f0eba2df..2552d94d899c9c8d9f60d5aba4f829697b28dc16 100644
--- a/app/javascript/mastodon/features/report/components/status_check_box.js
+++ b/app/javascript/mastodon/features/report/components/status_check_box.js
@@ -36,6 +36,7 @@ export default class StatusCheckBox extends React.PureComponent {
               <Component
                 preview={video.get('preview_url')}
                 src={video.get('url')}
+                alt={video.get('description')}
                 width={239}
                 height={110}
                 inline
diff --git a/app/javascript/mastodon/features/standalone/community_timeline/index.js b/app/javascript/mastodon/features/standalone/community_timeline/index.js
index 629d058a26c0407397d5f8d70bc1f7712a380255..f917f41c974a2dbe6e4789783931ab22881c62f6 100644
--- a/app/javascript/mastodon/features/standalone/community_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/community_timeline/index.js
@@ -12,9 +12,9 @@ const messages = defineMessages({
   title: { id: 'standalone.public_title', defaultMessage: 'A look inside...' },
 });
 
-@connect()
+export default @connect()
 @injectIntl
-export default class CommunityTimeline extends React.PureComponent {
+class CommunityTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -51,7 +51,7 @@ export default class CommunityTimeline extends React.PureComponent {
     const { intl } = this.props;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='users'
           title={intl.formatMessage(messages.title)}
diff --git a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
index 931ca2a32ea727710aa5ad19c40643f6c54e6dff..333726f94225d91c946a10b1eb41243f5f161a9d 100644
--- a/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/hashtag_timeline/index.js
@@ -1,33 +1,37 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import StatusListContainer from '../../ui/containers/status_list_container';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { expandHashtagTimeline } from '../../../actions/timelines';
-import Column from '../../../components/column';
-import ColumnHeader from '../../../components/column_header';
 import { connectHashtagStream } from '../../../actions/streaming';
+import Masonry from 'react-masonry-infinite';
+import { List as ImmutableList } from 'immutable';
+import DetailedStatusContainer from '../../status/containers/detailed_status_container';
+import { debounce } from 'lodash';
+import LoadingIndicator from '../../../components/loading_indicator';
 
-@connect()
-export default class HashtagTimeline extends React.PureComponent {
+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,
   };
 
-  handleHeaderClick = () => {
-    this.column.scrollTop();
-  }
-
-  setRef = c => {
-    this.column = c;
-  }
-
   componentDidMount () {
     const { dispatch, hashtag } = this.props;
 
     dispatch(expandHashtagTimeline(hashtag));
-    this.disconnect = dispatch(connectHashtagStream(hashtag));
+    this.disconnect = dispatch(connectHashtagStream(hashtag, hashtag));
   }
 
   componentWillUnmount () {
@@ -37,28 +41,52 @@ export default class HashtagTimeline extends React.PureComponent {
     }
   }
 
-  handleLoadMore = maxId => {
-    this.props.dispatch(expandHashtagTimeline(this.props.hashtag, { maxId }));
+  handleLoadMore = () => {
+    const maxId = this.props.statusIds.last();
+
+    if (maxId) {
+      this.props.dispatch(expandHashtagTimeline(this.props.hashtag, { maxId }));
+    }
+  }
+
+  setRef = c => {
+    this.masonry = c;
   }
 
+  handleHeightChange = debounce(() => {
+    if (!this.masonry) {
+      return;
+    }
+
+    this.masonry.forcePack();
+  }, 50)
+
   render () {
-    const { hashtag } = this.props;
+    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 (
-      <Column ref={this.setRef}>
-        <ColumnHeader
-          icon='hashtag'
-          title={hashtag}
-          onClick={this.handleHeaderClick}
-        />
-
-        <StatusListContainer
-          trackScroll={false}
-          scrollKey='standalone_hashtag_timeline'
-          timelineId={`hashtag:${hashtag}`}
-          onLoadMore={this.handleLoadMore}
-        />
-      </Column>
+      <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
index 1236cb92730f5640aa6ce9a0f3e9524eaac74f27..618696eb167f5412874b51fe8769e7cc996d782d 100644
--- a/app/javascript/mastodon/features/standalone/public_timeline/index.js
+++ b/app/javascript/mastodon/features/standalone/public_timeline/index.js
@@ -12,9 +12,9 @@ const messages = defineMessages({
   title: { id: 'standalone.public_title', defaultMessage: 'A look inside...' },
 });
 
-@connect()
+export default @connect()
 @injectIntl
-export default class PublicTimeline extends React.PureComponent {
+class PublicTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -51,7 +51,7 @@ export default class PublicTimeline extends React.PureComponent {
     const { intl } = this.props;
 
     return (
-      <Column ref={this.setRef}>
+      <Column ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon='globe'
           title={intl.formatMessage(messages.title)}
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 5414996681761441f8c698df38689bd04080f0a9..d3b725283ad74d0178ca375e38fde8b9dd4dfdd1 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -4,7 +4,7 @@ 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 } from '../../../initial_state';
+import { me, isStaff } from '../../../initial_state';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -26,10 +26,12 @@ const messages = defineMessages({
   pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
   unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
   embed: { id: 'status.embed', defaultMessage: 'Embed' },
+  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' },
 });
 
-@injectIntl
-export default class ActionBar extends React.PureComponent {
+export default @injectIntl
+class ActionBar extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -65,11 +67,11 @@ export default class ActionBar extends React.PureComponent {
   }
 
   handleDeleteClick = () => {
-    this.props.onDelete(this.props.status);
+    this.props.onDelete(this.props.status, this.context.router.history);
   }
 
   handleRedraftClick = () => {
-    this.props.onDelete(this.props.status, true);
+    this.props.onDelete(this.props.status, this.context.router.history, true);
   }
 
   handleDirectClick = () => {
@@ -145,12 +147,24 @@ export default class ActionBar extends React.PureComponent {
       menu.push({ text: intl.formatMessage(messages.mute, { name: status.getIn(['account', 'username']) }), action: this.handleMuteClick });
       menu.push({ text: intl.formatMessage(messages.block, { name: status.getIn(['account', 'username']) }), action: this.handleBlockClick });
       menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
+      if (isStaff) {
+        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')}` });
+      }
     }
 
     const shareButton = ('share' in navigator) && status.get('visibility') === 'public' && (
       <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShare} /></div>
     );
 
+    let replyIcon;
+    if (status.get('in_reply_to_id', null) === null) {
+      replyIcon = 'reply';
+    } else {
+      replyIcon = 'reply-all';
+    }
+
     let reblogIcon = 'retweet';
     if (status.get('visibility') === 'direct') reblogIcon = 'envelope';
     else if (status.get('visibility') === 'private') reblogIcon = 'lock';
@@ -159,7 +173,7 @@ export default class ActionBar extends React.PureComponent {
 
     return (
       <div className='detailed-status__action-bar'>
-        <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_id', null) === null ? 'reply' : 'reply-all'} onClick={this.handleReplyClick} /></div>
+        <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 disabled={reblog_disabled} active={status.get('reblogged')} title={reblog_disabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} 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>
         {shareButton}
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index b52f3c4fafd4689af84ae3ce0923407c8f8d8bbd..8491299ef49c68d1bf3128efa74f8e36a7d02c13 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -59,10 +59,12 @@ export default class Card extends React.PureComponent {
     card: ImmutablePropTypes.map,
     maxDescription: PropTypes.number,
     onOpenMedia: PropTypes.func.isRequired,
+    compact: PropTypes.bool,
   };
 
   static defaultProps = {
     maxDescription: 50,
+    compact: false,
   };
 
   state = {
@@ -71,7 +73,7 @@ export default class Card extends React.PureComponent {
   };
 
   componentWillReceiveProps (nextProps) {
-    if (this.props.card !== nextProps.card) {
+    if (!Immutable.is(this.props.card, nextProps.card)) {
       this.setState({ embedded: false });
     }
   }
@@ -118,7 +120,7 @@ export default class Card extends React.PureComponent {
     const content   = { __html: addAutoPlay(card.get('html')) };
     const { width } = this.state;
     const ratio     = card.get('width') / card.get('height');
-    const height    = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio);
+    const height    = width / ratio;
 
     return (
       <div
@@ -131,25 +133,25 @@ export default class Card extends React.PureComponent {
   }
 
   render () {
-    const { card, maxDescription } = this.props;
-    const { width, embedded }      = this.state;
+    const { card, maxDescription, compact } = this.props;
+    const { width, embedded } = this.state;
 
     if (card === null) {
       return null;
     }
 
     const provider    = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
-    const horizontal  = card.get('width') > card.get('height') && (card.get('width') + 100 >= width) || card.get('type') !== 'link';
-    const className   = classnames('status-card', { horizontal });
+    const horizontal  = (!compact && card.get('width') > card.get('height') && (card.get('width') + 100 >= width)) || card.get('type') !== 'link' || embedded;
     const interactive = card.get('type') !== 'link';
+    const className   = classnames('status-card', { horizontal, compact, interactive });
     const title       = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
     const ratio       = card.get('width') / card.get('height');
-    const height      = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio);
+    const height      = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
 
     const description = (
       <div className='status-card__content'>
         {title}
-        {!horizontal && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
+        {!(horizontal || compact) && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
         <span className='status-card__host'>{provider}</span>
       </div>
     );
@@ -174,7 +176,7 @@ export default class Card extends React.PureComponent {
             <div className='status-card__actions'>
               <div>
                 <button onClick={this.handleEmbedClick}><i className={`fa fa-${iconVariant}`} /></button>
-                <a href={card.get('url')} target='_blank' rel='noopener'><i className='fa fa-external-link' /></a>
+                {horizontal && <a href={card.get('url')} target='_blank' rel='noopener'><i className='fa fa-external-link' /></a>}
               </div>
             </div>
           </div>
@@ -184,7 +186,7 @@ export default class Card extends React.PureComponent {
       return (
         <div className={className} ref={this.setRef}>
           {embed}
-          {description}
+          {!compact && description}
         </div>
       );
     } else if (card.get('image')) {
@@ -193,6 +195,12 @@ export default class Card extends React.PureComponent {
           {thumbnail}
         </div>
       );
+    } else {
+      embed = (
+        <div className='status-card__image'>
+          <i className='fa fa-file-text' />
+        </div>
+      );
     }
 
     return (
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 4177190044ee5266e7e88038fd0efb7ee9ce2e22..0630387d297745febbf454132ad1c4e1a6705a50 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -8,9 +8,11 @@ import MediaGallery from '../../../components/media_gallery';
 import AttachmentList from '../../../components/attachment_list';
 import { Link } from 'react-router-dom';
 import { FormattedDate, FormattedNumber } from 'react-intl';
-import CardContainer from '../containers/card_container';
+import Card from './card';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Video from '../../video';
+import scheduleIdleTask from '../../ui/util/schedule_idle_task';
+import classNames from 'classnames';
 
 export default class DetailedStatus extends ImmutablePureComponent {
 
@@ -23,10 +25,18 @@ export default class DetailedStatus extends ImmutablePureComponent {
     onOpenMedia: PropTypes.func.isRequired,
     onOpenVideo: PropTypes.func.isRequired,
     onToggleHidden: PropTypes.func.isRequired,
+    measureHeight: PropTypes.bool,
+    onHeightChange: PropTypes.func,
+    domain: PropTypes.string.isRequired,
+    compact: PropTypes.bool,
+  };
+
+  state = {
+    height: null,
   };
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey) && this.context.router) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
@@ -42,13 +52,57 @@ export default class DetailedStatus extends ImmutablePureComponent {
     this.props.onToggleHidden(this.props.status);
   }
 
+  _measureHeight (heightJustChanged) {
+    if (this.props.measureHeight && this.node) {
+      scheduleIdleTask(() => this.node && this.setState({ height: Math.ceil(this.node.scrollHeight) + 1 }));
+
+      if (this.props.onHeightChange && heightJustChanged) {
+        this.props.onHeightChange();
+      }
+    }
+  }
+
+  setRef = c => {
+    this.node = c;
+    this._measureHeight();
+  }
+
+  componentDidUpdate (prevProps, prevState) {
+    this._measureHeight(prevState.height !== this.state.height);
+  }
+
+  handleModalLink = 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');
+  }
+
   render () {
     const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
+    const outerStyle = { boxSizing: 'border-box' };
+    const { compact } = this.props;
+
+    if (!status) {
+      return null;
+    }
 
     let media           = '';
     let applicationLink = '';
     let reblogLink = '';
     let reblogIcon = 'retweet';
+    let favouriteLink = '';
+
+    if (this.props.measureHeight) {
+      outerStyle.height = `${this.state.height}px`;
+    }
 
     if (status.get('media_attachments').size > 0) {
       if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
@@ -60,6 +114,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
           <Video
             preview={video.get('preview_url')}
             src={video.get('url')}
+            alt={video.get('description')}
             width={300}
             height={150}
             inline
@@ -79,7 +134,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
         );
       }
     } else if (status.get('spoiler_text').length === 0) {
-      media = <CardContainer onOpenMedia={this.props.onOpenMedia} statusId={status.get('id')} />;
+      media = <Card onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />;
     }
 
     if (status.get('application')) {
@@ -94,35 +149,63 @@ export default class DetailedStatus extends ImmutablePureComponent {
 
     if (status.get('visibility') === 'private') {
       reblogLink = <i className={`fa fa-${reblogIcon}`} />;
+    } else if (this.context.router) {
+      reblogLink = (
+        <Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'>
+          <i className={`fa fa-${reblogIcon}`} />
+          <span className='detailed-status__reblogs'>
+            <FormattedNumber value={status.get('reblogs_count')} />
+          </span>
+        </Link>
+      );
     } else {
-      reblogLink = (<Link to={`/statuses/${status.get('id')}/reblogs`} className='detailed-status__link'>
-        <i className={`fa fa-${reblogIcon}`} />
-        <span className='detailed-status__reblogs'>
-          <FormattedNumber value={status.get('reblogs_count')} />
-        </span>
-      </Link>);
+      reblogLink = (
+        <a href={`/interact/${status.get('id')}?type=reblog`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <i className={`fa fa-${reblogIcon}`} />
+          <span className='detailed-status__reblogs'>
+            <FormattedNumber value={status.get('reblogs_count')} />
+          </span>
+        </a>
+      );
     }
 
-    return (
-      <div className='detailed-status'>
-        <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>
-          <DisplayName account={status.get('account')} />
+    if (this.context.router) {
+      favouriteLink = (
+        <Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
+          <i className='fa fa-star' />
+          <span className='detailed-status__favorites'>
+            <FormattedNumber value={status.get('favourites_count')} />
+          </span>
+        </Link>
+      );
+    } else {
+      favouriteLink = (
+        <a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
+          <i className='fa fa-star' />
+          <span className='detailed-status__favorites'>
+            <FormattedNumber value={status.get('favourites_count')} />
+          </span>
         </a>
+      );
+    }
 
-        <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
-
-        {media}
-
-        <div className='detailed-status__meta'>
-          <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener'>
-            <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
-          </a>{applicationLink} Â· {reblogLink} Â· <Link to={`/statuses/${status.get('id')}/favourites`} className='detailed-status__link'>
-            <i className='fa fa-star' />
-            <span className='detailed-status__favorites'>
-              <FormattedNumber value={status.get('favourites_count')} />
-            </span>
-          </Link>
+    return (
+      <div style={outerStyle}>
+        <div ref={this.setRef} className={classNames('detailed-status', { 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>
+            <DisplayName account={status.get('account')} localDomain={this.props.domain} />
+          </a>
+
+          <StatusContent status={status} expanded={!status.get('hidden')} onExpandedToggle={this.handleExpandedToggle} />
+
+          {media}
+
+          <div className='detailed-status__meta'>
+            <a className='detailed-status__datetime' href={status.get('url')} target='_blank' rel='noopener'>
+              <FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' />
+            </a>{applicationLink} Â· {reblogLink} Â· {favouriteLink}
+          </div>
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/status/containers/card_container.js b/app/javascript/mastodon/features/status/containers/card_container.js
deleted file mode 100644
index a97404de1903b2b71b5b3a1b0260a274faf2a49d..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/features/status/containers/card_container.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { connect } from 'react-redux';
-import Card from '../components/card';
-
-const mapStateToProps = (state, { statusId }) => ({
-  card: state.getIn(['cards', statusId], null),
-});
-
-export default connect(mapStateToProps)(Card);
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
new file mode 100644
index 0000000000000000000000000000000000000000..2c0db0a6b23e7d7835157c1b1307db8fc6f2be59
--- /dev/null
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -0,0 +1,172 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import DetailedStatus from '../components/detailed_status';
+import { makeGetStatus } from '../../../selectors';
+import {
+  replyCompose,
+  mentionCompose,
+  directCompose,
+} from '../../../actions/compose';
+import {
+  reblog,
+  favourite,
+  unreblog,
+  unfavourite,
+  pin,
+  unpin,
+} from '../../../actions/interactions';
+import { blockAccount } from '../../../actions/accounts';
+import {
+  muteStatus,
+  unmuteStatus,
+  deleteStatus,
+  hideStatus,
+  revealStatus,
+} from '../../../actions/statuses';
+import { initMuteModal } from '../../../actions/mutes';
+import { initReport } from '../../../actions/reports';
+import { openModal } from '../../../actions/modal';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { boostModal, deleteModal } from '../../../initial_state';
+import { showAlertForError } from '../../../actions/alerts';
+
+const messages = defineMessages({
+  deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
+  deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
+  redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
+  redraftMessage: { id: 'confirmations.redraft.message', 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.' },
+  blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
+});
+
+const makeMapStateToProps = () => {
+  const getStatus = makeGetStatus();
+
+  const mapStateToProps = (state, props) => ({
+    status: getStatus(state, props),
+    domain: state.getIn(['meta', 'domain']),
+  });
+
+  return mapStateToProps;
+};
+
+const mapDispatchToProps = (dispatch, { intl }) => ({
+
+  onReply (status, router) {
+    dispatch((_, getState) => {
+      let state = getState();
+      if (state.getIn(['compose', 'text']).trim().length !== 0) {
+        dispatch(openModal('CONFIRM', {
+          message: intl.formatMessage(messages.replyMessage),
+          confirm: intl.formatMessage(messages.replyConfirm),
+          onConfirm: () => dispatch(replyCompose(status, router)),
+        }));
+      } else {
+        dispatch(replyCompose(status, router));
+      }
+    });
+  },
+
+  onModalReblog (status) {
+    dispatch(reblog(status));
+  },
+
+  onReblog (status, e) {
+    if (status.get('reblogged')) {
+      dispatch(unreblog(status));
+    } else {
+      if (e.shiftKey || !boostModal) {
+        this.onModalReblog(status);
+      } else {
+        dispatch(openModal('BOOST', { status, onReblog: this.onModalReblog }));
+      }
+    }
+  },
+
+  onFavourite (status) {
+    if (status.get('favourited')) {
+      dispatch(unfavourite(status));
+    } else {
+      dispatch(favourite(status));
+    }
+  },
+
+  onPin (status) {
+    if (status.get('pinned')) {
+      dispatch(unpin(status));
+    } else {
+      dispatch(pin(status));
+    }
+  },
+
+  onEmbed (status) {
+    dispatch(openModal('EMBED', {
+      url: status.get('url'),
+      onError: error => dispatch(showAlertForError(error)),
+    }));
+  },
+
+  onDelete (status, history, withRedraft = false) {
+    if (!deleteModal) {
+      dispatch(deleteStatus(status.get('id'), history, withRedraft));
+    } else {
+      dispatch(openModal('CONFIRM', {
+        message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
+        confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
+        onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
+      }));
+    }
+  },
+
+  onDirect (account, router) {
+    dispatch(directCompose(account, router));
+  },
+
+  onMention (account, router) {
+    dispatch(mentionCompose(account, router));
+  },
+
+  onOpenMedia (media, index) {
+    dispatch(openModal('MEDIA', { media, index }));
+  },
+
+  onOpenVideo (media, time) {
+    dispatch(openModal('VIDEO', { media, time }));
+  },
+
+  onBlock (account) {
+    dispatch(openModal('CONFIRM', {
+      message: <FormattedMessage id='confirmations.block.message' defaultMessage='Are you sure you want to block {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+      confirm: intl.formatMessage(messages.blockConfirm),
+      onConfirm: () => dispatch(blockAccount(account.get('id'))),
+    }));
+  },
+
+  onReport (status) {
+    dispatch(initReport(status.get('account'), status));
+  },
+
+  onMute (account) {
+    dispatch(initMuteModal(account));
+  },
+
+  onMuteConversation (status) {
+    if (status.get('muted')) {
+      dispatch(unmuteStatus(status.get('id')));
+    } else {
+      dispatch(muteStatus(status.get('id')));
+    }
+  },
+
+  onToggleHidden (status) {
+    if (status.get('hidden')) {
+      dispatch(revealStatus(status.get('id')));
+    } else {
+      dispatch(hideStatus(status.get('id')));
+    }
+  },
+
+});
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index d7b50786cfd374f04b34b23692cba6c35d009838..d48b682ebbc22303bdeca152a177627bfdfc9523 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -42,16 +42,20 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { HotKeys } from 'react-hotkeys';
 import { boostModal, deleteModal } from '../../initial_state';
-import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../../features/ui/util/fullscreen';
+import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen';
+import { textForScreenReader } from '../../components/status';
 
 const messages = defineMessages({
   deleteConfirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
   deleteMessage: { id: 'confirmations.delete.message', defaultMessage: 'Are you sure you want to delete this status?' },
   redraftConfirm: { id: 'confirmations.redraft.confirm', defaultMessage: 'Delete & redraft' },
-  redraftMessage: { id: 'confirmations.redraft.message', defaultMessage: 'Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.' },
+  redraftMessage: { id: 'confirmations.redraft.message', 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.' },
   blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
   revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
   hideAll: { id: 'status.show_less_all', defaultMessage: 'Show less for all' },
+  detailedStatus: { id: 'status.detailed_status', defaultMessage: 'Detailed conversation view' },
+  replyConfirm: { id: 'confirmations.reply.confirm', defaultMessage: 'Reply' },
+  replyMessage: { id: 'confirmations.reply.message', defaultMessage: 'Replying now will overwrite the message you are currently composing. Are you sure you want to proceed?' },
 });
 
 const makeMapStateToProps = () => {
@@ -96,15 +100,17 @@ const makeMapStateToProps = () => {
       status,
       ancestorsIds,
       descendantsIds,
+      askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
+      domain: state.getIn(['meta', 'domain']),
     };
   };
 
   return mapStateToProps;
 };
 
-@injectIntl
+export default @injectIntl
 @connect(makeMapStateToProps)
-export default class Status extends ImmutablePureComponent {
+class Status extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -117,6 +123,8 @@ export default class Status extends ImmutablePureComponent {
     ancestorsIds: ImmutablePropTypes.list,
     descendantsIds: ImmutablePropTypes.list,
     intl: PropTypes.object.isRequired,
+    askReplyConfirmation: PropTypes.bool,
+    domain: PropTypes.string.isRequired,
   };
 
   state = {
@@ -155,7 +163,16 @@ export default class Status extends ImmutablePureComponent {
   }
 
   handleReplyClick = (status) => {
-    this.props.dispatch(replyCompose(status, this.context.router.history));
+    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)),
+      }));
+    } else {
+      dispatch(replyCompose(status, this.context.router.history));
+    }
   }
 
   handleModalReblog = (status) => {
@@ -166,7 +183,7 @@ export default class Status extends ImmutablePureComponent {
     if (status.get('reblogged')) {
       this.props.dispatch(unreblog(status));
     } else {
-      if (e.shiftKey || !boostModal) {
+      if ((e && e.shiftKey) || !boostModal) {
         this.handleModalReblog(status);
       } else {
         this.props.dispatch(openModal('BOOST', { status, onReblog: this.handleModalReblog }));
@@ -174,16 +191,16 @@ export default class Status extends ImmutablePureComponent {
     }
   }
 
-  handleDeleteClick = (status, withRedraft = false) => {
+  handleDeleteClick = (status, history, withRedraft = false) => {
     const { dispatch, intl } = this.props;
 
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), withRedraft));
+      dispatch(deleteStatus(status.get('id'), history, withRedraft));
     } else {
       dispatch(openModal('CONFIRM', {
         message: intl.formatMessage(withRedraft ? messages.redraftMessage : messages.deleteMessage),
         confirm: intl.formatMessage(withRedraft ? messages.redraftConfirm : messages.deleteConfirm),
-        onConfirm: () => dispatch(deleteStatus(status.get('id'), withRedraft)),
+        onConfirm: () => dispatch(deleteStatus(status.get('id'), history, withRedraft)),
       }));
     }
   }
@@ -355,7 +372,9 @@ export default class Status extends ImmutablePureComponent {
     if (status && ancestorsIds && ancestorsIds.size > 0) {
       const element = this.node.querySelectorAll('.focusable')[ancestorsIds.size - 1];
 
-      element.scrollIntoView(true);
+      window.requestAnimationFrame(() => {
+        element.scrollIntoView(true);
+      });
       this._scrolledIntoView = true;
     }
   }
@@ -370,7 +389,7 @@ export default class Status extends ImmutablePureComponent {
 
   render () {
     let ancestors, descendants;
-    const { status, ancestorsIds, descendantsIds, intl } = this.props;
+    const { shouldUpdateScroll, status, ancestorsIds, descendantsIds, intl, domain } = this.props;
     const { fullscreen } = this.state;
 
     if (status === null) {
@@ -402,7 +421,7 @@ export default class Status extends ImmutablePureComponent {
     };
 
     return (
-      <Column>
+      <Column label={intl.formatMessage(messages.detailedStatus)}>
         <ColumnHeader
           showBackButton
           extraButton={(
@@ -410,17 +429,18 @@ export default class Status extends ImmutablePureComponent {
           )}
         />
 
-        <ScrollContainer scrollKey='thread'>
-          <div className={classNames('scrollable', 'detailed-status__wrapper', { fullscreen })} ref={this.setRef}>
+        <ScrollContainer scrollKey='thread' shouldUpdateScroll={shouldUpdateScroll}>
+          <div className={classNames('scrollable', { fullscreen })} ref={this.setRef}>
             {ancestors}
 
             <HotKeys handlers={handlers}>
-              <div className='focusable' tabIndex='0'>
+              <div className={classNames('focusable', 'detailed-status__wrapper')} tabIndex='0' aria-label={textForScreenReader(intl, status, false, !status.get('hidden'))}>
                 <DetailedStatus
                   status={status}
                   onOpenVideo={this.handleOpenVideo}
                   onOpenMedia={this.handleOpenMedia}
                   onToggleHidden={this.handleToggleHidden}
+                  domain={domain}
                 />
 
                 <ActionBar
diff --git a/app/javascript/mastodon/features/trends/index.js b/app/javascript/mastodon/features/trends/index.js
deleted file mode 100644
index f33af3e2e3fb45aeb8b61d0111ba84d2e2d82048..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/features/trends/index.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import { connect } from 'react-redux';
-import { injectIntl, defineMessages } from 'react-intl';
-import Column from '../ui/components/column';
-import ColumnHeader from '../../components/column_header';
-import Hashtag from '../../components/hashtag';
-import classNames from 'classnames';
-import { fetchTrends } from '../../actions/trends';
-
-const messages = defineMessages({
-  title: { id: 'trends.header', defaultMessage: 'Trending now' },
-  refreshTrends: { id: 'trends.refresh', defaultMessage: 'Refresh trends' },
-});
-
-const mapStateToProps = state => ({
-  trends: state.getIn(['trends', 'items']),
-  loading: state.getIn(['trends', 'isLoading']),
-});
-
-const mapDispatchToProps = dispatch => ({
-  fetchTrends: () => dispatch(fetchTrends()),
-});
-
-@connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
-export default class Trends extends ImmutablePureComponent {
-
-  static propTypes = {
-    intl: PropTypes.object.isRequired,
-    trends: ImmutablePropTypes.list,
-    fetchTrends: PropTypes.func.isRequired,
-    loading: PropTypes.bool,
-  };
-
-  componentDidMount () {
-    this.props.fetchTrends();
-  }
-
-  handleRefresh = () => {
-    this.props.fetchTrends();
-  }
-
-  render () {
-    const { trends, loading, intl } = this.props;
-
-    return (
-      <Column>
-        <ColumnHeader
-          icon='fire'
-          title={intl.formatMessage(messages.title)}
-          extraButton={(
-            <button className='column-header__button' title={intl.formatMessage(messages.refreshTrends)} aria-label={intl.formatMessage(messages.refreshTrends)} onClick={this.handleRefresh}><i className={classNames('fa', 'fa-refresh', { 'fa-spin': loading })} /></button>
-          )}
-        />
-
-        <div className='scrollable'>
-          {trends && trends.map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
-        </div>
-      </Column>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index 0e9592c977fdefc26021b11c153166a252f275de..b128e67d23d02b0258000081ac06b44db8e9c7d3 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -13,8 +13,8 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
 });
 
-@injectIntl
-export default class BoostModal extends ImmutablePureComponent {
+export default @injectIntl
+class BoostModal extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -37,7 +37,7 @@ export default class BoostModal extends ImmutablePureComponent {
   }
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.props.onClose();
       this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 3ab867b5a714fc55a1accc44b00c96e7ba769318..b7e350cbce29175a8e4e578be958364a05574985 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -29,10 +29,14 @@ const componentMap = {
   'LIST': ListTimeline,
 };
 
-const shouldHideFAB = path => path.match(/^\/statuses\//);
+const messages = defineMessages({
+  publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
+});
 
-@component => injectIntl(component, { withRef: true })
-export default class ColumnsArea extends ImmutablePureComponent {
+const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started/);
+
+export default @(component => injectIntl(component, { withRef: true }))
+class ColumnsArea extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
@@ -149,14 +153,14 @@ export default class ColumnsArea extends ImmutablePureComponent {
   }
 
   render () {
-    const { columns, children, singleColumn, isModalOpen } = this.props;
+    const { columns, children, singleColumn, isModalOpen, intl } = this.props;
     const { shouldAnimate } = this.state;
 
     const columnIndex = getIndex(this.context.router.history.location.pathname);
     this.pendingIndex = null;
 
     if (singleColumn) {
-      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button'><i className='fa fa-pencil' /></Link>;
+      const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button' aria-label={intl.formatMessage(messages.publish)}><i className='fa fa-pencil' /></Link>;
 
       return columnIndex !== -1 ? [
         <ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}>
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modal.js b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
index 86588c46a23ed869f425d1bb02ba76b1251864ca..f0f3ad134d22e8f7b29e81b46ac362c6ee97fb7f 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modal.js
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import Button from '../../../components/button';
 
-@injectIntl
-export default class ConfirmationModal extends React.PureComponent {
+export default @injectIntl
+class ConfirmationModal extends React.PureComponent {
 
   static propTypes = {
     message: PropTypes.node.isRequired,
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.js b/app/javascript/mastodon/features/ui/components/embed_modal.js
index 52aab00d0b698949f513e510a2d6a946ed063d70..982781db073d69319032ed809f6b01089e784c52 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.js
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.js
@@ -4,8 +4,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import api from '../../../api';
 
-@injectIntl
-export default class EmbedModal extends ImmutablePureComponent {
+export default @injectIntl
+class EmbedModal extends ImmutablePureComponent {
 
   static propTypes = {
     url: PropTypes.string.isRequired,
@@ -77,6 +77,7 @@ export default class EmbedModal extends ImmutablePureComponent {
             className='embed-modal__iframe'
             frameBorder='0'
             ref={this.setIframeRef}
+            sandbox='allow-same-origin'
             title='preview'
           />
         </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 21bf6d81b6db239559d9b0c1f059ed6caf38fd24..7488a3598bc143608c9985b7b4329fc600b07187 100644
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.js
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.js
@@ -19,8 +19,8 @@ const mapDispatchToProps = (dispatch, { id }) => ({
 
 });
 
-@connect(mapStateToProps, mapDispatchToProps)
-export default class FocalPointModal extends ImmutablePureComponent {
+export default @connect(mapStateToProps, mapDispatchToProps)
+class FocalPointModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index c7360a7264755a07ce95d73a5bb47289eee2de5c..5e1cf75af79aad303c4a5be2edcd239c97b77de5 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import { LoadingBar } from 'react-redux-loading-bar';
 import ZoomableImage from './zoomable_image';
 
 export default class ImageLoader extends React.PureComponent {
@@ -23,6 +24,7 @@ export default class ImageLoader extends React.PureComponent {
   state = {
     loading: true,
     error: false,
+    width: null,
   }
 
   removers = [];
@@ -122,6 +124,7 @@ export default class ImageLoader extends React.PureComponent {
 
   setCanvasRef = c => {
     this.canvas = c;
+    if (c) this.setState({ width: c.offsetWidth });
   }
 
   render () {
@@ -135,6 +138,7 @@ 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'
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index 6af0a101c9f17a323e7a934dec2ee4e23300a6e6..d29a4a6a7d3a6a19319dd3bf102830216eb8f04c 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -16,10 +16,10 @@ const messages = defineMessages({
   next: { id: 'lightbox.next', defaultMessage: 'Next' },
 });
 
-const previewState = 'previewMediaModal';
+export const previewState = 'previewMediaModal';
 
-@injectIntl
-export default class MediaModal extends ImmutablePureComponent {
+export default @injectIntl
+class MediaModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
@@ -54,19 +54,23 @@ export default class MediaModal extends ImmutablePureComponent {
     this.setState({ index: index % this.props.media.size });
   }
 
-  handleKeyUp = (e) => {
+  handleKeyDown = (e) => {
     switch(e.key) {
     case 'ArrowLeft':
       this.handlePrevClick();
+      e.preventDefault();
+      e.stopPropagation();
       break;
     case 'ArrowRight':
       this.handleNextClick();
+      e.preventDefault();
+      e.stopPropagation();
       break;
     }
   }
 
   componentDidMount () {
-    window.addEventListener('keyup', this.handleKeyUp, false);
+    window.addEventListener('keydown', this.handleKeyDown, false);
     if (this.context.router) {
       const history = this.context.router.history;
       history.push(history.location.pathname, previewState);
@@ -77,7 +81,7 @@ export default class MediaModal extends ImmutablePureComponent {
   }
 
   componentWillUnmount () {
-    window.removeEventListener('keyup', this.handleKeyUp);
+    window.removeEventListener('keydown', this.handleKeyDown);
     if (this.context.router) {
       this.unlistenHistory();
 
@@ -145,7 +149,7 @@ export default class MediaModal extends ImmutablePureComponent {
             startTime={time || 0}
             onCloseVideo={onClose}
             detailed
-            description={image.get('description')}
+            alt={image.get('description')}
             key={image.get('url')}
           />
         );
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index a334318ce56422f05e50b8444b6c1c39f3b8b3d3..cc2ab6c8ce9c34c89cc6744b0d94619e0de8afff 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -11,16 +11,15 @@ import BoostModal from './boost_modal';
 import ConfirmationModal from './confirmation_modal';
 import FocalPointModal from './focal_point_modal';
 import {
-  OnboardingModal,
   MuteModal,
   ReportModal,
   EmbedModal,
   ListEditor,
+  ListAdder,
 } from '../../../features/ui/util/async-components';
 
 const MODAL_COMPONENTS = {
   'MEDIA': () => Promise.resolve({ default: MediaModal }),
-  'ONBOARDING': OnboardingModal,
   'VIDEO': () => Promise.resolve({ default: VideoModal }),
   'BOOST': () => Promise.resolve({ default: BoostModal }),
   'CONFIRM': () => Promise.resolve({ default: ConfirmationModal }),
@@ -30,6 +29,7 @@ const MODAL_COMPONENTS = {
   'EMBED': EmbedModal,
   'LIST_EDITOR': ListEditor,
   'FOCAL_POINT': () => Promise.resolve({ default: FocalPointModal }),
+  'LIST_ADDER':ListAdder,
 };
 
 export default class ModalRoot extends React.PureComponent {
@@ -41,14 +41,15 @@ export default class ModalRoot extends React.PureComponent {
   };
 
   getSnapshotBeforeUpdate () {
-    const visible = !!this.props.type;
-    return {
-      overflowY: visible ? 'hidden' : null,
-    };
+    return { visible: !!this.props.type };
   }
 
-  componentDidUpdate (prevProps, prevState, { overflowY }) {
-    document.body.style.overflowY = overflowY;
+  componentDidUpdate (prevProps, prevState, { visible }) {
+    if (visible) {
+      document.body.classList.add('with-modals--active');
+    } else {
+      document.body.classList.remove('with-modals--active');
+    }
   }
 
   renderLoading = modalId => () => {
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.js b/app/javascript/mastodon/features/ui/components/mute_modal.js
index 73e48cf09b18ca1c8a49c688cdcf7b8a8fc6c7a5..ac356b42a7b26f19c0e90428debbd38a0567c7b5 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.js
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.js
@@ -33,9 +33,9 @@ const mapDispatchToProps = dispatch => {
   };
 };
 
-@connect(mapStateToProps, mapDispatchToProps)
+export default @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-export default class MuteModal extends React.PureComponent {
+class MuteModal extends React.PureComponent {
 
   static propTypes = {
     isSubmitting: PropTypes.bool.isRequired,
diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
deleted file mode 100644
index 9b713cf9ee595116a206cd5457f16255c236048d..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ /dev/null
@@ -1,324 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ReactSwipeableViews from 'react-swipeable-views';
-import classNames from 'classnames';
-import Permalink from '../../../components/permalink';
-import ComposeForm from '../../compose/components/compose_form';
-import Search from '../../compose/components/search';
-import NavigationBar from '../../compose/components/navigation_bar';
-import ColumnHeader from './column_header';
-import { List as ImmutableList } from 'immutable';
-import { me } from '../../../initial_state';
-
-const noop = () => { };
-
-const messages = defineMessages({
-  home_title: { id: 'column.home', defaultMessage: 'Home' },
-  notifications_title: { id: 'column.notifications', defaultMessage: 'Notifications' },
-  local_title: { id: 'column.community', defaultMessage: 'Local timeline' },
-  federated_title: { id: 'column.public', defaultMessage: 'Federated timeline' },
-});
-
-const PageOne = ({ acct, domain }) => (
-  <div className='onboarding-modal__page onboarding-modal__page-one'>
-    <div className='onboarding-modal__page-one__lead'>
-      <h1><FormattedMessage id='onboarding.page_one.welcome' defaultMessage='Welcome to Mastodon!' /></h1>
-      <p><FormattedMessage id='onboarding.page_one.federation' defaultMessage='Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.' /></p>
-    </div>
-
-    <div className='onboarding-modal__page-one__extra'>
-      <div className='display-case'>
-        <div className='display-case__label'>
-          <FormattedMessage id='onboarding.page_one.full_handle' defaultMessage='Your full handle' />
-        </div>
-
-        <div className='display-case__case'>
-          @{acct}@{domain}
-        </div>
-      </div>
-
-      <p><FormattedMessage id='onboarding.page_one.handle_hint' defaultMessage='This is what you would tell your friends to search for.' /></p>
-    </div>
-  </div>
-);
-
-PageOne.propTypes = {
-  acct: PropTypes.string.isRequired,
-  domain: PropTypes.string.isRequired,
-};
-
-const PageTwo = ({ myAccount }) => (
-  <div className='onboarding-modal__page onboarding-modal__page-two'>
-    <div className='figure non-interactive'>
-      <div className='pseudo-drawer'>
-        <NavigationBar account={myAccount} />
-
-        <ComposeForm
-          text='Awoo! #introductions'
-          suggestions={ImmutableList()}
-          mentionedDomains={[]}
-          spoiler={false}
-          onChange={noop}
-          onSubmit={noop}
-          onPaste={noop}
-          onPickEmoji={noop}
-          onChangeSpoilerText={noop}
-          onClearSuggestions={noop}
-          onFetchSuggestions={noop}
-          onSuggestionSelected={noop}
-          showSearch
-        />
-      </div>
-    </div>
-
-    <p><FormattedMessage id='onboarding.page_two.compose' defaultMessage='Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.' /></p>
-  </div>
-);
-
-PageTwo.propTypes = {
-  myAccount: ImmutablePropTypes.map.isRequired,
-};
-
-const PageThree = ({ myAccount }) => (
-  <div className='onboarding-modal__page onboarding-modal__page-three'>
-    <div className='figure non-interactive'>
-      <Search
-        value=''
-        onChange={noop}
-        onSubmit={noop}
-        onClear={noop}
-        onShow={noop}
-      />
-
-      <div className='pseudo-drawer'>
-        <NavigationBar account={myAccount} />
-      </div>
-    </div>
-
-    <p><FormattedMessage id='onboarding.page_three.search' defaultMessage='Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.' values={{ illustration: <Permalink to='/timelines/tag/illustration' href='/tags/illustration'>#illustration</Permalink>, introductions: <Permalink to='/timelines/tag/introductions' href='/tags/introductions'>#introductions</Permalink> }} /></p>
-    <p><FormattedMessage id='onboarding.page_three.profile' defaultMessage='Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.' /></p>
-  </div>
-);
-
-PageThree.propTypes = {
-  myAccount: ImmutablePropTypes.map.isRequired,
-};
-
-const PageFour = ({ domain, intl }) => (
-  <div className='onboarding-modal__page onboarding-modal__page-four'>
-    <div className='onboarding-modal__page-four__columns'>
-      <div className='row'>
-        <div>
-          <div className='figure non-interactive'><ColumnHeader icon='home' type={intl.formatMessage(messages.home_title)} /></div>
-          <p><FormattedMessage id='onboarding.page_four.home' defaultMessage='The home timeline shows posts from people you follow.' /></p>
-        </div>
-
-        <div>
-          <div className='figure non-interactive'><ColumnHeader icon='bell' type={intl.formatMessage(messages.notifications_title)} /></div>
-          <p><FormattedMessage id='onboarding.page_four.notifications' defaultMessage='The notifications column shows when someone interacts with you.' /></p>
-        </div>
-      </div>
-
-      <div className='row'>
-        <div>
-          <div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='users' type={intl.formatMessage(messages.local_title)} /></div>
-        </div>
-
-        <div>
-          <div className='figure non-interactive' style={{ marginBottom: 0 }}><ColumnHeader icon='globe' type={intl.formatMessage(messages.federated_title)} /></div>
-        </div>
-      </div>
-
-      <p><FormattedMessage id='onboarding.page_five.public_timelines' defaultMessage='The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.' values={{ domain }} /></p>
-    </div>
-  </div>
-);
-
-PageFour.propTypes = {
-  domain: PropTypes.string.isRequired,
-  intl: PropTypes.object.isRequired,
-};
-
-const PageSix = ({ admin, domain }) => {
-  let adminSection = '';
-
-  if (admin) {
-    adminSection = (
-      <p>
-        <FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/accounts/${admin.get('id')}`}>@{admin.get('acct')}</Permalink> }} />
-        <br />
-        <FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage="Please read {domain}'s {guidelines}!" values={{ domain, guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }} />
-      </p>
-    );
-  }
-
-  return (
-    <div className='onboarding-modal__page onboarding-modal__page-six'>
-      <h1><FormattedMessage id='onboarding.page_six.almost_done' defaultMessage='Almost done...' /></h1>
-      {adminSection}
-      <p><FormattedMessage id='onboarding.page_six.github' defaultMessage='Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.' values={{ github: <a href='https://github.com/tootsuite/mastodon' target='_blank' rel='noopener'>GitHub</a> }} /></p>
-      <p><FormattedMessage id='onboarding.page_six.apps_available' defaultMessage='There are {apps} available for iOS, Android and other platforms.' values={{ apps: <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' target='_blank' rel='noopener'><FormattedMessage id='onboarding.page_six.various_app' defaultMessage='mobile apps' /></a> }} /></p>
-      <p><em><FormattedMessage id='onboarding.page_six.appetoot' defaultMessage='Bon Appetoot!' /></em></p>
-    </div>
-  );
-};
-
-PageSix.propTypes = {
-  admin: ImmutablePropTypes.map,
-  domain: PropTypes.string.isRequired,
-};
-
-const mapStateToProps = state => ({
-  myAccount: state.getIn(['accounts', me]),
-  admin: state.getIn(['accounts', state.getIn(['meta', 'admin'])]),
-  domain: state.getIn(['meta', 'domain']),
-});
-
-@connect(mapStateToProps)
-@injectIntl
-export default class OnboardingModal extends React.PureComponent {
-
-  static propTypes = {
-    onClose: PropTypes.func.isRequired,
-    intl: PropTypes.object.isRequired,
-    myAccount: ImmutablePropTypes.map.isRequired,
-    domain: PropTypes.string.isRequired,
-    admin: ImmutablePropTypes.map,
-  };
-
-  state = {
-    currentIndex: 0,
-  };
-
-  componentWillMount() {
-    const { myAccount, admin, domain, intl } = this.props;
-    this.pages = [
-      <PageOne acct={myAccount.get('acct')} domain={domain} />,
-      <PageTwo myAccount={myAccount} />,
-      <PageThree myAccount={myAccount} />,
-      <PageFour domain={domain} intl={intl} />,
-      <PageSix admin={admin} domain={domain} />,
-    ];
-  };
-
-  componentDidMount() {
-    window.addEventListener('keyup', this.handleKeyUp);
-  }
-
-  componentWillUnmount() {
-    window.addEventListener('keyup', this.handleKeyUp);
-  }
-
-  handleSkip = (e) => {
-    e.preventDefault();
-    this.props.onClose();
-  }
-
-  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 });
-  }
-
-  handleKeyUp = ({ key }) => {
-    switch (key) {
-    case 'ArrowLeft':
-      this.handlePrev();
-      break;
-    case 'ArrowRight':
-      this.handleNext();
-      break;
-    }
-  }
-
-  handleClose = () => {
-    this.props.onClose();
-  }
-
-  render () {
-    const { pages } = this;
-    const { currentIndex } = this.state;
-    const hasMore = currentIndex < pages.length - 1;
-
-    const nextOrDoneBtn = hasMore ? (
-      <button onClick={this.handleNext} className='onboarding-modal__nav onboarding-modal__next shake-bottom'>
-        <FormattedMessage id='onboarding.next' defaultMessage='Next' /> <i className='fa fa-fw fa-chevron-right' />
-      </button>
-    ) : (
-      <button onClick={this.handleClose} className='onboarding-modal__nav onboarding-modal__done shake-bottom'>
-        <FormattedMessage id='onboarding.done' defaultMessage='Done' /> <i className='fa fa-fw fa-check' />
-      </button>
-    );
-
-    return (
-      <div className='modal-root__modal onboarding-modal'>
-        <ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='onboarding-modal__pager'>
-          {pages.map((page, i) => {
-            const className = classNames('onboarding-modal__page__wrapper', `onboarding-modal__page__wrapper-${i}`, {
-              'onboarding-modal__page__wrapper--active': i === currentIndex,
-            });
-
-            return (
-              <div key={i} className={className}>{page}</div>
-            );
-          })}
-        </ReactSwipeableViews>
-
-        <div className='onboarding-modal__paginator'>
-          <div>
-            <button
-              onClick={this.handleSkip}
-              className='onboarding-modal__nav onboarding-modal__skip'
-            >
-              <FormattedMessage id='onboarding.skip' defaultMessage='Skip' />
-            </button>
-          </div>
-
-          <div className='onboarding-modal__dots'>
-            {pages.map((_, i) => {
-              const className = classNames('onboarding-modal__dot', {
-                active: i === currentIndex,
-              });
-
-              return (
-                <div
-                  key={`dot-${i}`}
-                  role='button'
-                  tabIndex='0'
-                  data-index={i}
-                  onClick={this.handleDot}
-                  className={className}
-                />
-              );
-            })}
-          </div>
-
-          <div>
-            {nextOrDoneBtn}
-          </div>
-        </div>
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.js b/app/javascript/mastodon/features/ui/components/report_modal.js
index 90f0013197060e5af37ccfb0d3d6a745d8144147..bc6b18664a97401baf319872bdced75cc3627b47 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.js
+++ b/app/javascript/mastodon/features/ui/components/report_modal.js
@@ -37,9 +37,9 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-@connect(makeMapStateToProps)
+export default @connect(makeMapStateToProps)
 @injectIntl
-export default class ReportModal extends ImmutablePureComponent {
+class ReportModal extends ImmutablePureComponent {
 
   static propTypes = {
     isSubmitting: PropTypes.bool,
@@ -106,6 +106,7 @@ export default class ReportModal extends ImmutablePureComponent {
               onChange={this.handleCommentChange}
               onKeyDown={this.handleKeyDown}
               disabled={isSubmitting}
+              autoFocus
             />
 
             {domain && (
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 60bc56eef31092de8d97986870c4658a436648aa..16236ea51e5e2c6b4e95acb6e97ee328e51339ea 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -24,9 +24,9 @@ export function getLink (index) {
   return links[index].props.to;
 }
 
-@injectIntl
+export default @injectIntl
 @withRouter
-export default class TabsBar extends React.PureComponent {
+class TabsBar extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
diff --git a/app/javascript/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js
index 9ed4a43ad1fa151942c7463a774c3ccf8d8d5477..7cf3eb4d458f6db79cd19a2e1020e09dce52b811 100644
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@@ -24,7 +24,7 @@ export default class VideoModal extends ImmutablePureComponent {
             startTime={time}
             onCloseVideo={onClose}
             detailed
-            description={media.get('description')}
+            alt={media.get('description')}
           />
         </div>
       </div>
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.js b/app/javascript/mastodon/features/ui/components/zoomable_image.js
index 0a0a4d41a93adfde7e40d27614eb929dc5fb4414..3f6562bc991bdeb45f8fcd44f0bd800317f401c3 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.js
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.js
@@ -137,6 +137,7 @@ export default class ZoomableImage extends React.PureComponent {
           role='presentation'
           ref={this.setImageRef}
           alt={alt}
+          title={alt}
           src={src}
           style={{
             transform: `scale(${scale})`,
diff --git a/app/javascript/mastodon/features/ui/containers/columns_area_container.js b/app/javascript/mastodon/features/ui/containers/columns_area_container.js
index f3e82a8ac27aaa6297c1f834374d089f6b4d707f..42b9e48247df4d26792a8f773242b19bd3d76af6 100644
--- a/app/javascript/mastodon/features/ui/containers/columns_area_container.js
+++ b/app/javascript/mastodon/features/ui/containers/columns_area_container.js
@@ -6,4 +6,4 @@ const mapStateToProps = state => ({
   isModalOpen: !!state.get('modal').modalType,
 });
 
-export default connect(mapStateToProps, null, null, { withRef: true })(ColumnsArea);
+export default connect(mapStateToProps, null, null, { forwardRef: true })(ColumnsArea);
diff --git a/app/javascript/mastodon/features/ui/containers/loading_bar_container.js b/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
index 4bb90fb689f5ba64ab81b123f4ef64ba332d6e69..63e994f927c2215236d2884afa2e6a3cf7e17512 100644
--- a/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
+++ b/app/javascript/mastodon/features/ui/containers/loading_bar_container.js
@@ -1,8 +1,8 @@
 import { connect }    from 'react-redux';
 import LoadingBar from 'react-redux-loading-bar';
 
-const mapStateToProps = (state) => ({
-  loading: state.get('loadingBar'),
+const mapStateToProps = (state, ownProps) => ({
+  loading: state.get('loadingBar')[ownProps.scope || 'default'],
 });
 
 export default connect(mapStateToProps)(LoadingBar.WrappedComponent);
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 56a85623032c5c178e53a4157e0c18035077e2e5..f01c2bf247861d4d3676303a238271f7d0c7aec0 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -1,12 +1,14 @@
 import classNames from 'classnames';
 import React from 'react';
-import NotificationsContainer from './containers/notifications_container';
+import { HotKeys } from 'react-hotkeys';
+import { defineMessages, injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+import { Redirect, withRouter } from 'react-router-dom';
 import PropTypes from 'prop-types';
+import NotificationsContainer from './containers/notifications_container';
 import LoadingBarContainer from './containers/loading_bar_container';
 import TabsBar from './components/tabs_bar';
 import ModalContainer from './containers/modal_container';
-import { connect } from 'react-redux';
-import { Redirect, withRouter } from 'react-router-dom';
 import { isMobile } from '../../is_mobile';
 import { debounce } from 'lodash';
 import { uploadCompose, resetCompose } from '../../actions/compose';
@@ -44,9 +46,8 @@ import {
   PinnedStatuses,
   Lists,
 } from './util/async-components';
-import { HotKeys } from 'react-hotkeys';
 import { me } from '../../initial_state';
-import { defineMessages, injectIntl } from 'react-intl';
+import { previewState } from './components/media_modal';
 
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
@@ -58,7 +59,8 @@ const messages = defineMessages({
 
 const mapStateToProps = state => ({
   isComposing: state.getIn(['compose', 'is_composing']),
-  hasComposingText: state.getIn(['compose', 'text']) !== '',
+  hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
+  hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
   dropdownMenuIsOpen: state.getIn(['dropdown_menu', 'openId']) !== null,
 });
 
@@ -88,6 +90,7 @@ const keyMap = {
   goToProfile: 'g u',
   goToBlocked: 'g b',
   goToMuted: 'g m',
+  goToRequests: 'g r',
   toggleHidden: 'x',
 };
 
@@ -117,6 +120,10 @@ class SwitchingColumnsArea extends React.PureComponent {
     window.removeEventListener('resize', this.handleResize);
   }
 
+  shouldUpdateScroll (_, { location }) {
+    return location.state !== previewState;
+  }
+
   handleResize = debounce(() => {
     // The cached heights are no longer accurate, invalidate
     this.props.onLayoutChange();
@@ -127,7 +134,7 @@ class SwitchingColumnsArea extends React.PureComponent {
   });
 
   setRef = c => {
-    this.node = c.getWrappedInstance().getWrappedInstance();
+    this.node = c.getWrappedInstance();
   }
 
   render () {
@@ -141,37 +148,35 @@ class SwitchingColumnsArea extends React.PureComponent {
           {redirect}
           <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
           <WrappedRoute path='/keyboard-shortcuts' component={KeyboardShortcuts} content={children} />
-          <WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} />
-          <WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} />
-          <WrappedRoute path='/timelines/public/media' component={PublicTimeline} content={children} componentParams={{ onlyMedia: true }} />
-          <WrappedRoute path='/timelines/public/local' exact component={CommunityTimeline} content={children} />
-          <WrappedRoute path='/timelines/public/local/media' component={CommunityTimeline} content={children} componentParams={{ onlyMedia: true }} />
-          <WrappedRoute path='/timelines/direct' component={DirectTimeline} content={children} />
-          <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
-          <WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} />
-
-          <WrappedRoute path='/notifications' component={Notifications} content={children} />
-          <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
-          <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
+          <WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/timelines/public/local' exact component={CommunityTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/timelines/direct' component={DirectTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/timelines/list/:id' component={ListTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+
+          <WrappedRoute path='/notifications' component={Notifications} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/pinned' component={PinnedStatuses} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
 
           <WrappedRoute path='/search' component={Compose} content={children} componentParams={{ isSearchPage: true }} />
 
           <WrappedRoute path='/statuses/new' component={Compose} content={children} />
-          <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
-          <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
-          <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} />
-
-          <WrappedRoute path='/accounts/:accountId' exact component={AccountTimeline} content={children} />
-          <WrappedRoute path='/accounts/:accountId/with_replies' component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
-          <WrappedRoute path='/accounts/:accountId/followers' component={Followers} content={children} />
-          <WrappedRoute path='/accounts/:accountId/following' component={Following} content={children} />
-          <WrappedRoute path='/accounts/:accountId/media' component={AccountGallery} content={children} />
-
-          <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
-          <WrappedRoute path='/blocks' component={Blocks} content={children} />
-          <WrappedRoute path='/domain_blocks' component={DomainBlocks} content={children} />
-          <WrappedRoute path='/mutes' component={Mutes} content={children} />
-          <WrappedRoute path='/lists' component={Lists} content={children} />
+          <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+
+          <WrappedRoute path='/accounts/:accountId' exact component={AccountTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/accounts/:accountId/with_replies' component={AccountTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll, withReplies: true }} />
+          <WrappedRoute path='/accounts/:accountId/followers' component={Followers} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/accounts/:accountId/following' component={Following} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/accounts/:accountId/media' component={AccountGallery} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+
+          <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/blocks' component={Blocks} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/domain_blocks' component={DomainBlocks} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/mutes' component={Mutes} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
+          <WrappedRoute path='/lists' component={Lists} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />
 
           <WrappedRoute component={GenericNotFound} content={children} />
         </WrappedSwitch>
@@ -181,10 +186,10 @@ class SwitchingColumnsArea extends React.PureComponent {
 
 }
 
-@connect(mapStateToProps)
+export default @connect(mapStateToProps)
 @injectIntl
 @withRouter
-export default class UI extends React.PureComponent {
+class UI extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
@@ -195,6 +200,7 @@ export default class UI extends React.PureComponent {
     children: PropTypes.node,
     isComposing: PropTypes.bool,
     hasComposingText: PropTypes.bool,
+    hasMediaAttachments: PropTypes.bool,
     location: PropTypes.object,
     intl: PropTypes.object.isRequired,
     dropdownMenuIsOpen: PropTypes.bool,
@@ -205,9 +211,9 @@ export default class UI extends React.PureComponent {
   };
 
   handleBeforeUnload = (e) => {
-    const { intl, isComposing, hasComposingText } = this.props;
+    const { intl, isComposing, hasComposingText, hasMediaAttachments } = this.props;
 
-    if (isComposing && hasComposingText) {
+    if (isComposing && (hasComposingText || hasMediaAttachments)) {
       // Setting returnValue to any string causes confirmation dialog.
       // Many browsers no longer display this text to users,
       // but we set user-friendly message for other browsers, e.g. Edge.
@@ -237,6 +243,7 @@ export default class UI extends React.PureComponent {
   }
 
   handleDragOver = (e) => {
+    if (this.dataTransferIsText(e.dataTransfer)) return false;
     e.preventDefault();
     e.stopPropagation();
 
@@ -250,9 +257,11 @@ export default class UI extends React.PureComponent {
   }
 
   handleDrop = (e) => {
+    if (this.dataTransferIsText(e.dataTransfer)) return;
     e.preventDefault();
 
     this.setState({ draggingOver: false });
+    this.dragTargets = [];
 
     if (e.dataTransfer && e.dataTransfer.files.length === 1) {
       this.props.dispatch(uploadCompose(e.dataTransfer.files));
@@ -272,6 +281,10 @@ export default class UI extends React.PureComponent {
     this.setState({ draggingOver: false });
   }
 
+  dataTransferIsText = (dataTransfer) => {
+    return (dataTransfer && Array.from(dataTransfer.types).includes('text/plain') && dataTransfer.items.length === 1);
+  }
+
   closeUploadModal = () => {
     this.setState({ draggingOver: false });
   }
@@ -286,6 +299,7 @@ export default class UI extends React.PureComponent {
 
   componentWillMount () {
     window.addEventListener('beforeunload', this.handleBeforeUnload, false);
+
     document.addEventListener('dragenter', this.handleDragEnter, false);
     document.addEventListener('dragover', this.handleDragOver, false);
     document.addEventListener('drop', this.handleDrop, false);
@@ -296,8 +310,13 @@ export default class UI extends React.PureComponent {
       navigator.serviceWorker.addEventListener('message', this.handleServiceWorkerPostMessage);
     }
 
+    if (typeof window.Notification !== 'undefined' && Notification.permission === 'default') {
+      window.setTimeout(() => Notification.requestPermission(), 120 * 1000);
+    }
+
     this.props.dispatch(expandHomeTimeline());
     this.props.dispatch(expandNotifications());
+
     setTimeout(() => this.props.dispatch(fetchFilters()), 500);
   }
 
@@ -422,6 +441,10 @@ export default class UI extends React.PureComponent {
     this.context.router.history.push('/mutes');
   }
 
+  handleHotkeyGoToRequests = () => {
+    this.context.router.history.push('/follow_requests');
+  }
+
   render () {
     const { draggingOver } = this.state;
     const { children, isComposing, location, dropdownMenuIsOpen } = this.props;
@@ -444,10 +467,11 @@ export default class UI extends React.PureComponent {
       goToProfile: this.handleHotkeyGoToProfile,
       goToBlocked: this.handleHotkeyGoToBlocked,
       goToMuted: this.handleHotkeyGoToMuted,
+      goToRequests: this.handleHotkeyGoToRequests,
     };
 
     return (
-      <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef}>
+      <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 }}>
           <TabsBar />
 
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 8cf2a6e7d79bccae6e15f29628f811efb898ef8f..235fd2a073c2556571a3586358024344e2c57ecd 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -102,10 +102,6 @@ export function Mutes () {
   return import(/* webpackChunkName: "features/mutes" */'../../mutes');
 }
 
-export function OnboardingModal () {
-  return import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal');
-}
-
 export function MuteModal () {
   return import(/* webpackChunkName: "modals/mute_modal" */'../components/mute_modal');
 }
@@ -129,3 +125,7 @@ export function EmbedModal () {
 export function ListEditor () {
   return import(/* webpackChunkName: "features/list_editor" */'../../list_editor');
 }
+
+export function ListAdder () {
+  return import(/*webpackChunkName: "features/list_adder" */'../../list_adder');
+}
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 32dfe320b9dba12f0d1ca492033e4a79d6b53adf..d452b871f78ecffbd3720553aca6f3c66af43f9e 100644
--- a/app/javascript/mastodon/features/ui/util/react_router_helpers.js
+++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
@@ -26,7 +26,7 @@ WrappedSwitch.propTypes = {
   children: PropTypes.node,
 };
 
-// Small Wraper to extract the params from the route and pass
+// Small Wrapper to extract the params from the route and pass
 // them to the rendered component, together with the content to
 // be rendered inside (the children)
 export class WrappedRoute extends React.Component {
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js
index 47a165e1698c26c8a08183113e14392ebce5da29..3650fddb630e6d2dbcffad22b48a16b42c1b5307 100644
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -5,7 +5,7 @@ import { fromJS } from 'immutable';
 import { throttle } from 'lodash';
 import classNames from 'classnames';
 import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
-import { displaySensitiveMedia } from '../../initial_state';
+import { displayMedia } from '../../initial_state';
 
 const messages = defineMessages({
   play: { id: 'video.play', defaultMessage: 'Play' },
@@ -84,8 +84,8 @@ export const getPointerPosition = (el, event) => {
   return position;
 };
 
-@injectIntl
-export default class Video extends React.PureComponent {
+export default @injectIntl
+class Video extends React.PureComponent {
 
   static propTypes = {
     preview: PropTypes.string,
@@ -105,15 +105,25 @@ export default class Video extends React.PureComponent {
   state = {
     currentTime: 0,
     duration: 0,
+    volume: 0.5,
     paused: true,
     dragging: false,
     containerWidth: false,
     fullscreen: false,
     hovered: false,
     muted: false,
-    revealed: !this.props.sensitive || displaySensitiveMedia,
+    revealed: displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all',
   };
 
+  // hard coded in components.scss
+  // any way to get ::before values programatically?
+  volWidth = 50;
+  volOffset = 70;
+  volHandleOffset = v => {
+    const offset = v * this.volWidth + this.volOffset;
+    return (offset > 110) ? 110 : offset;
+  }
+
   setPlayerRef = c => {
     this.player = c;
 
@@ -132,6 +142,10 @@ export default class Video extends React.PureComponent {
     this.seek = c;
   }
 
+  setVolumeRef = c => {
+    this.volume = c;
+  }
+
   handleClickRoot = e => e.stopPropagation();
 
   handlePlay = () => {
@@ -149,6 +163,43 @@ export default class Video extends React.PureComponent {
     });
   }
 
+  handleVolumeMouseDown = e => {
+
+    document.addEventListener('mousemove', this.handleMouseVolSlide, true);
+    document.addEventListener('mouseup', this.handleVolumeMouseUp, true);
+    document.addEventListener('touchmove', this.handleMouseVolSlide, true);
+    document.addEventListener('touchend', this.handleVolumeMouseUp, true);
+
+    this.handleMouseVolSlide(e);
+
+    e.preventDefault();
+    e.stopPropagation();
+  }
+
+  handleVolumeMouseUp = () => {
+    document.removeEventListener('mousemove', this.handleMouseVolSlide, true);
+    document.removeEventListener('mouseup', this.handleVolumeMouseUp, true);
+    document.removeEventListener('touchmove', this.handleMouseVolSlide, true);
+    document.removeEventListener('touchend', this.handleVolumeMouseUp, true);
+  }
+
+  handleMouseVolSlide = throttle(e => {
+
+    const rect = this.volume.getBoundingClientRect();
+    const x = (e.clientX - rect.left) / this.volWidth; //x position within the element.
+
+    if(!isNaN(x)) {
+      var slideamt = x;
+      if(x > 1) {
+        slideamt = 1;
+      } else if(x < 0) {
+        slideamt = 0;
+      }
+      this.video.volume = slideamt;
+      this.setState({ volume: slideamt });
+    }
+  }, 60);
+
   handleMouseDown = e => {
     document.addEventListener('mousemove', this.handleMouseMove, true);
     document.addEventListener('mouseup', this.handleMouseUp, true);
@@ -158,6 +209,9 @@ export default class Video extends React.PureComponent {
     this.setState({ dragging: true });
     this.video.pause();
     this.handleMouseMove(e);
+
+    e.preventDefault();
+    e.stopPropagation();
   }
 
   handleMouseUp = () => {
@@ -174,8 +228,10 @@ export default class Video extends React.PureComponent {
     const { x } = getPointerPosition(this.seek, e);
     const currentTime = Math.floor(this.video.duration * x);
 
-    this.video.currentTime = currentTime;
-    this.setState({ currentTime });
+    if (!isNaN(currentTime)) {
+      this.video.currentTime = currentTime;
+      this.setState({ currentTime });
+    }
   }, 60);
 
   togglePlay = () => {
@@ -247,11 +303,12 @@ export default class Video extends React.PureComponent {
   }
 
   handleOpenVideo = () => {
-    const { src, preview, width, height } = this.props;
+    const { src, preview, width, height, alt } = this.props;
     const media = fromJS({
       type: 'video',
       url: src,
       preview_url: preview,
+      description: alt,
       width,
       height,
     });
@@ -266,9 +323,12 @@ export default class Video extends React.PureComponent {
   }
 
   render () {
-    const { preview, src, inline, startTime, onOpenVideo, onCloseVideo, intl, alt, detailed } = this.props;
-    const { containerWidth, currentTime, duration, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
+    const { preview, src, inline, startTime, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive } = this.props;
+    const { containerWidth, currentTime, duration, volume, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
     const progress = (currentTime / duration) * 100;
+
+    const volumeWidth = (muted) ? 0 : volume * this.volWidth;
+    const volumeHandleLoc = (muted) ? this.volHandleOffset(0) : this.volHandleOffset(volume);
     const playerStyle = {};
 
     let { width, height } = this.props;
@@ -281,6 +341,22 @@ export default class Video extends React.PureComponent {
       playerStyle.height = height;
     }
 
+    let preload;
+    if (startTime || fullscreen || dragging) {
+      preload = 'auto';
+    } else if (detailed) {
+      preload = 'metadata';
+    } else {
+      preload = 'none';
+    }
+
+    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
         role='menuitem'
@@ -296,13 +372,15 @@ export default class Video extends React.PureComponent {
           ref={this.setVideoRef}
           src={src}
           poster={preview}
-          preload={startTime ? 'auto' : 'none'}
+          preload={preload}
           loop
           role='button'
           tabIndex='0'
           aria-label={alt}
+          title={alt}
           width={width}
           height={height}
+          volume={volume}
           onClick={this.togglePlay}
           onPlay={this.handlePlay}
           onPause={this.handlePause}
@@ -312,7 +390,7 @@ export default class Video extends React.PureComponent {
         />
 
         <button type='button' className={classNames('video-player__spoiler', { active: !revealed })} onClick={this.toggleReveal}>
-          <span className='video-player__spoiler__title'><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
+          <span className='video-player__spoiler__title'>{warning}</span>
           <span className='video-player__spoiler__subtitle'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
         </button>
 
@@ -331,9 +409,15 @@ export default class Video extends React.PureComponent {
           <div className='video-player__buttons-bar'>
             <div className='video-player__buttons left'>
               <button type='button' aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><i className={classNames('fa fa-fw', { 'fa-play': paused, 'fa-pause': !paused })} /></button>
-              <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><i className={classNames('fa fa-fw', { 'fa-volume-off': muted, 'fa-volume-up': !muted })} /></button>
-
-              {!onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><i className='fa fa-fw fa-eye' /></button>}
+              <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onMouseEnter={this.volumeSlider} onMouseLeave={this.volumeSlider} onClick={this.toggleMute}><i className={classNames('fa fa-fw', { 'fa-volume-off': muted, 'fa-volume-up': !muted })} /></button>
+              <div className='video-player__volume' onMouseDown={this.handleVolumeMouseDown} ref={this.setVolumeRef}>
+                <div className='video-player__volume__current' style={{ width: `${volumeWidth}px` }} />
+                <span
+                  className={classNames('video-player__volume__handle')}
+                  tabIndex='0'
+                  style={{ left: `${volumeHandleLoc}px` }}
+                />
+              </div>
 
               {(detailed || fullscreen) &&
                 <span>
@@ -345,6 +429,7 @@ export default class Video extends React.PureComponent {
             </div>
 
             <div className='video-player__buttons right'>
+              {!onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><i className='fa fa-fw fa-eye' /></button>}
               {(!fullscreen && onOpenVideo) && <button type='button' aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><i className='fa fa-fw fa-expand' /></button>}
               {onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><i className='fa fa-fw fa-compress' /></button>}
               <button type='button' aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><i className={classNames('fa fa-fw', { 'fa-arrows-alt': !fullscreen, 'fa-compress': fullscreen })} /></button>
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
index 807262fd7b666499b79e0abdac24dc5e7a3ca99d..8c2e9d2de49d9b87428b873196c1aaff74b5e7c5 100644
--- a/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@ -5,12 +5,17 @@ const getMeta = (prop) => initialState && initialState.meta && initialState.meta
 
 export const reduceMotion = getMeta('reduce_motion');
 export const autoPlayGif = getMeta('auto_play_gif');
-export const displaySensitiveMedia = getMeta('display_sensitive_media');
+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 deleteModal = getMeta('delete_modal');
 export const me = getMeta('me');
 export const searchEnabled = getMeta('search_enabled');
 export const invitesEnabled = getMeta('invites_enabled');
+export const version = getMeta('version');
+export const mascot = getMeta('mascot');
+export const profile_directory = getMeta('profile_directory');
+export const isStaff = getMeta('is_staff');
 
 export default initialState;
diff --git a/app/javascript/mastodon/link_header.js b/app/javascript/mastodon/link_header.js
deleted file mode 100644
index a3e7ccf1c1b01633a65bb2d9734ac72594909177..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/link_header.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Link from 'http-link-header';
-import querystring from 'querystring';
-
-Link.parseAttrs = (link, parts) => {
-  let match = null;
-  let attr  = '';
-  let value = '';
-  let attrs = '';
-
-  let uriAttrs = /<(.*)>;\s*(.*)/gi.exec(parts);
-
-  if(uriAttrs) {
-    attrs = uriAttrs[2];
-    link  = Link.parseParams(link, uriAttrs[1]);
-  }
-
-  while(match = Link.attrPattern.exec(attrs)) { // eslint-disable-line no-cond-assign
-    attr  = match[1].toLowerCase();
-    value = match[4] || match[3] || match[2];
-
-    if( /\*$/.test(attr)) {
-      Link.setAttr(link, attr, Link.parseExtendedValue(value));
-    } else if(/%/.test(value)) {
-      Link.setAttr(link, attr, querystring.decode(value));
-    } else {
-      Link.setAttr(link, attr, value);
-    }
-  }
-
-  return link;
-};
-
-export default Link;
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index ff0ddd95f277ad59644f3eec1ec4bdb6c2468e32..1486272e2264482e438ca409ffea96491a6d3459 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Ø§Ø¶Ø§ÙÙˆ Ø£Ùˆ ØØ°Ù Ù…ÙÙ† Ø§Ù„Ù‚ÙˆØ§Ø¦Ù…",
   "account.badges.bot": "Ø±ÙˆØ¨ÙˆØª",
   "account.block": "ØØ¸Ø± @{name}",
   "account.block_domain": "Ø¥Ø®ÙØ§Ø¡ ÙƒÙ„ Ø´ÙŠØ¦ Ù‚Ø§Ø¯Ù… Ù…Ù† Ø¥Ø³Ù… Ø§Ù„Ù†Ø·Ø§Ù‚ {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Ù‚Ø¯ Ù„Ø§ ØªØ¹ÙƒØ³ Ø§Ù„Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø£Ø¯Ù†Ø§Ù‡ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ Ø§Ù„ÙƒØ§Ù…Ù„ Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù….",
   "account.domain_blocked": "Ø§Ù„Ù†Ø·Ø§Ù‚ Ù…Ø®ÙÙŠ",
   "account.edit_profile": "ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ",
+  "account.endorse": "Ø¥Ø¨Ø±Ø§Ø²Ù‡ Ø¹Ù„Ù‰ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ",
   "account.follow": "ØªØ§Ø¨ÙØ¹",
   "account.followers": "Ø§Ù„Ù…ØªØ§Ø¨Ø¹ÙˆÙ†",
+  "account.followers.empty": "Ù„Ø§ Ø£ØØ¯ ÙŠØªØ¨Ø¹ Ù‡Ø°Ø§ Ø§Ù„ØØ³Ø§Ø¨ Ø¨Ø¹Ø¯.",
   "account.follows": "ÙŠØªØ¨Ø¹",
+  "account.follows.empty": "Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ… Ù„Ø§ ÙŠØªØ¨Ø¹ Ø£ØØ¯Ù‹Ø§ Ø¨Ø¹Ø¯.",
   "account.follows_you": "ÙŠØªØ§Ø¨Ø¹Ùƒ",
   "account.hide_reblogs": "Ø¥Ø®ÙØ§Ø¡ ØªØ±Ù‚ÙŠØ§Øª @{name}",
+  "account.link_verified_on": "ØªÙ… Ø§Ù„ØªØÙ‚Ù‚ Ù…ÙÙ† Ù…Ø§Ù„Ùƒ Ù‡Ø°Ø§ Ø§Ù„Ø±Ø§Ø¨Ø· Ø¨ØªØ§Ø±ÙŠØ® {date}",
+  "account.locked_info": "ØªÙ… ØªØ£Ù…ÙŠÙ† Ø®ØµÙˆØµÙŠØ© Ù‡Ø°Ø§ Ø§Ù„ØØ³Ø§Ø¨ Ø¹Ø¨Ø± Ù‚ÙÙÙ„. ÙØµØ§ØØ¨ Ø§Ù„ØØ³Ø§Ø¨ ÙŠÙØ±Ø§Ø¬ÙØ¹ ÙŠØ¯ÙˆÙŠØ§ Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ù…ØªØ§Ø¨ÙŽØ¹Ø© Ùˆ Ø§Ù„Ø§Ø´ØªØ±Ø§Ùƒ Ø¨ØØ³Ø§Ø¨Ù‡.",
   "account.media": "ÙˆØ³Ø§Ø¦Ø·",
   "account.mention": "Ø£ÙØ°ÙƒÙØ± @{name}",
   "account.moved_to": "{name} Ø¥Ù†ØªÙ‚Ù„ Ø¥Ù„Ù‰ :",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Ø¹Ø±Ø¶ ØªØ±Ù‚ÙŠØ§Øª @{name}",
   "account.unblock": "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØØ¸Ø± Ø¹Ù† @{name}",
   "account.unblock_domain": "ÙÙƒ ØØ¸Ø± {domain}",
+  "account.unendorse": "Ø¥Ø²Ø§Ù„Ø© ØªØ±ÙˆÙŠØ¬Ù‡ Ù…ÙÙ† Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ",
   "account.unfollow": "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©",
   "account.unmute": "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ÙƒØªÙ… Ø¹Ù† @{name}",
   "account.unmute_notifications": "Ø¥Ù„ØºØ§Ø¡ ÙƒØªÙ… Ø¥Ø®Ø·Ø§Ø±Ø§Øª @{name}",
@@ -85,10 +92,12 @@
   "confirmations.mute.confirm": "Ø£ÙƒØªÙ…",
   "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} ØŸ",
-  "embed.instructions": "ÙŠÙ…ÙƒÙ†ÙƒÙ… Ø¥Ø¯Ù…Ø§Ø¬ Ù‡Ø°Ù‡ Ø§Ù„ØØ§Ù„Ø© Ø¹Ù„Ù‰ Ù…ÙˆÙ‚Ø¹ÙƒÙ… Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ù†Ø³Ø® Ø§Ù„Ø´ÙØ±Ø© Ø£Ø¯Ù†Ø§Ù‡.",
+  "embed.instructions": "ÙŠÙ…ÙƒÙ†ÙƒÙ… Ø¥Ø¯Ù…Ø§Ø¬ Ù‡Ø°Ø§ Ø§Ù„Ù…Ù†Ø´ÙˆØ± Ø¹Ù„Ù‰ Ù…ÙˆÙ‚Ø¹ÙƒÙ… Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø¹Ù† Ø·Ø±ÙŠÙ‚ Ù†Ø³Ø® Ø§Ù„Ø´ÙØ±Ø© Ø£Ø¯Ù†Ø§Ù‡.",
   "embed.preview": "Ù‡ÙƒØ°Ø§ Ù…Ø§ Ø³ÙˆÙ ÙŠØ¨Ø¯Ùˆ Ø¹Ù„ÙŠÙ‡ :",
   "emoji_button.activity": "Ø§Ù„Ø£Ù†Ø´Ø·Ø©",
   "emoji_button.custom": "Ù…Ø®ØµØµ",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Ù†ØªØ§Ø¦Ø¬ Ø§Ù„Ø¨ØØ«",
   "emoji_button.symbols": "Ø±Ù…ÙˆØ²",
   "emoji_button.travel": "Ø£Ù…Ø§ÙƒÙ† Ùˆ Ø£Ø³ÙØ§Ø±",
+  "empty_column.account_timeline": "Ù„ÙŠØ³ Ù‡Ù†Ø§Ùƒ ØªØ¨ÙˆÙŠÙ‚Ø§Øª!",
+  "empty_column.blocks": "Ù„Ù… ØªÙ‚Ù… Ø¨ØØ¸Ø± Ø£ÙŠ Ù…Ø³ØªØ®Ø¯ÙÙ… Ø¨Ø¹Ø¯.",
   "empty_column.community": "Ø§Ù„Ø®Ø· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„Ù…ØÙ„ÙŠ ÙØ§Ø±Øº. Ø£ÙƒØªØ¨ Ø´ÙŠØ¦Ø§ Ù…Ø§ Ù„Ù„Ø¹Ø§Ù…Ø© ÙƒØ¨Ø¯Ø§ÙŠØ© !",
   "empty_column.direct": "Ù„Ù… ØªØªÙ„Ù‚ Ø£ÙŠØ© Ø±Ø³Ø§Ù„Ø© Ø®Ø§ØµØ© Ù…Ø¨Ø§Ø´ÙØ±Ø© Ø¨Ø¹Ø¯. Ø³ÙˆÙ ÙŠØªÙ… Ø¹Ø±Ø¶ Ø§Ù„Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ù…Ø¨Ø§Ø´Ø±Ø© Ù‡Ù†Ø§ Ø¥Ù† Ù‚Ù…Øª Ø¨Ø¥Ø±Ø³Ø§Ù„ ÙˆØ§ØØ¯Ø© Ø£Ùˆ ØªÙ„Ù‚ÙŠØª Ø§Ù„Ø¨Ø¹Ø¶ Ù…Ù†Ù‡Ø§.",
+  "empty_column.domain_blocks": "Ù„ÙŠØ³ Ù‡Ù†Ø§Ùƒ Ù†Ø·Ø§Ù‚Ø§Øª Ù…Ø®ÙÙŠØ© Ø¨Ø¹Ø¯.",
+  "empty_column.favourited_statuses": "Ù„ÙŠØ³ Ù„Ø¯ÙŠÙƒ Ø£ÙŠØ© ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ù…ÙØ¶Ù„Ø© Ø¨Ø¹Ø¯. Ø¹Ù†Ø¯Ù…Ø§ Ø³ØªÙ‚ÙˆÙ… Ø¨Ø§Ù„Ø¥Ø¹Ø¬Ø§Ø¨ Ø¨ÙˆØ§ØØ¯ØŒ Ø³ÙŠØ¸Ù‡Ø± Ù‡Ù†Ø§.",
+  "empty_column.favourites": "Ù„Ù… ÙŠÙ‚Ù… Ø£ÙŠ Ø£ØØ¯ Ø¨Ø§Ù„Ø¥Ø¹Ø¬Ø§Ø¨ Ø¨Ù‡Ø°Ø§ Ø§Ù„ØªØ¨ÙˆÙŠÙ‚ Ø¨Ø¹Ø¯. Ø¹Ù†Ø¯Ù…Ø§ ÙŠÙ‚ÙˆÙ… Ø£ØØ¯Ù‡Ù… Ø¨Ø°Ù„Ùƒ Ø³ÙˆÙ ÙŠØ¸Ù‡Ø± Ù‡Ù†Ø§.",
+  "empty_column.follow_requests": "Ù„ÙŠØ³ Ø¹Ù†Ø¯Ùƒ Ø£ÙŠ Ø·Ù„Ø¨ Ù„Ù„Ù…ØªØ§Ø¨Ø¹Ø© Ø¨Ø¹Ø¯. Ø³ÙˆÙ ØªØ¸Ù‡Ø± Ø·Ù„Ø¨Ø§ØªÙƒ Ù‡Ù†Ø§ Ø¥Ù† Ù‚Ù…Øª Ø¨ØªÙ„Ù‚ÙŠ Ø§Ù„Ø¨Ø¹Ø¶ Ù…Ù†Ù‡Ø§.",
   "empty_column.hashtag": "Ù„ÙŠØ³ Ù‡Ù†Ø§Ùƒ Ø¨Ø¹Ø¯Ù Ø£ÙŠ Ù…ØØªÙˆÙ‰ Ø°Ùˆ Ø¹Ù„Ø§Ù‚Ø© Ø¨Ù‡Ø°Ø§ Ø§Ù„ÙˆØ³Ù….",
-  "empty_column.home": "Ø¥Ù†Ùƒ Ù„Ø§ ØªØªØ¨Ø¹ Ø¨Ø¹Ø¯ Ø£ÙŠ Ø´Ø®Øµ Ø¥Ù„Ù‰ ØØ¯ Ø§Ù„Ø¢Ù†. Ø²Ø± {public} Ø£Ùˆ Ø§Ø³ØªØ®Ø¯Ø§Ù… ØÙ‚Ù„ Ø§Ù„Ø¨ØØ« Ù„ÙƒÙŠ ØªØ¨Ø¯Ø£ Ø¹Ù„Ù‰ Ø§Ù„ØªØ¹Ø±Ù Ø¹Ù„Ù‰ Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø¢Ø®Ø±ÙŠÙ†.",
+  "empty_column.home": "Ø¥Ù†Ù‘ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ù„ØµÙØØªÙƒ Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠØ© ÙØ§Ø±Øº. Ù‚Ù… Ø¨Ø²ÙŠØ§Ø±Ø© {public} Ø£Ùˆ Ø§Ø³ØªØ®Ø¯Ù… ØÙ‚Ù„ Ø§Ù„Ø¨ØØ« Ù„ÙƒÙŠ ØªÙƒØªØ´Ù Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø¢Ø®Ø±ÙŠÙ†.",
   "empty_column.home.public_timeline": "Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø¹Ø§Ù…",
   "empty_column.list": "Ù‡Ø°Ù‡ Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© ÙØ§Ø±ØºØ© Ù…Ø¤Ù‚ØªØ§ Ùˆ Ù„ÙƒÙ† Ø³ÙˆÙ ØªÙ…ØªÙ„Ø¦ ØªØ¯Ø±ÙŠØ¬ÙŠØ§ Ø¹Ù†Ø¯Ù…Ø§ ÙŠØ¨Ø¯Ø£ Ø§Ù„Ø£Ø¹Ø¶Ø§Ø¡ Ø§Ù„Ù…ÙÙ†ØªÙŽÙ…ÙŠÙ† Ø¥Ù„ÙŠÙ‡Ø§ Ø¨Ù†Ø´Ø± ØªØ¨ÙˆÙŠÙ‚Ø§Øª.",
+  "empty_column.lists": "Ù„ÙŠØ³ Ø¹Ù†Ø¯Ùƒ Ø£ÙŠØ© Ù‚Ø§Ø¦Ù…Ø© Ø¨Ø¹Ø¯. Ø³ÙˆÙ ØªØ¸Ù‡Ø± Ù‚Ø§Ø¦Ù…ØªÙƒ Ù‡Ù†Ø§ Ø¥Ù† Ù‚Ù…Øª Ø¨Ø¥Ù†Ø´Ø§Ø¡ ÙˆØ§ØØ¯Ø©.",
+  "empty_column.mutes": "Ù„Ù… ØªÙ‚Ù… Ø¨ÙƒØªÙ… Ø£ÙŠ Ù…Ø³ØªØ®Ø¯Ù… Ø¨Ø¹Ø¯.",
   "empty_column.notifications": "Ù„Ù… ØªØªÙ„Ù‚ Ø£ÙŠ Ø¥Ø´Ø¹Ø§Ø± Ø¨Ø¹Ø¯Ù. ØªÙØ§Ø¹Ù„ Ù…Ø¹ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ù„Ø¥Ù†Ø´Ø§Ø¡ Ù…ØØ§Ø¯Ø«Ø©.",
   "empty_column.public": "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø£ÙŠ Ø´ÙŠØ¡ Ù‡Ù†Ø§ ! Ù‚Ù… Ø¨Ù†Ø´Ø± Ø´ÙŠØ¡ Ù…Ø§ Ù„Ù„Ø¹Ø§Ù…Ø©ØŒ Ø£Ùˆ Ø¥ØªØ¨Ø¹ Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø¢Ø®Ø±ÙŠÙ† ÙÙŠ Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ù…Ø«ÙŠÙ„Ø© Ø§Ù„Ø£Ø®Ø±Ù‰ Ù„Ù…Ù„Ø¡ Ø®ÙŠØ· Ø§Ù„Ù…ØØ§Ø¯Ø«Ø§Øª Ø§Ù„Ø¹Ø§Ù…",
   "follow_request.authorize": "ØªØ±Ø®ÙŠØµ",
   "follow_request.reject": "Ø±ÙØ¶",
   "getting_started.developers": "Ø§Ù„Ù…ÙØ·ÙˆÙ‘ÙØ±ÙˆÙ†",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Ø§Ù„Ø¨ØØ« Ø¹Ù† Ø£ØµØ¯Ù‚Ø§Ø¡ Ø¹Ù„Ù‰ ØªÙˆÙŠØªØ±",
+  "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.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": "Ø£Ø³Ø§Ø³ÙŠØ©",
   "home.column_settings.show_reblogs": "Ø¹Ø±Ø¶ Ø§Ù„ØªØ±Ù‚ÙŠØ§Øª",
   "home.column_settings.show_replies": "Ø¹Ø±Ø¶ Ø§Ù„Ø±Ø¯ÙˆØ¯",
+  "introduction.federation.action": "Ø§Ù„ØªØ§Ù„ÙŠ",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "ÙƒØ§ÙØ© Ø§Ù„Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø§Ù„ØªÙŠ Ù†ÙØ´ÙØ±Øª Ø¥Ù„Ù‰ Ø§Ù„Ø¹Ø§Ù…Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ø£Ø®Ø±Ù‰ Ù„Ù„ÙØ¯ÙŠÙØ±Ø³ Ø³ÙˆÙ ÙŠØªÙ… Ø¹Ø±Ø¶Ù‡Ø§ Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ù…ÙÙˆØÙ‘ÙŽØ¯.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Ø³ÙˆÙ ØªÙØ¹Ø±ÙŽØ¶ Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ø°ÙŠÙ† ØªÙØªØ§Ø¨ÙØ¹Ù‡Ù… Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠ. Ø¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ù…ØªØ§Ø¨Ø¹Ø© Ø£ÙŠ ØØ³Ø§Ø¨ Ø£ÙŠØ§ ÙƒØ§Ù† Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ù„Ø°ÙŠ Ù‡Ùˆ Ø¹Ù„ÙŠÙ‡!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Ø§Ù„Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø§Ù„Ù…ÙÙˆØ¬Ù‘Ù‡Ø© Ù„Ù„Ø¹Ø§Ù…Ø© Ø¹Ù„Ù‰ Ù†ÙØ³ Ø§Ù„Ø®Ø§Ø¯Ù… Ø§Ù„Ø°ÙŠ Ø£Ù†ØªÙ… Ø¹Ù„ÙŠÙ‡ Ø³ØªØ¸Ù‡Ø± Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„Ù…ØÙ„ÙŠ.",
+  "introduction.interactions.action": "Ø¥Ù†Ù‡Ø§Ø¡ Ø§Ù„Ø¹Ø±Ø¶ Ø§Ù„ØªÙˆØ¶ÙŠØÙŠ!",
+  "introduction.interactions.favourite.headline": "Ø§Ù„Ø¥Ø¶Ø§ÙØ© Ø¥Ù„Ù‰ Ø§Ù„Ù…ÙØ¶Ù„Ø©",
+  "introduction.interactions.favourite.text": "ÙŠÙ…ÙƒÙÙ†Ùƒ Ø¥Ø¶Ø§ÙØ© Ø£ÙŠ ØªØ¨ÙˆÙŠÙ‚ Ø¥Ù„Ù‰ Ø§Ù„Ù…ÙØ¶Ù„Ø© Ùˆ Ø¥Ø¹Ù„Ø§Ù… ØµØ§ØØ¨Ù‡ Ø£Ù†Ùƒ Ø£Ø¹Ø¬ÙØ¨Øª Ø¨Ø°Ø§Ùƒ Ø§Ù„ØªØ¨ÙˆÙŠÙ‚.",
+  "introduction.interactions.reblog.headline": "Ø§Ù„ØªØ±Ù‚ÙŠØ©",
+  "introduction.interactions.reblog.text": "ÙŠÙ…ÙƒÙ†ÙƒÙ… Ù…Ø´Ø§Ø±ÙƒØ© ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ù…Ø¹ Ù…ØªØ§Ø¨ÙØ¹ÙŠÙƒÙ… Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªØ±Ù‚ÙŠØªÙ‡Ø§.",
+  "introduction.interactions.reply.headline": "Ø§Ù„Ø±Ø¯",
+  "introduction.interactions.reply.text": "ÙŠÙ…ÙƒÙ†ÙƒÙ… Ø§Ù„Ø±Ø¯ Ø¹Ù„Ù‰ ØªØ¨ÙˆÙŠÙ‚Ø§ØªÙƒÙ… Ùˆ ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ø¹Ù„Ù‰ Ø´ÙƒÙ„ Ø³Ù„Ø³Ù„Ø© Ù…ØØ§Ø¯Ø«Ø©.",
+  "introduction.welcome.action": "Ù‡ÙŠØ§ Ø¨Ù†Ø§!",
+  "introduction.welcome.headline": "Ø§Ù„Ø®Ø·ÙˆØ§Øª Ø§Ù„Ø£ÙˆÙ„Ù‰",
+  "introduction.welcome.text": "Ù…Ø±ØØ¨Ø§ Ø¨ÙƒÙ… Ø¹Ù„Ù‰ Ø§Ù„ÙÙŠØ¯ÙŠÙÙŠØ±Ø³! Ø¨Ø¹Ø¯ Ù„ØØ¸Ø§Øª Ù‚Ù„ÙŠÙ„Ø© ØŒ Ø³ÙŠÙƒÙˆÙ† Ø¨Ù…Ù‚Ø¯ÙˆØ±ÙƒÙ… Ø¨Ø« Ø±Ø³Ø§Ø¦Ù„ ÙˆØ§Ù„ØªØØ¯Ø« Ø¥Ù„Ù‰ Ø£ØµØ¯Ù‚Ø§Ø¦ÙƒÙ… Ø¹Ø¨Ø± ØªØ´ÙƒÙŠÙ„Ø© ÙˆØ§Ø³Ø¹Ø© Ù…Ù† Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ù…Ø®ØªÙ„ÙØ©. Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… ØŒ {domain} ØŒ ÙŠØ³ØªØ¶ÙŠÙ Ù…Ù„ÙÙƒÙ… Ø§Ù„Ø´Ø®ØµÙŠ ØŒ Ù„Ø°Ø§ ÙŠØ¬Ø¨ ØªØ°ÙƒØ± Ø§Ø³Ù…Ù‡ Ø¬ÙŠØ¯Ø§.",
   "keyboard_shortcuts.back": "Ù„Ù„Ø¹ÙˆØ¯Ø©",
+  "keyboard_shortcuts.blocked": "Ù„ÙØªØ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ù…ØØ¸ÙˆØ±ÙŠÙ†",
   "keyboard_shortcuts.boost": "Ù„Ù„ØªØ±Ù‚ÙŠØ©",
   "keyboard_shortcuts.column": "Ù„Ù„ØªØ±ÙƒÙŠØ² Ø¹Ù„Ù‰ Ù…Ù†Ø´ÙˆØ± Ø¹Ù„Ù‰ Ø£ØØ¯ Ø§Ù„Ø£Ø¹Ù…Ø¯Ø©",
   "keyboard_shortcuts.compose": "Ù„Ù„ØªØ±ÙƒÙŠØ² Ø¹Ù„Ù‰ Ù†Ø§ÙØ°Ø© ØªØØ±ÙŠØ± Ø§Ù„Ù†ØµÙˆØµ",
   "keyboard_shortcuts.description": "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.hotkey": "Ù…ÙØªØ§Ø Ø§Ù„Ø¥Ø®ØªØµØ§Ø±",
   "keyboard_shortcuts.legend": "Ù„Ø¹Ø±Ø¶ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø",
+  "keyboard_shortcuts.local": "Ù„ÙØªØ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„Ù…ØÙ„ÙŠ",
   "keyboard_shortcuts.mention": "Ù„Ø°ÙÙƒØ± Ø§Ù„Ù†Ø§Ø´Ø±",
+  "keyboard_shortcuts.muted": "Ù„ÙØªØ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ† Ø§Ù„Ù…ÙƒØªÙˆÙ…ÙŠÙ†",
+  "keyboard_shortcuts.my_profile": "Ù„ÙØªØ Ù…Ù„ÙÙƒ Ø§Ù„Ø´Ø®ØµÙŠ",
+  "keyboard_shortcuts.notifications": "Ù„ÙØªØ Ø¹Ù…ÙˆØ¯ Ø§Ù„Ø¥Ø´Ø¹Ø§Ø±Ø§Øª",
+  "keyboard_shortcuts.pinned": "Ù„ÙØªØ Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„Ù…Ø¯Ø¨Ø³Ø©",
+  "keyboard_shortcuts.profile": "Ù„ÙØªØ Ø±Ø§Ø¨Ø· Ø§Ù„Ù†Ø§Ø´Ø±",
   "keyboard_shortcuts.reply": "Ù„Ù„Ø±Ø¯Ù‘",
+  "keyboard_shortcuts.requests": "Ù„ÙØªØ Ù‚Ø§Ø¦Ù…Ø© Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©",
   "keyboard_shortcuts.search": "Ù„Ù„ØªØ±ÙƒÙŠØ² Ø¹Ù„Ù‰ Ø§Ù„Ø¨ØØ«",
+  "keyboard_shortcuts.start": "Ù„ÙØªØ Ø¹Ù…ÙˆØ¯ \"Ù‡ÙŠØ§ Ù†Ø¨Ø¯Ø£\"",
   "keyboard_shortcuts.toggle_hidden": "Ù„Ø¹Ø±Ø¶ Ø£Ùˆ Ø¥Ø®ÙØ§Ø¡ Ø§Ù„Ù†Øµ Ù…ÙÙ† ÙˆØ±Ø§Ø¡ Ø§Ù„ØªØØ°ÙŠØ±",
   "keyboard_shortcuts.toot": "Ù„ØªØØ±ÙŠØ± ØªØ¨ÙˆÙŠÙ‚ Ø¬Ø¯ÙŠØ¯",
   "keyboard_shortcuts.unfocus": "Ù„Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªØ±ÙƒÙŠØ² Ø¹Ù„Ù‰ ØÙ‚Ù„ Ø§Ù„Ù†Øµ Ø£Ùˆ Ù†Ø§ÙØ°Ø© Ø§Ù„Ø¨ØØ«",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„ÙŠÙ‡",
   "missing_indicator.sublabel": "ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙˆØ±Ø¯",
   "mute_modal.hide_notifications": "Ù‡Ù„ ØªÙˆØ¯ Ø¥Ø®ÙØ§Ø¡ Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ø§Ù„Ù‚Ø§Ø¯Ù…Ø© Ù…Ù† Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… ØŸ",
+  "navigation_bar.apps": "ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø§Ù„Ø£Ø¬Ù‡Ø²Ø© Ø§Ù„Ù…ØÙ…ÙˆÙ„Ø©",
   "navigation_bar.blocks": "Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…ØØ¬ÙˆØ¨Ø©",
   "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": "Muted words",
+  "navigation_bar.filters": "Ø§Ù„ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ù…ÙƒØªÙˆÙ…Ø©",
   "navigation_bar.follow_requests": "Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©",
   "navigation_bar.info": "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¥Ø¶Ø§ÙÙŠØ©",
   "navigation_bar.keyboard_shortcuts": "Ø¥Ø®ØªØµØ§Ø±Ø§Øª Ù„ÙˆØØ© Ø§Ù„Ù…ÙØ§ØªÙŠØ",
@@ -178,7 +234,7 @@
   "navigation_bar.preferences": "Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª",
   "navigation_bar.public_timeline": "Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø¹Ø§Ù… Ø§Ù„Ù…ÙˆØØ¯",
   "navigation_bar.security": "Ø§Ù„Ø£Ù…Ø§Ù†",
-  "notification.favourite": "{name} Ø£Ø¹Ø¬Ø¨ Ø¨Ù…Ù†Ø´ÙˆØ±Ùƒ",
+  "notification.favourite": "Ø£ÙØ¹Ø¬ÙØ¨ {name} Ø¨Ù…Ù†Ø´ÙˆØ±Ùƒ",
   "notification.follow": "{name} ÙŠØªØ§Ø¨Ø¹Ùƒ",
   "notification.mention": "{name} Ø°ÙƒØ±Ùƒ",
   "notification.reblog": "{name} Ù‚Ø§Ù… Ø¨ØªØ±Ù‚ÙŠØ© ØªØ¨ÙˆÙŠÙ‚Ùƒ",
@@ -186,35 +242,21 @@
   "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.mention": "Ø§Ù„Ø¥Ø´Ø§Ø±Ø§Øª :",
   "notifications.column_settings.push": "Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ø§Ù„Ù…Ø¯ÙÙˆØ¹Ø©",
-  "notifications.column_settings.push_meta": "Ù‡Ø°Ø§ Ø§Ù„Ø¬Ù‡Ø§Ø²",
   "notifications.column_settings.reblog": "Ø§Ù„ØªØ±Ù‚ÙŠÙ‘Ø§Øª:",
   "notifications.column_settings.show": "Ø¥Ø¹Ø±ÙØ¶Ù‡Ø§ ÙÙŠ Ø¹Ù…ÙˆØ¯",
   "notifications.column_settings.sound": "Ø£ØµØ¯Ø± ØµÙˆØªØ§",
+  "notifications.filter.all": "Ø§Ù„ÙƒÙ„",
+  "notifications.filter.boosts": "Ø§Ù„ØªØ±Ù‚ÙŠØ§Øª",
+  "notifications.filter.favourites": "Ø§Ù„Ù…ÙØ¶Ù„Ø©",
+  "notifications.filter.follows": "ÙŠØªØ§Ø¨ÙØ¹",
+  "notifications.filter.mentions": "Ø§Ù„Ø¥Ø´Ø§Ø±Ø§Øª",
   "notifications.group": "{count} Ø¥Ø´Ø¹Ø§Ø±Ø§Øª",
-  "onboarding.done": "ØªÙ…",
-  "onboarding.next": "Ø§Ù„ØªØ§Ù„ÙŠ",
-  "onboarding.page_five.public_timelines": "ØªÙØ¹Ø±ÙŽØ¶ ÙÙŠ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„Ù…ØÙ„ÙŠ Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ§Øª Ø§Ù„Ø¹Ø§Ù…Ø© Ø§Ù„Ù…ØØ±Ø±Ø© Ù…Ù† Ø·Ø±Ù Ø¬Ù…ÙŠØ¹ Ø§Ù„Ù…Ø³Ø¬Ù„ÙŠÙ† ÙÙŠ {domain}. Ø£Ù…Ø§ ÙÙŠ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„Ù…ÙˆØØ¯ ØŒ ÙØ¥Ù†Ù‡ ÙŠØªÙ… Ø¹Ø±Ø¶ Ø¬Ù…ÙŠØ¹ Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ§Øª Ø§Ù„Ø¹Ø§Ù…Ø© Ø§Ù„Ù…Ù†Ø´ÙˆØ±Ø© Ù…Ù† Ø·Ø±Ù Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ù…ØªØ§Ø¨ÙŽØ¹ÙŠÙ† Ù…Ù† Ø·Ø±Ù Ø£Ø¹Ø¶Ø§Ø¡ {domain}. Ù‡Ø°Ù‡ Ù‡ÙŠ Ø§Ù„Ø®ÙŠÙˆØ· Ø§Ù„Ø²Ù…Ù†ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©ØŒ ÙˆÙ‡ÙŠ Ø·Ø±ÙŠÙ‚Ø© Ø±Ø§Ø¦Ø¹Ø© Ù„Ù„ØªØ¹Ø±Ù Ø£Ø´Ø®Ø§Øµ Ø¬Ø¯Ø¯.",
-  "onboarding.page_four.home": "ØªØ¹Ø±Ø¶ Ø§Ù„ØµÙØØ© Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠØ© Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ø°ÙŠÙ† ØªØªØ§Ø¨Ø¹Ù‡Ù….",
-  "onboarding.page_four.notifications": "ÙØ¹Ù†Ø¯Ù…Ø§ ÙŠØªÙØ§Ø¹Ù„ Ø´Ø®Øµ Ù…Ø§ Ù…Ø¹ÙƒØŒ Ø¹Ù…ÙˆØ¯ Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª ÙŠØ®Ø¨Ø±Ùƒ.",
-  "onboarding.page_one.federation": "Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø´Ø¨ÙƒØ© Ù…Ù† Ø®ÙˆØ§Ø¯Ù… Ù…Ø³ØªÙ‚Ù„Ø© Ù…ØªÙ„Ø§ØÙ…Ø© ØªÙ‡Ø¯Ù Ø¥Ù„Ù‰ Ø¥Ù†Ø´Ø§Ø¡ Ø£ÙƒØ¨Ø± Ø´Ø¨ÙƒØ© Ø§Ø¬ØªÙ…Ø§Ø¹ÙŠØ© Ù…ÙˆØØ¯Ø©. ØªØ³Ù…Ù‰ Ù‡Ø°Ù‡ Ø§Ù„Ø³Ø±ÙÙŠØ±Ø§Øª Ø¨Ù…Ø«ÙŠÙ„Ø§Øª Ø®ÙˆØ§Ø¯Ù….",
-  "onboarding.page_one.full_handle": "Ø¹Ù†ÙˆØ§Ù†Ùƒ Ø§Ù„ÙƒØ§Ù…Ù„",
-  "onboarding.page_one.handle_hint": "Ù‡Ø°Ø§ Ù‡Ùˆ Ù…Ø§ ÙŠØ¬Ø¨ Ø¹Ù„ÙŠÙƒ ØªÙˆØµÙŠÙ„Ù‡ Ù„Ø£ØµØ¯Ù‚Ø§Ø¦Ùƒ Ù„Ù„Ø¨ØØ« Ø¹Ù†Ù‡.",
-  "onboarding.page_one.welcome": "Ù…Ø±ØØ¨Ø§ Ø¨Ùƒ ÙÙŠ Ù…Ø§Ø³ØªØ¯ÙˆÙ† !",
-  "onboarding.page_six.admin": "Ù…Ø¯ÙŠØ±(Ø©) Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯Ù… Ù‡Ø°Ø§ {admin}.",
-  "onboarding.page_six.almost_done": "Ø£Ù†Ù‡ÙŠØª ØªÙ‚Ø±ÙŠØ¨Ø§ ...",
-  "onboarding.page_six.appetoot": "ØªÙ…ØªØ¹ Ø¨Ø§Ù„ØªØ¨ÙˆÙŠÙ‚ !",
-  "onboarding.page_six.apps_available": "Ù‡Ù†Ø§Ùƒ {apps} Ù…ØªÙˆÙØ±Ø© Ù„Ø£Ù†Ø¸Ù…Ø© Ø¢ÙŠ Ø£Ùˆ Ø¥Ø³ Ùˆ Ø£Ù†Ø¯Ø±ÙˆÙŠØ¯ Ùˆ ØºÙŠØ±Ù‡Ø§ Ù…Ù† Ø§Ù„Ù…Ù†ØµØ§Øª Ùˆ Ø§Ù„Ø£Ù†Ø¸Ù…Ø©.",
-  "onboarding.page_six.github": "Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¨Ø±Ù†Ø§Ù…Ø¬ Ù…ÙØªÙˆØ Ø§Ù„Ù…ØµØ¯Ø±. ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ù…Ø³Ø§Ù‡Ù…Ø©ØŒ Ø£Ùˆ Ø§Ù„Ø¥Ø¨Ù„Ø§Øº Ø¹Ù† ØªÙ‚Ø§Ø±ÙŠØ± Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ØŒ Ø¹Ù„Ù‰ GitHub {github}.",
-  "onboarding.page_six.guidelines": "Ø§Ù„Ù…Ø¨Ø§Ø¯Ø¦ Ø§Ù„ØªÙˆØ¬ÙŠÙ‡ÙŠØ© Ù„Ù„Ù…Ø¬ØªÙ…Ø¹",
-  "onboarding.page_six.read_guidelines": "Ø±Ø¬Ø§Ø¡Ø§ØŒ Ù‚Ù… Ø¨Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ø¹Ù„Ù‰ {guidelines} Ù„Ù€ {domain} !",
-  "onboarding.page_six.various_app": "ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø§Ù„Ø¬ÙˆØ§Ù„",
-  "onboarding.page_three.profile": "ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø¯Ø®Ø§Ù„ ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ø¹Ù„Ù‰ Ù…Ù„ÙÙƒ Ø§Ù„Ø´Ø®ØµÙŠ Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªØºÙŠÙŠØ± Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ù…Ø²ÙŠØ© Ùˆ Ø§Ù„Ø³ÙŠØ±Ø© Ùˆ Ø¥Ø³Ù…Ùƒ Ø§Ù„Ù…Ø³ØªØ¹Ø§Ø±. Ù‡Ù†Ø§ÙƒØŒ Ø³ÙˆÙ ØªØ¬Ø¯ Ø£ÙŠØ¶Ø§ ØªÙØ¶ÙŠÙ„Ø§Øª Ø£Ø®Ø±Ù‰ Ù…ØªØ§ØØ©.",
-  "onboarding.page_three.search": "Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø´Ø±ÙŠØ· Ø§Ù„Ø¨ØØ« ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£Ø´Ø®Ø§Øµ Ùˆ Ø£ØµØ¯Ù‚Ø§Ø¡ Ø£Ùˆ Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ø¹Ù„Ù‰ Ø£ÙˆØ³Ù…Ø©ØŒ ÙƒÙ€ {illustration} Ùˆ {introductions}. Ù„Ù„Ø¨ØØ« Ø¹Ù† Ø´Ø®Øµ ØºÙŠØ± Ù…Ø³Ø¬Ù„ ÙÙŠ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯Ù… Ù‡Ø°Ø§ØŒ Ø§Ø³ØªØ®Ø¯Ù… Ù…ÙØ¹Ø±Ù‘ÙÙ‡ Ø§Ù„ÙƒØ§Ù…Ù„.",
-  "onboarding.page_two.compose": "ØØ±Ø± Ù…Ø´Ø§Ø±ÙƒØ§ØªÙƒ Ø¹Ø¨Ø± Ø¹Ù…ÙˆØ¯ Ø§Ù„ØªØØ±ÙŠØ±. ÙŠÙ…ÙƒÙ†Ùƒ Ù…Ù† Ø®Ù„Ø§Ù„Ù‡ ØªØÙ…ÙŠÙ„ Ø§Ù„ØµÙˆØ± ÙˆØªØºÙŠÙŠØ± Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„Ø®ØµÙˆØµÙŠØ© ÙˆØ¥Ø¶Ø§ÙØ© ØªØØ°ÙŠØ±Ø§Øª Ø¹Ù† Ø§Ù„Ù…ØØªÙˆÙ‰ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ø±Ù…ÙˆØ² Ø£Ø¯Ù†Ø§Ù‡.",
-  "onboarding.skip": "ØªØ®Ø·ÙŠ",
   "privacy.change": "Ø¥Ø¶Ø¨Ø· Ø®ØµÙˆØµÙŠØ© Ø§Ù„Ù…Ù†Ø´ÙˆØ±",
   "privacy.direct.long": "Ø£Ù†Ø´Ø± Ø¥Ù„Ù‰ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ù…Ø´Ø§Ø± Ø¥Ù„ÙŠÙ‡Ù… ÙÙ‚Ø·",
   "privacy.direct.short": "Ù…Ø¨Ø§Ø´Ø±",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª",
   "search_results.total": "{count, number} {count, plural, one {result} Ùˆ {results}}",
   "standalone.public_title": "Ù†Ø¸Ø±Ø© Ø¹Ù„Ù‰ ...",
+  "status.admin_account": "Ø§ÙØªØ Ø§Ù„ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ø¥Ø¯Ø§Ø±ÙŠØ© Ù„Ù€ @{name}",
+  "status.admin_status": "Ø§ÙØªØ Ù‡Ø°Ø§ Ø§Ù„Ù…Ù†Ø´ÙˆØ± Ø¹Ù„Ù‰ ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ø¥Ø´Ø±Ø§Ù",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªØ±Ù‚ÙŠØ©",
   "status.cannot_reblog": "ØªØ¹Ø°Ø±Øª ØªØ±Ù‚ÙŠØ© Ù‡Ø°Ø§ Ø§Ù„Ù…Ù†Ø´ÙˆØ±",
   "status.delete": "Ø¥ØØ°Ù",
+  "status.detailed_status": "ØªÙØ§ØµÙŠÙ„ Ø§Ù„Ù…ØØ§Ø¯Ø«Ø©",
   "status.direct": "Ø±Ø³Ø§Ù„Ø© Ø®Ø§ØµØ© Ø¥Ù„Ù‰ @{name}",
   "status.embed": "Ø¥Ø¯Ù…Ø§Ø¬",
   "status.favourite": "Ø£Ø¶Ù Ø¥Ù„Ù‰ Ø§Ù„Ù…ÙØ¶Ù„Ø©",
@@ -267,9 +312,11 @@
   "status.open": "ÙˆØ³Ø¹ Ù‡Ø°Ù‡ Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©",
   "status.pin": "ØªØ¯Ø¨ÙŠØ³ Ø¹Ù„Ù‰ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ",
   "status.pinned": "ØªØ¨ÙˆÙŠÙ‚ Ù…Ø«Ø¨Ù‘ÙŽØª",
+  "status.read_more": "Ø§Ù‚Ø±Ø£ Ø§Ù„Ù…Ø²ÙŠØ¯",
   "status.reblog": "Ø±ÙŽÙ‚Ù‘ÙÙŠ",
   "status.reblog_private": "Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ø§Ù„ØªØ±Ù‚ÙŠØ© Ø¥Ù„Ù‰ Ø§Ù„Ø¬Ù…Ù‡ÙˆØ± Ø§Ù„Ø£ØµÙ„ÙŠ",
-  "status.reblogged_by": "{name} Ø±Ù‚Ù‰",
+  "status.reblogged_by": "Ø±Ù‚Ù‘Ø§Ù‡ {name}",
+  "status.reblogs.empty": "Ù„Ù… ÙŠÙ‚Ù… Ø£ÙŠ Ø£ØØ¯ Ø¨ØªØ±Ù‚ÙŠØ© Ù‡Ø°Ø§ Ø§Ù„ØªØ¨ÙˆÙŠÙ‚ Ø¨Ø¹Ø¯. Ø¹Ù†Ø¯Ù…Ø§ ÙŠÙ‚ÙˆÙ… Ø£ØØ¯Ù‡Ù… Ø¨Ø°Ù„Ùƒ Ø³ÙˆÙ ØªØ¸Ù‡Ø± Ù‡Ù†Ø§.",
   "status.redraft": "Ø¥Ø²Ø§Ù„Ø© Ùˆ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„ØµÙŠØ§ØºØ©",
   "status.reply": "Ø±Ø¯Ù‘",
   "status.replyAll": "Ø±ÙØ¯ Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠØ·",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Ø·ÙŠ Ø§Ù„ÙƒÙ„",
   "status.show_more": "Ø£Ø¸Ù‡Ø± Ø§Ù„Ù…Ø²ÙŠØ¯",
   "status.show_more_all": "ØªÙˆØ³ÙŠØ¹ Ø§Ù„ÙƒÙ„",
+  "status.show_thread": "Ø§Ù„ÙƒØ´Ù Ø¹Ù† Ø§Ù„Ù…ØØ§Ø¯Ø«Ø©",
   "status.unmute_conversation": "ÙÙƒ Ø§Ù„ÙƒØªÙ… Ø¹Ù† Ø§Ù„Ù…ØØ§Ø¯Ø«Ø©",
   "status.unpin": "ÙÙƒ Ø§Ù„ØªØ¯Ø¨ÙŠØ³ Ù…Ù† Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ",
+  "suggestions.dismiss": "Ø¥Ù„ØºØ§Ø¡ Ø§Ù„Ø¥Ù‚ØªØ±Ø§Ø",
+  "suggestions.header": "ÙŠÙ…ÙƒÙ† Ø£Ù† ÙŠÙ‡Ù…Ùƒâ€¦",
   "tabs_bar.federated_timeline": "Ø§Ù„Ù…ÙˆØÙ‘ÙŽØ¯",
   "tabs_bar.home": "Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠØ©",
   "tabs_bar.local_timeline": "Ø§Ù„Ù…ØÙ„ÙŠ",
@@ -291,7 +341,7 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} Ø¢Ø®Ø±ÙˆÙ† {people}} ÙŠØªØØ¯Ø«ÙˆÙ†",
   "ui.beforeunload": "Ø³ÙˆÙ ØªÙÙ‚Ø¯ Ù…Ø³ÙˆØ¯ØªÙƒ Ø¥Ù† ØªØ±ÙƒØª Ù…Ø§Ø³ØªØ¯ÙˆÙ†.",
   "upload_area.title": "Ø¥Ø³ØØ¨ Ø«Ù… Ø£ÙÙ„Øª Ù„Ù„Ø±ÙØ¹",
-  "upload_button.label": "Ø¥Ø¶Ø§ÙØ© ÙˆØ³Ø§Ø¦Ø·",
+  "upload_button.label": "Ø¥Ø¶Ø§ÙØ© ÙˆØ³Ø§Ø¦Ø· (JPEGØŒ PNGØŒ GIFØŒ WebMØŒ MP4ØŒ MOV)",
   "upload_form.description": "ÙˆØµÙ Ù„Ù„Ù…Ø¹Ø§Ù‚ÙŠÙ† Ø¨ØµØ±ÙŠØ§",
   "upload_form.focus": "Ù‚Øµ",
   "upload_form.undo": "ØØ°Ù",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
new file mode 100644
index 0000000000000000000000000000000000000000..a9407e82dd0671d4ec77073458ed04a67a0e34bb
--- /dev/null
+++ b/app/javascript/mastodon/locales/ast.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "RobÃ³",
+  "account.block": "Bloquiar a @{name}",
+  "account.block_domain": "Anubrir tolo de {domain}",
+  "account.blocked": "Blocked",
+  "account.direct": "Unviar un mensaxe direutu a @{name}",
+  "account.disclaimer_full": "La informaciÃ³n d'embaxo podrÃa reflexar de mou incompletu'l perfil del usuariu.",
+  "account.domain_blocked": "Dominiu anubrÃu",
+  "account.edit_profile": "Editar el perfil",
+  "account.endorse": "Destacar nel perfil",
+  "account.follow": "Follow",
+  "account.followers": "Siguidores",
+  "account.followers.empty": "Naide sigue a esti usuariu entÃ¡.",
+  "account.follows": "Sigue a",
+  "account.follows.empty": "Esti usuariu entÃ¡ nun sigue a naide.",
+  "account.follows_you": "SÃguete",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "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": "Mentar a @{name}",
+  "account.moved_to": "{name} has moved to:",
+  "account.mute": "Silenciar a @{name}",
+  "account.mute_notifications": "Mute notifications from @{name}",
+  "account.muted": "Muted",
+  "account.posts": "Toots",
+  "account.posts_with_replies": "Toots y rempuestes",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "account.unblock": "Desbloquiar a @{name}",
+  "account.unblock_domain": "Amosar {domain}",
+  "account.unendorse": "Don't feature on profile",
+  "account.unfollow": "Unfollow",
+  "account.unmute": "Unmute @{name}",
+  "account.unmute_notifications": "Unmute notifications from @{name}",
+  "account.view_full_profile": "Ver el perfil completu",
+  "alert.unexpected.message": "AsocediÃ³ un fallu inesperÃ¡u.",
+  "alert.unexpected.title": "Â¡Ups!",
+  "boost_modal.combo": "Pues primir {combo} pa saltar esto la prÃ³xima vegada",
+  "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": "Usuarios bloquiaos",
+  "column.community": "Llinia temporal llocal",
+  "column.direct": "Mensaxes direutos",
+  "column.domain_blocks": "Dominios anubrÃos",
+  "column.favourites": "Favoritos",
+  "column.follow_requests": "SolicitÃºes de siguimientu",
+  "column.home": "Aniciu",
+  "column.lists": "Llistes",
+  "column.mutes": "Usuarios silenciaos",
+  "column.notifications": "Avisos",
+  "column.pins": "Toots fixaos",
+  "column.public": "Llinia temporal 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.pin": "Fixar",
+  "column_header.show_settings": "Show settings",
+  "column_header.unpin": "Desfixar",
+  "column_subheading.settings": "Axustes",
+  "community.column_settings.media_only": "Media Only",
+  "compose_form.direct_message_warning": "Esti toot 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",
+  "compose_form.placeholder": "Â¿En quÃ© pienses?",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "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 va anubrise",
+  "compose_form.spoiler_placeholder": "Escribi equÃ l'avertencia",
+  "confirmation_modal.cancel": "Encaboxar",
+  "confirmations.block.confirm": "Block",
+  "confirmations.block.message": "Â¿De xuru que quies bloquiar a {name}?",
+  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.message": "Â¿De xuru que quies desaniciar esti estÃ¡u?",
+  "confirmations.delete_list.confirm": "Desaniciar",
+  "confirmations.delete_list.message": "Â¿De xuru que quies desaniciar dafechu esta llista?",
+  "confirmations.domain_block.confirm": "Anubrir 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.mute.confirm": "Mute",
+  "confirmations.mute.message": "Â¿De xuru que quies silenciar a {name}?",
+  "confirmations.redraft.confirm": "Desaniciar y reeditar",
+  "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": "Â¿De xuru que quies dexar de siguir a {name}?",
+  "embed.instructions": "Empotra esti estÃ¡u nun sitiu web copiando'l cÃ³digu d'embaxo.",
+  "embed.preview": "Asina ye como va vese:",
+  "emoji_button.activity": "Actividaes",
+  "emoji_button.custom": "Custom",
+  "emoji_button.flags": "Banderes",
+  "emoji_button.food": "Comida y bÃ©bora",
+  "emoji_button.label": "Insert emoji",
+  "emoji_button.nature": "Natura",
+  "emoji_button.not_found": "Â¡Nun hai fustaxes! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "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.symbols": "SÃmbolos",
+  "emoji_button.travel": "Viaxes y llugares",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "EntÃ¡ nun bloquiesti a dengÃºn usuariu.",
+  "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
+  "empty_column.direct": "EntÃ¡ nun tienes dengÃº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": "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_requests": "EntÃ¡ nun tienes denguna solicitÃº de siguimientu. Cuando recibas una, va amosase equÃ.",
+  "empty_column.hashtag": "There is nothing in this hashtag yet.",
+  "empty_column.home": "Â¡Tienes la llinia temporal balera! Visita {public} o usa la gueta pa entamar y conocer a otros usuarios.",
+  "empty_column.home.public_timeline": "la llinia temporal pÃºblica",
+  "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 denguna llista. Cuando crees una, va amosase equÃ.",
+  "empty_column.mutes": "EntÃ¡ nun silenciesti a dengÃºn usuariu.",
+  "empty_column.notifications": "EntÃ¡ nun tienes dengÃºn avisu. Interactua con otros p'aniciar la conversaciÃ³n.",
+  "empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other instances to fill it up",
+  "follow_request.authorize": "Autorizar",
+  "follow_request.reject": "Refugar",
+  "getting_started.developers": "Desendolcadores",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "DocumentaciÃ³n",
+  "getting_started.heading": "Entamu",
+  "getting_started.invite": "Convidar xente",
+  "getting_started.open_source_notice": "Mastodon ye software de cÃ³digu abiertu. Pues collaborar o informar de fallos en {github} (GitHub).",
+  "getting_started.security": "Seguranza",
+  "getting_started.terms": "TÃ©rminos del serviciu",
+  "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.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",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Amosar toots compartÃos",
+  "home.column_settings.show_replies": "Amosar rempuestes",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "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": "to focus the compose textarea",
+  "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": "to open status",
+  "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "p'abrir la llista de favoritos",
+  "keyboard_shortcuts.federated": "p'abrir la llinia temporal federada",
+  "keyboard_shortcuts.heading": "Atayos del teclÃ¡u",
+  "keyboard_shortcuts.home": "p'abrir la llinia temporal d'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": "to open your profile",
+  "keyboard_shortcuts.notifications": "p'abrir la columna d'avisos",
+  "keyboard_shortcuts.pinned": "p'abrir la llista de toots 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": "to focus search",
+  "keyboard_shortcuts.start": "p'abrir la columna Â«entamarÂ»",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.toot": "p'apenzar un toot nuevu",
+  "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
+  "keyboard_shortcuts.up": "pa xubir na llista",
+  "lightbox.close": "Close",
+  "lightbox.next": "Siguiente",
+  "lightbox.previous": "Previous",
+  "lists.account.add": "Amestar a la llista",
+  "lists.account.remove": "Desaniciar de la llista",
+  "lists.delete": "Desaniciar la llista",
+  "lists.edit": "Editar la llista",
+  "lists.new.create": "Add list",
+  "lists.new.title_placeholder": "TÃtulu nuevu de la llista",
+  "lists.search": "Guetar ente la xente que sigues",
+  "lists.subheading": "Les tos llistes",
+  "loading_indicator.label": "Cargando...",
+  "media_gallery.toggle_visible": "Toggle visibility",
+  "missing_indicator.label": "Nun s'alcontrÃ³",
+  "missing_indicator.sublabel": "Esti recursu nun pudo alcontrase",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Aplicaciones pa mÃ³viles",
+  "navigation_bar.blocks": "Usuarios bloquiaos",
+  "navigation_bar.community_timeline": "Llinia temporal llocal",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "Mensaxes direutos",
+  "navigation_bar.discover": "Discover",
+  "navigation_bar.domain_blocks": "Dominios anubrÃos",
+  "navigation_bar.edit_profile": "Editar el perfil",
+  "navigation_bar.favourites": "Favoritos",
+  "navigation_bar.filters": "Pallabres silenciaes",
+  "navigation_bar.follow_requests": "SolicitÃºes de siguimientu",
+  "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.personal": "Personal",
+  "navigation_bar.pins": "Toots fixaos",
+  "navigation_bar.preferences": "Preferencies",
+  "navigation_bar.public_timeline": "Llinia temporal federada",
+  "navigation_bar.security": "Seguranza",
+  "notification.favourite": "{name} favourited your status",
+  "notification.follow": "{name} siguiÃ³te",
+  "notification.mention": "{name} mentÃ³te",
+  "notification.reblog": "{name} compartiÃ³'l to estÃ¡u",
+  "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": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "Siguidores nuevos:",
+  "notifications.column_settings.mention": "Menciones:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.reblog": "Toots compartÃos:",
+  "notifications.column_settings.show": "Amosar en columna",
+  "notifications.column_settings.sound": "Reproducir sonÃu",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} avisos",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Post to mentioned users only",
+  "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": "Do not show in public timelines",
+  "privacy.unlisted.short": "Unlisted",
+  "regeneration_indicator.label": "Cargandoâ€¦",
+  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "agora",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "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": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+  "report.placeholder": "Comentarios adicionales",
+  "report.submit": "Submit",
+  "report.target": "Report {target}",
+  "search.placeholder": "Search",
+  "search_popout.search_format": "Formatu de gueta 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_results.hashtags": "Etiquetes",
+  "search_results.statuses": "Toots",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Bloquiar a @{name}",
+  "status.cancel_reblog_private": "Dexar de compartir",
+  "status.cannot_reblog": "Esti artÃculu nun pue compartise",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Unviar un mensaxe direutu a @{name}",
+  "status.embed": "Empotrar",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "status.load_more": "Cargar mÃ¡s",
+  "status.media_hidden": "Mediu anubrÃu",
+  "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.pin": "Fixar nel perfil",
+  "status.pinned": "Toot fixÃ¡u",
+  "status.read_more": "Read more",
+  "status.reblog": "Compartir",
+  "status.reblog_private": "Compartir cola audiencia orixinal",
+  "status.reblogged_by": "{name} compartiÃ³",
+  "status.reblogs.empty": "Naide nun compartiÃ³ esti toot entÃ¡. Cuando daquiÃ©n lo faiga, va amosase equÃ.",
+  "status.redraft": "Desaniciar y reeditar",
+  "status.reply": "Responder",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_toggle": "Fai clic pa velu",
+  "status.sensitive_warning": "ContenÃu sensible",
+  "status.share": "Share",
+  "status.show_less": "Amosar menos",
+  "status.show_less_all": "Show less for all",
+  "status.show_more": "Amosar mÃ¡s",
+  "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
+  "status.unmute_conversation": "Unmute conversation",
+  "status.unpin": "Desfixar del perfil",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
+  "tabs_bar.federated_timeline": "Federated",
+  "tabs_bar.home": "Aniciu",
+  "tabs_bar.local_timeline": "Llocal",
+  "tabs_bar.notifications": "Avisos",
+  "tabs_bar.search": "Search",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "ui.beforeunload": "El borrador va perdese si coles de Mastodon.",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add media",
+  "upload_form.description": "DescripciÃ³n pa discapacitaos visuales",
+  "upload_form.focus": "Crop",
+  "upload_form.undo": "Desaniciar",
+  "upload_progress.label": "Xubiendo...",
+  "video.close": "Zarrar el videu",
+  "video.exit_fullscreen": "Colar de la pantalla completa",
+  "video.expand": "Espander el videu",
+  "video.fullscreen": "Pantalla completa",
+  "video.hide": "Anubrir el videu",
+  "video.mute": "Silenciar el sonÃu",
+  "video.pause": "Posar",
+  "video.play": "Reproducir",
+  "video.unmute": "Unmute sound"
+}
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index c788b8c61738327aeff8b9990669b8ab21be5976..a812f5cb1a5b4e898ba9a2623ebfae7d77fd9d89 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¹",
   "account.block_domain": "Hide everything from {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð°Ð¹ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð° ÑÐ¸",
+  "account.endorse": "Feature on profile",
   "account.follow": "ÐŸÐ¾ÑÐ»ÐµÐ´Ð²Ð°Ð¹",
   "account.followers": "ÐŸÐ¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Ð¡Ð»ÐµÐ´Ð²Ð°Ð¼",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Ð¢Ð²Ð¾Ð¹ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»",
   "account.hide_reblogs": "Hide boosts from @{name}",
+  "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": "Ð¡Ð¿Ð¾Ð¼ÐµÐ½Ð°Ð²Ð°Ð½Ðµ",
   "account.moved_to": "{name} has moved to:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Show boosts from @{name}",
   "account.unblock": "ÐÐµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¹",
   "account.unblock_domain": "Unhide {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "ÐÐµ ÑÐ»ÐµÐ´Ð²Ð°Ð¹",
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
@@ -86,6 +93,8 @@
   "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? 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}?",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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_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.public_timeline": "the public timeline",
   "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.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 instances to fill it up",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "ÐŸÑŠÑ€Ð²Ð¸ ÑÑ‚ÑŠÐ¿ÐºÐ¸",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon Ðµ ÑÐ¾Ñ„Ñ‚ÑƒÐµÑ€ Ñ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½ ÐºÐ¾Ð´. ÐœÐ¾Ð¶ÐµÑˆ Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½ÐµÑˆ Ð¸Ð»Ð¸ Ð´Ð° Ð´Ð¾ÐºÐ»Ð°Ð´Ð²Ð°Ñˆ Ð·Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð² Github: {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.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",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "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",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?",
   "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.follow": "ÐÐ¾Ð²Ð¸ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸:",
   "notifications.column_settings.mention": "Ð¡Ð¿Ð¾Ð¼ÐµÐ½Ð°Ð²Ð°Ð½Ð¸Ñ:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ð¸Ñ:",
   "notifications.column_settings.show": "ÐŸÐ¾ÐºÐ°Ð¶Ð¸ Ð² ÐºÐ¾Ð»Ð¾Ð½Ð°",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
   "privacy.direct.short": "Direct",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "ÐŸÑ€ÐµÐ´Ð¿Ð¾Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸",
@@ -267,9 +312,11 @@
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÑÐ½Ðµ",
   "status.reblog_private": "Boost to original audience",
   "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.reply": "ÐžÑ‚Ð³Ð¾Ð²Ð¾Ñ€",
   "status.replyAll": "Reply to thread",
@@ -281,8 +328,11 @@
   "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.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",
   "tabs_bar.home": "ÐÐ°Ñ‡Ð°Ð»Ð¾",
   "tabs_bar.local_timeline": "Local",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 408f5ced7b618e10df017c22437405802a51f85c..07a4f01746c3b8e08325a639552d4747d6dbda0a 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Afegir o Treure de les llistes",
   "account.badges.bot": "Bot",
   "account.block": "Bloca @{name}",
   "account.block_domain": "Amaga-ho tot de {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "La informaciÃ³ segÃ¼ent pot reflectir incompleta el perfil de l'usuari.",
   "account.domain_blocked": "Domini ocult",
   "account.edit_profile": "Editar el perfil",
+  "account.endorse": "Recomanar en el teu perfil",
   "account.follow": "Segueix",
   "account.followers": "Seguidors",
+  "account.followers.empty": "Encara ningÃº no segueix aquest usuari.",
   "account.follows": "Seguint",
+  "account.follows.empty": "Aquest usuari encara no segueix a ningÃº.",
   "account.follows_you": "Et segueix",
   "account.hide_reblogs": "Amaga els impulsos de @{name}",
+  "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": "Media",
   "account.mention": "Esmentar @{name}",
   "account.moved_to": "{name} s'ha mogut a:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Mostra els impulsos de @{name}",
   "account.unblock": "Desbloca @{name}",
   "account.unblock_domain": "Mostra {domain}",
+  "account.unendorse": "No es mostren al perfil",
   "account.unfollow": "Deixa de seguir",
   "account.unmute": "Treure silenci de @{name}",
   "account.unmute_notifications": "Activar notificacions de @{name}",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Silencia",
   "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 aquesta publicaciÃ³ i tornar a redactar-la? PerderÃ s totes les respostes, impulsos i favorits.",
+  "confirmations.redraft.message": "EstÃ s segur que vols esborrar aquesta publicaciÃ³ i tornar a redactar-la? PerderÃ s totes els impulsos i favorits, i les respostes a la publicaciÃ³ original es quedaran orfes.",
+  "confirmations.reply.confirm": "Respon",
+  "confirmations.reply.message": "Responen ara es sobreescriurÃ  el missatge que estÃ s editant. EstÃ s segur que vols continuar?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
   "confirmations.unfollow.message": "EstÃ s segur que vols deixar de seguir {name}?",
   "embed.instructions": "Incrusta aquest estat al lloc web copiant el codi a continuaciÃ³.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Resultats de la cerca",
   "emoji_button.symbols": "SÃmbols",
   "emoji_button.travel": "Viatges i Llocs",
+  "empty_column.account_timeline": "No hi ha toots aquÃ!",
+  "empty_column.blocks": "Encara no has bloquejat cap usuari.",
   "empty_column.community": "La lÃnia de temps local Ã©s buida. Escriu alguna cosa pÃºblicament per 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 tens cap toot favorit. Quan en tinguis, apareixerÃ  aquÃ.",
+  "empty_column.favourites": "Encara ningÃº ha marcat aquest toot com a favorit. Quan algÃº ho faci, apareixera aquÃ.",
+  "empty_column.follow_requests": "Encara no teniu cap peticiÃ³ de seguiment. Quan rebeu una, apareixerÃ  aquÃ.",
   "empty_column.hashtag": "Encara no hi ha res amb 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.public_timeline": "la lÃnia de temps pÃºblica",
   "empty_column.list": "Encara no hi ha res en aquesta llista. Quan els membres d'aquesta llista publiquin nous estats, 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 alguna cosa pÃºblicament o segueix manualment usuaris d'altres instÃ ncies per omplir-ho",
   "follow_request.authorize": "Autoritzar",
   "follow_request.reject": "Rebutjar",
   "getting_started.developers": "Desenvolupadors",
+  "getting_started.directory": "Directori de perfils",
   "getting_started.documentation": "DocumentaciÃ³",
-  "getting_started.find_friends": "Troba amics de Twitter",
   "getting_started.heading": "ComenÃ§ant",
   "getting_started.invite": "Convida gent",
   "getting_started.open_source_notice": "Mastodon Ã©s un programari de codi obert. Pots contribuir o informar de problemes a GitHub a {github}.",
   "getting_started.security": "Seguretat",
   "getting_started.terms": "Termes del servei",
+  "hashtag.column_header.tag_mode.all": "i {additional}",
+  "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_header.tag_mode.none": "sense {additional}",
+  "hashtag.column_settings.tag_mode.all": "Tots aquests",
+  "hashtag.column_settings.tag_mode.any": "Qualsevol dâ€™aquests",
+  "hashtag.column_settings.tag_mode.none": "Cap dâ€™aquests",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "BÃ sic",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostes",
+  "introduction.federation.action": "SegÃ¼ent",
+  "introduction.federation.federated.headline": "Federada",
+  "introduction.federation.federated.text": "Les publicacions pÃºbliques d'altres servidors del fedivers apareixeran a la lÃnia de temps federada.",
+  "introduction.federation.home.headline": "Inici",
+  "introduction.federation.home.text": "Les publicacions de les persones que segueixes apareixeran a la lÃnia de temps Inici. Pots seguir qualsevol persona de qualsevol servidor!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Les publicacions pÃºbliques de les persones del teu mateix servidor apareixeran a la lÃnia de temps local.",
+  "introduction.interactions.action": "Finalitza el tutorial!",
+  "introduction.interactions.favourite.headline": "Favorit",
+  "introduction.interactions.favourite.text": "Pots desar un toot per a mÃ©s tard i deixar que l'autor sÃ piga que t'ha agradat, marcant-lo com a favorit.",
+  "introduction.interactions.reblog.headline": "Impuls",
+  "introduction.interactions.reblog.text": "Pots compartir amb els teus seguidors els toots d'altres usuaris, impulsant-los.",
+  "introduction.interactions.reply.headline": "Respondre",
+  "introduction.interactions.reply.text": "Pots respondre als toots d'altres persones i als teus propis, que els unirÃ  en una conversa.",
+  "introduction.welcome.action": "Som-hi!",
+  "introduction.welcome.headline": "Primers passos",
+  "introduction.welcome.text": "Benvingut al fedivers! En uns moments podrÃ s emetre missatges i conversar amb els teus amics en una gran varietat de servidors. PerÃ² aquest servidor, {domain}, Ã©s especial: allotja el teu perfil aixÃ que recorda el seu nom.",
   "keyboard_shortcuts.back": "navegar enrera",
+  "keyboard_shortcuts.blocked": "per obrir la llista d'usuaris bloquejats",
   "keyboard_shortcuts.boost": "impulsar",
   "keyboard_shortcuts.column": "per centrar un estat en una de les columnes",
   "keyboard_shortcuts.compose": "per centrar l'area de composiciÃ³ de text",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "per obrir la columna de missatges directes",
   "keyboard_shortcuts.down": "per baixar en la llista",
   "keyboard_shortcuts.enter": "ampliar estat",
   "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.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "per obrir la lÃnia de temps Inici",
   "keyboard_shortcuts.hotkey": "Tecla d'accÃ©s directe",
   "keyboard_shortcuts.legend": "per a mostrar aquesta llegenda",
+  "keyboard_shortcuts.local": "per obrir la lÃnia de temps local",
   "keyboard_shortcuts.mention": "per esmentar l'autor",
+  "keyboard_shortcuts.muted": "per obrir la llista d'usuaris silenciats",
+  "keyboard_shortcuts.my_profile": "per obrir el teu perfil",
+  "keyboard_shortcuts.notifications": "per obrir la columna de notificacions",
+  "keyboard_shortcuts.pinned": "per obrir la llista de toots fixats",
+  "keyboard_shortcuts.profile": "per obrir el perfil de l'autor",
   "keyboard_shortcuts.reply": "respondre",
+  "keyboard_shortcuts.requests": "per obrir la llista de solÂ·licituds de seguiment",
   "keyboard_shortcuts.search": "per centrar la cerca",
+  "keyboard_shortcuts.start": "per obrir la columna \"ComenÃ§ar\"",
   "keyboard_shortcuts.toggle_hidden": "per a mostrar/amagar text sota CW",
   "keyboard_shortcuts.toot": "per a comenÃ§ar un toot nou de trinca",
   "keyboard_shortcuts.unfocus": "descentrar l'area de composiciÃ³ de text/cerca",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "No trobat",
   "missing_indicator.sublabel": "Aquest recurs no pot ser trobat",
   "mute_modal.hide_notifications": "Amagar notificacions d'aquest usuari?",
+  "navigation_bar.apps": "Apps MÃ²bils",
   "navigation_bar.blocks": "Usuaris bloquejats",
   "navigation_bar.community_timeline": "LÃnia de temps Local",
+  "navigation_bar.compose": "Redacta nou toot",
   "navigation_bar.direct": "Missatges directes",
   "navigation_bar.discover": "Descobreix",
   "navigation_bar.domain_blocks": "Dominis ocults",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favorits",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Paraules silenciades",
   "navigation_bar.follow_requests": "SolÂ·licituds de seguiment",
   "navigation_bar.info": "InformaciÃ³ addicional",
   "navigation_bar.keyboard_shortcuts": "Dreceres de teclat",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "EstÃ s segur que vols esborrar permanenment totes les teves notificacions?",
   "notifications.column_settings.alert": "Notificacions d'escriptori",
   "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.follow": "Nous seguidors:",
   "notifications.column_settings.mention": "Mencions:",
   "notifications.column_settings.push": "Push notificacions",
-  "notifications.column_settings.push_meta": "Aquest dispositiu",
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar en la columna",
   "notifications.column_settings.sound": "ReproduÃ¯r so",
+  "notifications.filter.all": "Tots",
+  "notifications.filter.boosts": "Impulsos",
+  "notifications.filter.favourites": "Favorits",
+  "notifications.filter.follows": "Seguiments",
+  "notifications.filter.mentions": "Mencions",
   "notifications.group": "{count} notificacions",
-  "onboarding.done": "Fet",
-  "onboarding.next": "SegÃ¼ent",
-  "onboarding.page_five.public_timelines": "La lÃnia de temps local mostra missatges pÃºblics de tothom de {domain}. La lÃnia de temps federada mostra els missatges pÃºblics de tothom que la gent de {domain} segueix. Aquests sÃ³n les lÃnies de temps PÃºbliques, una bona manera de descobrir noves persones.",
-  "onboarding.page_four.home": "La lÃnia de temps d'Inici mostra missatges de les persones que segueixes.",
-  "onboarding.page_four.notifications": "La columna Notificacions mostra quan algÃº interactua amb tu.",
-  "onboarding.page_one.federation": "Mastodon Ã©s una xarxa de servidors independents que s'uneixen per fer una xarxa social encara mÃ©s gran. A aquests servidors els hi diem instÃ ncies.",
-  "onboarding.page_one.full_handle": "El teu usuari complet",
-  "onboarding.page_one.handle_hint": "AixÃ² Ã©s el que els hi diries als teus amics que cerquin.",
-  "onboarding.page_one.welcome": "Benvingut a Mastodon!",
-  "onboarding.page_six.admin": "L'administrador de la teva instÃ ncia Ã©s {admin}.",
-  "onboarding.page_six.almost_done": "Quasi fet...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Hi ha {apps} disponibles per iOS, Android i altres plataformes.",
-  "onboarding.page_six.github": "Mastodon Ã©s un programari de codi obert. Pots informar d'errors, solÂ·licitar caracterÃstiques o contribuir en el codi a {github}.",
-  "onboarding.page_six.guidelines": "Normes de la comunitat",
-  "onboarding.page_six.read_guidelines": "Si us plau llegeix les {guidelines} de {domain}!",
-  "onboarding.page_six.various_app": "aplicacions per mÃ²bils",
-  "onboarding.page_three.profile": "Edita el teu perfil per canviar el teu avatar, bio o el nom de visualitzaciÃ³. TambÃ© hi trobarÃ s altres preferÃ¨ncies.",
-  "onboarding.page_three.search": "Utilitza la barra de cerca per trobar gent i mirar etiquetes, com a {illustration} i {introductions}. Per buscar una persona que no estÃ  en aquesta instÃ ncia, utilitza tot el seu nom d'usuari complert.",
-  "onboarding.page_two.compose": "Escriu missatges en la columna de redacciÃ³. Pots pujar imatges, canviar la configuraciÃ³ de privacitat i afegir les advertÃ¨ncies de contingut amb les icones de sota.",
-  "onboarding.skip": "Omet",
   "privacy.change": "Ajusta l'estat de privacitat",
   "privacy.direct.long": "Publicar nomÃ©s per als usuaris esmentats",
   "privacy.direct.short": "Directe",
@@ -250,14 +292,17 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, un {result} altres {results}}",
   "standalone.public_title": "Una mirada a l'interior ...",
+  "status.admin_account": "Obre l'interfÃcie de moderaciÃ³ per a @{name}",
+  "status.admin_status": "Obre aquest estat a la interfÃcie de moderaciÃ³",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Desfer l'impuls",
   "status.cannot_reblog": "Aquesta publicaciÃ³ no pot ser retootejada",
   "status.delete": "Esborrar",
+  "status.detailed_status": "VisualitzaciÃ³ detallada de la conversa",
   "status.direct": "Missatge directe @{name}",
   "status.embed": "Incrustar",
   "status.favourite": "Favorit",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrat",
   "status.load_more": "Carrega mÃ©s",
   "status.media_hidden": "MultimÃ¨dia amagat",
   "status.mention": "Esmentar @{name}",
@@ -267,9 +312,11 @@
   "status.open": "Ampliar aquest estat",
   "status.pin": "Fixat en el perfil",
   "status.pinned": "Toot fixat",
+  "status.read_more": "Llegir mÃ©s",
   "status.reblog": "Impuls",
   "status.reblog_private": "Impulsar a l'audiÃ¨ncia original",
   "status.reblogged_by": "{name} ha retootejat",
+  "status.reblogs.empty": "Encara ningÃº no ha impulsat aquest toot. Quan algÃº ho faci, apareixeran aquÃ.",
   "status.redraft": "Esborrar i reescriure",
   "status.reply": "Respondre",
   "status.replyAll": "Respondre al tema",
@@ -281,8 +328,11 @@
   "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.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",
   "tabs_bar.home": "Inici",
   "tabs_bar.local_timeline": "Local",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, una {person} altres {people}} parlant",
   "ui.beforeunload": "El vostre esborrany es perdrÃ  si sortiu de Mastodon.",
   "upload_area.title": "Arrossega i deixa anar per carregar",
-  "upload_button.label": "Afegir multimÃ¨dia",
+  "upload_button.label": "Afegir multimÃ¨dia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Descriure els problemes visuals",
-  "upload_form.focus": "Retallar",
+  "upload_form.focus": "Modificar la previsualitzaciÃ³",
   "upload_form.undo": "Esborra",
   "upload_progress.label": "Pujant...",
   "video.close": "Tancar el vÃdeo",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 1e7090a199a51b47ad08db01931371219e21cb07..496f13e7d58f698b374572d2477f7b9ffbf5ba90 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "AghjustÃ  o toglie da e liste",
   "account.badges.bot": "Bot",
   "account.block": "BluccÃ  @{name}",
   "account.block_domain": "PiattÃ  tuttu da {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "GhjÃ¨ pussibule chÃ¬ lâ€™infurmazione quÃ¬ sottu Ã¹n rifletta micca u prufile sanu di lâ€™utilizatore.",
   "account.domain_blocked": "Duminiu piattatu",
   "account.edit_profile": "MudificÃ  u prufile",
+  "account.endorse": "FÃ  figurÃ  nant'Ã  u prufilu",
   "account.follow": "SiguitÃ ",
   "account.followers": "Abbunati",
+  "account.followers.empty": "Nisunu hÃ¨ abbunatu Ã  st'utilizatore.",
   "account.follows": "Abbunamenti",
+  "account.follows.empty": "St'utilizatore Ã¹n seguita nisunu.",
   "account.follows_you": "Vi seguita",
   "account.hide_reblogs": "PiattÃ  spartere da @{name}",
+  "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'Ã :",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Vede spartere da @{name}",
   "account.unblock": "SbluccÃ  @{name}",
   "account.unblock_domain": "Ã™n piattÃ  piÃ¹ {domain}",
+  "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}",
@@ -59,9 +66,9 @@
   "column_header.show_settings": "MustrÃ  i parametri",
   "column_header.unpin": "SpuntarulÃ ",
   "column_subheading.settings": "Parametri",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Solu media",
   "compose_form.direct_message_warning": "Solu l'utilizatori mintuvati puderenu vede stu statutu.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.direct_message_warning_learn_more": "AmparÃ  di piÃ¹",
   "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",
@@ -81,11 +88,13 @@
   "confirmations.delete_list.confirm": "Toglie",
   "confirmations.delete_list.message": "Site sicuruÂ·a che vulete supprime sta lista?",
   "confirmations.domain_block.confirm": "PiattÃ  tuttu u duminiu",
-  "confirmations.domain_block.message": "Site sicuruÂ·a che vulete piattÃ  tuttu Ã  {domain}? Saria forse abbastanza di bluccÃ  Ã² piattÃ  alcuni conti da quallÃ .",
+  "confirmations.domain_block.message": "Site 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.",
   "confirmations.mute.confirm": "PiattÃ ",
   "confirmations.mute.message": "Site sicuruÂ·a che vulete piattÃ  @{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.redraft.confirm": "SguassÃ  Ã¨ riscrive",
+  "confirmations.redraft.message": "Site sicuruÂ·a chÃ¨ vulete sguassÃ  stu statutu Ã¨ riscrivelu? I favuriti Ã¨ spartere saranu persi, Ã¨ e risposte diventeranu orfane.",
+  "confirmations.reply.confirm": "Risponde",
+  "confirmations.reply.message": "Risponde avÃ  sguasserÃ  u missaghju chÃ¬ scrivite. Site sicuruÂ·a chÃ¬ vulete cuntinuÃ ?",
   "confirmations.unfollow.confirm": "Disabbunassi",
   "confirmations.unfollow.message": "Site sicuruÂ·a ch'Ã¹n vulete piÃ¹ siguitÃ  @{name}?",
   "embed.instructions": "IntegrÃ  stu statutu Ã  u vostru situ cÃ¹ u codice quÃ¬ sottu.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Risultati di a cerca",
   "emoji_button.symbols": "Simbuli",
   "emoji_button.travel": "Lochi Ã¨ Viaghju",
+  "empty_column.account_timeline": "Nisun statutu quÃ¬!",
+  "empty_column.blocks": "Per avÃ  Ã¹n avete bluccatu manc'un utilizatore.",
   "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.domain_blocks": "Ã™n c'hÃ¨ manc'un duminiu bluccatu avÃ .",
+  "empty_column.favourited_statuses": "Ã™n avete manc'unu statutu favuritu. Quandu aghjusterate unu Ã  i vostri favuriti, sarÃ  mustratu quÃ¬.",
+  "empty_column.favourites": "Nisunu hÃ  aghjustatu stu statutu Ã  i so favuriti. Quandu qualch'unu farÃ  quessa, u so contu sarÃ  mustratu quÃ¬.",
+  "empty_column.follow_requests": "Ã™n avete manc'una dumanda d'abbunamentu. Quandu averete una, sarÃ  mustrata quÃ¬.",
   "empty_column.hashtag": "Ã™n c'hÃ¨ ancu nunda quÃ¬.",
   "empty_column.home": "A vostr'accolta hÃ¨ viota! Pudete andÃ  nant'Ã  {public} o pruvÃ  a ricerca per truvÃ  parsone da siguitÃ .",
   "empty_column.home.public_timeline": "a linea pubblica",
   "empty_column.list": "Ã™n c'hÃ¨ ancu nunda quÃ¬. Quandu membri di sta lista manderanu novi statuti, i vidarete quÃ¬.",
+  "empty_column.lists": "Ã™n avete manc'una lista. Quandu farete una, sarÃ  mustrata quÃ¬.",
+  "empty_column.mutes": "Per avÃ  Ã¹n avete manc'un utilizatore piattatu.",
   "empty_column.notifications": "Ã™n avete ancu nisuna nutificazione. Interact with others to start the conversation.",
   "empty_column.public": "Ã™n c'hÃ¨ nunda quÃ¬! Scrivete qualcosa in pubblicu o seguitate utilizatori d'altre istanze per empie a linea pubblica",
   "follow_request.authorize": "AuturizÃ ",
   "follow_request.reject": "RighjittÃ ",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Sviluppatori",
+  "getting_started.directory": "Annuariu di i prufili",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Per principiÃ ",
-  "getting_started.invite": "Invite people",
+  "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": "Security",
-  "getting_started.terms": "Terms of service",
+  "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}",
+  "hashtag.column_settings.tag_mode.all": "Tutti quessi",
+  "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",
   "home.column_settings.basic": "BÃ sichi",
   "home.column_settings.show_reblogs": "Vede e spartere",
   "home.column_settings.show_replies": "Vede e risposte",
+  "introduction.federation.action": "CuntinuÃ ",
+  "introduction.federation.federated.headline": "Federata",
+  "introduction.federation.federated.text": "I statuti pubblichi da l'altri servori di u fediverse saranu mustrati nant'Ã  a linea pubblica federata.",
+  "introduction.federation.home.headline": "Accolta",
+  "introduction.federation.home.text": "I statuti da a ghjente che vo siguitate saranu affissati nant'Ã  a linea d'accolta. Pudete seguitÃ  qualvogliasia nant'Ã  tutti i servori!",
+  "introduction.federation.local.headline": "Lucale",
+  "introduction.federation.local.text": "I statuti pubblichi da quelli chÃ¬ sÃ² nant'a listessu servore chÃ¬ voi ponu esse visti indÃ¨ a linea pubblica lucale.",
+  "introduction.interactions.action": "Finisce u tutoriale!",
+  "introduction.interactions.favourite.headline": "Favuritu",
+  "introduction.interactions.favourite.text": "Pudete salvÃ  un statutu per ritruvallu piÃ¹ tardi, Ã¨ fÃ  sapÃ¨ Ã  l'autore chÃ¬ v'hÃ¨ piaciutu, l'aghustendu Ã  i vostri favuriti.",
+  "introduction.interactions.reblog.headline": "Sparte",
+  "introduction.interactions.reblog.text": "Pudete sparte i statuti d'altre persone Ã  i vostri abbunati cÃ¹ u buttone di spartera.",
+  "introduction.interactions.reply.headline": "Risponde",
+  "introduction.interactions.reply.text": "Pudete risponde Ã  d'altre persone o a i vostri propii statuti, cio chÃ¬ i ligarÃ  indÃ¨ una cunversazione.",
+  "introduction.welcome.action": "Andemu!",
+  "introduction.welcome.headline": "Primi passi",
+  "introduction.welcome.text": "BenvenutuÂ·a indÃ¨ u fediverse! In qualchi minuta, puderete diffonde missaghji Ã¨ parlÃ  Ã  i vostri amichi nant'Ã  una varietÃ  maiÃ² di servori. MÃ  quess'istanza, {domain}, hÃ¨ specialeâ€”ghjÃ¨ induve hÃ¨ uspitatu u vostru prufile, allora ricurdatevi di u so nome.",
   "keyboard_shortcuts.back": "rivultÃ ",
+  "keyboard_shortcuts.blocked": "per apre una lista d'utilizatori bluccati",
   "keyboard_shortcuts.boost": "sparte",
   "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.down": "falÃ  indÃ¨ a lista",
   "keyboard_shortcuts.enter": "apre u statutu",
   "keyboard_shortcuts.favourite": "aghjunghje Ã  i favuriti",
+  "keyboard_shortcuts.favourites": "per apre a lista di i favuriti",
+  "keyboard_shortcuts.federated": "per apre a linea pubblica federata",
   "keyboard_shortcuts.heading": "Accorte cÃ¹ a tastera",
+  "keyboard_shortcuts.home": "per apre a linea d'accolta",
   "keyboard_shortcuts.hotkey": "Accorta",
   "keyboard_shortcuts.legend": "vede a legenda",
+  "keyboard_shortcuts.local": "per apre a linea pubblica lucale",
   "keyboard_shortcuts.mention": "mintuvÃ  l'autore",
+  "keyboard_shortcuts.muted": "per apre a lista di l'utilizatori piattati",
+  "keyboard_shortcuts.my_profile": "per apre u vostru prufile",
+  "keyboard_shortcuts.notifications": "per apre a culonna di nutificazione",
+  "keyboard_shortcuts.pinned": "per apre a lista di statuti puntarulati",
+  "keyboard_shortcuts.profile": "per apre u prufile di l'autore",
   "keyboard_shortcuts.reply": "risponde",
+  "keyboard_shortcuts.requests": "per apre a lista di dumande d'abbunamentu",
   "keyboard_shortcuts.search": "fucalizÃ  nant'Ã  l'area di circata",
+  "keyboard_shortcuts.start": "per apre a culonna \"per principiÃ \"",
   "keyboard_shortcuts.toggle_hidden": "vede/piattÃ  u testu daretu Ã  l'avertimentu CW",
   "keyboard_shortcuts.toot": "scrive un novu statutu",
   "keyboard_shortcuts.unfocus": "Ã¹n fucalizÃ  piÃ¹ l'area di testu",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Micca trovu",
   "missing_indicator.sublabel": "Ã™n era micca pussivule di truvÃ  sta risorsa",
   "mute_modal.hide_notifications": "PiattÃ  nutificazione da st'utilizatore?",
+  "navigation_bar.apps": "Applicazione per u telefuninu",
   "navigation_bar.blocks": "Utilizatori bluccati",
   "navigation_bar.community_timeline": "Linea pubblica lucale",
+  "navigation_bar.compose": "Scrive un novu statutu",
   "navigation_bar.direct": "Missaghji diretti",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.discover": "Scopre",
   "navigation_bar.domain_blocks": "Duminii piattati",
   "navigation_bar.edit_profile": "MudificÃ  u prufile",
   "navigation_bar.favourites": "Favuriti",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Parolle silenzate",
   "navigation_bar.follow_requests": "Dumande d'abbunamentu",
   "navigation_bar.info": "Ã€ prupositu di l'istanza",
   "navigation_bar.keyboard_shortcuts": "Accorte cÃ¹ a tastera",
@@ -177,7 +233,7 @@
   "navigation_bar.pins": "Statuti puntarulati",
   "navigation_bar.preferences": "Preferenze",
   "navigation_bar.public_timeline": "Linea pubblica glubale",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "SicuritÃ ",
   "notification.favourite": "{name} hÃ  aghjuntu u vostru statutu Ã  i so favuriti",
   "notification.follow": "{name} v'hÃ  seguitatu",
   "notification.mention": "{name} v'hÃ  mintuvatu",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Site sicuruÂ·a che vulete toglie tutte ste nutificazione?",
   "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.follow": "Abbunati novi:",
   "notifications.column_settings.mention": "Minzione:",
   "notifications.column_settings.push": "Nutificazione Push",
-  "notifications.column_settings.push_meta": "Quess'apparechju",
   "notifications.column_settings.reblog": "Spartere:",
   "notifications.column_settings.show": "MustrÃ  indÃ¨ a colonna",
   "notifications.column_settings.sound": "SunÃ ",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Fatta",
-  "onboarding.next": "Siguente",
-  "onboarding.page_five.public_timelines": "A linea pubblica lucale mostra statuti pubblichi da tuttu u mondu nant'Ã  {domain}. A linea pubblica glubale mostra ancu quelli di a ghjente seguitata da l'utilizatori di {domain}. Quesse sÃ² una bona manera d'incuntrÃ  nove parsone.",
-  "onboarding.page_four.home": "A linea d'accolta mostra i statuti di i vostr'abbunamenti.",
-  "onboarding.page_four.notifications": "A colonna di nutificazione mostra l'interazzione ch'altre parsone anu cÃ¹ u vostru contu.",
-  "onboarding.page_one.federation": "Mastodon ghjÃ¨ una rete di servori independenti, chjamati istanze, uniti indÃ¨ una sola rete suciale.",
-  "onboarding.page_one.full_handle": "U vostru identificatore cumplettu",
-  "onboarding.page_one.handle_hint": "Quessu ghjÃ¨ cio chÃ¬ direte Ã  i vostri amichi per circavi.",
-  "onboarding.page_one.welcome": "Benvenuti/a nant'Ã  Mastodon!",
-  "onboarding.page_six.admin": "L'amministratore di a vostr'istanza hÃ¨ {admin}.",
-  "onboarding.page_six.almost_done": "Quasgi finitu...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Ci sÃ² {apps} dispunibule per iOS, Android Ã¨ altre piattaforme.",
-  "onboarding.page_six.github": "Mastodon ghjÃ¨ un lugiziale liberu. Pudete cuntribuisce Ã  u codice o a traduzione, o palisÃ  un prublemu, nant'Ã  {github}.",
-  "onboarding.page_six.guidelines": "regule di a cumunitÃ ",
-  "onboarding.page_six.read_guidelines": "Ã™n vi scurdate di leghje e {guidelines} di {domain}!",
-  "onboarding.page_six.various_app": "applicazione pÃ¨ u telefuninu",
-  "onboarding.page_three.profile": "Pudete mudificÃ  u prufile per cambia u ritrattu, a descrizzione Ã¨ u nome affissatu. Ci sÃ² ancu alcun'altre preferenze.",
-  "onboarding.page_three.search": "Fate usu di l'area di ricerca per truvÃ  altre persone Ã¨ vede hashtag cum'Ã¨ {illustration} o {introductions}. Per vede qualcunu ch'Ã¹n hÃ¨ micca nant'Ã  st'istanza, cercate u so identificatore complettu (pare un'email).",
-  "onboarding.page_two.compose": "I statuti Ã¨ missaghji si scrivenu indÃ¨ l'area di ridazzione. Pudete caricÃ  imagine, cambiÃ  i parametri di pubblicazione, Ã¨ mette avertimenti di cuntenuti cÃ¹ i buttoni quÃ¬ sottu.",
-  "onboarding.skip": "PassÃ ",
+  "notifications.filter.all": "Tuttu",
+  "notifications.filter.boosts": "Spartere",
+  "notifications.filter.favourites": "Favuriti",
+  "notifications.filter.follows": "Abbunamenti",
+  "notifications.filter.mentions": "Minzione",
+  "notifications.group": "{count} nutificazione",
   "privacy.change": "MudificÃ  a cunfidenzialitÃ  di u statutu",
   "privacy.direct.long": "MandÃ  solu Ã  quelli chÃ¬ so mintuvati",
   "privacy.direct.short": "Direttu",
@@ -249,15 +291,18 @@
   "search_results.hashtags": "Hashtag",
   "search_results.statuses": "Statuti",
   "search_results.total": "{count, number} {count, plural, one {risultatu} other {risultati}}",
-  "standalone.public_title": "Una vista di...",
+  "standalone.public_title": "Una vista Ã  l'internu...",
+  "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}",
   "status.cancel_reblog_private": "Ã™n sparte piÃ¹",
   "status.cannot_reblog": "Stu statutu Ã¹n pÃ² micca esse spartutu",
   "status.delete": "Toglie",
+  "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.direct": "MandÃ  un missaghju @{name}",
   "status.embed": "IntegrÃ ",
   "status.favourite": "Aghjunghje Ã  i favuriti",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtratu",
   "status.load_more": "Vede di piÃ¹",
   "status.media_hidden": "Media piattata",
   "status.mention": "MintuvÃ  @{name}",
@@ -267,10 +312,12 @@
   "status.open": "Apre stu statutu",
   "status.pin": "PuntarulÃ  Ã  u prufile",
   "status.pinned": "Statutu puntarulatu",
+  "status.read_more": "Leghje di piÃ¹",
   "status.reblog": "Sparte",
   "status.reblog_private": "Sparte Ã  l'audienza uriginale",
   "status.reblogged_by": "{name} hÃ  spartutu",
-  "status.redraft": "Delete & re-draft",
+  "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.reply": "Risponde",
   "status.replyAll": "Risponde Ã  tutti",
   "status.report": "PalisÃ  @{name}",
@@ -281,19 +328,22 @@
   "status.show_less_all": "RipiegÃ  tuttu",
   "status.show_more": "SlibrÃ ",
   "status.show_more_all": "SlibrÃ  tuttu",
+  "status.show_thread": "Vede u filu",
   "status.unmute_conversation": "Ã™n piattÃ  piÃ¹ a cunversazione",
   "status.unpin": "SpuntarulÃ  da u prufile",
+  "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Ã ",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} parlanu",
   "ui.beforeunload": "A bruttacopia sarÃ  persa s'ellu hÃ¨ chjosu Mastodon.",
   "upload_area.title": "Drag & drop per caricÃ  un fugliale",
-  "upload_button.label": "Aghjunghje un media",
+  "upload_button.label": "Aghjunghje un media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Discrive per i malvistosi",
-  "upload_form.focus": "RiquatrÃ ",
+  "upload_form.focus": "CambiÃ  a vista",
   "upload_form.undo": "SguassÃ ",
   "upload_progress.label": "Caricamentu...",
   "video.close": "ChjudÃ  a video",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 59d7c403b8c9bf0fae30d872109bcd468ef252dc..e11e0be93e73d5f4585f50e678884b9469aa5693 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -1,308 +1,358 @@
 {
+  "account.add_or_remove_from_list": "PÅ™idat nebo odstranit ze seznamÅ¯",
   "account.badges.bot": "Robot",
-  "account.block": "Blokovat @{name}",
+  "account.block": "Zablokovat uÅ¾ivatele @{name}",
   "account.block_domain": "SkrÃ½t vÅ¡e z {domain}",
-  "account.blocked": "Blocked",
-  "account.direct": "Direct message @{name}",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
-  "account.domain_blocked": "Domain hidden",
-  "account.edit_profile": "Edit profile",
-  "account.follow": "Follow",
-  "account.followers": "Followers",
-  "account.follows": "Follows",
-  "account.follows_you": "Follows you",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "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.posts": "Toots",
-  "account.posts_with_replies": "Toots and replies",
-  "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval. Click to cancel follow request",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
-  "account.unblock": "Unblock @{name}",
-  "account.unblock_domain": "Unhide {domain}",
-  "account.unfollow": "Unfollow",
-  "account.unmute": "Unmute @{name}",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account.view_full_profile": "View full profile",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
-  "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.community": "Local timeline",
-  "column.direct": "Direct messages",
-  "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.media_only": "Media 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.publish": "Toot",
+  "account.blocked": "BlokovÃ¡n/a",
+  "account.direct": "PÅ™ÃmÃ¡ zprÃ¡va pro uÅ¾ivatele @{name}",
+  "account.disclaimer_full": "NÃÅ¾e uvedenÃ© informace nemusejÃ zcela odrÃ¡Å¾et profil uÅ¾ivatele.",
+  "account.domain_blocked": "DomÃ©na skryta",
+  "account.edit_profile": "Upravit profil",
+  "account.endorse": "PÅ™edstavit na profilu",
+  "account.follow": "Sledovat",
+  "account.followers": "SledovatelÃ©",
+  "account.followers.empty": "Tohoto uÅ¾ivatele jeÅ¡tÄ› nikdo nesleduje.",
+  "account.follows": "SledovanÃ",
+  "account.follows.empty": "Tento uÅ¾ivatel jeÅ¡tÄ› nikoho nesleduje.",
+  "account.follows_you": "Sleduje vÃ¡s",
+  "account.hide_reblogs": "SkrÃ½t boosty od uÅ¾ivatele @{name}",
+  "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 uÅ¾ivatele @{name}",
+  "account.moved_to": "{name} se pÅ™esunul/a na:",
+  "account.mute": "Ignorovat uÅ¾ivatele @{name}",
+  "account.mute_notifications": "SkrÃ½t oznÃ¡menÃ od uÅ¾ivatele @{name}",
+  "account.muted": "ZtiÅ¡en/a",
+  "account.posts": "Tooty",
+  "account.posts_with_replies": "Tooty a odpovÄ›di",
+  "account.report": "NahlÃ¡sit uÅ¾ivatele @{name}",
+  "account.requested": "PoÅ¾adavek ÄekÃ¡ na schvÃ¡lenÃ. KliknutÃm zruÅ¡Ãte poÅ¾adavek o sledovÃ¡nÃ",
+  "account.share": "SdÃlet profil uÅ¾ivatele @{name}",
+  "account.show_reblogs": "Zobrazit boosty od uÅ¾ivatele @{name}",
+  "account.unblock": "Odblokovat uÅ¾ivatele @{name}",
+  "account.unblock_domain": "OdkrÃ½t domÃ©nu {domain}",
+  "account.unendorse": "NepÅ™edstavit na profilu",
+  "account.unfollow": "PÅ™estat sledovat",
+  "account.unmute": "PÅ™estat ignorovat uÅ¾ivatele @{name}",
+  "account.unmute_notifications": "OdtiÅ¡it oznÃ¡menÃ od uÅ¾ivatele @{name}",
+  "account.view_full_profile": "Zobrazit celÃ½ profil",
+  "alert.unexpected.message": "Objevila se neoÄekÃ¡vanÃ¡ chyba.",
+  "alert.unexpected.title": "Jejda!",
+  "boost_modal.combo": "PÅ™ÃÅ¡tÄ› mÅ¯Å¾ete pro pÅ™eskoÄenÃ kliknout na {combo}",
+  "bundle_column_error.body": "PÅ™i naÄÃtÃ¡nÃ tohoto komponentu se nÄ›co pokazilo.",
+  "bundle_column_error.retry": "Zkuste to znovu",
+  "bundle_column_error.title": "Chyba sÃtÄ›",
+  "bundle_modal_error.close": "ZavÅ™Ãt",
+  "bundle_modal_error.message": "PÅ™i naÄÃtÃ¡nÃ tohoto komponentu se nÄ›co pokazilo.",
+  "bundle_modal_error.retry": "Zkusit znovu",
+  "column.blocks": "BlokovanÃ uÅ¾ivatelÃ©",
+  "column.community": "MÃstnÃ ÄasovÃ¡ osa",
+  "column.direct": "PÅ™ÃmÃ© zprÃ¡vy",
+  "column.domain_blocks": "SkrytÃ© domÃ©ny",
+  "column.favourites": "OblÃbenÃ©",
+  "column.follow_requests": "PoÅ¾adavky o sledovÃ¡nÃ",
+  "column.home": "DomÅ¯",
+  "column.lists": "Seznamy",
+  "column.mutes": "IgnorovanÃ uÅ¾ivatelÃ©",
+  "column.notifications": "OznÃ¡menÃ",
+  "column.pins": "PÅ™ipnutÃ© tooty",
+  "column.public": "FederovanÃ¡ ÄasovÃ¡ osa",
+  "column_back_button.label": "ZpÄ›t",
+  "column_header.hide_settings": "SkrÃ½t nastavenÃ",
+  "column_header.moveLeft_settings": "PÅ™esunout sloupec doleva",
+  "column_header.moveRight_settings": "PÅ™esunout sloupec doprava",
+  "column_header.pin": "PÅ™ipnout",
+  "column_header.show_settings": "Zobrazit nastavenÃ",
+  "column_header.unpin": "Odepnout",
+  "column_subheading.settings": "NastavenÃ",
+  "community.column_settings.media_only": "Pouze mÃ©dia",
+  "compose_form.direct_message_warning": "Tento toot bude odeslÃ¡n pouze zmÃnÄ›nÃ½m uÅ¾ivatelÅ¯m.",
+  "compose_form.direct_message_warning_learn_more": "Zjistit vÃce",
+  "compose_form.hashtag_warning": "Tento toot nebude zobrazen pod Å¾Ã¡dnÃ½m hashtagem, neboÅ¥ je neuvedenÃ½. Pouze veÅ™ejnÃ© tooty 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 pouze pro sledovatele.",
+  "compose_form.lock_disclaimer.lock": "zamÄenÃ½",
+  "compose_form.placeholder": "Co mÃ¡te na mysli?",
+  "compose_form.publish": "Tootnout",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "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.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.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.mute.confirm": "Mute",
-  "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? You will lose all replies, boosts and favourites to it.",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "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.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.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.public_timeline": "the public timeline",
-  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
-  "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 instances to fill it up",
-  "follow_request.authorize": "Authorize",
-  "follow_request.reject": "Reject",
-  "getting_started.developers": "Developers",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
-  "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",
-  "home.column_settings.basic": "Basic",
-  "home.column_settings.show_reblogs": "Show boosts",
-  "home.column_settings.show_replies": "Show replies",
-  "keyboard_shortcuts.back": "to navigate back",
-  "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.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.hotkey": "Hotkey",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "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.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.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
-  "loading_indicator.label": "Loading...",
-  "media_gallery.toggle_visible": "Toggle visibility",
-  "missing_indicator.label": "Not found",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
-  "navigation_bar.blocks": "Blocked users",
-  "navigation_bar.community_timeline": "Local timeline",
-  "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.info": "About this instance",
-  "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.mention": "{name} mentioned you",
-  "notification.reblog": "{name} boosted your status",
-  "notifications.clear": "Clear notifications",
-  "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.follow": "New followers:",
-  "notifications.column_settings.mention": "Mentions:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
-  "notifications.column_settings.reblog": "Boosts:",
-  "notifications.column_settings.show": "Show in column",
-  "notifications.column_settings.sound": "Play sound",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
-  "privacy.change": "Adjust status privacy",
-  "privacy.direct.long": "Post to 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",
-  "regeneration_indicator.label": "Loadingâ€¦",
-  "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.seconds": "{number}s",
-  "reply_indicator.cancel": "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.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.",
+  "compose_form.sensitive.marked": "MediÃ¡lnÃ obsah je oznaÄen jako citlivÃ½",
+  "compose_form.sensitive.unmarked": "MediÃ¡lnÃ obsah nenÃ oznaÄen jako citlivÃ½",
+  "compose_form.spoiler.marked": "Text je skrytÃ½ za varovÃ¡nÃm",
+  "compose_form.spoiler.unmarked": "Text nenÃ skrytÃ½",
+  "compose_form.spoiler_placeholder": "Sem napiÅ¡te vaÅ¡e varovÃ¡nÃ",
+  "confirmation_modal.cancel": "ZruÅ¡it",
+  "confirmations.block.confirm": "Blokovat",
+  "confirmations.block.message": "Jste si jistÃ½/Ã¡, Å¾e chcete zablokovat uÅ¾ivatele {name}?",
+  "confirmations.delete.confirm": "Smazat",
+  "confirmations.delete.message": "Jste si jistÃ½/Ã¡, Å¾e chcete smazat tento pÅ™ÃspÄ›vek?",
+  "confirmations.delete_list.confirm": "Smazat",
+  "confirmations.delete_list.message": "Jste si jistÃ½/Ã¡, Å¾e chcete tento seznam navÅ¾dy vymazat?",
+  "confirmations.domain_block.confirm": "SkrÃ½t celou domÃ©nu",
+  "confirmations.domain_block.message": "Jste si opravdu, opravdu jistÃ½/Ã¡, Å¾e chcete blokovat celou {domain}? Ve vÄ›tÅ¡inÄ› pÅ™ÃpadÅ¯ staÄÃ zablokovat nebo ignorovat pÃ¡r konkrÃ©tnÃch uÅ¾ivatelÅ¯, coÅ¾ se doporuÄuje. Z tÃ©to domÃ©ny neuvidÃte obsah v Å¾Ã¡dnÃ© veÅ™ejnÃ© ÄasovÃ© ose ani v oznÃ¡menÃch. VaÅ¡i sledovatelÃ© z tÃ©to domÃ©ny budou odstranÄ›ni.",
+  "confirmations.mute.confirm": "Ignorovat",
+  "confirmations.mute.message": "Jste si jistÃ½/Ã¡, Å¾e chcete ignorovat uÅ¾ivatele {name}?",
+  "confirmations.redraft.confirm": "Vymazat a pÅ™epsat",
+  "confirmations.redraft.message": "Jste si jistÃ½/Ã¡, Å¾e chcete vymazat a pÅ™epsat tento pÅ™ÃspÄ›vek? OblÃbenÃ a boosty budou ztraceny a odpovÄ›di na pÅ¯vodnÃ pÅ™ÃspÄ›vek budou opuÅ¡tÄ›ny.",
+  "confirmations.reply.confirm": "OdpovÄ›dÄ›t",
+  "confirmations.reply.message": "OdpovÄ›zenÃm nynÃ pÅ™epÃÅ¡ete zprÃ¡vu, kterou aktuÃ¡lnÄ› pÃÅ¡ete. Jste si jistÃ½/Ã¡, Å¾e chcete pokraÄovat?",
+  "confirmations.unfollow.confirm": "PÅ™estat sledovat",
+  "confirmations.unfollow.message": "jste si jistÃ½/Ã¡, Å¾e chcete pÅ™estat sledovat uÅ¾ivatele {name}?",
+  "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.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": "Å½Ã¡dnÃ© emoji!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "PÅ™edmÄ›ty",
+  "emoji_button.people": "LidÃ©",
+  "emoji_button.recent": "ÄŒasto pouÅ¾ÃvanÃ©",
+  "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_timeline": "Tady nejsou Å¾Ã¡dnÃ© tooty!",
+  "empty_column.blocks": "JeÅ¡tÄ› jste nezablokoval/a Å¾Ã¡dnÃ©ho uÅ¾ivatele.",
+  "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Ä› nejsou Å¾Ã¡dnÃ© skrytÃ© domÃ©ny.",
+  "empty_column.favourited_statuses": "JeÅ¡tÄ› nemÃ¡te Å¾Ã¡dnÃ© oblÃbenÃ© tooty. Pokud si nÄ›jakÃ½ oblÃbÃte, zobrazÃ se zde.",
+  "empty_column.favourites": "Tento toot si jeÅ¡tÄ› nikdo neoblÃbil. Pokud to nÄ›kdo udÄ›lÃ¡, zobrazÃ se zde.",
+  "empty_column.follow_requests": "JeÅ¡tÄ› nemÃ¡te Å¾Ã¡dnÃ© poÅ¾adavky o sledovÃ¡nÃ. Pokud nÄ›jakÃ½ obdrÅ¾Ãte, zobrazÃ se zde.",
+  "empty_column.hashtag": "Pod tÃmto hashtagem jeÅ¡tÄ› nic nenÃ.",
+  "empty_column.home": "VaÅ¡e domovskÃ¡ ÄasovÃ¡ osa je prÃ¡zdnÃ¡! ZaÄnÄ›te navÅ¡tÃvenÃm {public} nebo pouÅ¾ijte hledÃ¡nÃ a seznamte se s dalÅ¡Ãmi uÅ¾ivateli.",
+  "empty_column.home.public_timeline": "veÅ™ejnÃ© ÄasovÃ© osy",
+  "empty_column.list": "V tomto seznamu jeÅ¡tÄ› nic nenÃ. Pokud budou ÄlenovÃ© tohoto seznamu psÃ¡t novÃ© pÅ™ÃspÄ›vky, 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Ä› neignorujete Å¾Ã¡dnÃ© uÅ¾ivatele.",
+  "empty_column.notifications": "JeÅ¡tÄ› nemÃ¡te Å¾Ã¡dnÃ¡ oznÃ¡menÃ. ZaÄnÄ›te konverzaci komunikovÃ¡nÃm s ostatnÃmi.",
+  "empty_column.public": "Tady nic nenÃ! NapiÅ¡te nÄ›co veÅ™ejnÄ›, nebo manuÃ¡lnÄ› zaÄnÄ›te sledovat uÅ¾ivatele z jinÃ½ch instancÃ, aby tu nÄ›co pÅ™ibylo",
+  "follow_request.authorize": "Autorizovat",
+  "follow_request.reject": "OdmÃtnout",
+  "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. Na GitHubu k nÄ›mu mÅ¯Å¾ete pÅ™ispÄ›t nebo nahlÃ¡sit chyby: {github}.",
+  "getting_started.security": "ZabezpeÄenÃ",
+  "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.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",
+  "home.column_settings.basic": "ZÃ¡kladnÃ",
+  "home.column_settings.show_reblogs": "Zobrazit boosty",
+  "home.column_settings.show_replies": "Zobrazit odpovÄ›di",
+  "introduction.federation.action": "DalÅ¡Ã",
+  "introduction.federation.federated.headline": "FederovanÃ¡",
+  "introduction.federation.federated.text": "VeÅ™ejnÃ© pÅ™ÃspÄ›vky z jinÃ½ch serverÅ¯ na fediverse se zobrazÃ na federovanÃ© ÄasovÃ© ose.",
+  "introduction.federation.home.headline": "DomÅ¯",
+  "introduction.federation.home.text": "PÅ™ÃspÄ›vky od lidÃ, kterÃ© sledujete, se objevÃ ve vaÅ¡em domovskÃ©m proudu. MÅ¯Å¾ete sledovat kohokoliv na jakÃ©mkoliv serveru!",
+  "introduction.federation.local.headline": "MÃstnÃ",
+  "introduction.federation.local.text": "VeÅ™ejnÃ© pÅ™ÃspÄ›vky od lidÃ ze stejnÃ©ho serveru, jako vy, se zobrazÃ na mÃstnÃ ÄasovÃ© ose.",
+  "introduction.interactions.action": "DokonÄit tutoriÃ¡l!",
+  "introduction.interactions.favourite.headline": "OblÃbenÃ",
+  "introduction.interactions.favourite.text": "OblÃbenÃm si mÅ¯Å¾ete uloÅ¾it toot na pozdÄ›ji a dÃ¡t jeho autorovi vÄ›dÄ›t, Å¾e se vÃ¡m lÃbÃ.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "BoostnutÃm mÅ¯Å¾ete sdÃlet tooty jinÃ½ch lidÃ s vaÅ¡imi sledovately.",
+  "introduction.interactions.reply.headline": "OdpovÄ›Ä",
+  "introduction.interactions.reply.text": "MÅ¯Å¾ete odpovÃdat na tooty jinÃ½ch lidÃ i vaÅ¡e vlastnÃ, coÅ¾ je propojÃ do konverzace.",
+  "introduction.welcome.action": "Jdeme na to!",
+  "introduction.welcome.headline": "PrvnÃ kroky",
+  "introduction.welcome.text": "VÃtejte na fediverse! Za malou chvÃli budete moci posÃlat zprÃ¡vy a povÃdat si se svÃ½mi pÅ™Ã¡tely pÅ™es Å¡irokou Å¡kÃ¡lu serverÅ¯. Tento server, {domain}, je vÅ¡ak speciÃ¡lnÃâ€”je na nÄ›m vÃ¡Å¡ profil, proto si zapamatujte jeho jmÃ©no.",
+  "keyboard_shortcuts.back": "k nÃ¡vratu zpÄ›t",
+  "keyboard_shortcuts.blocked": "k otevÅ™enÃ seznamu blokovanÃ½ch uÅ¾ivatelÅ¯",
+  "keyboard_shortcuts.boost": "k boostnutÃ",
+  "keyboard_shortcuts.column": "k zamÄ›Å™enÃ na pÅ™ÃspÄ›vek v jednom ze sloupcÅ¯",
+  "keyboard_shortcuts.compose": "k zamÄ›Å™enÃ na psacÃ prostor",
+  "keyboard_shortcuts.description": "Popis",
+  "keyboard_shortcuts.direct": "k otevÅ™enÃ sloupce s pÅ™ÃmÃ½mi zprÃ¡vami",
+  "keyboard_shortcuts.down": "k posunutÃ dolÅ¯ v seznamu",
+  "keyboard_shortcuts.enter": "k otevÅ™enÃ pÅ™ÃspÄ›vku",
+  "keyboard_shortcuts.favourite": "k oblÃbenÃ",
+  "keyboard_shortcuts.favourites": "k otevÅ™enÃ seznamu oblÃbenÃ½ch",
+  "keyboard_shortcuts.federated": "k otevÅ™enÃ federovanÃ© ÄasovÃ© osy",
+  "keyboard_shortcuts.heading": "KlÃ¡vesovÃ© zkratky",
+  "keyboard_shortcuts.home": "k otevÅ™enÃ domovskÃ© ÄasovÃ© osy",
+  "keyboard_shortcuts.hotkey": "HorkÃ¡ klÃ¡vesa",
+  "keyboard_shortcuts.legend": "k zobrazenÃ tÃ©to legendy",
+  "keyboard_shortcuts.local": "k otevÅ™enÃ mÃstnÃ ÄasovÃ© osy",
+  "keyboard_shortcuts.mention": "ke zmÃnÄ›nÃ autora",
+  "keyboard_shortcuts.muted": "k otevÅ™enÃ seznamu ignorovanÃ½ch uÅ¾ivatelÅ¯",
+  "keyboard_shortcuts.my_profile": "k otevÅ™enÃ vaÅ¡eho profilu",
+  "keyboard_shortcuts.notifications": "k otevÅ™enÃ sloupce s oznÃ¡menÃmi",
+  "keyboard_shortcuts.pinned": "k otevÅ™enÃ seznamu pÅ™ipnutÃ½ch tootÅ¯",
+  "keyboard_shortcuts.profile": "k otevÅ™enÃ autorova profilu",
+  "keyboard_shortcuts.reply": "k odpovÄ›zenÃ",
+  "keyboard_shortcuts.requests": "k otevÅ™enÃ seznamu poÅ¾adavkÅ¯ o sledovÃ¡nÃ",
+  "keyboard_shortcuts.search": "k zamÄ›Å™enÃ na hledÃ¡nÃ",
+  "keyboard_shortcuts.start": "k otevÅ™enÃ sloupce â€žzaÄÃnÃ¡meâ€œ",
+  "keyboard_shortcuts.toggle_hidden": "k zobrazenÃ/skrytÃ textu za varovÃ¡nÃm o obsahu",
+  "keyboard_shortcuts.toot": "k napsÃ¡nÃ ÃºplnÄ› novÃ©ho tootu",
+  "keyboard_shortcuts.unfocus": "ke zruÅ¡enÃ soustÅ™edÄ›nÃ na psacÃ prostor/hledÃ¡nÃ",
+  "keyboard_shortcuts.up": "k posunutÃ nahoru v seznamu",
+  "lightbox.close": "ZavÅ™Ãt",
+  "lightbox.next": "DalÅ¡Ã",
+  "lightbox.previous": "PÅ™edchozÃ",
+  "lists.account.add": "PÅ™idat do seznamu",
+  "lists.account.remove": "Odebrat ze seznamu",
+  "lists.delete": "Smazat seznam",
+  "lists.edit": "Upravit seznam",
+  "lists.new.create": "PÅ™idat seznam",
+  "lists.new.title_placeholder": "NÃ¡zev novÃ©ho seznamu",
+  "lists.search": "Hledejte mezi lidmi, kterÃ© sledujete",
+  "lists.subheading": "VaÅ¡e seznamy",
+  "loading_indicator.label": "NaÄÃtÃ¡m...",
+  "media_gallery.toggle_visible": "PÅ™epÃnat viditelnost",
+  "missing_indicator.label": "Nenalezeno",
+  "missing_indicator.sublabel": "Tento zdroj se nepodaÅ™ilo najÃt",
+  "mute_modal.hide_notifications": "SkrÃ½t oznÃ¡menÃ od tohoto uÅ¾ivatele?",
+  "navigation_bar.apps": "MobilnÃ aplikace",
+  "navigation_bar.blocks": "BlokovanÃ uÅ¾ivatelÃ©",
+  "navigation_bar.community_timeline": "MÃstnÃ ÄasovÃ¡ osa",
+  "navigation_bar.compose": "VytvoÅ™it novÃ½ toot",
+  "navigation_bar.direct": "PÅ™ÃmÃ© zprÃ¡vy",
+  "navigation_bar.discover": "Objevujte",
+  "navigation_bar.domain_blocks": "SkrytÃ© domÃ©ny",
+  "navigation_bar.edit_profile": "Upravit profil",
+  "navigation_bar.favourites": "OblÃbenÃ©",
+  "navigation_bar.filters": "SkrytÃ¡ slova",
+  "navigation_bar.follow_requests": "PoÅ¾adavky o sledovÃ¡nÃ",
+  "navigation_bar.info": "O tÃ©to instanci",
+  "navigation_bar.keyboard_shortcuts": "KlÃ¡vesovÃ© zkratky",
+  "navigation_bar.lists": "Seznamy",
+  "navigation_bar.logout": "OdhlÃ¡sit se",
+  "navigation_bar.mutes": "IgnorovanÃ uÅ¾ivatelÃ©",
+  "navigation_bar.personal": "OsobnÃ",
+  "navigation_bar.pins": "PÅ™ipnutÃ© tooty",
+  "navigation_bar.preferences": "PÅ™edvolby",
+  "navigation_bar.public_timeline": "FederovanÃ¡ ÄasovÃ¡ osa",
+  "navigation_bar.security": "ZabezpeÄenÃ",
+  "notification.favourite": "{name} si oblÃbil/a vÃ¡Å¡ pÅ™ÃspÄ›vek",
+  "notification.follow": "{name} vÃ¡s zaÄal/a sledovat",
+  "notification.mention": "{name} vÃ¡s zmÃnil/a",
+  "notification.reblog": "{name} boostnul/a vÃ¡Å¡ pÅ™ÃspÄ›vek",
+  "notifications.clear": "Vymazat oznÃ¡menÃ",
+  "notifications.clear_confirmation": "Jste si jistÃ½/Ã¡, Å¾e chcete trvale vymazat vÅ¡echna vaÅ¡e oznÃ¡menÃ?",
+  "notifications.column_settings.alert": "DesktopovÃ¡ oznÃ¡menÃ",
+  "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.follow": "NovÃ sledovatelÃ©:",
+  "notifications.column_settings.mention": "ZmÃnky:",
+  "notifications.column_settings.push": "Push oznÃ¡menÃ",
+  "notifications.column_settings.reblog": "Boosty:",
+  "notifications.column_settings.show": "Zobrazit ve sloupci",
+  "notifications.column_settings.sound": "PÅ™ehrÃ¡t zvuk",
+  "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.group": "{count} oznÃ¡menÃ",
+  "privacy.change": "ZmÄ›nit soukromÃ pÅ™ÃspÄ›vku",
+  "privacy.direct.long": "Odeslat pouze zmÃnÄ›nÃ½m uÅ¾ivatelÅ¯m",
+  "privacy.direct.short": "PÅ™ÃmÃ½",
+  "privacy.private.long": "Odeslat pouze sledovatelÅ¯m",
+  "privacy.private.short": "Pouze pro sledovatele",
+  "privacy.public.long": "Odeslat na veÅ™ejnÃ© ÄasovÃ© osy",
+  "privacy.public.short": "VeÅ™ejnÃ½",
+  "privacy.unlisted.long": "Neodeslat na veÅ™ejnÃ© ÄasovÃ© osy",
+  "privacy.unlisted.short": "NeuvedenÃ½",
+  "regeneration_indicator.label": "NaÄÃtÃ¡mâ€¦",
+  "regeneration_indicator.sublabel": "VÃ¡Å¡ domovskÃ½ proud se pÅ™ipravuje!",
+  "relative_time.days": "{number} d",
+  "relative_time.hours": "{number} h",
+  "relative_time.just_now": "teÄ",
+  "relative_time.minutes": "{number} m",
+  "relative_time.seconds": "{number} s",
+  "reply_indicator.cancel": "ZruÅ¡it",
+  "report.forward": "PÅ™eposlat na {target}",
+  "report.forward_hint": "Tento ÃºÄet je z jinÃ©ho serveru. Chcete na nÄ›j takÃ© poslat anonymizovanou kopii?",
+  "report.hint": "Toto nahlÃ¡Å¡enÃ bude zaslÃ¡no moderÃ¡torÅ¯m vaÅ¡Ã instance. NÃÅ¾e mÅ¯Å¾ete uvÃ©st, proÄ tento ÃºÄet nahlaÅ¡ujete:",
+  "report.placeholder": "DodateÄnÃ© komentÃ¡Å™e",
+  "report.submit": "Odeslat",
+  "report.target": "NahlÃ¡Å¡enÃ uÅ¾ivatele {target}",
+  "search.placeholder": "Hledat",
+  "search_popout.search_format": "PokroÄilÃ© hledÃ¡nÃ",
+  "search_popout.tips.full_text": "JednoduchÃ½ textovÃ½ vÃ½pis pÅ™ÃspÄ›vkÅ¯, kterÃ© jste napsal/a, oblÃbil/a si, boostnul/a, nebo v nich byl/a zmÃnÄ›n/a, vÄetnÄ› odpovÃdajÃcÃch pÅ™ezdÃvek, zobrazovanÃ½ch jmen a hashtagÅ¯.",
   "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.total": "{count, number} {count, plural, one {result} other {results}}",
-  "standalone.public_title": "A look inside...",
-  "status.block": "Block @{name}",
-  "status.cancel_reblog_private": "Unboost",
-  "status.cannot_reblog": "This post cannot be boosted",
-  "status.delete": "Delete",
-  "status.direct": "Direct message @{name}",
-  "status.embed": "Embed",
-  "status.favourite": "Favourite",
-  "status.filtered": "Filtered",
-  "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 toot",
-  "status.reblog": "Boost",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} boosted",
-  "status.redraft": "Delete & re-draft",
-  "status.reply": "Reply",
-  "status.replyAll": "Reply to thread",
-  "status.report": "Report @{name}",
-  "status.sensitive_toggle": "Click to view",
-  "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.unmute_conversation": "Unmute conversation",
-  "status.unpin": "Unpin from profile",
-  "tabs_bar.federated_timeline": "Federated",
-  "tabs_bar.home": "Home",
-  "tabs_bar.local_timeline": "Local",
-  "tabs_bar.notifications": "Notifications",
-  "tabs_bar.search": "Search",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
-  "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.focus": "Crop",
-  "upload_form.undo": "Delete",
-  "upload_progress.label": "Uploading...",
-  "video.close": "Close video",
-  "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"
+  "search_popout.tips.status": "pÅ™ÃspÄ›vek",
+  "search_popout.tips.text": "JednoduchÃ½ textovÃ½ vÃ½pis odpovÃdajÃcÃch zobrazovanÃ½ch jmen, pÅ™ezdÃvek a hashtagÅ¯",
+  "search_popout.tips.user": "uÅ¾ivatel",
+  "search_results.accounts": "LidÃ©",
+  "search_results.hashtags": "Hashtagy",
+  "search_results.statuses": "Tooty",
+  "search_results.total": "{count, number} {count, plural, one {vÃ½sledek} few {vÃ½sledky} many {vÃ½sledku} other {vÃ½sledkÅ¯}}",
+  "standalone.public_title": "NahlÃ©dnÄ›te dovnitÅ™...",
+  "status.admin_account": "OtevÅ™Ãt moderaÄnÃ rozhranÃ pro uÅ¾ivatele @{name}",
+  "status.admin_status": "OtevÅ™Ãt tento pÅ™ÃspÄ›vek v moderaÄnÃm rozhranÃ",
+  "status.block": "Zablokovat uÅ¾ivatele @{name}",
+  "status.cancel_reblog_private": "ZruÅ¡it boost",
+  "status.cannot_reblog": "Tento pÅ™ÃspÄ›vek nemÅ¯Å¾e bÃ½t boostnutÃ½",
+  "status.delete": "Smazat",
+  "status.detailed_status": "DetailnÃ zobrazenÃ konverzace",
+  "status.direct": "Poslat pÅ™Ãmou zprÃ¡vu uÅ¾ivateli @{name}",
+  "status.embed": "VloÅ¾it",
+  "status.favourite": "OblÃbit",
+  "status.filtered": "FiltrovÃ¡no",
+  "status.load_more": "Zobrazit vÃce",
+  "status.media_hidden": "MÃ©dia skryta",
+  "status.mention": "ZmÃnit uÅ¾ivatele @{name}",
+  "status.more": "VÃce",
+  "status.mute": "Ignorovat uÅ¾ivatele @{name}",
+  "status.mute_conversation": "Ignorovat konverzaci",
+  "status.open": "Rozbalit tento pÅ™ÃspÄ›vek",
+  "status.pin": "PÅ™ipnout na profil",
+  "status.pinned": "PÅ™ipnutÃ½ toot",
+  "status.read_more": "ÄŒÃst vÃce",
+  "status.reblog": "Boostnout",
+  "status.reblog_private": "Boostnout pÅ¯vodnÃmu publiku",
+  "status.reblogged_by": "{name} boostnul/a",
+  "status.reblogs.empty": "Tento toot jeÅ¡tÄ› nikdo neboostnul. Pokud to nÄ›kdo udÄ›lÃ¡, zobrazÃ se zde.",
+  "status.redraft": "Vymazat a pÅ™epsat",
+  "status.reply": "OdpovÄ›dÄ›t",
+  "status.replyAll": "OdpovÄ›dÄ›t na vlÃ¡kno",
+  "status.report": "NahlÃ¡sit uÅ¾ivatele @{name}",
+  "status.sensitive_toggle": "KliknÄ›te pro zobrazenÃ",
+  "status.sensitive_warning": "CitlivÃ½ obsah",
+  "status.share": "SdÃlet",
+  "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.unmute_conversation": "PÅ™estat ignorovat konverzaci",
+  "status.unpin": "Odepnout z profilu",
+  "suggestions.dismiss": "OdmÃtnout nÃ¡vrh",
+  "suggestions.header": "Mohlo by vÃ¡s zajÃmatâ€¦",
+  "tabs_bar.federated_timeline": "FederovanÃ¡",
+  "tabs_bar.home": "DomÅ¯",
+  "tabs_bar.local_timeline": "MÃstnÃ",
+  "tabs_bar.notifications": "OznÃ¡menÃ",
+  "tabs_bar.search": "Hledat",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {ÄlovÄ›k} few {lidÃ©} many {lidÃ} other {lidÃ}} hovoÅ™Ã",
+  "ui.beforeunload": "VÃ¡Å¡ koncept se ztratÃ, pokud Mastodon opustÃte.",
+  "upload_area.title": "PÅ™etaÅ¾enÃm nahrajete",
+  "upload_button.label": "PÅ™idat mÃ©dia (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "Popis pro zrakovÄ› postiÅ¾enÃ©",
+  "upload_form.focus": "ZmÄ›nit nÃ¡hled",
+  "upload_form.undo": "Smazat",
+  "upload_progress.label": "NahrÃ¡vÃ¡m...",
+  "video.close": "ZavÅ™Ãt video",
+  "video.exit_fullscreen": "UkonÄit celou obrazovku",
+  "video.expand": "OtevÅ™Ãt video",
+  "video.fullscreen": "CelÃ¡ obrazovka",
+  "video.hide": "SkrÃ½t video",
+  "video.mute": "Vypnout zvuk",
+  "video.pause": "Pauza",
+  "video.play": "PÅ™ehrÃ¡t",
+  "video.unmute": "Zapnout zvuk"
 }
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
new file mode 100644
index 0000000000000000000000000000000000000000..f35b96244ebbcd05f69573b933ffa2f9fa167839
--- /dev/null
+++ b/app/javascript/mastodon/locales/cy.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.block": "Blocio @{name}",
+  "account.block_domain": "Cuddio popeth rhag {domain}",
+  "account.blocked": "Blociwyd",
+  "account.direct": "Neges breifat @{name}",
+  "account.disclaimer_full": "Gall y wybodaeth isod adlewyrchu darlun anghyflawn o broffil defnyddiwr.",
+  "account.domain_blocked": "Parth wedi ei guddio",
+  "account.edit_profile": "Golygu proffil",
+  "account.endorse": "Arddangos ar fy mhroffil",
+  "account.follow": "Dilyn",
+  "account.followers": "Dilynwyr",
+  "account.followers.empty": "Nid oes neb yn dilyn y defnyddiwr hwn eto.",
+  "account.follows": "Yn dilyn",
+  "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.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "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.posts": "TÅµtiau",
+  "account.posts_with_replies": "TÅµtiau ac atebion",
+  "account.report": "Adrodd @{name}",
+  "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
+  "account.share": "Rhannwch broffil @{name}",
+  "account.show_reblogs": "Dangos bwstiau o @{name}",
+  "account.unblock": "Dadflocio @{name}",
+  "account.unblock_domain": "Dadguddio {domain}",
+  "account.unendorse": "Peidio a'i arddangos ar fy mhroffil",
+  "account.unfollow": "Dad-ddilyn",
+  "account.unmute": "Dad-dawelu @{name}",
+  "account.unmute_notifications": "Dad-dawelu hysbysiadau o @{name}",
+  "account.view_full_profile": "Gweld proffil llawn",
+  "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
+  "alert.unexpected.title": "Wps!",
+  "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.",
+  "bundle_column_error.retry": "Ceisiwch eto",
+  "bundle_column_error.title": "Gwall rhwydwaith",
+  "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",
+  "column.blocks": "Defnyddwyr a flociwyd",
+  "column.community": "Llinell amser lleol",
+  "column.direct": "Negeseuon preifat",
+  "column.domain_blocks": "Parthau cuddiedig",
+  "column.favourites": "Ffefrynnau",
+  "column.follow_requests": "Ceisiadau dilyn",
+  "column.home": "Hafan",
+  "column.lists": "Rhestrau",
+  "column.mutes": "Defnyddwyr a ddistewyd",
+  "column.notifications": "Hysbysiadau",
+  "column.pins": "TÅµtiau wedi eu pinio",
+  "column.public": "Ffrwd y ffederasiwn",
+  "column_back_button.label": "NÃ´l",
+  "column_header.hide_settings": "Cuddio dewisiadau",
+  "column_header.moveLeft_settings": "Symud y golofn i'r chwith",
+  "column_header.moveRight_settings": "Symud y golofn i'r dde",
+  "column_header.pin": "Pinio",
+  "column_header.show_settings": "Dangos gosodiadau",
+  "column_header.unpin": "Dadbinio",
+  "column_subheading.settings": "Gosodiadau",
+  "community.column_settings.media_only": "Cyfryngau 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.",
+  "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.lock_disclaimer.lock": "wedi ei gloi",
+  "compose_form.placeholder": "Beth sydd ar eich meddwl?",
+  "compose_form.publish": "TÅµt",
+  "compose_form.publish_loud": "{publish}!",
+  "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",
+  "confirmations.block.confirm": "Blocio",
+  "confirmations.block.message": "Ydych chi'n sicr eich bod eisiau blocio {name}?",
+  "confirmations.delete.confirm": "Dileu",
+  "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y tÅµt hwn?",
+  "confirmations.delete_list.confirm": "Dileu",
+  "confirmations.delete_list.message": "Ydych chi'n sicr eich bod eisiau dileu y rhestr hwn am byth?",
+  "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.mute.confirm": "Tawelu",
+  "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.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}?",
+  "embed.instructions": "Mewnblannwch y tÅµt hwn ar eich gwefan drwy gopÃ¯o'r cÃ´d isod.",
+  "embed.preview": "Dyma sut olwg fydd arno:",
+  "emoji_button.activity": "Gweithgarwch",
+  "emoji_button.custom": "Unigryw",
+  "emoji_button.flags": "Baneri",
+  "emoji_button.food": "Bwyd a Diod",
+  "emoji_button.label": "Mewnosodwch emoji",
+  "emoji_button.nature": "Natur",
+  "emoji_button.not_found": "Dim emojo!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "Gwrthrychau",
+  "emoji_button.people": "Pobl",
+  "emoji_button.recent": "Defnyddir yn aml",
+  "emoji_button.search": "Chwilio...",
+  "emoji_button.search_results": "Canlyniadau chwilio",
+  "emoji_button.symbols": "Symbolau",
+  "emoji_button.travel": "Teithio & Llefydd",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
+  "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.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_requests": "Nid oes gennych unrhyw geisiadau dilyn eto. Pan dderbyniwch chi un, byddent yn 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.public_timeline": "y ffrwd gyhoeddus",
+  "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",
+  "follow_request.authorize": "Caniatau",
+  "follow_request.reject": "Gwrthod",
+  "getting_started.developers": "Datblygwyr",
+  "getting_started.directory": "Profile directory",
+  "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}",
+  "hashtag.column_settings.tag_mode.all": "Pob un o'r rhain",
+  "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",
+  "home.column_settings.basic": "Syml",
+  "home.column_settings.show_reblogs": "Dangos bÅµstiau",
+  "home.column_settings.show_replies": "Dangos ymatebion",
+  "introduction.federation.action": "Nesaf",
+  "introduction.federation.federated.headline": "Ffederasiwn",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Ffefryn",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Hwb",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Ateb",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "keyboard_shortcuts.back": "i lywio 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.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": "Hotkey",
+  "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.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.start": "i agor colofn \"dechrau arni\"",
+  "keyboard_shortcuts.toggle_hidden": "i ddangos/cuddio testun tu Ã´l i CW",
+  "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",
+  "lightbox.close": "Cau",
+  "lightbox.next": "Nesaf",
+  "lightbox.previous": "Blaenorol",
+  "lists.account.add": "Ychwanegwch at restr",
+  "lists.account.remove": "Dileu o'r rhestr",
+  "lists.delete": "Dileu rhestr",
+  "lists.edit": "Golygwch rhestr",
+  "lists.new.create": "Ychwanegu rhestr",
+  "lists.new.title_placeholder": "Teitl rhestr newydd",
+  "lists.search": "Chwilio ymysg pobl yr ydych yn ei ddilyn",
+  "lists.subheading": "Eich rhestrau",
+  "loading_indicator.label": "Llwytho...",
+  "media_gallery.toggle_visible": "Toglo gwelededd",
+  "missing_indicator.label": "Heb ei ganfod",
+  "missing_indicator.sublabel": "Ni ellid canfod yr adnodd hwn",
+  "mute_modal.hide_notifications": "Cuddio hysbysiadau rhag y defnyddiwr hwn?",
+  "navigation_bar.apps": "Apiau symudol",
+  "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
+  "navigation_bar.community_timeline": "Ffrwd leol",
+  "navigation_bar.compose": "Cyfansoddi tÅµt newydd",
+  "navigation_bar.direct": "Negeseuon preifat",
+  "navigation_bar.discover": "Darganfod",
+  "navigation_bar.domain_blocks": "Parthau cuddiedig",
+  "navigation_bar.edit_profile": "Golygu proffil",
+  "navigation_bar.favourites": "Ffefrynnau",
+  "navigation_bar.filters": "Geiriau a dawelwyd",
+  "navigation_bar.follow_requests": "Ceisiadau dilyn",
+  "navigation_bar.info": "Ynghylch yr achos hwn",
+  "navigation_bar.keyboard_shortcuts": "Bysellau brys",
+  "navigation_bar.lists": "Rhestrau",
+  "navigation_bar.logout": "Allgofnodi",
+  "navigation_bar.mutes": "Defnyddwyr a dawelwyd",
+  "navigation_bar.personal": "Personol",
+  "navigation_bar.pins": "TÅµtiau wedi eu pinio",
+  "navigation_bar.preferences": "Dewisiadau",
+  "navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
+  "navigation_bar.security": "Diogelwch",
+  "notification.favourite": "hoffodd {name} eich tÅµt",
+  "notification.follow": "dilynodd {name} chi",
+  "notification.mention": "Soniodd {name} amdanoch chi",
+  "notification.reblog": "Hysbysebodd {name} eich tÅµt",
+  "notifications.clear": "Clirio hysbysiadau",
+  "notifications.clear_confirmation": "Ydych chi'n sicr eich bod am glirio'ch holl hysbysiadau am byth?",
+  "notifications.column_settings.alert": "Hysbysiadau bwrdd gwaith",
+  "notifications.column_settings.favourite": "Ffefrynnau:",
+  "notifications.column_settings.filter_bar.advanced": "Display all categories",
+  "notifications.column_settings.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Dangos",
+  "notifications.column_settings.follow": "Dilynwyr newydd:",
+  "notifications.column_settings.mention": "Crybwylliadau:",
+  "notifications.column_settings.push": "Hysbysiadau push",
+  "notifications.column_settings.reblog": "Hybiadau:",
+  "notifications.column_settings.show": "Dangos yn y golofn",
+  "notifications.column_settings.sound": "Chwarae sain",
+  "notifications.filter.all": "Pob",
+  "notifications.filter.boosts": "Hybiadau",
+  "notifications.filter.favourites": "Ffefrynnau",
+  "notifications.filter.follows": "Yn dilyn",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} o hysbysiadau",
+  "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.public.short": "Cyhoeddus",
+  "privacy.unlisted.long": "Peidio a chyhoeddi i ffrydiau cyhoeddus",
+  "privacy.unlisted.short": "Heb ei restru",
+  "regeneration_indicator.label": "Llwythoâ€¦",
+  "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei baratoi!",
+  "relative_time.days": "{number}d",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "nawr",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "reply_indicator.cancel": "Canslo",
+  "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.placeholder": "Sylwadau ychwanegol",
+  "report.submit": "Cyflwyno",
+  "report.target": "Cwyno am {target}",
+  "search.placeholder": "Chwilio",
+  "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.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.user": "defnyddiwr",
+  "search_results.accounts": "Pobl",
+  "search_results.hashtags": "Hanshnodau",
+  "search_results.statuses": "TÅµtiau",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "Golwg tu fewn...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this tÅµt in the moderation interface",
+  "status.block": "Blocio @{name}",
+  "status.cancel_reblog_private": "DadfÅµstio",
+  "status.cannot_reblog": "Ni ellir sbarduno'r tÅµt hwn",
+  "status.delete": "Dileu",
+  "status.detailed_status": "Golwg manwl o'r sgwrs",
+  "status.direct": "Neges breifat @{name}",
+  "status.embed": "Plannu",
+  "status.favourite": "Hoffi",
+  "status.filtered": "Wedi'i hidlo",
+  "status.load_more": "Llwythwch mwy",
+  "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.pin": "Pinio ar y proffil",
+  "status.pinned": "Pinio tÅµt",
+  "status.read_more": "Darllen mwy",
+  "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.reply": "Ateb",
+  "status.replyAll": "Ateb i edefyn",
+  "status.report": "Adrodd @{name}",
+  "status.sensitive_toggle": "Clicio i weld",
+  "status.sensitive_warning": "Cynnwys sensitif",
+  "status.share": "Rhannu",
+  "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.unmute_conversation": "Dad-dawelu sgwrs",
+  "status.unpin": "Dadbinio o'r proffil",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
+  "tabs_bar.federated_timeline": "Ffederasiwn",
+  "tabs_bar.home": "Hafan",
+  "tabs_bar.local_timeline": "Lleol",
+  "tabs_bar.notifications": "Hysbysiadau",
+  "tabs_bar.search": "Chwilio",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} yn siarad",
+  "ui.beforeunload": "Mi fyddwch yn colli eich drafft os gadewch Mastodon.",
+  "upload_area.title": "Llusgwch & gollwing i uwchlwytho",
+  "upload_button.label": "Ychwanegwch gyfryngau (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
+  "upload_form.focus": "Newid rhagolwg",
+  "upload_form.undo": "Dileu",
+  "upload_progress.label": "Uwchlwytho...",
+  "video.close": "Cau fideo",
+  "video.exit_fullscreen": "Gadael sgrÃ®n llawn",
+  "video.expand": "Ymestyn fideo",
+  "video.fullscreen": "SgrÃ®n llawn",
+  "video.hide": "Cuddio fideo",
+  "video.mute": "Tawelu sain",
+  "video.pause": "Oedi",
+  "video.play": "Chwarae",
+  "video.unmute": "Dad-dawelu sain"
+}
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 37b5e73ee77e53555e8f528c9232524821706dfd..60315211adfdd51ddcc03695e16b7ea488e86e66 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "TilfÃ¸j eller fjern fra lister",
   "account.badges.bot": "Robot",
   "account.block": "Bloker @{name}",
   "account.block_domain": "Skjul alt fra {domain}",
@@ -7,25 +8,31 @@
   "account.disclaimer_full": "NedenstÃ¥ende oplysninger reflekterer ikke nÃ¸dvendigvis brugerens profil fuldstÃ¦ndigt.",
   "account.domain_blocked": "DomÃ¦net er blevet skjult",
   "account.edit_profile": "Rediger profil",
+  "account.endorse": "FremhÃ¦v pÃ¥ profil",
   "account.follow": "FÃ¸lg",
   "account.followers": "FÃ¸lgere",
+  "account.followers.empty": "Der er endnu ingen der fÃ¸lger denne bruger.",
   "account.follows": "FÃ¸lger",
+  "account.follows.empty": "Denne bruger fÃ¸lger endnu ikke nogen.",
   "account.follows_you": "FÃ¸lger dig",
   "account.hide_reblogs": "Skjul fremhÃ¦velserne fra @{name}",
-  "account.media": "Multimedier",
+  "account.link_verified_on": "Ejerskabet af dette link blev tjekket den %{date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+  "account.media": "Medie",
   "account.mention": "NÃ¦vn @{name}",
   "account.moved_to": "{name} er flyttet til:",
   "account.mute": "DÃ¦mp @{name}",
   "account.mute_notifications": "DÃ¦mp notifikationer fra @{name}",
   "account.muted": "DÃ¦mpet",
-  "account.posts": "Dyt",
-  "account.posts_with_replies": "Toots og svar",
+  "account.posts": "Trut",
+  "account.posts_with_replies": "Trut og svar",
   "account.report": "Rapporter @{name}",
   "account.requested": "Afventer godkendelse. Tryk for at annullere fÃ¸lgeanmodning",
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhÃ¦velserne fra @{name}",
   "account.unblock": "Fjern blokeringen af @{name}",
   "account.unblock_domain": "Skjul ikke lÃ¦ngere {domain}",
+  "account.unendorse": "FremhÃ¦v ikke pÃ¥ profil",
   "account.unfollow": "FÃ¸lg ikke lÃ¦ngere",
   "account.unmute": "Fjern dÃ¦mpningen af @{name}",
   "account.unmute_notifications": "Fjern dÃ¦mpningen af notifikationer fra @{name}",
@@ -49,7 +56,7 @@
   "column.lists": "Lister",
   "column.mutes": "DÃ¦mpede brugere",
   "column.notifications": "Notifikationer",
-  "column.pins": "Fastgjorte toots",
+  "column.pins": "Fastgjorte trut",
   "column.public": "FÃ¦lles tidslinje",
   "column_back_button.label": "Tilbage",
   "column_header.hide_settings": "Skjul indstillinger",
@@ -59,7 +66,7 @@
   "column_header.show_settings": "Vis indstillinger",
   "column_header.unpin": "FastgÃ¸r ikke lÃ¦ngere",
   "column_subheading.settings": "Indstillinger",
-  "community.column_settings.media_only": "Kun multimedier",
+  "community.column_settings.media_only": "Kun medie",
   "compose_form.direct_message_warning": "Dette trut vil kun blive sendt til de nÃ¦vnte brugere.",
   "compose_form.direct_message_warning_learn_more": "LÃ¦r mere",
   "compose_form.hashtag_warning": "Dette trut vil ikke blive vist under noget hashtag da det ikke er listet. Kun offentlige trut kan blive vist under sÃ¸gninger med hashtags.",
@@ -68,8 +75,8 @@
   "compose_form.placeholder": "Hvad har du pÃ¥ hjertet?",
   "compose_form.publish": "Trut",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.marked": "Multimedie er markeret som vÃ¦rende fÃ¸lsomt",
-  "compose_form.sensitive.unmarked": "Multimediet er ikke markeret som vÃ¦rende fÃ¸lsomt",
+  "compose_form.sensitive.marked": "Medie er markeret som vÃ¦rende fÃ¸lsomt",
+  "compose_form.sensitive.unmarked": "Mediet er ikke markeret som vÃ¦rende fÃ¸lsomt",
   "compose_form.spoiler.marked": "Teksten er skjult bag en advarsel",
   "compose_form.spoiler.unmarked": "Teksten er ikke skjult",
   "compose_form.spoiler_placeholder": "Skriv din advarsel her",
@@ -81,11 +88,13 @@
   "confirmations.delete_list.confirm": "Slet",
   "confirmations.delete_list.message": "Er du sikker pÃ¥, du vil slette denne liste?",
   "confirmations.domain_block.confirm": "Skjul helt domÃ¦ne",
-  "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": "Er du helt sikker pÃ¥ du vil blokere hele {domain} domÃ¦net? I de fleste tilfÃ¦lde vil fÃ¥ specifikke blokeringer eller dÃ¦mpninger vÃ¦re nok og at fortrÃ¦kke. Du vil ikke se indhold fra det domÃ¦ne hverken pÃ¥ offentlige tidslinjer eller i dine notifikationer. Dine fÃ¸lgere fra det domÃ¦ne vil blive fjernet.",
   "confirmations.mute.confirm": "DÃ¦mp",
   "confirmations.mute.message": "Er du sikker pÃ¥, du vil dÃ¦mpe {name}?",
   "confirmations.redraft.confirm": "Slet & omskriv",
-  "confirmations.redraft.message": "Er du sikker pÃ¥, du vil slette denne status og omskrive den? Du vil miste alle svar, fremhÃ¦velser og favoritter der medfÃ¸lger.",
+  "confirmations.redraft.message": "Er du sikker pÃ¥, du vil slette denne status og omskrive den? Favoritter og fremhÃ¦velser vil gÃ¥ tabt og svar til det oprindelige opslag vil blive forÃ¦ldrelÃ¸se.",
+  "confirmations.reply.confirm": "Svar",
+  "confirmations.reply.message": "Hvis du svarer nu vil du overskrive den besked du er ved at skrive. Er du sikker pÃ¥, du vil fortsÃ¦tte?",
   "confirmations.unfollow.confirm": "FÃ¸lg ikke lÃ¦ngere",
   "confirmations.unfollow.message": "Er du sikker pÃ¥, du ikke lÃ¦ngere vil fÃ¸lge {name}?",
   "embed.instructions": "Indlejre denne status pÃ¥ din side ved at kopiere nedenstÃ¥ende kode.",
@@ -101,44 +110,89 @@
   "emoji_button.people": "Mennesker",
   "emoji_button.recent": "Oftest brugt",
   "emoji_button.search": "SÃ¸g...",
-  "emoji_button.search_results": "SÃ¸geresultat",
+  "emoji_button.search_results": "SÃ¸geresultater",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Rejser & steder",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "Du har ikke blokeret nogen endnu.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at starte lavinen!",
   "empty_column.direct": "Du har endnu ingen direkte beskeder. NÃ¥r du sender eller modtager en, vil den vises her.",
+  "empty_column.domain_blocks": "Der er endnu ikke nogle skjulte domÃ¦ner.",
+  "empty_column.favourited_statuses": "Du har endnu ikke favoriseret nogen trut. NÃ¥r du favoriserer et, vil det blive vist her.",
+  "empty_column.favourites": "Endnu ingen har favoriseret dette trut. NÃ¥r en anden gÃ¸r vil det blive vist her.",
+  "empty_column.follow_requests": "Du har endnu ingen fÃ¸lgeranmodninger. NÃ¥r du modtager en, vil den komme frem her.",
   "empty_column.hashtag": "Dette hashtag indeholder endnu ikke noget.",
   "empty_column.home": "Din hjemme tidslinje er tom! BesÃ¸g {public} eller brug sÃ¸gningen for at komme igang og mÃ¸de andre brugere.",
   "empty_column.home.public_timeline": "den offentlige tidslinje",
   "empty_column.list": "Der er endnu intet i denne liste. NÃ¥r medlemmer af denne liste poster nye statusser, vil de vises her.",
+  "empty_column.lists": "Du har endnu ingen lister. NÃ¥r du opretter en, vil den blive vist her.",
+  "empty_column.mutes": "Du har endnu ikke dÃ¦mpet nogen som helst bruger.",
   "empty_column.notifications": "Du har endnu ingen notifikationer. Tag ud og bland dig med folkemÃ¦ngden for at starte samtalen.",
   "empty_column.public": "Der er ikke noget at se her! Skriv noget offentligt eller start ud med manuelt at fÃ¸lge brugere fra andre instanser for st udfylde tomrummet",
   "follow_request.authorize": "Godkend",
   "follow_request.reject": "Afvis",
   "getting_started.developers": "Udviklere",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Dokumentation",
-  "getting_started.find_friends": "Find venner fra Twitter",
   "getting_started.heading": "Kom igang",
   "getting_started.invite": "Inviter folk",
   "getting_started.open_source_notice": "Mastodon er et open source software. Du kan bidrage eller rapporterer fejl pÃ¥ GitHub {github}.",
   "getting_started.security": "Sikkerhed",
   "getting_started.terms": "VilkÃ¥r",
+  "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.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",
   "home.column_settings.basic": "GrundlÃ¦ggende",
   "home.column_settings.show_reblogs": "Vis fremhÃ¦velser",
   "home.column_settings.show_replies": "Vis svar",
+  "introduction.federation.action": "NÃ¦ste",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "for at navigere dig tilbage",
+  "keyboard_shortcuts.blocked": "for at Ã¥bne listen over blokerede brugere",
   "keyboard_shortcuts.boost": "for at fremhÃ¦ve",
   "keyboard_shortcuts.column": "for at fokusere pÃ¥ en status i en af kolonnerne",
   "keyboard_shortcuts.compose": "for at fokusere pÃ¥ skriveomrÃ¥det",
   "keyboard_shortcuts.description": "Beskrivelse",
+  "keyboard_shortcuts.direct": "for at Ã¥bne privat besked kolonnen",
   "keyboard_shortcuts.down": "for at rykke ned ad listen",
   "keyboard_shortcuts.enter": "for at Ã¥bne status",
   "keyboard_shortcuts.favourite": "for at favorisere",
+  "keyboard_shortcuts.favourites": "for at Ã¥bne listen over favoritter",
+  "keyboard_shortcuts.federated": "for at Ã¥bne den forenede tidslinje",
   "keyboard_shortcuts.heading": "Tastaturgenveje",
+  "keyboard_shortcuts.home": "for at Ã¥bne hjem tidslinjen",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
   "keyboard_shortcuts.legend": "for at vise denne legende",
+  "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 dÃ¦mpede brugere",
+  "keyboard_shortcuts.my_profile": "for at Ã¥bne din profil",
+  "keyboard_shortcuts.notifications": "for at Ã¥bne notifikations kolonnen",
+  "keyboard_shortcuts.pinned": "for at Ã¥bne listen over fastgjorte trut",
+  "keyboard_shortcuts.profile": "til profil af Ã¥ben forfatter",
   "keyboard_shortcuts.reply": "for at svare",
+  "keyboard_shortcuts.requests": "for at Ã¥bne listen over fÃ¸lgeranmodninger",
   "keyboard_shortcuts.search": "for at fokusere sÃ¸gningen",
+  "keyboard_shortcuts.start": "for at Ã¥bne \"kom igen\" kolonnen",
   "keyboard_shortcuts.toggle_hidden": "for at vise/skjule tekst bag CW",
   "keyboard_shortcuts.toot": "for at pÃ¥begynde et helt nyt trut",
   "keyboard_shortcuts.unfocus": "for at fjerne fokus fra skriveomrÃ¥de/sÃ¸gning",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Ikke fundet",
   "missing_indicator.sublabel": "Denne ressource kunne ikke blive fundet",
   "mute_modal.hide_notifications": "Skjul notifikationer fra denne bruger?",
+  "navigation_bar.apps": "Mobil apps",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.community_timeline": "Lokal tidslinje",
+  "navigation_bar.compose": "Skriv nyt trut",
   "navigation_bar.direct": "Direkte beskeder",
   "navigation_bar.discover": "Opdag",
   "navigation_bar.domain_blocks": "Skjulte domÃ¦ner",
   "navigation_bar.edit_profile": "Rediger profil",
   "navigation_bar.favourites": "Favoritter",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "DÃ¦mpede ord",
   "navigation_bar.follow_requests": "FÃ¸lgeanmodninger",
   "navigation_bar.info": "Om denne instans",
   "navigation_bar.keyboard_shortcuts": "Hurtigtast",
@@ -174,8 +230,8 @@
   "navigation_bar.logout": "Logud",
   "navigation_bar.mutes": "DÃ¦mpede brugere",
   "navigation_bar.personal": "Personligt",
-  "navigation_bar.pins": "Fastgjorte toots",
-  "navigation_bar.preferences": "Indstillinger",
+  "navigation_bar.pins": "Fastgjorte trut",
+  "navigation_bar.preferences": "PrÃ¦ferencer",
   "navigation_bar.public_timeline": "FÃ¦lles tidslinje",
   "navigation_bar.security": "Sikkerhed",
   "notification.favourite": "{name} favoriserede din status",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Er du sikker pÃ¥, du vil rydde alle dine notifikationer permanent?",
   "notifications.column_settings.alert": "Skrivebords notifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
+  "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.follow": "Nye fÃ¸lgere:",
   "notifications.column_settings.mention": "Omtale:",
   "notifications.column_settings.push": "Push notifikationer",
-  "notifications.column_settings.push_meta": "Denne enhed",
   "notifications.column_settings.reblog": "FremhÃ¦velser:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
+  "notifications.filter.all": "Alle",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favoritter",
+  "notifications.filter.follows": "FÃ¸lger",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifikationer",
-  "onboarding.done": "FÃ¦rdig",
-  "onboarding.next": "NÃ¦ste",
-  "onboarding.page_five.public_timelines": "Den lokale tidslinje viser offentlige opslag fra alle i {domain}. Den fÃ¦lles tidslinje viser opslag fra alle der fÃ¸lges af folk i {domain}. Disse er de offentlige tidslinjer, hvilket er en god mÃ¥de at mÃ¸de nye mennesker pÃ¥.",
-  "onboarding.page_four.home": "Hjem tidslinjen viser opslag fra folk som du fÃ¸lger.",
-  "onboarding.page_four.notifications": "Notifikations kolonnen viser nÃ¥r nogen interagerer med dig.",
-  "onboarding.page_one.federation": "Mastodon er et netvÃ¦rk af uafhÃ¦ngige serverer der forbindes til at udgÃ¸re et stÃ¸rre socialt netvÃ¦rk. Vi kalder disse servere for instanser.",
-  "onboarding.page_one.full_handle": "Dit fulde brugernavn",
-  "onboarding.page_one.handle_hint": "Dette er hvad du vil fortÃ¦lle dine venner hvad de skal sÃ¸ge efter.",
-  "onboarding.page_one.welcome": "Velkommen til Mastodon!",
-  "onboarding.page_six.admin": "Administratoren for denne instans er {admin}.",
-  "onboarding.page_six.almost_done": "NÃ¦sten fÃ¦rdig...",
-  "onboarding.page_six.appetoot": "God Appetoot!",
-  "onboarding.page_six.apps_available": "Der er {apps} tilgÃ¦ngelige for iOS, Android og andre platforme.",
-  "onboarding.page_six.github": "Mastodon er frit open-source software. Du kan rapportere fejl, anmode om features, eller bidrage til koden ved at gÃ¥ til {github}.",
-  "onboarding.page_six.guidelines": "retningslinjer for fÃ¦llesskabet",
-  "onboarding.page_six.read_guidelines": "LÃ¦s venligst {domain}s {guidelines}!",
-  "onboarding.page_six.various_app": "apps til mobilen",
-  "onboarding.page_three.profile": "Rediger din profil for at Ã¦ndre profilbillede, beskrivelse og visningsnavn. Der vil du ogsÃ¥ finde andre indstillinger.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Spring over",
   "privacy.change": "Ã†ndre status privatliv",
   "privacy.direct.long": "Post til kun de nÃ¦vnte brugere",
   "privacy.direct.short": "Direkte",
@@ -240,26 +282,29 @@
   "report.target": "Anmelder {target}",
   "search.placeholder": "SÃ¸g",
   "search_popout.search_format": "Avanceret sÃ¸geformat",
-  "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": "Simpel tekst returnerer statusser du har skrevet, favoriseret, fremhÃ¦vet, eller er blevet nÃ¦vnt i, lige sÃ¥ vel som matchende brugernavne, visningsnavne, og hashtags.",
   "search_popout.tips.hashtag": "emnetag",
   "search_popout.tips.status": "status",
   "search_popout.tips.text": "Simpelt tekst returnerer passende visningsnavne, brugernavne og hashtags",
   "search_popout.tips.user": "bruger",
   "search_results.accounts": "Folk",
   "search_results.hashtags": "Emnetags",
-  "search_results.statuses": "Toote",
+  "search_results.statuses": "Trut",
   "search_results.total": "{count, number} {count, plural, et {result} andre {results}}",
   "standalone.public_title": "Et kig indenfor...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Bloker @{name}",
   "status.cancel_reblog_private": "FremhÃ¦v ikke lÃ¦ngere",
   "status.cannot_reblog": "Denne post kan ikke fremhÃ¦ves",
   "status.delete": "Slet",
+  "status.detailed_status": "Detaljeret visning af samtale",
   "status.direct": "Send direkte besked til @{name}",
   "status.embed": "Indlejre",
   "status.favourite": "Favorit",
   "status.filtered": "Filtreret",
   "status.load_more": "IndlÃ¦s mere",
-  "status.media_hidden": "Multimedia skjult",
+  "status.media_hidden": "Medie skjult",
   "status.mention": "NÃ¦vn @{name}",
   "status.more": "Mere",
   "status.mute": "DÃ¦mp @{name}",
@@ -267,12 +312,14 @@
   "status.open": "Udvid denne status",
   "status.pin": "FastgÃ¸r til profil",
   "status.pinned": "Fastgjort trut",
+  "status.read_more": "LÃ¦s mere",
   "status.reblog": "FremhÃ¦v",
   "status.reblog_private": "FremhÃ¦v til oprindeligt publikum",
   "status.reblogged_by": "{name} fremhÃ¦vede",
+  "status.reblogs.empty": "Der er endnu ingen der har fremhÃ¦vet dette trut. NÃ¥r der er nogen der gÃ¸r, vil det blive vist her.",
   "status.redraft": "Slet og omskriv",
   "status.reply": "Svar",
-  "status.replyAll": "Svar trÃ¥d",
+  "status.replyAll": "Svar samtale",
   "status.report": "Anmeld @{name}",
   "status.sensitive_toggle": "Tryk for at se",
   "status.sensitive_warning": "FÃ¸lsomt indhold",
@@ -281,18 +328,21 @@
   "status.show_less_all": "Vis mindre for alle",
   "status.show_more": "Vis mere",
   "status.show_more_all": "Vis mere for alle",
+  "status.show_thread": "Show thread",
   "status.unmute_conversation": "Fjern dÃ¦mpningen fra samtale",
   "status.unpin": "Fjern som fastgjort fra profil",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "FÃ¦lles",
   "tabs_bar.home": "Hjem",
   "tabs_bar.local_timeline": "Lokal",
   "tabs_bar.notifications": "Notifikationer",
   "tabs_bar.search": "SÃ¸g",
-  "trends.count_by_accounts": "{count} {rawCount, flere, en {person} flere {people}} snakker",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} snakker",
   "ui.beforeunload": "Din kladde vil gÃ¥ tabt hvis du forlader Mastodon.",
   "upload_area.title": "TrÃ¦k og slip for at uploade",
-  "upload_button.label": "TilfÃ¸j multimedier",
-  "upload_form.description": "Beskrivelse for de svagtseende",
+  "upload_button.label": "TilfÃ¸j medie (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "Beskriv for de svagtseende",
   "upload_form.focus": "BeskÃ¦r",
   "upload_form.undo": "Slet",
   "upload_progress.label": "Uploader...",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 8ea318158aca5dec75d72d44fd37b20cfc5bac1d..3a55f26a7521d933085a2299488e1ea453ae009b 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -1,17 +1,23 @@
 {
+  "account.add_or_remove_from_list": "HinzufÃ¼gen oder Entfernen von Listen",
   "account.badges.bot": "Bot",
-  "account.block": "@{name} blocken",
+  "account.block": "@{name} blockieren",
   "account.block_domain": "Alles von {domain} verstecken",
   "account.blocked": "Blockiert",
-  "account.direct": "Direct Message @{name}",
+  "account.direct": "Direktnachricht an @{name}",
   "account.disclaimer_full": "Das Profil wird mÃ¶glicherweise unvollstÃ¤ndig wiedergegeben.",
   "account.domain_blocked": "Domain versteckt",
   "account.edit_profile": "Profil bearbeiten",
+  "account.endorse": "Auf Profil hervorheben",
   "account.follow": "Folgen",
   "account.followers": "Folgende",
+  "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.follows": "Folgt",
+  "account.follows.empty": "Dieses Profil folgt noch niemandem.",
   "account.follows_you": "Folgt dir",
   "account.hide_reblogs": "Geteilte BeitrÃ¤ge von @{name} verbergen",
+  "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.media": "Medien",
   "account.mention": "@{name} erwÃ¤hnen",
   "account.moved_to": "{name} ist umgezogen auf:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Von @{name} geteilte BeitrÃ¤ge anzeigen",
   "account.unblock": "@{name} entblocken",
   "account.unblock_domain": "{domain} wieder anzeigen",
+  "account.unendorse": "Nicht auf Profil hervorheben",
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
   "account.unmute_notifications": "Benachrichtigungen von @{name} einschalten",
@@ -65,7 +72,7 @@
   "compose_form.hashtag_warning": "Dieser Beitrag wird nicht unter einen dieser Hashtags sichtbar sein, solange er ungelistet ist. Bei einer Suche kann er nicht gefunden werden.",
   "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.placeholder": "Was gibt's neues?",
+  "compose_form.placeholder": "Was gibt's Neues?",
   "compose_form.publish": "TrÃ¶t",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.marked": "Medien sind als heikel markiert",
@@ -81,11 +88,13 @@
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste permanent lÃ¶schen mÃ¶chtest?",
   "confirmations.domain_block.confirm": "Die ganze Domain verbergen",
-  "confirmations.domain_block.message": "Bist du dir wirklich sicher, dass du die ganze Domain {domain} verbergen willst? In den meisten FÃ¤llen reichen ein paar gezielte Blocks aus. Du wirst nicht den Inhalt von dieser Domain in irgendwelchen Ã¶ffentlichen Timelines oder den Benachrichtigungen finden. Deine Follower von dieser Domain werden entfernt.",
+  "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 Follower von dieser Domain werden entfernt.",
   "confirmations.mute.confirm": "Stummschalten",
   "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 Status lÃ¶schen und neu machen mÃ¶chtest? Du wirst alle Antworten, Boosts und Favoriten darauf verlieren.",
+  "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.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.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Bist du dir sicher, dass du {name} entfolgen mÃ¶chtest?",
   "embed.instructions": "Du kannst diesen Beitrag auf deiner Webseite einbetten, indem du den folgenden Code einfÃ¼gst.",
@@ -104,44 +113,89 @@
   "emoji_button.search_results": "Suchergebnisse",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "Reisen und Orte",
+  "empty_column.account_timeline": "Keine BeitrÃ¤ge!",
+  "empty_column.blocks": "Du hast keine Profile blockiert.",
   "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 ist noch keine versteckten Domains.",
+  "empty_column.favourited_statuses": "Du hast noch keine favorisierten TrÃ¶ts. Wenn 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_requests": "Du hast noch keine Folge-Anfragen. 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.public_timeline": "die Ã¶ffentliche Zeitleiste",
   "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.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 Instanzen, um die Zeitleiste aufzufÃ¼llen",
   "follow_request.authorize": "Erlauben",
   "follow_request.reject": "Ablehnen",
   "getting_started.developers": "Entwickler",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Finde Freunde von Twitter",
+  "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": "Sicherheit",
   "getting_started.terms": "Nutzungsbedingungen",
+  "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.tag_mode.all": "All diese",
+  "hashtag.column_settings.tag_mode.any": "Eine von diesen",
+  "hashtag.column_settings.tag_mode.none": "Keine von diesen",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "Einfach",
   "home.column_settings.show_reblogs": "Geteilte BeitrÃ¤ge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
+  "introduction.federation.action": "Weiter",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Ã–ffentliche BeitrÃ¤ge von anderen Servern im Fediverse werden in der fÃ¶derierten Zeitleiste erscheinen.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "BeitrÃ¤ge von Leuten, denen du folgst werden in deiner Startseite erscheinen. Du kannst jedem auf irgendeinen Server folgen!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Ã–ffentliche BeitrÃ¤ge von Leuten auf demselben Server wie du werden in der lokalen Zeitleiste erscheinen.",
+  "introduction.interactions.action": "Tutorial beenden!",
+  "introduction.interactions.favourite.headline": "Favorisieren",
+  "introduction.interactions.favourite.text": "Du kannst einen Beitrag fÃ¼r spÃ¤ter speichern und dem Autor wissen lassen, dass du ihn magst, indem du ihn favorisierst.",
+  "introduction.interactions.reblog.headline": "Teilen",
+  "introduction.interactions.reblog.text": "Du kannst BeitrÃ¤ge von anderen Leuten an deine Follower teilen.",
+  "introduction.interactions.reply.headline": "Antworten",
+  "introduction.interactions.reply.text": "Du kannst auf die BeitrÃ¤ge von anderen Leuten antworten und die BeitrÃ¤ge werden dann in eine Konversation zusammengebunden.",
+  "introduction.welcome.action": "Lasst uns loslegen!",
+  "introduction.welcome.headline": "Erste Schritte",
+  "introduction.welcome.text": "Willkommen im Fediverse! In wenigen Momenten wirst du in der Lage sein Nachrichten zu versenden und mit deinen Freunden Ã¼ber Server hinweg in Kontakt zu treten. Aber dieser Server, {domain}, ist sehr speziell â€” er hostet dein Profil, also merke dir den Namen.",
   "keyboard_shortcuts.back": "zurÃ¼ck navigieren",
-  "keyboard_shortcuts.boost": "boosten",
+  "keyboard_shortcuts.blocked": "Liste blockierter Profile Ã¶ffnen",
+  "keyboard_shortcuts.boost": "teilen",
   "keyboard_shortcuts.column": "einen Status in einer der Spalten fokussieren",
-  "keyboard_shortcuts.compose": "um das Textfeld zu fokussieren",
+  "keyboard_shortcuts.compose": "fokussiere das Eingabefeld",
   "keyboard_shortcuts.description": "Beschreibung",
+  "keyboard_shortcuts.direct": "Direct-Message-Spalte Ã¶ffnen",
   "keyboard_shortcuts.down": "sich in der Liste hinunter bewegen",
-  "keyboard_shortcuts.enter": "um den Status zu Ã¶ffnen",
+  "keyboard_shortcuts.enter": "Status Ã¶ffnen",
   "keyboard_shortcuts.favourite": "um zu favorisieren",
+  "keyboard_shortcuts.favourites": "Favoriten-Liste Ã¶ffnen",
+  "keyboard_shortcuts.federated": "FÃ¶rderierte Zeitleiste Ã¶ffnen",
   "keyboard_shortcuts.heading": "Tastenkombinationen",
+  "keyboard_shortcuts.home": "Startseite Ã¶ffnen",
   "keyboard_shortcuts.hotkey": "TastenkÃ¼rzel",
-  "keyboard_shortcuts.legend": "um diese Ãœbersicht anzuzeigen",
+  "keyboard_shortcuts.legend": "diese Ãœbersicht anzeigen",
+  "keyboard_shortcuts.local": "Lokale Zeitleiste Ã¶ffnen",
   "keyboard_shortcuts.mention": "um Autor_in zu erwÃ¤hnen",
-  "keyboard_shortcuts.reply": "um zu antworten",
-  "keyboard_shortcuts.search": "um die Suche zu fokussieren",
-  "keyboard_shortcuts.toggle_hidden": "um den Text hinter einer Inhaltswarnung zu verstecken oder ihn anzuzeigen",
-  "keyboard_shortcuts.toot": "um einen neuen Toot zu beginnen",
-  "keyboard_shortcuts.unfocus": "um das Textfeld/die Suche nicht mehr zu fokussieren",
+  "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile Ã¶ffnen",
+  "keyboard_shortcuts.my_profile": "Dein Profil Ã¶ffnen",
+  "keyboard_shortcuts.notifications": "Benachrichtigungsspalte Ã¶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.start": "\"Erste Schritte-Spalte Ã¶ffnen",
+  "keyboard_shortcuts.toggle_hidden": "Text hinter einer Inhaltswarnung verstecken/anzeigen",
+  "keyboard_shortcuts.toot": "einen neuen Toot beginnen",
+  "keyboard_shortcuts.unfocus": "Textfeld/die Suche nicht mehr fokussieren",
   "keyboard_shortcuts.up": "sich in der Liste hinauf bewegen",
   "lightbox.close": "SchlieÃŸen",
   "lightbox.next": "Weiter",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Nicht gefunden",
   "missing_indicator.sublabel": "Die Ressource konnte nicht gefunden werden",
   "mute_modal.hide_notifications": "Benachrichtigungen von diesem Account verbergen?",
+  "navigation_bar.apps": "Mobile Apps",
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.community_timeline": "Lokale Zeitleiste",
+  "navigation_bar.compose": "Neuen Beitrag verfassen",
   "navigation_bar.direct": "Direktnachrichten",
   "navigation_bar.discover": "Entdecken",
   "navigation_bar.domain_blocks": "Versteckte Domains",
   "navigation_bar.edit_profile": "Profil bearbeiten",
   "navigation_bar.favourites": "Favoriten",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Stummgeschaltene WÃ¶rter",
   "navigation_bar.follow_requests": "Folgeanfragen",
   "navigation_bar.info": "Ãœber diese Instanz",
   "navigation_bar.keyboard_shortcuts": "Tastenkombinationen",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Bist du dir sicher, dass du alle Mitteilungen lÃ¶schen mÃ¶chtest?",
   "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.mention": "ErwÃ¤hnungen:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
-  "notifications.column_settings.push_meta": "Auf diesem GerÃ¤t",
   "notifications.column_settings.reblog": "Geteilte BeitrÃ¤ge:",
   "notifications.column_settings.show": "In der Spalte anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
+  "notifications.filter.all": "Alle",
+  "notifications.filter.boosts": "Erneut geteilte BeitrÃ¤ge",
+  "notifications.filter.favourites": "Favoriten",
+  "notifications.filter.follows": "Folgende",
+  "notifications.filter.mentions": "ErwÃ¤hnungen",
   "notifications.group": "{count} Benachrichtigungen",
-  "onboarding.done": "Fertig",
-  "onboarding.next": "Weiter",
-  "onboarding.page_five.public_timelines": "Die lokale Zeitleiste zeigt alle BeitrÃ¤ge von Leuten, die auch auf {domain} sind. Das gesamte bekannte Netz zeigt BeitrÃ¤ge von allen, denen von Leuten auf {domain} gefolgt wird. Zusammen sind sie die Ã¶ffentlichen Zeitleisten, ein guter Weg, um neue Leute zu finden.",
-  "onboarding.page_four.home": "Die Startseite zeigt dir BeitrÃ¤ge von Leuten, denen du folgst.",
-  "onboarding.page_four.notifications": "Wenn jemand mit dir interagiert, bekommst du eine Mitteilung.",
-  "onboarding.page_one.federation": "Mastodon ist ein soziales Netzwerk, das aus unabhÃ¤ngigen Servern besteht. Diese Server nennen wir auch Instanzen.",
-  "onboarding.page_one.full_handle": "Dein vollstÃ¤ndiger Benutzername",
-  "onboarding.page_one.handle_hint": "Das ist das, was du deinen Freunden sagst, um nach dir zu suchen.",
-  "onboarding.page_one.welcome": "Willkommen bei Mastodon!",
-  "onboarding.page_six.admin": "FÃ¼r deine Instanz ist {admin} zustÃ¤ndig.",
-  "onboarding.page_six.almost_done": "Fast fertig â€¦",
-  "onboarding.page_six.appetoot": "Guten AppetrÃ¶t!",
-  "onboarding.page_six.apps_available": "Es gibt verschiedene {apps} fÃ¼r iOS, Android und weitere Plattformen.",
-  "onboarding.page_six.github": "Mastodon ist freie, quelloffene Software. Du kannst auf {github} dazu beitragen, Probleme melden und WÃ¼nsche Ã¤uÃŸern.",
-  "onboarding.page_six.guidelines": "Richtlinien",
-  "onboarding.page_six.read_guidelines": "Bitte mach dich mit den {guidelines} von {domain} vertraut!",
-  "onboarding.page_six.various_app": "Apps",
-  "onboarding.page_three.profile": "Bearbeite dein Profil, um dein Bild, deinen Namen und deine Beschreibung anzupassen. Dort findest du auch weitere Einstellungen.",
-  "onboarding.page_three.search": "Benutze die Suchfunktion, um Leute zu finden und mit Hashtags wie {illustration} oder {introductions} nach BeitrÃ¤gen zu suchen. Um eine Person zu finden, die auf einer anderen Instanz ist, benutze den vollstÃ¤ndigen Profilnamen.",
-  "onboarding.page_two.compose": "Schreibe deine BeitrÃ¤ge in der Schreiben-Spalte. Mit den Symbolen unter dem Eingabefeld kannst du Bilder hochladen, Sichtbarkeits-Einstellungen Ã¤ndern und Inhaltswarnungen hinzufÃ¼gen.",
-  "onboarding.skip": "Ãœberspringen",
   "privacy.change": "Sichtbarkeit des Beitrags anpassen",
   "privacy.direct.long": "Beitrag nur an erwÃ¤hnte Profile",
   "privacy.direct.short": "Direkt",
@@ -250,10 +292,13 @@
   "search_results.statuses": "BeitrÃ¤ge",
   "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
   "standalone.public_title": "Ein kleiner Einblick â€¦",
-  "status.block": "Block @{name}",
+  "status.admin_account": "Ã–ffne ModerationsoberflÃ¤che fÃ¼r @{name}",
+  "status.admin_status": "Ã–ffne diesen Status in der ModerationsoberflÃ¤che",
+  "status.block": "Blockiere @{name}",
   "status.cancel_reblog_private": "Nicht mehr teilen",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
   "status.delete": "LÃ¶schen",
+  "status.detailed_status": "Detaillierte Ansicht der Konversation",
   "status.direct": "Direktnachricht @{name}",
   "status.embed": "Einbetten",
   "status.favourite": "Favorisieren",
@@ -267,9 +312,11 @@
   "status.open": "Diesen Beitrag Ã¶ffnen",
   "status.pin": "Im Profil anheften",
   "status.pinned": "Angehefteter Beitrag",
+  "status.read_more": "Mehr lesen",
   "status.reblog": "Teilen",
   "status.reblog_private": "An das eigentliche Publikum teilen",
   "status.reblogged_by": "{name} teilte",
+  "status.reblogs.empty": "Diesen Beitrag hat noch niemand geteilt. Sobald es jemand tut, wird die Person hier angezeigt.",
   "status.redraft": "LÃ¶schen und neu erstellen",
   "status.reply": "Antworten",
   "status.replyAll": "Auf Thread antworten",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Zeige weniger fÃ¼r alles",
   "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Zeige mehr fÃ¼r alles",
+  "status.show_thread": "Zeige Thread",
   "status.unmute_conversation": "Stummschaltung von Thread aufheben",
   "status.unpin": "Vom Profil lÃ¶sen",
+  "suggestions.dismiss": "Hinweis ausblenden",
+  "suggestions.header": "Du bist vielleicht interessiert inâ€¦",
   "tabs_bar.federated_timeline": "FÃ¶deration",
   "tabs_bar.home": "Startseite",
   "tabs_bar.local_timeline": "Lokal",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, eine {Person} other {Personen}} reden darÃ¼ber",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlÃ¤sst.",
   "upload_area.title": "Zum Hochladen hereinziehen",
-  "upload_button.label": "Mediendatei hinzufÃ¼gen",
+  "upload_button.label": "Mediendatei hinzufÃ¼gen (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "FÃ¼r Menschen mit Sehbehinderung beschreiben",
-  "upload_form.focus": "Zuschneiden",
+  "upload_form.focus": "Thumbnail bearbeiten",
   "upload_form.undo": "LÃ¶schen",
   "upload_progress.label": "Wird hochgeladen â€¦",
   "video.close": "Video schlieÃŸen",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 8c43b4f42ef5e52c9b3a3fc018f24edc64261a54..6ac8160ba4dc5ec3d78c82f6ed78995a7e74f4ef 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -302,12 +302,24 @@
       {
         "defaultMessage": "Embed",
         "id": "status.embed"
+      },
+      {
+        "defaultMessage": "Open moderation interface for @{name}",
+        "id": "status.admin_account"
+      },
+      {
+        "defaultMessage": "Open this status in the moderation interface",
+        "id": "status.admin_status"
       }
     ],
     "path": "app/javascript/mastodon/components/status_action_bar.json"
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Read more",
+        "id": "status.read_more"
+      },
       {
         "defaultMessage": "Show more",
         "id": "status.show_more"
@@ -345,6 +357,10 @@
       {
         "defaultMessage": "{name} boosted",
         "id": "status.reblogged_by"
+      },
+      {
+        "defaultMessage": "Show thread",
+        "id": "status.show_thread"
       }
     ],
     "path": "app/javascript/mastodon/components/status.json"
@@ -390,13 +406,21 @@
         "id": "confirmations.redraft.confirm"
       },
       {
-        "defaultMessage": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+        "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": "Block",
         "id": "confirmations.block.confirm"
       },
+      {
+        "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"
+      },
       {
         "defaultMessage": "Are you sure you want to block {name}?",
         "id": "confirmations.block.message"
@@ -459,6 +483,15 @@
     ],
     "path": "app/javascript/mastodon/features/account_timeline/containers/header_container.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "No toots here!",
+        "id": "empty_column.account_timeline"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/account_timeline/index.json"
+  },
   {
     "descriptors": [
       {
@@ -557,6 +590,22 @@
         "defaultMessage": "Muted users",
         "id": "navigation_bar.mutes"
       },
+      {
+        "defaultMessage": "Feature on profile",
+        "id": "account.endorse"
+      },
+      {
+        "defaultMessage": "Don't feature on profile",
+        "id": "account.unendorse"
+      },
+      {
+        "defaultMessage": "Add or Remove from lists",
+        "id": "account.add_or_remove_from_list"
+      },
+      {
+        "defaultMessage": "Open moderation interface for @{name}",
+        "id": "status.admin_account"
+      },
       {
         "defaultMessage": "Information below may reflect the user's profile incompletely.",
         "id": "account.disclaimer_full"
@@ -602,6 +651,14 @@
         "defaultMessage": "Edit profile",
         "id": "account.edit_profile"
       },
+      {
+        "defaultMessage": "Ownership of this link was checked on {date}",
+        "id": "account.link_verified_on"
+      },
+      {
+        "defaultMessage": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
+        "id": "account.locked_info"
+      },
       {
         "defaultMessage": "Follows you",
         "id": "account.follows_you"
@@ -630,6 +687,10 @@
       {
         "defaultMessage": "Blocked users",
         "id": "column.blocks"
+      },
+      {
+        "defaultMessage": "You haven't blocked any users yet.",
+        "id": "empty_column.blocks"
       }
     ],
     "path": "app/javascript/mastodon/features/blocks/index.json"
@@ -844,6 +905,14 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Dismiss suggestion",
+        "id": "suggestions.dismiss"
+      },
+      {
+        "defaultMessage": "You might be interested inâ€¦",
+        "id": "suggestions.header"
+      },
       {
         "defaultMessage": "People",
         "id": "search_results.accounts"
@@ -899,7 +968,7 @@
   {
     "descriptors": [
       {
-        "defaultMessage": "Add media",
+        "defaultMessage": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
         "id": "upload_button.label"
       }
     ],
@@ -1011,6 +1080,10 @@
       {
         "defaultMessage": "Logout",
         "id": "navigation_bar.logout"
+      },
+      {
+        "defaultMessage": "Compose new toot",
+        "id": "navigation_bar.compose"
       }
     ],
     "path": "app/javascript/mastodon/features/compose/index.json"
@@ -1037,6 +1110,10 @@
       {
         "defaultMessage": "Unhide {domain}",
         "id": "account.unblock_domain"
+      },
+      {
+        "defaultMessage": "There are no hidden domains yet.",
+        "id": "empty_column.domain_blocks"
       }
     ],
     "path": "app/javascript/mastodon/features/domain_blocks/index.json"
@@ -1046,10 +1123,23 @@
       {
         "defaultMessage": "Favourites",
         "id": "column.favourites"
+      },
+      {
+        "defaultMessage": "You don't have any favourite toots yet. When you favourite one, it will show up here.",
+        "id": "empty_column.favourited_statuses"
       }
     ],
     "path": "app/javascript/mastodon/features/favourited_statuses/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "No one has favourited this toot yet. When someone does, they will show up here.",
+        "id": "empty_column.favourites"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/favourites/index.json"
+  },
   {
     "descriptors": [
       {
@@ -1068,10 +1158,32 @@
       {
         "defaultMessage": "Follow requests",
         "id": "column.follow_requests"
+      },
+      {
+        "defaultMessage": "You don't have any follow requests yet. When you receive one, it will show up here.",
+        "id": "empty_column.follow_requests"
       }
     ],
     "path": "app/javascript/mastodon/features/follow_requests/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "No one follows this user yet.",
+        "id": "account.followers.empty"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/followers/index.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "This user doesn't follow anyone yet.",
+        "id": "account.follows.empty"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/following/index.json"
+  },
   {
     "descriptors": [
       {
@@ -1147,8 +1259,8 @@
         "id": "getting_started.heading"
       },
       {
-        "defaultMessage": "Find friends from Twitter",
-        "id": "getting_started.find_friends"
+        "defaultMessage": "Profile directory",
+        "id": "getting_started.directory"
       },
       {
         "defaultMessage": "Invite people",
@@ -1166,6 +1278,10 @@
         "defaultMessage": "About this instance",
         "id": "navigation_bar.info"
       },
+      {
+        "defaultMessage": "Mobile apps",
+        "id": "navigation_bar.apps"
+      },
       {
         "defaultMessage": "Terms of service",
         "id": "getting_started.terms"
@@ -1191,6 +1307,39 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Any of these",
+        "id": "hashtag.column_settings.tag_mode.any"
+      },
+      {
+        "defaultMessage": "All of these",
+        "id": "hashtag.column_settings.tag_mode.all"
+      },
+      {
+        "defaultMessage": "None of these",
+        "id": "hashtag.column_settings.tag_mode.none"
+      },
+      {
+        "defaultMessage": "Include additional tags in this column",
+        "id": "hashtag.column_settings.tag_toggle"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/hashtag_timeline/components/column_settings.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "or {additional}",
+        "id": "hashtag.column_header.tag_mode.any"
+      },
+      {
+        "defaultMessage": "and {additional}",
+        "id": "hashtag.column_header.tag_mode.all"
+      },
+      {
+        "defaultMessage": "without {additional}",
+        "id": "hashtag.column_header.tag_mode.none"
+      },
       {
         "defaultMessage": "There is nothing in this hashtag yet.",
         "id": "empty_column.hashtag"
@@ -1232,6 +1381,79 @@
     ],
     "path": "app/javascript/mastodon/features/home_timeline/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "First steps",
+        "id": "introduction.welcome.headline"
+      },
+      {
+        "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.",
+        "id": "introduction.welcome.text"
+      },
+      {
+        "defaultMessage": "Let's go!",
+        "id": "introduction.welcome.action"
+      },
+      {
+        "defaultMessage": "Home",
+        "id": "introduction.federation.home.headline"
+      },
+      {
+        "defaultMessage": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+        "id": "introduction.federation.home.text"
+      },
+      {
+        "defaultMessage": "Local",
+        "id": "introduction.federation.local.headline"
+      },
+      {
+        "defaultMessage": "Public posts from people on the same server as you will appear in the local timeline.",
+        "id": "introduction.federation.local.text"
+      },
+      {
+        "defaultMessage": "Federated",
+        "id": "introduction.federation.federated.headline"
+      },
+      {
+        "defaultMessage": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+        "id": "introduction.federation.federated.text"
+      },
+      {
+        "defaultMessage": "Next",
+        "id": "introduction.federation.action"
+      },
+      {
+        "defaultMessage": "Reply",
+        "id": "introduction.interactions.reply.headline"
+      },
+      {
+        "defaultMessage": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+        "id": "introduction.interactions.reply.text"
+      },
+      {
+        "defaultMessage": "Boost",
+        "id": "introduction.interactions.reblog.headline"
+      },
+      {
+        "defaultMessage": "You can share other people's toots with your followers by boosting them.",
+        "id": "introduction.interactions.reblog.text"
+      },
+      {
+        "defaultMessage": "Favourite",
+        "id": "introduction.interactions.favourite.headline"
+      },
+      {
+        "defaultMessage": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+        "id": "introduction.interactions.favourite.text"
+      },
+      {
+        "defaultMessage": "Finish tutorial!",
+        "id": "introduction.interactions.action"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/introduction/index.json"
+  },
   {
     "descriptors": [
       {
@@ -1254,6 +1476,10 @@
         "defaultMessage": "to mention author",
         "id": "keyboard_shortcuts.mention"
       },
+      {
+        "defaultMessage": "to open author's profile",
+        "id": "keyboard_shortcuts.profile"
+      },
       {
         "defaultMessage": "to favourite",
         "id": "keyboard_shortcuts.favourite"
@@ -1302,6 +1528,54 @@
         "defaultMessage": "to un-focus compose textarea/search",
         "id": "keyboard_shortcuts.unfocus"
       },
+      {
+        "defaultMessage": "to open home timeline",
+        "id": "keyboard_shortcuts.home"
+      },
+      {
+        "defaultMessage": "to open notifications column",
+        "id": "keyboard_shortcuts.notifications"
+      },
+      {
+        "defaultMessage": "to open local timeline",
+        "id": "keyboard_shortcuts.local"
+      },
+      {
+        "defaultMessage": "to open federated timeline",
+        "id": "keyboard_shortcuts.federated"
+      },
+      {
+        "defaultMessage": "to open direct messages column",
+        "id": "keyboard_shortcuts.direct"
+      },
+      {
+        "defaultMessage": "to open \"get started\" column",
+        "id": "keyboard_shortcuts.start"
+      },
+      {
+        "defaultMessage": "to open favourites list",
+        "id": "keyboard_shortcuts.favourites"
+      },
+      {
+        "defaultMessage": "to open pinned toots list",
+        "id": "keyboard_shortcuts.pinned"
+      },
+      {
+        "defaultMessage": "to open your profile",
+        "id": "keyboard_shortcuts.my_profile"
+      },
+      {
+        "defaultMessage": "to open blocked users list",
+        "id": "keyboard_shortcuts.blocked"
+      },
+      {
+        "defaultMessage": "to open muted users list",
+        "id": "keyboard_shortcuts.muted"
+      },
+      {
+        "defaultMessage": "to open follow requests list",
+        "id": "keyboard_shortcuts.requests"
+      },
       {
         "defaultMessage": "to display this legend",
         "id": "keyboard_shortcuts.legend"
@@ -1309,6 +1583,19 @@
     ],
     "path": "app/javascript/mastodon/features/keyboard_shortcuts/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Remove from list",
+        "id": "lists.account.remove"
+      },
+      {
+        "defaultMessage": "Add to list",
+        "id": "lists.account.add"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/list_adder/components/list.json"
+  },
   {
     "descriptors": [
       {
@@ -1378,6 +1665,10 @@
       {
         "defaultMessage": "Your lists",
         "id": "lists.subheading"
+      },
+      {
+        "defaultMessage": "You don't have any lists yet. When you create one, it will show up here.",
+        "id": "empty_column.lists"
       }
     ],
     "path": "app/javascript/mastodon/features/lists/index.json"
@@ -1387,6 +1678,10 @@
       {
         "defaultMessage": "Muted users",
         "id": "column.mutes"
+      },
+      {
+        "defaultMessage": "You haven't muted any users yet.",
+        "id": "empty_column.mutes"
       }
     ],
     "path": "app/javascript/mastodon/features/mutes/index.json"
@@ -1402,6 +1697,14 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Show",
+        "id": "notifications.column_settings.filter_bar.show"
+      },
+      {
+        "defaultMessage": "Display all categories",
+        "id": "notifications.column_settings.filter_bar.advanced"
+      },
       {
         "defaultMessage": "Desktop notifications",
         "id": "notifications.column_settings.alert"
@@ -1419,8 +1722,8 @@
         "id": "notifications.column_settings.push"
       },
       {
-        "defaultMessage": "This device",
-        "id": "notifications.column_settings.push_meta"
+        "defaultMessage": "Quick filter bar",
+        "id": "notifications.column_settings.filter_bar.category"
       },
       {
         "defaultMessage": "New followers:",
@@ -1441,6 +1744,31 @@
     ],
     "path": "app/javascript/mastodon/features/notifications/components/column_settings.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Mentions",
+        "id": "notifications.filter.mentions"
+      },
+      {
+        "defaultMessage": "Favourites",
+        "id": "notifications.filter.favourites"
+      },
+      {
+        "defaultMessage": "Boosts",
+        "id": "notifications.filter.boosts"
+      },
+      {
+        "defaultMessage": "Follows",
+        "id": "notifications.filter.follows"
+      },
+      {
+        "defaultMessage": "All",
+        "id": "notifications.filter.all"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/notifications/components/filter_bar.json"
+  },
   {
     "descriptors": [
       {
@@ -1506,6 +1834,15 @@
     ],
     "path": "app/javascript/mastodon/features/public_timeline/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "No one has boosted this toot yet. When someone does, they will show up here.",
+        "id": "status.reblogs.empty"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/reblogs/index.json"
+  },
   {
     "descriptors": [
       {
@@ -1601,6 +1938,14 @@
       {
         "defaultMessage": "Embed",
         "id": "status.embed"
+      },
+      {
+        "defaultMessage": "Open moderation interface for @{name}",
+        "id": "status.admin_account"
+      },
+      {
+        "defaultMessage": "Open this status in the moderation interface",
+        "id": "status.admin_status"
       }
     ],
     "path": "app/javascript/mastodon/features/status/components/action_bar.json"
@@ -1620,7 +1965,44 @@
         "id": "confirmations.redraft.confirm"
       },
       {
-        "defaultMessage": "Are you sure you want to delete this status and re-draft it? You will lose all replies, boosts and favourites to it.",
+        "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": "Block",
+        "id": "confirmations.block.confirm"
+      },
+      {
+        "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"
+      },
+      {
+        "defaultMessage": "Are you sure you want to block {name}?",
+        "id": "confirmations.block.message"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/status/containers/detailed_status_container.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"
       },
       {
@@ -1635,6 +2017,18 @@
         "defaultMessage": "Show less for all",
         "id": "status.show_less_all"
       },
+      {
+        "defaultMessage": "Detailed conversation view",
+        "id": "status.detailed_status"
+      },
+      {
+        "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"
+      },
       {
         "defaultMessage": "Are you sure you want to block {name}?",
         "id": "confirmations.block.message"
@@ -1689,6 +2083,15 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Toot",
+        "id": "compose_form.publish"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/columns_area.json"
+  },
   {
     "descriptors": [
       {
@@ -1753,111 +2156,6 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/mute_modal.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "Home",
-        "id": "column.home"
-      },
-      {
-        "defaultMessage": "Notifications",
-        "id": "column.notifications"
-      },
-      {
-        "defaultMessage": "Local timeline",
-        "id": "column.community"
-      },
-      {
-        "defaultMessage": "Federated timeline",
-        "id": "column.public"
-      },
-      {
-        "defaultMessage": "Welcome to Mastodon!",
-        "id": "onboarding.page_one.welcome"
-      },
-      {
-        "defaultMessage": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-        "id": "onboarding.page_one.federation"
-      },
-      {
-        "defaultMessage": "Your full handle",
-        "id": "onboarding.page_one.full_handle"
-      },
-      {
-        "defaultMessage": "This is what you would tell your friends to search for.",
-        "id": "onboarding.page_one.handle_hint"
-      },
-      {
-        "defaultMessage": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-        "id": "onboarding.page_two.compose"
-      },
-      {
-        "defaultMessage": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-        "id": "onboarding.page_three.search"
-      },
-      {
-        "defaultMessage": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-        "id": "onboarding.page_three.profile"
-      },
-      {
-        "defaultMessage": "The home timeline shows posts from people you follow.",
-        "id": "onboarding.page_four.home"
-      },
-      {
-        "defaultMessage": "The notifications column shows when someone interacts with you.",
-        "id": "onboarding.page_four.notifications"
-      },
-      {
-        "defaultMessage": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-        "id": "onboarding.page_five.public_timelines"
-      },
-      {
-        "defaultMessage": "Your instance's admin is {admin}.",
-        "id": "onboarding.page_six.admin"
-      },
-      {
-        "defaultMessage": "Please read {domain}'s {guidelines}!",
-        "id": "onboarding.page_six.read_guidelines"
-      },
-      {
-        "defaultMessage": "community guidelines",
-        "id": "onboarding.page_six.guidelines"
-      },
-      {
-        "defaultMessage": "Almost done...",
-        "id": "onboarding.page_six.almost_done"
-      },
-      {
-        "defaultMessage": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-        "id": "onboarding.page_six.github"
-      },
-      {
-        "defaultMessage": "There are {apps} available for iOS, Android and other platforms.",
-        "id": "onboarding.page_six.apps_available"
-      },
-      {
-        "defaultMessage": "mobile apps",
-        "id": "onboarding.page_six.various_app"
-      },
-      {
-        "defaultMessage": "Bon Appetoot!",
-        "id": "onboarding.page_six.appetoot"
-      },
-      {
-        "defaultMessage": "Next",
-        "id": "onboarding.next"
-      },
-      {
-        "defaultMessage": "Done",
-        "id": "onboarding.done"
-      },
-      {
-        "defaultMessage": "Skip",
-        "id": "onboarding.skip"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/ui/components/onboarding_modal.json"
-  },
   {
     "descriptors": [
       {
@@ -1976,6 +2274,10 @@
         "defaultMessage": "Sensitive content",
         "id": "status.sensitive_warning"
       },
+      {
+        "defaultMessage": "Media hidden",
+        "id": "status.media_hidden"
+      },
       {
         "defaultMessage": "Click to view",
         "id": "status.sensitive_toggle"
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 7e8fa8b1720b0a150c6c3d8ab9c72018a93fe083..7b4852271bc08ba649ee4cb995a59454bc66cb90 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -1,17 +1,23 @@
 {
+  "account.add_or_remove_from_list": "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î® Î±Ï†Î±Î¯ÏÎµÏƒÎ· Î±Ï€ÏŒ Î»Î¯ÏƒÏ„ÎµÏ‚",
   "account.badges.bot": "ÎœÏ€Î¿Ï„",
   "account.block": "Î‘Ï€ÏŒÎºÎ»ÎµÎ¹ÏƒÎµ Ï„Î¿Î½/Ï„Î·Î½ @{name}",
-  "account.block_domain": "Î‘Ï€ÏŒÎºÏÏ…ÏˆÎµ Ï„Î± Ï€Î¬Î½Ï„Î± Î±Ï€ÏŒ Ï„Î¿Î½/Ï„Î·Î½",
+  "account.block_domain": "Î‘Ï€ÏŒÎºÏÏ…ÏˆÎµ Ï„Î± Ï€Î¬Î½Ï„Î± Î±Ï€ÏŒ Ï„Î¿ {domain}",
   "account.blocked": "Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚/Î·",
   "account.direct": "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒ Î¼Î®Î½Ï…Î¼Î± Ï€ÏÎ¿Ï‚ @{name}",
   "account.disclaimer_full": "ÎŸÎ¹ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î¼Ï€Î¿ÏÎµÎ¹ Î½Î± Î¼Î·Î½ Î±Î½Ï„Î±Î½Î±ÎºÎ»Î¿ÏÎ½ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î» Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· ÎµÏ€Î±ÏÎºÏ‰Ï‚.",
   "account.domain_blocked": "ÎšÏÏ…Î¼Î¼ÎÎ½Î¿Ï‚ Ï„Î¿Î¼ÎÎ±Ï‚",
   "account.edit_profile": "Î•Ï€ÎµÎ¾ÎµÏÎ³Î¬ÏƒÎ¿Ï… Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
+  "account.endorse": "Î ÏÎ¿Î²Î¿Î»Î® ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
   "account.follow": "Î‘ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎµ",
   "account.followers": "Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹",
+  "account.followers.empty": "ÎšÎ±Î½ÎµÎ¯Ï‚ Î´ÎµÎ½ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î±ÎºÏŒÎ¼Î±.",
   "account.follows": "Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯",
+  "account.follows.empty": "Î‘Ï…Ï„ÏŒÏ‚ Î¿ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î´ÎµÎ½ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯ ÎºÎ±Î½ÎÎ½Î±Î½ Î±ÎºÏŒÎ¼Î±.",
   "account.follows_you": "Î£Îµ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯",
   "account.hide_reblogs": "Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÏ‰Î½ Î±Ï€ÏŒ @{name}",
+  "account.link_verified_on": "Î— Î¹Î´Î¹Î¿ÎºÏ„Î·ÏƒÎ¯Î± Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÏƒÏ…Î½Î´ÎÏƒÎ¼Î¿Ï… ÎµÎºÎ»ÎÏ‡Î¸Î·ÎºÎµ Ï„Î·Î½ {date}",
+  "account.locked_info": "Î— ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Î±Ï€Î¿ÏÏÎ®Ï„Î¿Ï… Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÎµÎ¯Î½Î±Î¹ ÎºÎ»ÎµÎ¹Î´Ï‰Î¼ÎÎ½Î·. ÎŸ Î¹Î´Î¹Î¿ÎºÏ„Î®Ï„Î·Ï‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¹ÏŽÎ½ÎµÎ¹ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± Ï€Î¿Î¹Î¿Ï‚ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï„Î¿Î½ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹.",
   "account.media": "Î Î¿Î»Ï…Î¼ÎÏƒÎ±",
   "account.mention": "Î‘Î½Î¬Ï†ÎµÏÎµ @{name}",
   "account.moved_to": "{name} Î¼ÎµÏ„Î±Ï†ÎÏÎ¸Î·ÎºÎµ ÏƒÏ„Î¿:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Î”ÎµÎ¯Î¾Îµ Ï„Î¹Ï‚ Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ @{name}",
   "account.unblock": "ÎžÎµÎ¼Ï€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¿Î½/Ï„Î·Î½ @{name}",
   "account.unblock_domain": "Î‘Ï€Î¿ÎºÎ¬Î»Ï…ÏˆÎµ Ï„Î¿ {domain}",
+  "account.unendorse": "Î†Î½ÎµÏ… Ï€ÏÎ¿Î²Î¿Î»Î®Ï‚ ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
   "account.unfollow": "Î”Î¹Î±ÎºÎ¿Ï€Î® Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚",
   "account.unmute": "Î”Î¹Î±ÎºÎ¿Ï€Î® Î±Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·Ï‚ Ï„Î¿Ï…/Ï„Î·Ï‚ @{name}",
   "account.unmute_notifications": "Î”Î¹Î±ÎºÎ¿Ï€Î® Î±Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ Ï„Î¿Ï…/Ï„Î·Ï‚ @{name}",
@@ -65,13 +72,13 @@
   "compose_form.hashtag_warning": "Î‘Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„ Î´ÎµÎ½ Î¸Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÏ„Î±Î¹ ÎºÎ¬Ï„Ï‰ Î±Ï€ÏŒ ÎºÎ±Î½ÎÎ½Î± hashtag ÎºÎ±Î¸ÏŽÏ‚ ÎµÎ¯Î½Î±Î¹ Î±Ï†Î±Î½ÎÏ‚. ÎœÏŒÎ½Î¿ Ï„Î± Î´Î·Î¼ÏŒÏƒÎ¹Î± Ï„Î¿Ï…Ï„ Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± Î±Î½Î±Î¶Î·Ï„Î·Î¸Î¿ÏÎ½ Î±Î½Î¬ hashtag.",
   "compose_form.lock_disclaimer": "ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ {locked}. ÎŸÏ€Î¿Î¹Î¿ÏƒÎ´Î®Ï€Î¿Ï„Îµ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹ Î³Î¹Î± Î½Î± Î´ÎµÎ¹ Ï„Î¹Ï‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÏƒÎ±Ï‚ Ï€ÏÎ¿Ï‚ Ï„Î¿Ï…Ï‚ Î±ÎºÎ¿Î»Î¿ÏÎ¸Î¿Ï…Ï‚ ÏƒÎ±Ï‚.",
   "compose_form.lock_disclaimer.lock": "ÎºÎ»ÎµÎ¹Î´Ï‰Î¼ÎÎ½Î¿Ï‚",
-  "compose_form.placeholder": "Î¤Î¹ ÎÏ‡ÎµÎ¹Ï‚ ÏƒÏ„Î¿ Î¼Ï…Î±Î»ÏŒ ÏƒÎ¿Ï…;",
+  "compose_form.placeholder": "Î¤Î¹ ÏƒÎºÎÏ†Ï„ÎµÏƒÎ±Î¹;",
   "compose_form.publish": "Î¤Î¿Ï…Ï„",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.marked": "Î¤Î¿ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ¿ ÎÏ‡ÎµÎ¹ ÏƒÎ·Î¼ÎµÎ¹Ï‰Î¸ÎµÎ¯ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿",
   "compose_form.sensitive.unmarked": "Î¤Î¿ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ¿ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÎ·Î¼ÎµÎ¹Ï‰Î¸ÎµÎ¯ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿",
   "compose_form.spoiler.marked": "ÎšÎµÎ¯Î¼ÎµÎ½Î¿ ÎºÏÏ…Î¼Î¼ÎÎ½Î¿ Ï€Î¯ÏƒÏ‰ Î±Ï€ÏŒ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
-  "compose_form.spoiler.unmarked": "ÎšÎµÎ¯Î¼ÎµÎ½Î¿ Î¼Î· ÎºÏÏ…Î¼Î¼ÎÎ½Î¿",
+  "compose_form.spoiler.unmarked": "ÎœÎ· ÎºÏÏ…Î¼Î¼ÎÎ½Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿",
   "compose_form.spoiler_placeholder": "Î“ÏÎ¬ÏˆÎµ Ï„Î·Î½ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ® ÏƒÎ¿Ï… ÎµÎ´ÏŽ",
   "confirmation_modal.cancel": "Î†ÎºÏ…ÏÎ¿",
   "confirmations.block.confirm": "Î‘Ï€ÏŒÎºÎ»ÎµÎ¹ÏƒÎµ",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Î‘Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·",
   "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};",
   "embed.instructions": "Î•Î½ÏƒÏ‰Î¼Î±Ï„ÏŽÏƒÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· ÏƒÏ„Î·Î½ Î¹ÏƒÏ„Î¿ÏƒÎµÎ»Î¯Î´Î± ÏƒÎ±Ï‚ Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Î¿Î½Ï„Î±Ï‚ Ï„Î¿Î½ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ ÎºÏŽÎ´Î¹ÎºÎ±.",
@@ -104,51 +113,96 @@
   "emoji_button.search_results": "Î‘Ï€Î¿Ï„ÎµÎ»ÎÏƒÎ¼Î±Ï„Î± Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
   "emoji_button.symbols": "Î£ÏÎ¼Î²Î¿Î»Î±",
   "emoji_button.travel": "Î¤Î±Î¾Î¯Î´Î¹Î± & Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯ÎµÏ‚",
+  "empty_column.account_timeline": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹ Ï„Î¿Ï…Ï„ ÎµÎ´ÏŽ!",
+  "empty_column.blocks": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Î±Ï€Î¿ÎºÎ»ÎµÎ¯ÏƒÎµÎ¹ ÎºÎ±Î½ÎÎ½Î±Î½ Ï‡ÏÎ®ÏƒÏ„Î· Î±ÎºÏŒÎ¼Î±.",
   "empty_column.community": "Î— Ï„Î¿Ï€Î¹ÎºÎ® ÏÎ¿Î® ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®. Î“ÏÎ¬ÏˆÎµ ÎºÎ¬Ï„Î¹ Î´Î·Î¼ÏŒÏƒÎ¹Î¿ Ï€Î±ÏÎ±Î¼ÏÎ¸Î¹ Î½' Î±ÏÏ‡Î¹Î½Î¯ÏƒÎµÎ¹!",
   "empty_column.direct": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¬ Î¼Î·Î½ÏÎ¼Î±Ï„Î± Î±ÎºÏŒÎ¼Î±. ÎŒÏ„Î±Î½ ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹Ï‚ Î® Î»Î¬Î²ÎµÎ¹Ï‚ ÎºÎ±Î½ÎÎ½Î±, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÎµÎ´ÏŽ.",
+  "empty_column.domain_blocks": "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ Î±Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Î¹ Ï„Î¿Î¼ÎµÎ¯Ï‚ Î±ÎºÏŒÎ¼Î±.",
+  "empty_column.favourited_statuses": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ ÎºÎ±Î½ÎÎ½Î± Î±Î³Î±Ï€Î·Î¼ÎÎ½Î¿ Ï„Î¿Ï…Ï„ Î±ÎºÏŒÎ¼Î±. ÎœÏŒÎ»Î¹Ï‚ Î±Î³Î±Ï€Î®ÏƒÎµÎ¹Ï‚ ÎºÎ¬Ï€Î¿Î¹Î¿, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÎµÎ´ÏŽ.",
+  "empty_column.favourites": "ÎšÎ±Î½ÎµÎ¯Ï‚ Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î±Î³Î±Ï€Î®ÏƒÎµÎ¹ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„ Î±ÎºÏŒÎ¼Î±. ÎœÏŒÎ»Î¹Ï‚ Ï„Î¿ ÎºÎ¬Î½ÎµÎ¹ ÎºÎ¬Ï€Î¿Î¹Î±, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ ÎµÎ´ÏŽ.",
+  "empty_column.follow_requests": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ ÎºÎ±Î½ÎÎ½Î± Î±Î¯Ï„Î·Î¼Î± Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚ Î±ÎºÏŒÎ¼Î±. ÎœÏŒÎ»Î¹Ï‚ Î»Î¬Î²ÎµÎ¹Ï‚ ÎºÎ¬Ï€Î¿Î¹Î¿, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÎµÎ´ÏŽ.",
   "empty_column.hashtag": "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î±ÎºÏŒÎ¼Î± ÎºÎ¬Ï„Î¹ Î³Î¹Î± Î±Ï…Ï„Î® Ï„Î·Î½ Ï„Î±Î¼Ï€ÎÎ»Î±.",
   "empty_column.home": "Î— Ï„Î¿Ï€Î¹ÎºÎ® ÏƒÎ¿Ï… ÏÎ¿Î® ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®! Î Î®Î³Î±Î¹Î½Îµ ÏƒÏ„Î¿ {public} Î® ÎºÎ¬Î½Îµ Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ· Î³Î¹Î± Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î½Î± Î³Î½Ï‰ÏÎ¯ÏƒÎµÎ¹Ï‚ Î¬Î»Î»Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚.",
   "empty_column.home.public_timeline": "Î· Î´Î·Î¼ÏŒÏƒÎ¹Î± ÏÎ¿Î®",
   "empty_column.list": "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÏƒÎµ Î±Ï…Ï„Î® Ï„Î· Î»Î¯ÏƒÏ„Î± Î±ÎºÏŒÎ¼Î±. ÎŒÏ„Î±Î½ Ï„Î± Î¼ÎÎ»Î· Ï„Î·Ï‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎ¿Ï…Î½ Î½ÎÎµÏ‚ ÎºÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ ÎµÎ´ÏŽ.",
+  "empty_column.lists": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ ÎºÎ±Î¼Î¯Î± Î»Î¯ÏƒÏ„Î± Î±ÎºÏŒÎ¼Î±. ÎœÏŒÎ»Î¹Ï‚ Ï†Ï„Î¹Î¬Î¾ÎµÎ¹Ï‚ Î¼Î¹Î±, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„ÎµÎ¯ ÎµÎ´ÏŽ.",
+  "empty_column.mutes": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Î±Ï€Î¿ÏƒÎ¹Ï‰Ï€Î®ÏƒÎµÎ¹ ÎºÎ±Î½ÎÎ½Î± Ï‡ÏÎ®ÏƒÏ„Î· Î±ÎºÏŒÎ¼Î±.",
   "empty_column.notifications": "Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Î±ÎºÏŒÎ¼Î±. Î‘Î»Î»Î·Î»ÎµÏ€Î¯Î´ÏÎ±ÏƒÎµ Î¼Îµ Î¬Î»Î»Î¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î³Î¹Î± Î½Î± Î¾ÎµÎºÎ¹Î½Î®ÏƒÎµÎ¹Ï‚ Ï„Î·Î½ ÎºÎ¿Ï…Î²ÎÎ½Ï„Î±.",
   "empty_column.public": "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ! Î“ÏÎ¬ÏˆÎµ ÎºÎ¬Ï„Î¹ Î´Î·Î¼ÏŒÏƒÎ¹Î¿, Î® Î±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎµ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î±Ï€ÏŒ Î¬Î»Î»Î± instances Î³Î¹Î± Î½Î± Ï„Î· Î³ÎµÎ¼Î¯ÏƒÎµÎ¹Ï‚",
   "follow_request.authorize": "Î•Î½ÎÎºÏÎ¹Î½Îµ",
   "follow_request.reject": "Î‘Ï€ÎÏÏÎ¹ÏˆÎµ",
-  "getting_started.developers": "Î ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¹ÏƒÏ„ÎÏ‚",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Î’ÏÎµÏ‚ Ï†Î¯Î»Î¿Ï…Ï‚/ÎµÏ‚ Î±Ï€ÏŒ Ï„Î¿ Twitter",
+  "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}",
+  "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": "Î’Î±ÏƒÎ¹ÎºÎ¬",
   "home.column_settings.show_reblogs": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÏ‰Î½",
   "home.column_settings.show_replies": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î±Ï€Î±Î½Ï„Î®ÏƒÎµÏ‰Î½",
-  "keyboard_shortcuts.back": "Î³Î¹Î± ÎµÏ€Î¹ÏƒÏ„ÏÎ¿Ï†Î® Ï€Î¯ÏƒÏ‰",
-  "keyboard_shortcuts.boost": "Î³Î¹Î± Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·",
-  "keyboard_shortcuts.column": "Î³Î¹Î± ÎµÏƒÏ„Î¯Î±ÏƒÎ· Î¼Î¹Î±Ï‚ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ ÏƒÎµ Î¼Î¹Î± Î±Ï€ÏŒ Ï„Î¹Ï‚ ÏƒÏ„Î®Î»ÎµÏ‚",
-  "keyboard_shortcuts.compose": "Î³Î¹Î± ÎµÏƒÏ„Î¯Î±ÏƒÎ· ÏƒÏ„Î·Î½ Ï€ÎµÏÎ¹Î¿Ï‡Î® ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï… ÏƒÏ…Î³Î³ÏÎ±Ï†Î®Ï‚",
-  "keyboard_shortcuts.description": "Description",
-  "keyboard_shortcuts.down": "Î³Î¹Î± ÎºÎ¯Î½Î·ÏƒÎ· Ï€ÏÎ¿Ï‚ Ï„Î± ÎºÎ¬Ï„Ï‰ ÏƒÏ„Î· Î»Î¯ÏƒÏ„Î±",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "Î³Î¹Î± ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ· Î±Î³Î±Ï€Î·Î¼ÎÎ½Î¿Ï…",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "introduction.federation.action": "Î•Ï€ÏŒÎ¼ÎµÎ½Î¿",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "ÎŸÎ¹ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ Î±Î½Î±ÏÏ„Î®ÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ Î¬Î»Î»Î¿Ï…Ï‚ ÎºÏŒÎ¼Î²Î¿Ï…Ï‚ Ï„Î¿Ï… fediverse Î¸Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶Î¿Î½Ï„Î±Î¹ ÏƒÏ„Î·Î½ Î¿Î¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÎ® ÏÎ¿Î®.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "ÎŸÎ¹ Î±Î½Î±ÏÏ„Î®ÏƒÎµÎ¹Ï‚ ÏŒÏƒÏ‰Î½ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ Î¸Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶Î¿Î½Ï„Î±Î¹ ÏƒÏ„Î·Î½ Î±ÏÏ‡Î¹ÎºÎ® ÏÎ¿Î®. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚ ÏŒÏ€Î¿Î¹Î¿Î½ Î¸ÎÎ»ÎµÎ¹Ï‚ ÏƒÎµ Î¿Ï€Î¿Î¹Î¿Î½Î´Î®Ï€Î¿Ï„Îµ ÎºÏŒÎ¼Î²Î¿!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "ÎŸÎ¹ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ Î±Î½Î±ÏÏ„Î®ÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ Î¬Ï„Î¿Î¼Î± ÏƒÏ„Î¿Î½ Î¯Î´Î¹Î¿ ÎºÏŒÎ¼Î²Î¿ Î¼Îµ ÎµÏƒÎÎ½Î± Î¸Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶Î¿Î½Ï„Î±Î¹ ÏƒÏ„Î·Î½ Ï„Î¿Ï€Î¹ÎºÎ® ÏÎ¿Î®.",
+  "introduction.interactions.action": "Î¤ÎÎ»Î¿Ï‚ Î¼Î±Î¸Î®Î¼Î±Ï„Î¿Ï‚!",
+  "introduction.interactions.favourite.headline": "Î‘Î³Î±Ï€Î·Î¼ÎÎ½Î¿",
+  "introduction.interactions.favourite.text": "Î¦ÏÎ»Î±Î¾Îµ ÎÎ½Î± Ï„Î¿Ï…Ï„ Î³Î¹Î± Î±ÏÎ³ÏŒÏ„ÎµÏÎ± ÎºÎ±Î¹ Î½Î± ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î¿Î½ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³ÏŒ Ï„Î¿Ï… ÏŒÏ„Î¹ ÏƒÎ¿Ï… Î¬ÏÎµÏƒÎµ ÏƒÎ·Î¼ÎµÎ¹ÏŽÎ½Î¿Î½Ï„Î±Ï‚ Ï„Î¿ Ï‰Ï‚ Î±Î³Î±Ï€Î·Î¼ÎÎ½Î¿.",
+  "introduction.interactions.reblog.headline": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·",
+  "introduction.interactions.reblog.text": "ÎœÎ¿Î¹ÏÎ¬ÏƒÎ¿Ï… Ï„Î¿Ï…Ï„ Î¬Î»Î»Ï‰Î½ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ Î¼Îµ ÏŒÏƒÎ¿Ï…Ï‚ ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Ï€ÏÎ¿Ï‰Î¸ÏŽÎ½Ï„Î±Ï‚ Ï„Î±.",
+  "introduction.interactions.reply.headline": "Î‘Ï€Î¬Î½Ï„Î·ÏƒÎ·",
+  "introduction.interactions.reply.text": "ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ„Î± Ï„Î¿Ï…Ï„ Î¬Î»Î»Ï‰Î½ Î±Î»Î»Î¬ Î±ÎºÏŒÎ¼Î± ÎºÎ±Î¹ ÏƒÏ„Î± Î´Î¹ÎºÎ¬ ÏƒÎ¿Ï…, Î´ÎÎ½Î¿Î½Ï„Î±Ï‚ Ï„Î± ÏŒÎ»Î± Î¼Î±Î¶Î¯ ÏƒÎµ Î¼Î¹Î± ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·.",
+  "introduction.welcome.action": "Î‘Ï‚ Î¾ÎµÎºÎ¹Î½Î®ÏƒÎ¿Ï…Î¼Îµ!",
+  "introduction.welcome.headline": "Î ÏÏŽÏ„Î± Î²Î®Î¼Î±Ï„Î±",
+  "introduction.welcome.text": "ÎšÎ±Î»ÏŽÏ‚ Î®ÏÎ¸ÎµÏ‚ ÏƒÏ„Î¿ fediverse! Î£Îµ Ï€Î¿Î»Ï Î»Î¯Î³Î¿ Î¸Î± Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÏƒÏ„ÎÎ»Î½ÎµÎ¹Ï‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î½Î± Î¼Î¹Î»Î¬Ï‚ Î¼Îµ Ï„Î¿Ï…Ï‚ Ï†Î¯Î»Î¿Ï…Ï‚ ÏƒÎ¿Ï… ÏƒÎµ Ï€Î¿Î»Î»Î¿ÏÏ‚, Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÎ¿ÏÏ‚ ÎºÏŒÎ¼Î²Î¿Ï…Ï‚. ÎŸ ÎºÏŒÎ¼Î²Î¿Ï‚ {domain} ÏŒÎ¼Ï‰Ï‚ ÎµÎ¯Î½Î±Î¹ Î¾ÎµÏ‡Ï‰ÏÎ¹ÏƒÏ„ÏŒÏ‚ â€” Ï†Î¹Î»Î¿Î¾ÎµÎ½ÎµÎ¯ Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…, Î³Î¹Î± Î±Ï…Ï„ÏŒ Î¼Î± Î¸Ï…Î¼Î¬ÏƒÎ±Î¹ Ï„Î¿ ÏŒÎ½Î¿Î¼Î¬ Ï„Î¿Ï….",
+  "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.mention": "Î³Î¹Î± Î½Î± Î±Î½Î±Ï†ÎÏÎµÎ¹Ï‚ Ï„Î¿ ÏƒÏ…Î³Î³ÏÎ±Ï†ÎÎ±",
-  "keyboard_shortcuts.reply": "Î³Î¹Î± Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·",
-  "keyboard_shortcuts.search": "Î³Î¹Î± ÎµÏƒÏ„Î¯Î±ÏƒÎ· Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
-  "keyboard_shortcuts.toggle_hidden": "Î³Î¹Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·/Î±Ï€ÏŒÎºÏÏ…ÏˆÎ· ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï… Ï€Î¯ÏƒÏ‰ Î±Ï€ÏŒ Ï„Î·Î½ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
-  "keyboard_shortcuts.toot": "Î³Î¹Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î¿Î»Î¿ÎºÎ±Î¯Î½Î¿Ï…ÏÎ¹Î¿Ï… Ï„Î¿Ï…Ï„",
-  "keyboard_shortcuts.unfocus": "Î³Î¹Î± Ï„Î·Î½ Î±Ï€Î¿-ÎµÏƒÏ„Î¯Î±ÏƒÎ· Ï„Î¿Ï… Ï€ÎµÎ´Î¯Î¿Ï… ÏƒÏÎ½Î¸ÎµÏƒÎ·Ï‚/Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
-  "keyboard_shortcuts.up": "Î½Î± ÎºÎ¹Î½Î·Î¸ÎµÎ¯Ï‚ Ï€ÏÎ¿Ï‚ Ï„Î·Î½ ÎºÎ¿ÏÏ…Ï†Î® Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚",
-  "lightbox.close": "ÎšÎ»ÎµÎ¯ÏƒÎµ",
+  "keyboard_shortcuts.legend": "ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Î¿Î´Î·Î³Î¿Ï",
+  "keyboard_shortcuts.local": "Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï€Î¹ÎºÎ®Ï‚ ÏÎ¿Î®Ï‚",
+  "keyboard_shortcuts.mention": "Î±Î½Î±Ï†Î¿ÏÎ¬ Ï€ÏÎ¿Ï‚ ÏƒÏ…Î³Î³ÏÎ±Ï†ÎÎ±",
+  "keyboard_shortcuts.muted": "Î¬Î½Î¿Î¹Î³Î¼Î± Î»Î¯ÏƒÏ„Î±Ï‚ Î±Ï€Î¿ÏƒÎ¹Ï‰Ï€Î·Î¼ÎµÎ½Ï‰Î½ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½",
+  "keyboard_shortcuts.my_profile": "Î¬Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï…",
+  "keyboard_shortcuts.notifications": "Î¬Î½Î¿Î¹Î³Î¼Î± ÏƒÏ„Î®Î»Î·Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½",
+  "keyboard_shortcuts.pinned": "Î¬Î½Î¿Î¹Î³Î¼Î± Î»Î¯ÏƒÏ„Î±Ï‚ ÎºÎ±ÏÏ†Î¹Ï„ÏƒÏ‰Î¼ÎÎ½Ï‰Î½ Ï„Î¿Ï…Ï„",
+  "keyboard_shortcuts.profile": "Î¬Î½Î¿Î¹Î³Î¼Î± Ï€ÏÎ¿Ï†Î¯Î» ÏƒÏ…Î³Î³ÏÎ±Ï†ÎÎ±",
+  "keyboard_shortcuts.reply": "Î±Ï€Î¬Î½Ï„Î·ÏƒÎ·",
+  "keyboard_shortcuts.requests": "Î¬Î½Î¿Î¹Î³Î¼Î± Î»Î¯ÏƒÏ„Î±Ï‚ Î±Î¹Ï„Î·Î¼Î¬Ï„Ï‰Î½ Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚",
+  "keyboard_shortcuts.search": "ÎµÏƒÏ„Î¯Î±ÏƒÎ· Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
+  "keyboard_shortcuts.start": "Î¬Î½Î¿Î¹Î³Î¼Î± ÎºÎ¿Î»ÏŽÎ½Î±Ï‚ \"ÎžÎµÎºÎ¹Î½ÏŽÎ½Ï„Î±Ï‚\"",
+  "keyboard_shortcuts.toggle_hidden": "ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·/Î±Ï€ÏŒÎºÏÏ…ÏˆÎ· ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï… Ï€Î¯ÏƒÏ‰ Î±Ï€ÏŒ Ï„Î·Î½ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
+  "keyboard_shortcuts.toot": "Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± Î½ÎÎ¿Ï… Ï„Î¿Ï…Ï„",
+  "keyboard_shortcuts.unfocus": "Î±Ï€Î¿-ÎµÏƒÏ„Î¯Î±ÏƒÎ· Ï„Î¿Ï… Ï€ÎµÎ´Î¯Î¿Ï… ÏƒÏÎ½Î¸ÎµÏƒÎ·Ï‚/Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
+  "keyboard_shortcuts.up": "ÎºÎ¯Î½Î·ÏƒÎ· Ï€ÏÎ¿Ï‚ Ï„Î·Î½ ÎºÎ¿ÏÏ…Ï†Î® Ï„Î·Ï‚ Î»Î¯ÏƒÏ„Î±Ï‚",
+  "lightbox.close": "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿",
   "lightbox.next": "Î•Ï€ÏŒÎ¼ÎµÎ½Î¿",
   "lightbox.previous": "Î ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿",
   "lists.account.add": "Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ ÏƒÏ„Î· Î»Î¯ÏƒÏ„Î±",
   "lists.account.remove": "Î’Î³Î¬Î»Îµ Î±Ï€ÏŒ Ï„Î· Î»Î¯ÏƒÏ„Î±",
-  "lists.delete": "Delete list",
+  "lists.delete": "Î”Î¹Î±Î³ÏÎ±Ï†Î® Î»Î¯ÏƒÏ„Î±Ï‚",
   "lists.edit": "Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î± Î»Î¯ÏƒÏ„Î±Ï‚",
   "lists.new.create": "Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î»Î¯ÏƒÏ„Î±Ï‚",
   "lists.new.title_placeholder": "Î¤Î¯Ï„Î»Î¿Ï‚ Î½ÎÎ±Ï‚ Î»Î¯ÏƒÏ„Î±",
@@ -159,21 +213,23 @@
   "missing_indicator.label": "Î”Îµ Î²ÏÎÎ¸Î·ÎºÎµ",
   "missing_indicator.sublabel": "Î‘Î´ÏÎ½Î±Ï„Î· Î· ÎµÏÏÎµÏƒÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€ÏŒÏÎ¿Ï…",
   "mute_modal.hide_notifications": "Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·;",
+  "navigation_bar.apps": "Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚ Ï†Î¿ÏÎ·Ï„ÏŽÎ½ ÏƒÏ…ÏƒÎºÎµÏ…ÏŽÎ½",
   "navigation_bar.blocks": "Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚",
   "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": "Muted words",
+  "navigation_bar.filters": "Î‘Ï€Î¿ÏƒÎ¹Ï‰Ï€Î·Î¼ÎÎ½ÎµÏ‚ Î»ÎÎ¾ÎµÎ¹Ï‚",
   "navigation_bar.follow_requests": "Î‘Î¹Ï„Î®Î¼Î±Ï„Î± Î±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚",
-  "navigation_bar.info": "Extended information",
+  "navigation_bar.info": "Î Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ ÎºÏŒÎ¼Î²Î¿Ï…",
   "navigation_bar.keyboard_shortcuts": "Î£Ï…Î½Ï„Î¿Î¼ÎµÏÏƒÎµÎ¹Ï‚",
   "navigation_bar.lists": "Î›Î¯ÏƒÏ„ÎµÏ‚",
   "navigation_bar.logout": "Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·",
   "navigation_bar.mutes": "Î‘Ï€Î¿ÏƒÎ¹Ï‰Ï€Î·Î¼ÎÎ½Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¬",
   "navigation_bar.pins": "ÎšÎ±ÏÏ†Î¹Ï„ÏƒÏ‰Î¼ÎÎ½Î± Ï„Î¿Ï…Ï„",
   "navigation_bar.preferences": "Î ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÎ¹Ï‚",
   "navigation_bar.public_timeline": "ÎŸÎ¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÎ® ÏÎ¿Î®",
@@ -186,35 +242,21 @@
   "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.mention": "Î‘Î½Î±Ï†Î¿ÏÎÏ‚:",
   "notifications.column_settings.push": "Î†Î¼ÎµÏƒÎµÏ‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚",
-  "notifications.column_settings.push_meta": "Î‘Ï…Ï„Î® Î· ÏƒÏ…ÏƒÎºÎµÏ…Î®",
   "notifications.column_settings.reblog": "Î ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚:",
   "notifications.column_settings.show": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎµ ÏƒÎµ ÏƒÏ„Î®Î»Î·",
   "notifications.column_settings.sound": "Î—Ï‡Î·Ï„Î¹ÎºÎ® ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·",
+  "notifications.filter.all": "ÎŒÎ»ÎµÏ‚",
+  "notifications.filter.boosts": "Î ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚",
+  "notifications.filter.favourites": "Î‘Î³Î±Ï€Î·Î¼ÎÎ½Î±",
+  "notifications.filter.follows": "Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹",
+  "notifications.filter.mentions": "Î‘Î½Î±Ï†Î¿ÏÎÏ‚",
   "notifications.group": "{count} ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚",
-  "onboarding.done": "ÎˆÎ³Î¹Î½Îµ",
-  "onboarding.next": "Î•Ï€ÏŒÎ¼ÎµÎ½Î¿",
-  "onboarding.page_five.public_timelines": "Î— Ï„Î¿Ï€Î¹ÎºÎ® ÏÎ¿Î® Î´ÎµÎ¯Ï‡Î½ÎµÎ¹ Ï„Î¹Ï‚ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ ÏŒÏƒÎ¿Ï…Ï‚ ÎµÎ´ÏÎµÏÎ¿Ï…Î½ ÏƒÏ„Î¿Î½ ÎºÏŒÎ¼Î²Î¿ {domain}. Î— Î¿Î¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÎ® ÏÎ¿Î® Î´ÎµÎ¯Ï‡Î½ÎµÎ¹ Ï„Î¹Ï‚ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÎµÎºÎµÎ¯Î½Ï‰Î½ Ï€Î¿Ï… Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Ï„Î¿Ï… {domain} Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½. Î‘Ï…Ï„ÎÏ‚ Î¿Î¹ ÎµÎ¯Î½Î±Î¹ Î”Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ Î¡Î¿ÎÏ‚, ÎÎ½Î±Ï‚ Ï‰ÏÎ±Î¯Î¿Ï‚ Ï„ÏÏŒÏ€Î¿Ï‚ Î½Î± Î±Î½Î±ÎºÎ±Î»ÏÏˆÎµÎ¹Ï‚ ÎºÎ±Î¹Î½Î¿ÏÏÎ¹Î¿Ï…Ï‚ Î±Î½Î¸ÏÏŽÏ€Î¿Ï…Ï‚.",
-  "onboarding.page_four.home": "Î— Î±ÏÏ‡Î¹ÎºÎ® ÏÎ¿Î® Î´ÎµÎ¯Ï‡Î½ÎµÎ¹ ÎºÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ Î±Î½Î¸ÏÏŽÏ€Î¿Ï…Ï‚ Ï€Î¿Ï… Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚.",
-  "onboarding.page_four.notifications": "Î— ÏƒÏ„Î®Î»Î· ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ Î´ÎµÎ¯Ï‡Î½ÎµÎ¹ Ï€ÏŒÏ„Îµ ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ Î±Î»Î»Î·Î»ÎµÏ€Î¹Î´ÏÎ¬ÎµÎ¹ Î¼Î±Î¶Î¯ ÏƒÎ¿Ï….",
-  "onboarding.page_one.federation": "Î¤Î¿ Mastodon ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± Î´Î¯ÎºÏ„Ï…Î¿ Î±Î½ÎµÎ¾Î¬ÏÏ„Î·Ï„Ï‰Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÏŽÎ½ (servers) Ï€Î¿Ï… ÏƒÏ…Î½ÎµÏÎ³Î¬Î¶Î¿Î½Ï„Î±Î¹ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³ÏŽÎ½Ï„Î±Ï‚ ÎÎ½Î± Î¼ÎµÎ³Î±Î»ÏÏ„ÎµÏÎ¿ ÎºÎ¿Î¹Î½Ï‰Î½Î¹ÎºÏŒ Î´Î¯ÎºÏ„Ï…Î¿. Î¤Î¿Ï…Ï‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚ Î±Ï…Ï„Î¿ÏÏ‚ Ï„Î¿Ï…Ï‚ Î»ÎÎ¼Îµ ÎºÏŒÎ¼Î²Î¿Ï…Ï‚.",
-  "onboarding.page_one.full_handle": "Î¤Î¿ Ï€Î»Î®ÏÎµÏ‚ Î±Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ ÏƒÎ¿Ï…",
-  "onboarding.page_one.handle_hint": "Î‘Ï…Ï„ÏŒ ÎµÎ¯Î½Î±Î¹ Ï€Î¿Ï… Î¸Î± Ï€ÎµÎ¹Ï‚ ÏƒÏ„Î¿Ï…Ï‚ Ï†Î¯Î»Î¿Ï…Ï‚ & Ï†Î¯Î»ÎµÏ‚ ÏƒÎ¿Ï… Î½Î± ÏˆÎ¬Î¾Î¿Ï…Î½.",
-  "onboarding.page_one.welcome": "ÎšÎ±Î»ÏŽÏ‚ ÏŒÏÎ¹ÏƒÎµÏ‚ ÏƒÏ„Î¿ Mastodon!",
-  "onboarding.page_six.admin": "ÎŸ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï… ÏƒÎ¿Ï… ÎµÎ¯Î½Î±Î¹ Î¿/Î· {admin}.",
-  "onboarding.page_six.almost_done": "Î£Ï‡ÎµÎ´ÏŒÎ½ ÎÏ„Î¿Î¹Î¼Î¿Î¹...",
-  "onboarding.page_six.appetoot": "ÎšÎ±Î»Î¬ Ï„Î¿Ï…Ï„!",
-  "onboarding.page_six.apps_available": "Î¥Ï€Î¬ÏÏ‡Î¿Ï…Î½ {apps} Î³Î¹Î± iOS, Android ÎºÎ±Î¹ Î¬Î»Î»ÎµÏ‚ Ï€Î»Î±Ï„Ï†ÏŒÏÎ¼ÎµÏ‚.",
-  "onboarding.page_six.github": "Î¤Î¿ Mastodon ÎµÎ¯Î½Î±Î¹ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒ. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±Î½Î±Ï†ÎÏÎµÎ¹Ï‚ ÏƒÏ†Î¬Î»Î¼Î±Ï„Î±, Î½Î± Î±Î¹Ï„Î·Î¸ÎµÎ¯Ï‚ Î½ÎÎµÏ‚ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯ÎµÏ‚ Î® Î½Î± ÏƒÏ…Î½ÎµÎ¹ÏƒÏ†ÎÏÎµÎ¹Ï‚ ÎºÏŽÎ´Î¹ÎºÎ± ÏƒÏ„Î¿ {github}.",
-  "onboarding.page_six.guidelines": "Î¿Î´Î·Î³Î¯ÎµÏ‚ ÎºÎ¿Î¹Î½ÏŒÏ„Î·Ï„Î±Ï‚",
-  "onboarding.page_six.read_guidelines": "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î´Î¹Î¬Î²Î±ÏƒÎµ Ï„Î¹Ï‚ {guidelines} Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï… {domain}!",
-  "onboarding.page_six.various_app": "ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ ÎºÎ¹Î½Î·Ï„ÏŽÎ½",
-  "onboarding.page_three.profile": "Î•Ï€ÎµÎ¾ÎµÏÎ³Î¬ÏƒÎ¿Ï… Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï… Î³Î¹Î± Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹Ï‚ Ï„Î·Î½ ÎµÎ¹ÎºÏŒÎ½Î± ÏƒÎ¿Ï…, Ï„Î¿ Î²Î¹Î¿Î³ÏÎ±Ï†Î¹ÎºÏŒ ÏƒÎ¿Ï… ÎºÎ±Î¹ Ï„Î¿ ÎµÎ¼Ï†Î±Î½Î¹Î¶ÏŒÎ¼ÎµÎ½Î¿ ÏŒÎ½Î¿Î¼Î¬ ÏƒÎ¿Ï…. Î•ÎºÎµÎ¯ Î¸Î± Î²ÏÎµÎ¹Ï‚ ÎµÏ€Î¯ÏƒÎ·Ï‚ ÎºÎ¹ Î¬Î»Î»ÎµÏ‚ Ï€ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÎ¹Ï‚.",
-  "onboarding.page_three.search": "Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î·Î½ Î¼Ï€Î¬ÏÎ± Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·Ï‚ Î³Î¹Î± Î½Î± Î²ÏÎµÎ¹Ï‚ Î±Î½Î¸ÏÏŽÏ€Î¿Ï…Ï‚ ÎºÎ±Î¹ Î½Î± Î´ÎµÎ¹Ï‚ Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚ ÏŒÏ€Ï‰Ï‚ Î³Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î± {illustration} ÎºÎ±Î¹ {introductions}. Î“Î¹Î± Î½Î± ÏˆÎ¬Î¾ÎµÎ¹Ï‚ ÎºÎ¬Ï€Î¿Î¹Î¿Î½ Î® ÎºÎ¬Ï€Î¿Î¹Î± Ï€Î¿Ï… Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÎºÏŒÎ¼Î²Î¿, Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î¿ Ï€Î»Î®ÏÎµÏ‚ Î±Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ Ï„Î¿Ï…Ï‚.",
-  "onboarding.page_two.compose": "Î“ÏÎ¬ÏˆÎµ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÏƒÏ„Î·Î½ ÎºÎ¿Î»ÏŽÎ½Î± ÏƒÏ…Î³Î³ÏÎ±Ï†Î®Ï‚. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±Î½ÎµÎ²Î¬ÏƒÎµÎ¹Ï‚ ÎµÎ¹ÎºÏŒÎ½ÎµÏ‚, Î½Î± Î±Î»Î»Î¬Î¾ÎµÎ¹Ï‚ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î¹Î´Î¹Ï‰Ï„Î¹ÎºÏŒÏ„Î·Ï„Î±Ï‚ ÎºÎ±Î¹ Î½Î± Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÎµÎ¹Ï‚ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï… Î¼Îµ Ï„Î± Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î±.",
-  "onboarding.skip": "Î Î±ÏÎ¬Î»Î·ÏˆÎ·",
   "privacy.change": "Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿Î³Î® Î¹Î´Î¹Ï‰Ï„Î¹ÎºÏŒÏ„Î·Ï„Î±Ï‚ Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ·Ï‚",
   "privacy.direct.long": "Î”Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ· Î¼ÏŒÎ½Î¿ ÏƒÎµ ÏŒÏƒÎ¿Ï…Ï‚ ÎºÎ±Î¹ ÏŒÏƒÎµÏ‚ Î±Î½Î±Ï†ÎÏÎ¿Î½Ï„Î±Î¹",
   "privacy.direct.short": "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¬",
@@ -222,15 +264,15 @@
   "privacy.private.short": "ÎœÏŒÎ½Î¿ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹",
   "privacy.public.long": "Î”Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎµ ÏƒÏ„Î¹Ï‚ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ ÏÎ¿ÎÏ‚",
   "privacy.public.short": "Î”Î·Î¼ÏŒÏƒÎ¹Î¿",
-  "privacy.unlisted.long": "Do not show in public timelines",
+  "privacy.unlisted.long": "ÎœÎ·Î½ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÏƒÏ„Î¹Ï‚ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ ÏÎ¿ÎÏ‚",
   "privacy.unlisted.short": "ÎœÎ· ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î±",
   "regeneration_indicator.label": "Î¦Î¿ÏÏ„ÏŽÎ½ÎµÎ¹â€¦",
   "regeneration_indicator.sublabel": "Î— Î±ÏÏ‡Î¹ÎºÎ® ÏƒÎ¿Ï… ÏÎ¿Î® ÎµÏ„Î¿Î¹Î¼Î¬Î¶ÎµÏ„Î±Î¹!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "relative_time.days": "{number}Î·",
+  "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}Î´",
   "reply_indicator.cancel": "Î†ÎºÏ…ÏÎ¿",
   "report.forward": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎ· Ï€ÏÎ¿Ï‚ {target}",
   "report.forward_hint": "ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÎµÎ¯Î½Î±Î¹ Î±Ï€ÏŒ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÏŒ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®. ÎÎ± ÏƒÏ„Î±Î»ÎµÎ¯ Î±Î½ÏŽÎ½Ï…Î¼Î¿ Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î¿ Ï„Î·Ï‚ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±Ï‚ ÎºÎ¹ ÎµÎºÎµÎ¯;",
@@ -242,18 +284,21 @@
   "search_popout.search_format": "Î ÏÎ¿Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î· Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ·",
   "search_popout.tips.full_text": "Î‘Ï€Î»ÏŒ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Ï€Î¿Ï… ÎµÏ€Î¹ÏƒÏ„ÏÎÏ†ÎµÎ¹ ÎºÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚ Ï€Î¿Ï… ÎÏ‡ÎµÎ¹Ï‚ Î³ÏÎ¬ÏˆÎµÎ¹, ÏƒÎ·Î¼ÎµÎ¹ÏŽÏƒÎµÎ¹ Ï‰Ï‚ Î±Î³Î±Ï€Î·Î¼ÎÎ½ÎµÏ‚, Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹ Î® ÎÏ‡ÎµÎ¹Ï‚ Î±Î½Î±Ï†ÎµÏÎ¸ÎµÎ¯ ÏƒÎµ Î±Ï…Ï„ÎÏ‚, ÎºÎ±Î¸ÏŽÏ‚ ÎºÎ±Î¹ ÏŒÏƒÎ± Î¿Î½ÏŒÎ¼Î±Ï„Î± Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ÎºÎ±Î¹ Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚ Ï„Î±Î¹ÏÎ¹Î¬Î¶Î¿Ï…Î½.",
   "search_popout.tips.hashtag": "Ï„Î±Î¼Ï€ÎÎ»Î±",
-  "search_popout.tips.status": "status",
-  "search_popout.tips.text": "Î‘Ï€Î»ÏŒ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Ï€Î¿Ï… ÎµÏ€Î¹ÏƒÏ„ÏÎÏ†ÎµÎ¹ Ï„Î±Î¹ÏÎ¹Î±ÏƒÏ„Î¬ Î¿Î½ÏŒÎ¼Î±Ï„Î± ÎºÎ±Î¹ Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚",
+  "search_popout.tips.status": "ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·",
+  "search_popout.tips.text": "Î‘Ï€Î»ÏŒ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Ï€Î¿Ï… ÎµÏ€Î¹ÏƒÏ„ÏÎÏ†ÎµÎ¹ Î¿Î½ÏŒÎ¼Î±Ï„Î± ÎºÎ±Î¹ Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚ Ï€Î¿Ï… Ï„Î±Î¹ÏÎ¹Î¬Î¶Î¿Ï…Î½",
   "search_popout.tips.user": "Ï‡ÏÎ®ÏƒÏ„Î·Ï‚",
   "search_results.accounts": "Î†Î½Î¸ÏÏ‰Ï€Î¿Î¹",
   "search_results.hashtags": "Î¤Î±Î¼Ï€ÎÎ»ÎµÏ‚",
   "search_results.statuses": "Î¤Î¿Ï…Ï„",
-  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "search_results.total": "{count, number} {count, plural, ÎÎ½Î± {result} Ï…Ï€ÏŒÎ»Î¿Î¹Ï€Î± {results}}",
   "standalone.public_title": "ÎœÎ¹Î± Ï€ÏÏŽÏ„Î· Î³ÎµÏÏƒÎ·...",
-  "status.block": "Block @{name}",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÏŒÏ‚ @{name}",
   "status.cancel_reblog_private": "Î‘ÎºÏÏÏ‰ÏƒÎµ Ï„Î·Î½ Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·",
   "status.cannot_reblog": "Î‘Ï…Ï„Î® Î· Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ· Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€ÏÎ¿Ï‰Î¸Î·Î¸ÎµÎ¯",
   "status.delete": "Î”Î¹Î±Î³ÏÎ±Ï†Î®",
+  "status.detailed_status": "Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏ€Ï„Î¿Î¼ÎµÏÎµÎ¹ÏŽÎ½ ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
   "status.direct": "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÏŒ Î¼Î®Î½Ï…Î¼Î± Ï€ÏÎ¿Ï‚ @{name}",
   "status.embed": "Î•Î½ÏƒÏ‰Î¼Î¬Ï„Ï‰ÏƒÎµ",
   "status.favourite": "Î£Î·Î¼ÎµÎ¯Ï‰ÏƒÎµ Ï‰Ï‚ Î±Î³Î±Ï€Î·Î¼ÎÎ½Î¿",
@@ -267,13 +312,15 @@
   "status.open": "Î”Î¹ÎµÏÏÏ…Î½Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·",
   "status.pin": "ÎšÎ±ÏÏ†Î¯Ï„ÏƒÏ‰ÏƒÎµ ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
   "status.pinned": "ÎšÎ±ÏÏ†Î¹Ï„ÏƒÏ‰Î¼ÎÎ½Î¿ Ï„Î¿Ï…Ï„",
+  "status.read_more": "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±",
   "status.reblog": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ",
   "status.reblog_private": "Î ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ ÏƒÏ„Î¿Ï…Ï‚ Î±ÏÏ‡Î¹ÎºÎ¿ÏÏ‚ Ï€Î±ÏÎ±Î»Î®Ï€Ï„ÎµÏ‚",
   "status.reblogged_by": "{name} Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ",
+  "status.reblogs.empty": "ÎšÎ±Î½ÎµÎ¯Ï‚ Î´ÎµÎ½ Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„ Î±ÎºÏŒÎ¼Î±. ÎœÏŒÎ»Î¹Ï‚ Ï„Î¿ ÎºÎ¬Î½ÎµÎ¹ ÎºÎ¬Ï€Î¿Î¹Î±, Î¸Î± ÎµÎ¼Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ ÎµÎ´ÏŽ.",
   "status.redraft": "Î£Î²Î®ÏƒÎµ & Î¾Î±Î½Î±Î³ÏÎ¬ÏˆÎµ",
   "status.reply": "Î‘Ï€Î¬Î½Ï„Î·ÏƒÎµ",
   "status.replyAll": "Î‘Ï€Î¬Î½Ï„Î·ÏƒÎµ ÏƒÏ„Î·Î½ ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·",
-  "status.report": "ÎšÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î± @{name}",
+  "status.report": "ÎšÎ±Ï„Î¬Î³Î³ÎµÎ¹Î»Îµ @{name}",
   "status.sensitive_toggle": "ÎšÎ»Î¹Îº Î³Î¹Î± Î½Î± Î´ÎµÎ¹Ï‚",
   "status.sensitive_warning": "Î•Ï…Î±Î¯ÏƒÎ¸Î·Ï„Î¿ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿",
   "status.share": "ÎœÎ¿Î¹ÏÎ¬ÏƒÎ¿Ï…",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Î”ÎµÎ¯Î¾Îµ Î»Î¹Î³ÏŒÏ„ÎµÏÎ± Î³Î¹Î± ÏŒÎ»Î±",
   "status.show_more": "Î”ÎµÎ¯Î¾Îµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±",
   "status.show_more_all": "Î”ÎµÎ¯Î¾Îµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Î³Î¹Î± ÏŒÎ»Î±",
+  "status.show_thread": "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î½Î®Î¼Î±Ï„Î¿Ï‚",
   "status.unmute_conversation": "Î”Î¹ÎÎºÎ¿ÏˆÎµ Ï„Î·Î½ Î±Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ· Ï„Î·Ï‚ ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·Ï‚",
   "status.unpin": "ÎžÎµÎºÎ±ÏÏ†Î¯Ï„ÏƒÏ‰ÏƒÎµ Î±Ï€ÏŒ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î»",
+  "suggestions.dismiss": "Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Ï€ÏÏŒÏ„Î±ÏƒÎ·Ï‚",
+  "suggestions.header": "ÎŠÏƒÏ‰Ï‚ Î½Î± ÎµÎ½Î´Î¹Î±Ï†ÎÏÎµÏƒÎ±Î¹ Î³Î¹Î±â€¦",
   "tabs_bar.federated_timeline": "ÎŸÎ¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÎ®",
   "tabs_bar.home": "Î‘ÏÏ‡Î¹ÎºÎ®",
   "tabs_bar.local_timeline": "Î¤Î¿Ï€Î¹ÎºÎ¬",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} Î¼Î¹Î»Î¬Î½Îµ",
   "ui.beforeunload": "Î¤Î¿ Ï€ÏÎ¿ÏƒÏ‡ÎÎ´Î¹ÏŒ ÏƒÎ¿Ï… Î¸Î± Ï‡Î±Î¸ÎµÎ¯ Î±Î½ Ï†ÏÎ³ÎµÎ¹Ï‚ Î±Ï€ÏŒ Ï„Î¿ Mastodon.",
   "upload_area.title": "Drag & drop Î³Î¹Î± Î½Î± Î±Î½ÎµÎ²Î¬ÏƒÎµÎ¹Ï‚",
-  "upload_button.label": "Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±",
+  "upload_button.label": "Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ± (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Î ÎµÏÎ¹ÎÎ³ÏÎ±ÏˆÎµ Î³Î¹Î± ÏŒÏƒÎ¿Ï…Ï‚ & ÏŒÏƒÎµÏ‚ ÎÏ‡Î¿Ï…Î½ Ï€ÏÎ¿Î²Î»Î®Î¼Î±Ï„Î± ÏŒÏÎ±ÏƒÎ·Ï‚",
-  "upload_form.focus": "Î ÎµÏÎ¹ÎºÎ¿Ï€Î®",
+  "upload_form.focus": "Î‘Î»Î»Î±Î³Î® Ï€ÏÎ¿ÎµÏ€Î¹ÏƒÎºÏŒÏ€Î·ÏƒÎ·Ï‚",
   "upload_form.undo": "Î”Î¹Î±Î³ÏÎ±Ï†Î®",
   "upload_progress.label": "Î‘Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹...",
   "video.close": "ÎšÎ»ÎµÎ¯ÏƒÎµ Ï„Î¿ Î²Î¯Î½Ï„ÎµÎ¿",
@@ -302,7 +352,7 @@
   "video.fullscreen": "Î Î»Î®ÏÎ·Ï‚ Î¿Î¸ÏŒÎ½Î·",
   "video.hide": "ÎšÏÏÏˆÎµ Î²Î¯Î½Ï„ÎµÎ¿",
   "video.mute": "Î£Î¯Î³Î±ÏƒÎ· Î®Ï‡Î¿Ï…",
-  "video.pause": "Pause",
+  "video.pause": "Î Î±ÏÏƒÎ·",
   "video.play": "Î‘Î½Î±Ï€Î±ÏÎ±Î³Ï‰Î³Î®",
   "video.unmute": "Î‘Î½Î±Ï€Î±ÏÎ±Î³Ï‰Î³Î® Î®Ï‡Î¿Ï…"
 }
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 887c668ed3add320c2494df5267deed03ea2320f..1dbf2802226aeb444519e3bef60d5cd63df8479e 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
   "account.hide_reblogs": "Hide boosts from @{name}",
+  "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:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Show boosts from @{name}",
   "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}",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Mute",
   "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? You will lose all replies, boosts and favourites to it.",
+  "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}?",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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_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.public_timeline": "the public timeline",
   "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 instances to fill it up",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "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.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 for this column",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "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",
@@ -186,35 +242,21 @@
   "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.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
   "privacy.direct.short": "Direct",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
@@ -267,9 +312,11 @@
   "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 to original audience",
   "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.reply": "Reply",
   "status.replyAll": "Reply to thread",
@@ -281,8 +328,11 @@
   "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.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",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
   "upload_area.title": "Drag & drop to upload",
-  "upload_button.label": "Add media",
+  "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Describe for the visually impaired",
-  "upload_form.focus": "Crop",
+  "upload_form.focus": "Change preview",
   "upload_form.undo": "Delete",
   "upload_progress.label": "Uploading...",
   "video.close": "Close video",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index be2bc3d65d08309a85a4e65a5b349c34996eaf22..8be964a52a7ab9cefee325d57350a0e0751a6b72 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Aldoni al aÅ forigi el listoj",
   "account.badges.bot": "Roboto",
   "account.block": "Bloki @{name}",
   "account.block_domain": "KaÅi Ä‰ion de {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Subaj informoj povas reflekti la profilon de la uzanto nekomplete.",
   "account.domain_blocked": "Domajno kaÅita",
   "account.edit_profile": "Redakti profilon",
+  "account.endorse": "Montri en profilo",
   "account.follow": "Sekvi",
   "account.followers": "Sekvantoj",
+  "account.followers.empty": "AnkoraÅ neniu sekvas tiun uzanton.",
   "account.follows": "Sekvatoj",
+  "account.follows.empty": "Tiu uzanto ankoraÅ ne sekvas iun.",
   "account.follows_you": "Sekvas vin",
   "account.hide_reblogs": "KaÅi diskonigojn de @{name}",
+  "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": "AÅdovidaÄµoj",
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} moviÄis al:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Montri diskonigojn de @{name}",
   "account.unblock": "Malbloki @{name}",
   "account.unblock_domain": "MalkaÅi {domain}",
+  "account.unendorse": "Ne montri en profilo",
   "account.unfollow": "Ne plu sekvi",
   "account.unmute": "Malsilentigi @{name}",
   "account.unmute_notifications": "Malsilentigi sciigojn de @{name}",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Silentigi",
   "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? Vi perdos Ä‰iujn respondojn, diskonigojn kaj stelumojn ligitajn al Äi.",
+  "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.",
+  "confirmations.reply.confirm": "Respondi",
+  "confirmations.reply.message": "Respondi nun anstataÅigos la mesaÄon, kiun vi nun skribas. Äˆu vi certas, ke vi volas daÅrigi?",
   "confirmations.unfollow.confirm": "Ne plu sekvi",
   "confirmations.unfollow.message": "Äˆu vi certas, ke vi volas Ä‰esi sekvi {name}?",
   "embed.instructions": "Enkorpigu Ä‰i tiun mesaÄon en vian retejon per kopio de la suba kodo.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "SerÄ‰aj rezultoj",
   "emoji_button.symbols": "Simboloj",
   "emoji_button.travel": "VojaÄoj kaj lokoj",
+  "empty_column.account_timeline": "Neniu mesaÄo Ä‰i tie!",
+  "empty_column.blocks": "Vi ankoraÅ ne blokis uzanton.",
   "empty_column.community": "La loka tempolinio 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.favourites": "AnkoraÅ neniu stelumis tiun mesaÄon. Kiam iu faros tion, tiu aperos Ä‰i tie.",
+  "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.",
   "empty_column.home.public_timeline": "la publikan tempolinion",
   "empty_column.list": "AnkoraÅ estas nenio en Ä‰i tiu listo. Kiam membroj de Ä‰i tiu listo afiÅos novajn mesaÄojn, ili aperos Ä‰i tie.",
+  "empty_column.lists": "Vi ankoraÅ ne havas liston. Kiam vi kreos iun, Äi aperos Ä‰i tie.",
+  "empty_column.mutes": "Vi ne ankoraÅ silentigis iun uzanton.",
   "empty_column.notifications": "Vi ankoraÅ ne havas sciigojn. Interagu kun aliaj por komenci konversacion.",
   "empty_column.public": "Estas nenio Ä‰i tie! Publike skribu ion, aÅ mane sekvu uzantojn de aliaj nodoj por plenigi la publikan tempolinion",
   "follow_request.authorize": "Rajtigi",
   "follow_request.reject": "Rifuzi",
   "getting_started.developers": "Programistoj",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Dokumentado",
-  "getting_started.find_friends": "Trovi amikojn el Twitter",
   "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}",
+  "hashtag.column_settings.tag_mode.all": "Äˆiuj",
+  "hashtag.column_settings.tag_mode.any": "Iu ajn",
+  "hashtag.column_settings.tag_mode.none": "Neniu",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "Bazaj agordoj",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
+  "introduction.federation.action": "Sekva",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "por reveni",
+  "keyboard_shortcuts.blocked": "por malfermi la liston de blokitaj uzantoj",
   "keyboard_shortcuts.boost": "por diskonigi",
   "keyboard_shortcuts.column": "por fokusigi mesaÄon en unu el la kolumnoj",
   "keyboard_shortcuts.compose": "por fokusigi la tekstujon",
   "keyboard_shortcuts.description": "Priskribo",
+  "keyboard_shortcuts.direct": "por malfermi la kolumnon de rektaj mesaÄoj",
   "keyboard_shortcuts.down": "por iri suben en la listo",
   "keyboard_shortcuts.enter": "por malfermi mesaÄon",
   "keyboard_shortcuts.favourite": "por stelumi",
+  "keyboard_shortcuts.favourites": "por malfermi la liston de stelumoj",
+  "keyboard_shortcuts.federated": "por malfermi la frataran tempolinion",
   "keyboard_shortcuts.heading": "Klavaraj mallongigoj",
+  "keyboard_shortcuts.home": "por malfermi la hejman tempolinion",
   "keyboard_shortcuts.hotkey": "Rapidklavo",
   "keyboard_shortcuts.legend": "por montri Ä‰i tiun noton",
+  "keyboard_shortcuts.local": "por malfermi la lokan tempolinion",
   "keyboard_shortcuts.mention": "por mencii la aÅtoron",
+  "keyboard_shortcuts.muted": "por malfermi la liston de silentigitaj uzantoj",
+  "keyboard_shortcuts.my_profile": "por malfermi vian profilon",
+  "keyboard_shortcuts.notifications": "por malfermi la kolumnon de sciigoj",
+  "keyboard_shortcuts.pinned": "por malfermi la liston de alpinglitaj mesaÄoj",
+  "keyboard_shortcuts.profile": "por malfermi la profilon de la aÅtoro",
   "keyboard_shortcuts.reply": "por respondi",
+  "keyboard_shortcuts.requests": "por malfermi la liston de petoj de sekvado",
   "keyboard_shortcuts.search": "por fokusigi la serÄ‰ilon",
+  "keyboard_shortcuts.start": "por malfermi la kolumnon Â«por komenciÂ»",
   "keyboard_shortcuts.toggle_hidden": "por montri/kaÅi tekston malantaÅ enhava averto",
   "keyboard_shortcuts.toot": "por komenci tute novan mesaÄon",
   "keyboard_shortcuts.unfocus": "por malfokusigi la tekstujon aÅ la serÄ‰ilon",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "Äˆi tiu elemento ne estis trovita",
   "mute_modal.hide_notifications": "Äˆu vi volas kaÅi la sciigojn el Ä‰i tiu uzanto?",
+  "navigation_bar.apps": "Telefonaj aplikaÄµoj",
   "navigation_bar.blocks": "Blokitaj uzantoj",
   "navigation_bar.community_timeline": "Loka tempolinio",
+  "navigation_bar.compose": "Skribi novan mesaÄon",
   "navigation_bar.direct": "Rektaj mesaÄoj",
   "navigation_bar.discover": "Esplori",
   "navigation_bar.domain_blocks": "KaÅitaj domajnoj",
   "navigation_bar.edit_profile": "Redakti profilon",
   "navigation_bar.favourites": "Stelumoj",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Silentigitaj vortoj",
   "navigation_bar.follow_requests": "Petoj de sekvado",
   "navigation_bar.info": "Pri Ä‰i tiu nodo",
   "navigation_bar.keyboard_shortcuts": "Rapidklavoj",
@@ -186,35 +242,21 @@
   "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.favourite": "Stelumoj:",
+  "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.follow": "Novaj sekvantoj:",
   "notifications.column_settings.mention": "Mencioj:",
   "notifications.column_settings.push": "PuÅsciigoj",
-  "notifications.column_settings.push_meta": "Äˆi tiu aparato",
   "notifications.column_settings.reblog": "Diskonigoj:",
   "notifications.column_settings.show": "Montri en kolumno",
   "notifications.column_settings.sound": "Eligi sonon",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} sciigoj",
-  "onboarding.done": "Farita",
-  "onboarding.next": "Sekva",
-  "onboarding.page_five.public_timelines": "La loka tempolinio montras publikajn mesaÄojn de Ä‰iuj en {domain}. La fratara tempolinio montras publikajn mesaÄojn de Ä‰iuj, kiuj estas sekvataj de homoj en {domain}. Tio estas la publikaj tempolinioj, kio estas bona maniero por malkovri novajn homojn.",
-  "onboarding.page_four.home": "La hejma tempolinio montras mesaÄojn de Ä‰iuj uzantoj, kiujn vi sekvas.",
-  "onboarding.page_four.notifications": "La sciiga kolumno montras kiam iu interagas kun vi.",
-  "onboarding.page_one.federation": "Mastodon estas reto de sendependaj serviloj, unuiÄintaj por krei pligrandan socian reton. Ni nomas tiujn servilojn nodoj.",
-  "onboarding.page_one.full_handle": "Via kompleta uzantnomo",
-  "onboarding.page_one.handle_hint": "Jen kion vi petus al viaj amikoj serÄ‰i.",
-  "onboarding.page_one.welcome": "Bonvenon en Mastodon!",
-  "onboarding.page_six.admin": "Via noda administranto estas {admin}.",
-  "onboarding.page_six.almost_done": "PreskaÅ finitaâ€¦",
-  "onboarding.page_six.appetoot": "SaÄan mesaÄadon!",
-  "onboarding.page_six.apps_available": "{apps} estas disponeblaj por iOS, Android kaj aliaj platformoj.",
-  "onboarding.page_six.github": "Mastodon estas libera, senpaga kaj malfermitkoda programo. Vi povas raporti cimojn, proponi funkciojn aÅ kontribui al la kodo en {github}.",
-  "onboarding.page_six.guidelines": "komunumaj gvidlinioj",
-  "onboarding.page_six.read_guidelines": "Bonvolu atenti pri la {guidelines} de {domain}!",
-  "onboarding.page_six.various_app": "telefonaj aplikaÄµoj",
-  "onboarding.page_three.profile": "Redaktu vian profilon por ÅanÄi vian profilbildon, priskribon kaj nomon. Vi ankaÅ trovos tie aliajn agordojn.",
-  "onboarding.page_three.search": "Uzu la serÄ‰ilon por trovi uzantojn kaj esplori kradvortojn, tiel {illustration} kaj {introductions}. Por trovi iun, kiu ne estas en Ä‰i tiu nodo, uzu ties kompletan uzantnomon.",
-  "onboarding.page_two.compose": "Skribu mesaÄojn en la skriba kolumno. Vi povas alÅuti bildojn, ÅanÄi privatecajn agordojn, kaj aldoni avertojn pri la enhavo per la subaj bildetoj.",
-  "onboarding.skip": "Preterpasi",
   "privacy.change": "Agordi mesaÄan privatecon",
   "privacy.direct.long": "AfiÅi nur al menciitaj uzantoj",
   "privacy.direct.short": "Rekta",
@@ -250,14 +292,17 @@
   "search_results.statuses": "MesaÄoj",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezultoj}}",
   "standalone.public_title": "Enrigardoâ€¦",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Bloki @{name}",
   "status.cancel_reblog_private": "Eksdiskonigi",
   "status.cannot_reblog": "Äˆi tiu mesaÄo ne diskonigeblas",
   "status.delete": "Forigi",
+  "status.detailed_status": "Detala konversacia vido",
   "status.direct": "Rekte mesaÄi @{name}",
   "status.embed": "Enkorpigi",
   "status.favourite": "Stelumi",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrita",
   "status.load_more": "Åœargi pli",
   "status.media_hidden": "AÅdovidaÄµo kaÅita",
   "status.mention": "Mencii @{name}",
@@ -267,9 +312,11 @@
   "status.open": "Grandigi",
   "status.pin": "Alpingli profile",
   "status.pinned": "Alpinglita mesaÄo",
+  "status.read_more": "Legi pli",
   "status.reblog": "Diskonigi",
   "status.reblog_private": "Diskonigi al la originala atentaro",
   "status.reblogged_by": "{name} diskonigis",
+  "status.reblogs.empty": "AnkoraÅ neniu diskonigis tiun mesaÄon. Kiam iu faros tion, tiu aperos Ä‰i tie.",
   "status.redraft": "Forigi kaj reskribi",
   "status.reply": "Respondi",
   "status.replyAll": "Respondi al la fadeno",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Malgrandigi Ä‰iujn",
   "status.show_more": "Grandigi",
   "status.show_more_all": "Grandigi Ä‰iujn",
-  "status.unmute_conversation": "Malsilentigi konversacion",
+  "status.show_thread": "Montri la fadenon",
+  "status.unmute_conversation": "Malsilentigi la konversacion",
   "status.unpin": "Depingli de profilo",
+  "suggestions.dismiss": "Forigi la proponon",
+  "suggestions.header": "Vi povus interesiÄi priâ€¦",
   "tabs_bar.federated_timeline": "Fratara tempolinio",
   "tabs_bar.home": "Hejmo",
   "tabs_bar.local_timeline": "Loka tempolinio",
@@ -291,7 +341,7 @@
   "trends.count_by_accounts": "{count} {rawCount, pluraj, unu {person} alia(j) {people}} parolas",
   "ui.beforeunload": "Via malneto perdiÄos se vi eliras de Mastodon.",
   "upload_area.title": "Altreni kaj lasi por alÅuti",
-  "upload_button.label": "Aldoni aÅdovidaÄµon",
+  "upload_button.label": "Aldoni aÅdovidaÄµon (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Priskribi por misvidantaj homoj",
   "upload_form.focus": "Stuci",
   "upload_form.undo": "Forigi",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index d4db8d15fb9e3668032706bfa245c5d932e61468..4f73dbba244fc17d9cfbf663f92d5ce866b82cd8 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Bloquear",
   "account.block_domain": "Ocultar todo de {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "La siguiente informaciÃ³n del usuario puede estar incompleta.",
   "account.domain_blocked": "Dominio oculto",
   "account.edit_profile": "Editar perfil",
+  "account.endorse": "Mostrar en perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
+  "account.followers.empty": "Nadie sigue a este usuario todavÃa.",
   "account.follows": "Sigue",
+  "account.follows.empty": "Este usuario todavÃa no sigue a nadie.",
   "account.follows_you": "Te sigue",
   "account.hide_reblogs": "Ocultar retoots de @{name}",
+  "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": "Mencionar a @{name}",
   "account.moved_to": "{name} se ha mudado a:",
@@ -26,11 +32,12 @@
   "account.show_reblogs": "Mostrar retoots de @{name}",
   "account.unblock": "Desbloquear a @{name}",
   "account.unblock_domain": "Mostrar a {domain}",
+  "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.view_full_profile": "Ver perfil completo",
-  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "Oops!",
   "boost_modal.combo": "Puedes presionar {combo} para saltear este aviso la prÃ³xima vez",
   "bundle_column_error.body": "Algo saliÃ³ mal al cargar este componente.",
@@ -41,8 +48,8 @@
   "bundle_modal_error.retry": "IntÃ©ntalo de nuevo",
   "column.blocks": "Usuarios bloqueados",
   "column.community": "LÃnea de tiempo local",
-  "column.direct": "Direct messages",
-  "column.domain_blocks": "Hidden domains",
+  "column.direct": "Mensajes directos",
+  "column.domain_blocks": "Dominios ocultos",
   "column.favourites": "Favoritos",
   "column.follow_requests": "Solicitudes de seguimiento",
   "column.home": "Inicio",
@@ -59,9 +66,9 @@
   "column_header.show_settings": "Mostrar ajustes",
   "column_header.unpin": "Dejar de fijar",
   "column_subheading.settings": "Ajustes",
-  "community.column_settings.media_only": "Media 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.media_only": "Solo media",
+  "compose_form.direct_message_warning": "Este toot solo serÃ¡ enviado a los usuarios mencionados.",
+  "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.lock_disclaimer": "Tu cuenta no estÃ¡ bloqueada. Todos pueden seguirte para ver tus toots solo para seguidores.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -81,11 +88,13 @@
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Â¿Seguro que quieres borrar esta lista permanentemente?",
   "confirmations.domain_block.confirm": "Ocultar dominio entero",
-  "confirmations.domain_block.message": "Â¿Seguro de que quieres bloquear al dominio entero? En algunos casos es preferible bloquear o silenciar objetivos determinados.",
+  "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.mute.confirm": "Silenciar",
   "confirmations.mute.message": "Â¿EstÃ¡s seguro de que quieres silenciar a {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.redraft.confirm": "Borrar y volver a borrador",
+  "confirmations.redraft.message": "EstÃ¡s seguro de que quieres borrar este estado y volverlo a borrador? PerderÃ¡s todas las respuestas, impulsos y favoritos asociados a Ã©l, y las respuestas a la publicaciÃ³n original quedarÃ¡n huÃ©rfanos.",
+  "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": "Dejar de seguir",
   "confirmations.unfollow.message": "Â¿EstÃ¡s seguro de que quieres dejar de seguir a {name}?",
   "embed.instructions": "AÃ±ade este toot a tu sitio web con el siguiente cÃ³digo.",
@@ -104,42 +113,87 @@
   "emoji_button.search_results": "Resultados de bÃºsqueda",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viajes y lugares",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "AÃºn no has bloqueado a ningÃºn usuario.",
   "empty_column.community": "La lÃnea de tiempo local estÃ¡ vacÃa. Â¡Escribe algo para empezar la fiesta!",
-  "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": "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.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_requests": "No tienes ninguna peticiÃ³n de seguidor. Cuando recibas una, se mostrarÃ¡ aquÃ.",
   "empty_column.hashtag": "No hay nada en este hashtag aÃºn.",
   "empty_column.home": "No estÃ¡s siguiendo a nadie aÃºn. Visita {public} o haz bÃºsquedas para empezar y conocer gente nueva.",
   "empty_column.home.public_timeline": "la lÃnea de tiempo pÃºblica",
   "empty_column.list": "No hay nada en esta lista aÃºn. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerÃ¡n qui.",
+  "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrarÃ¡ aquÃ.",
+  "empty_column.mutes": "AÃºn no has silenciado a ningÃºn usuario.",
   "empty_column.notifications": "No tienes ninguna notificaciÃ³n aÃºn. InteractÃºa con otros para empezar una conversaciÃ³n.",
   "empty_column.public": "Â¡No hay nada aquÃ! Escribe algo pÃºblicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rechazar",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Desarrolladores",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Primeros pasos",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Invitar usuarios",
   "getting_started.open_source_notice": "Mastodon es software libre. Puedes contribuir o reportar errores en {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.security": "Seguridad",
+  "getting_started.terms": "TÃ©rminos de servicio",
+  "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.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",
   "home.column_settings.basic": "BÃ¡sico",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "volver atrÃ¡s",
+  "keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados",
   "keyboard_shortcuts.boost": "retootear",
   "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": "Description",
+  "keyboard_shortcuts.direct": "abrir la columna de mensajes directos",
   "keyboard_shortcuts.down": "mover hacia abajo en la lista",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "aÃ±adir a favoritos",
+  "keyboard_shortcuts.favourites": "abrir la lista de favoritos",
+  "keyboard_shortcuts.federated": "abrir el timeline federado",
   "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.muted": "abrir la lista de usuarios silenciados",
+  "keyboard_shortcuts.my_profile": "abrir tu perfil",
+  "keyboard_shortcuts.notifications": "abrir la columna de notificaciones",
+  "keyboard_shortcuts.pinned": "abrir la lista de toots destacados",
+  "keyboard_shortcuts.profile": "abrir el perfil del autor",
   "keyboard_shortcuts.reply": "para responder",
+  "keyboard_shortcuts.requests": "abrir la lista de peticiones de seguidores",
   "keyboard_shortcuts.search": "para poner el foco en la bÃºsqueda",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "keyboard_shortcuts.start": "abrir la columna \"comenzar\"",
+  "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)",
   "keyboard_shortcuts.toot": "para comenzar un nuevo toot",
   "keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacciÃ³n/bÃºsqueda",
   "keyboard_shortcuts.up": "para ir hacia arriba en la lista",
@@ -159,17 +213,19 @@
   "missing_indicator.label": "No encontrado",
   "missing_indicator.sublabel": "No se encontrÃ³ este recurso",
   "mute_modal.hide_notifications": "Ocultar notificaciones de este usuario?",
+  "navigation_bar.apps": "Aplicaciones mÃ³viles",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.community_timeline": "Historia local",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.compose": "Escribir un nuevo toot",
+  "navigation_bar.direct": "Mensajes directos",
+  "navigation_bar.discover": "Descubrir",
+  "navigation_bar.domain_blocks": "Dominios ocultos",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritos",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Palabras silenciadas",
   "navigation_bar.follow_requests": "Solicitudes para seguirte",
   "navigation_bar.info": "InformaciÃ³n adicional",
-  "navigation_bar.keyboard_shortcuts": "Atajos de teclado",
+  "navigation_bar.keyboard_shortcuts": "Atajos",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Cerrar sesiÃ³n",
   "navigation_bar.mutes": "Usuarios silenciados",
@@ -177,7 +233,7 @@
   "navigation_bar.pins": "Toots fijados",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "Historia federada",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "Seguridad",
   "notification.favourite": "{name} marcÃ³ tu estado como favorito",
   "notification.follow": "{name} te empezÃ³ a seguir",
   "notification.mention": "{name} te ha mencionado",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Â¿Seguro que quieres limpiar permanentemente todas tus notificaciones?",
   "notifications.column_settings.alert": "Notificaciones de escritorio",
   "notifications.column_settings.favourite": "Favoritos:",
+  "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.follow": "Nuevos seguidores:",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.push": "Notificaciones push",
-  "notifications.column_settings.push_meta": "Este dispositivo",
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Listo",
-  "onboarding.next": "Siguiente",
-  "onboarding.page_five.public_timelines": "La lÃnea de tiempo local muestra toots pÃºblicos de todos en {domain}. La lÃnea de tiempo federada muestra toots pÃºblicos de cualquiera a quien la gente de {domain} siga. Estas son las lÃneas de tiempo pÃºblicas, una buena forma de conocer gente nueva.",
-  "onboarding.page_four.home": "La lÃnea de tiempo principal muestra toots de gente que sigues.",
-  "onboarding.page_four.notifications": "Las notificaciones se muestran cuando alguien interactÃºa contigo.",
-  "onboarding.page_one.federation": "Mastodon es una red de servidores federados que conforman una red social aÃºn mÃ¡s grande. Llamamos a estos servidores instancias.",
-  "onboarding.page_one.full_handle": "Tu sobrenombre completo",
-  "onboarding.page_one.handle_hint": "Esto es lo que dirÃas a tus amistades que buscaran.",
-  "onboarding.page_one.welcome": "Â¡Bienvenido a Mastodon!",
-  "onboarding.page_six.admin": "El administrador de tu instancia es {admin}.",
-  "onboarding.page_six.almost_done": "Ya casiâ€¦",
-  "onboarding.page_six.appetoot": "Â¡Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Hay {apps} disponibles para iOS, Android y otras plataformas.",
-  "onboarding.page_six.github": "Mastodon es software libre. Puedes reportar errores, pedir funciones nuevas, o contribuir al cÃ³digo en {github}.",
-  "onboarding.page_six.guidelines": "guÃas de la comunidad",
-  "onboarding.page_six.read_guidelines": "Â¡Por favor lee las {guidelines} de {domain}!",
-  "onboarding.page_six.various_app": "aplicaciones mÃ³viles",
-  "onboarding.page_three.profile": "Edita tu perfil para cambiar tu avatar, biografÃa y nombre de cabecera. AhÃ, tambiÃ©n encontrarÃ¡s otros ajustes.",
-  "onboarding.page_three.search": "Usa la barra de bÃºsqueda y revisa hashtags, como {illustration} y {introductions}. Para ver a alguien que no es de tu propia instancia, usa su nombre de usuario completo.",
-  "onboarding.page_two.compose": "Escribe toots en la columna de redacciÃ³n. Puedes subir imÃ¡genes, cambiar ajustes de privacidad, y aÃ±adir advertencias de contenido con los siguientes Ãconos.",
-  "onboarding.skip": "Saltar",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} notificaciones",
   "privacy.change": "Ajustar privacidad",
   "privacy.direct.long": "SÃ³lo mostrar a los usuarios mencionados",
   "privacy.direct.short": "Directo",
@@ -246,18 +288,21 @@
   "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.hashtags": "Hashtags",
+  "search_results.hashtags": "Etiquetas",
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "standalone.public_title": "Un pequeÃ±o vistazo...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
-  "status.cancel_reblog_private": "Unboost",
+  "status.cancel_reblog_private": "Des-impulsar",
   "status.cannot_reblog": "Este toot no puede retootearse",
   "status.delete": "Borrar",
-  "status.direct": "Direct message @{name}",
+  "status.detailed_status": "Vista de conversaciÃ³n detallada",
+  "status.direct": "Mensaje directo a @{name}",
   "status.embed": "Incrustado",
   "status.favourite": "Favorito",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrado",
   "status.load_more": "Cargar mÃ¡s",
   "status.media_hidden": "Contenido multimedia oculto",
   "status.mention": "Mencionar",
@@ -267,10 +312,12 @@
   "status.open": "Expandir estado",
   "status.pin": "Fijar",
   "status.pinned": "Toot fijado",
+  "status.read_more": "Read more",
   "status.reblog": "Retootear",
-  "status.reblog_private": "Boost to original audience",
+  "status.reblog_private": "Implusar a la audiencia original",
   "status.reblogged_by": "Retooteado por {name}",
-  "status.redraft": "Delete & re-draft",
+  "status.reblogs.empty": "Nadie impulsÃ³ este toot todavÃa. Cuando alguien lo haga, aparecerÃ¡ aqui.",
+  "status.redraft": "Borrar y volver a borrador",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Reportar",
@@ -281,20 +328,23 @@
   "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": "Show thread",
   "status.unmute_conversation": "Dejar de silenciar conversaciÃ³n",
   "status.unpin": "Dejar de fijar",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "Federado",
   "tabs_bar.home": "Inicio",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "Notificaciones",
-  "tabs_bar.search": "Search",
+  "tabs_bar.search": "Buscar",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
   "ui.beforeunload": "Tu borrador se perderÃ¡ si sales de Mastodon.",
   "upload_area.title": "Arrastra y suelta para subir",
-  "upload_button.label": "Subir multimedia",
+  "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Describir para los usuarios con dificultad visual",
   "upload_form.focus": "Recortar",
-  "upload_form.undo": "Deshacer",
+  "upload_form.undo": "Borrar",
   "upload_progress.label": "Subiendoâ€¦",
   "video.close": "Cerrar video",
   "video.exit_fullscreen": "Salir de pantalla completa",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 33f477af38f6797547b4c8b30b9ce941dd419062..0602fbf9e97bf590cb2508f29a3d0ede02f1f00f 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Gehitu edo kendu zerrendetatik",
   "account.badges.bot": "Bot",
   "account.block": "Blokeatu @{name}",
   "account.block_domain": "Ezkutatu {domain} domeinuko guztia",
@@ -6,19 +7,24 @@
   "account.direct": "Mezu zuzena @{name}(r)i",
   "account.disclaimer_full": "Baliteke beheko informazioak erabiltzailearen profilaren zati bat baino ez erakustea.",
   "account.domain_blocked": "Ezkutatutako domeinua",
-  "account.edit_profile": "Profila aldatu",
+  "account.edit_profile": "Aldatu profila",
+  "account.endorse": "Nabarmendu profilean",
   "account.follow": "Jarraitu",
   "account.followers": "Jarraitzaileak",
+  "account.followers.empty": "Ez du inork erabiltzaile hau jarraitzen oraindik.",
   "account.follows": "Jarraitzen",
-  "account.follows_you": "Jarraitzen zaitu",
+  "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
+  "account.follows_you": "Jarraitzen dizu",
   "account.hide_reblogs": "Ezkutatu @{name}(r)en bultzadak",
+  "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": "Media",
   "account.mention": "Aipatu @{name}",
   "account.moved_to": "{name} hona lekualdatu da:",
   "account.mute": "Mututu @{name}",
   "account.mute_notifications": "Mututu @{name}(r)en jakinarazpenak",
   "account.muted": "Mutututa",
-  "account.posts": "Toot-ak",
+  "account.posts": "Tootak",
   "account.posts_with_replies": "Toot eta erantzunak",
   "account.report": "Salatu @{name}",
   "account.requested": "Onarpenaren zain. Klikatu jarraitzeko eskaera ezeztatzeko",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Erakutsi @{name}(r)en bultzadak",
   "account.unblock": "Desblokeatu @{name}",
   "account.unblock_domain": "Berriz erakutsi {domain}",
+  "account.unendorse": "Ez nabarmendu profilean",
   "account.unfollow": "Jarraitzeari utzi",
   "account.unmute": "Desmututu @{name}",
   "account.unmute_notifications": "Desmututu @{name}(r)en jakinarazpenak",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Mututu",
   "confirmations.mute.message": "Ziur {name} mututu nahi duzula?",
   "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
-  "confirmations.redraft.message": "Ziur mezu hau ezabatu eta berridatzi nahi duzula? Berari egindako erantzun, bultzada eta gogokoak galduko dira.",
+  "confirmations.redraft.message": "Ziur mezu hau ezabatu eta berridatzi nahi duzula? Gogokoak eta bultzadak galduko dira eta jaso dituen erantzunak umezurtz geratuko dira.",
+  "confirmations.reply.confirm": "Erantzun",
+  "confirmations.reply.message": "Orain erantzuteak idazten ari zaren mezua gainidatziko du. Ziur jarraitu nahi duzula?",
   "confirmations.unfollow.confirm": "Utzi jarraitzeari",
   "confirmations.unfollow.message": "Ziur {name} jarraitzeari utzi nahi diozula?",
   "embed.instructions": "Txertatu mezu hau zure webgunean beheko kodea kopatuz.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Bilaketaren emaitzak",
   "emoji_button.symbols": "Sinboloak",
   "emoji_button.travel": "Bidaiak eta tokiak",
+  "empty_column.account_timeline": "Ez dago toot-ik hemen!",
+  "empty_column.blocks": "Ez duzu erabiltzailerik blokeatu oraindik.",
   "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.favourited_statuses": "Ez duzu gogokorik oraindik. Gogokoren bat duzunean hemen agertuko da.",
+  "empty_column.favourites": "Ez du inork gogokoetara gehitu toot hau oraindik. Inork egiten duenean, hemen agertuko dira.",
+  "empty_column.follow_requests": "Ez duzu jarraitzeko eskaririk oraindik. Baten bat jasotzen duzunean, hemen agertuko da.",
   "empty_column.hashtag": "Ez dago ezer traola honetan oraindik.",
   "empty_column.home": "Zure hasierako denbora-lerroa hutsik dago! Ikusi {public} edo erabili bilaketa lehen urratsak eman eta beste batzuk aurkitzeko.",
   "empty_column.home.public_timeline": "denbora-lerro publikoa",
   "empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek mezu berriak argitaratzean, hemen agertuko dira.",
+  "empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
+  "empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
   "empty_column.notifications": "Ez duzu jakinarazpenik oraindik. Jarri besteekin harremanetan elkarrizketa abiatzeko.",
   "empty_column.public": "Ez dago ezer hemen! Idatzi zerbait publikoki edo jarraitu eskuz beste instantzia batzuetako erabiltzailean hau betetzeko",
   "follow_request.authorize": "Baimendu",
   "follow_request.reject": "Ukatu",
   "getting_started.developers": "Garatzaileak",
+  "getting_started.directory": "Profil-direktorioa",
   "getting_started.documentation": "Dokumentazioa",
-  "getting_started.find_friends": "Aurkitu Twitter-eko lagunak",
   "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}",
+  "hashtag.column_settings.tag_mode.all": "Hauetako guztiak",
+  "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",
   "home.column_settings.basic": "Oinarrizkoa",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
+  "introduction.federation.action": "Hurrengoa",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Fedibertsoko beste zerbitzarietako bidalketa publikoak federatutako denbora-lerroan agertuko dira.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Jarraitzen dituzun horien mezuak zure hasierako jarioan agertuko dira. Edozein zerbitzariko edonor jarraitu dezakezu!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Zure zerbitzari berean dauden horien mezu publikoak denbora-lerro lokalean agertuko dira.",
+  "introduction.interactions.action": "Amaitu tutoriala!",
+  "introduction.interactions.favourite.headline": "Gogokoa",
+  "introduction.interactions.favourite.text": "Toot bat geroko gorde dezakezu, eta egileari gustukoa duzula jakinarazi, hau gogoko bihurtuz.",
+  "introduction.interactions.reblog.headline": "Bultzada",
+  "introduction.interactions.reblog.text": "Beste batzuen mezuak partekatu ditzakezu zure jarraitzaileekin hauei bultzada emanez.",
+  "introduction.interactions.reply.headline": "Erantzun",
+  "introduction.interactions.reply.text": "Besteen mezuei eta zure mezuei ere erantzun diezaiekezu, eta elkarrizketa batean lotuta agertuko dira.",
+  "introduction.welcome.action": "Goazen!",
+  "introduction.welcome.headline": "Lehen urratsak",
+  "introduction.welcome.text": "Ongi etorri fedibertsora! Hemendik gutxira hainbat zerbitzarietan zehar mezuak zabaldu eta lagunekin hitz egin ahal izango duzu. Baina zerbitzari hau hainbat zerbitzarietan zehar. berezia da, hau da zure profila ostatatzen duena, ez ahaztu bere izena.",
   "keyboard_shortcuts.back": "atzera nabigatzeko",
+  "keyboard_shortcuts.blocked": "blokeatutako erabiltzaileen zerrenda irekitzeko",
   "keyboard_shortcuts.boost": "bultzada ematea",
   "keyboard_shortcuts.column": "mezu bat zutabe batean fokatzea",
   "keyboard_shortcuts.compose": "testua konposatzeko arean fokatzea",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "mezu zuzenen zutabea irekitzeko",
   "keyboard_shortcuts.down": "zerrendan behera mugitzea",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "gogoko egitea",
+  "keyboard_shortcuts.favourites": "gogokoen zerrenda irekitzeko",
+  "keyboard_shortcuts.federated": "federatutako denbora-lerroa irekitzeko",
   "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.home": "hasierako denbora-lerroa irekitzeko",
   "keyboard_shortcuts.hotkey": "Laster-tekla",
   "keyboard_shortcuts.legend": "legenda hau bistaratzea",
+  "keyboard_shortcuts.local": "denbora-lerro lokala irekitzeko",
   "keyboard_shortcuts.mention": "egilea aipatzea",
+  "keyboard_shortcuts.muted": "mutututako erabiltzaileen zerrenda irekitzeko",
+  "keyboard_shortcuts.my_profile": "zure profila irekitzeko",
+  "keyboard_shortcuts.notifications": "jakinarazpenen zutabea irekitzeko",
+  "keyboard_shortcuts.pinned": "finkatutako toot-en zerrenda irekitzeko",
+  "keyboard_shortcuts.profile": "egilearen profila irekitzeko",
   "keyboard_shortcuts.reply": "erantzutea",
+  "keyboard_shortcuts.requests": "jarraitzeko eskarien zerrenda irekitzeko",
   "keyboard_shortcuts.search": "bilaketan fokua jartzea",
+  "keyboard_shortcuts.start": "\"Menua\" zutabea irekitzeko",
   "keyboard_shortcuts.toggle_hidden": "testua erakustea/ezkutatzea abisu baten atzean",
   "keyboard_shortcuts.toot": "toot berria hastea",
   "keyboard_shortcuts.unfocus": "testua konposatzeko area / bilaketatik fokua kentzea",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Ez aurkitua",
   "missing_indicator.sublabel": "Baliabide hau ezin izan da aurkitu",
   "mute_modal.hide_notifications": "Ezkutatu erabiltzaile honen jakinarazpenak?",
+  "navigation_bar.apps": "Mugikorrerako aplikazioak",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
   "navigation_bar.community_timeline": "Denbora-lerro lokala",
+  "navigation_bar.compose": "Idatzi toot berria",
   "navigation_bar.direct": "Mezu zuzenak",
   "navigation_bar.discover": "Aurkitu",
   "navigation_bar.domain_blocks": "Ezkutatutako domeinuak",
   "navigation_bar.edit_profile": "Aldatu profila",
   "navigation_bar.favourites": "Gogokoak",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Mutututako hitzak",
   "navigation_bar.follow_requests": "Jarraitzeko eskariak",
   "navigation_bar.info": "Instantzia honi buruz",
   "navigation_bar.keyboard_shortcuts": "Laster-teklak",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Ziur zure jakinarazpen guztiak behin betirako garbitu nahi dituzula?",
   "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.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.mention": "Aipamenak:",
   "notifications.column_settings.push": "Push jakinarazpenak",
-  "notifications.column_settings.push_meta": "Gailu hau",
   "notifications.column_settings.reblog": "Bultzadak:",
   "notifications.column_settings.show": "Erakutsi zutabean",
   "notifications.column_settings.sound": "Jo soinua",
+  "notifications.filter.all": "Denak",
+  "notifications.filter.boosts": "Bultzadak",
+  "notifications.filter.favourites": "Gogokoak",
+  "notifications.filter.follows": "Jarraipenak",
+  "notifications.filter.mentions": "Aipamenak",
   "notifications.group": "{count} jakinarazpen",
-  "onboarding.done": "Egina",
-  "onboarding.next": "Hurrengoa",
-  "onboarding.page_five.public_timelines": "Denbora-lerro lokalak {domain} domeinuko guztien mezu publikoak erakusten ditu. Federatutako denbora-lerroak {domain} domeinuko edonork jarraitutakoen mezu publikoak erakusten ditu. Hauek denbora-lerro publikoak dira, jende berria ezagutzeko primerakoak.",
-  "onboarding.page_four.home": "Hasierako denbora-lerroak jarraitzen duzun jendearen mezuak erakusten ditu.",
-  "onboarding.page_four.notifications": "Jakinarazpenen  zutabeak besteek zurekin hasitako hartu-emanak erakusten ditu.",
-  "onboarding.page_one.federation": "Mastodon lotutako zerbitzari independenteez eraikitako gizarte sare bat da. Zerbitzari hauei instantzia deitzen diegu.",
-  "onboarding.page_one.full_handle": "Zure erabiltzaile-izen osoa",
-  "onboarding.page_one.handle_hint": "Hau da zure lagunei zu aurkitzeko emango zeniena.",
-  "onboarding.page_one.welcome": "Ongi etorri Mastodon-era!",
-  "onboarding.page_six.admin": "Zure instantziaren administratzailea {admin} da.",
-  "onboarding.page_six.almost_done": "Ia eginda...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "{apps} eskuragarri daude iOS, Android eta beste plataformetarako.",
-  "onboarding.page_six.github": "Mastodon software librea da. Akatsen berri eman ezakezu, ezaugarriak eskatu, edo kodea proposatu hemen:  {github}.",
-  "onboarding.page_six.guidelines": "komunitatearen gida-lerroak",
-  "onboarding.page_six.read_guidelines": "Irakurri {domain} {guidelines} mesedez!",
-  "onboarding.page_six.various_app": "mugikorrerako aplikazioak",
-  "onboarding.page_three.profile": "Editatu zure profila zure abatarra, biografia eta pantaila-izena aldatzeko. Han hobespen gehiago daude ere.",
-  "onboarding.page_three.search": "Erabili bilaketa-barra jendea aurkitzeko eta traolak begiratzeko, esaterako {illustration} edo {introductions}. Instantzia honetan ez dagoen pertsona bat bilatzeko , erabili erabiltzaile-izen osoa.",
-  "onboarding.page_two.compose": "Idatzi mezuak konposizio-zutabean. Irudiak igo ditzakezu, pribatutasun ezarpenak aldatu, eta edukiei abisuak gehitu beheko ikonoekin.",
-  "onboarding.skip": "Saltatu",
   "privacy.change": "Doitu mezuaren pribatutasuna",
   "privacy.direct.long": "Bidali aipatutako erabiltzaileei besterik ez",
   "privacy.direct.short": "Zuzena",
@@ -226,8 +268,8 @@
   "privacy.unlisted.short": "Zerrendatu gabea",
   "regeneration_indicator.label": "Kargatzenâ€¦",
   "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!",
-  "relative_time.days": "{number}d",
-  "relative_time.hours": "{number}h",
+  "relative_time.days": "{number}e",
+  "relative_time.hours": "{number}o",
   "relative_time.just_now": "orain",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
@@ -250,14 +292,17 @@
   "search_results.statuses": "Toot-ak",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "Begiradatxo bat...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Kendu bultzada",
   "status.cannot_reblog": "Mezu honi ezin zaio bultzada eman",
   "status.delete": "Ezabatu",
+  "status.detailed_status": "Elkarrizketaren ikuspegi xehetsua",
   "status.direct": "Mezu zuzena @{name}(r)i",
   "status.embed": "Txertatu",
   "status.favourite": "Gogokoa",
-  "status.filtered": "Filtered",
+  "status.filtered": "Iragazita",
   "status.load_more": "Kargatu gehiago",
   "status.media_hidden": "Multimedia ezkutatua",
   "status.mention": "Aipatu @{name}",
@@ -267,22 +312,27 @@
   "status.open": "Hedatu mezu hau",
   "status.pin": "Finkatu profilean",
   "status.pinned": "Finkatutako toot-a",
+  "status.read_more": "Irakurri gehiago",
   "status.reblog": "Bultzada",
   "status.reblog_private": "Bultzada jatorrizko hartzaileei",
   "status.reblogged_by": "{name}(r)en bultzada",
+  "status.reblogs.empty": "Ez dio inork bultzada eman toot honi oraindik. Inork egiten duenean, hemen agertuko dira.",
   "status.redraft": "Ezabatu eta berridatzi",
   "status.reply": "Erantzun",
   "status.replyAll": "Erantzun harian",
   "status.report": "Salatu @{name}",
   "status.sensitive_toggle": "Egin klik ikusteko",
-  "status.sensitive_warning": "Eduki hunkigarria",
+  "status.sensitive_warning": "Kontuz: Eduki hunkigarria",
   "status.share": "Partekatu",
   "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.unmute_conversation": "Desmututu elkarrizketa",
   "status.unpin": "Desfinkatu profiletik",
+  "suggestions.dismiss": "Errefusatu proposamena",
+  "suggestions.header": "Hau interesatu dakizukeâ€¦",
   "tabs_bar.federated_timeline": "Federatua",
   "tabs_bar.home": "Hasiera",
   "tabs_bar.local_timeline": "Lokala",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} hitz egiten",
   "ui.beforeunload": "Zure zirriborroa galduko da Mastodon uzten baduzu.",
   "upload_area.title": "Arrastatu eta jaregin igotzeko",
-  "upload_button.label": "Gehitu multimedia",
+  "upload_button.label": "Gehitu multimedia  (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Deskribatu ikusmen arazoak dituztenentzat",
-  "upload_form.focus": "Moztu",
+  "upload_form.focus": "Aldatu aurrebista",
   "upload_form.undo": "Ezabatu",
   "upload_progress.label": "Igotzen...",
   "video.close": "Itxi bideoa",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index ad53e9b7d3bc495b12caace0c890ceb82abcf9b1..b11d88d8757b33d3c0cc0c9786c56e163eeabaf4 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Ø±Ø¨Ø§Øª",
   "account.block": "Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ @{name}",
   "account.block_domain": "Ù¾Ù†Ù‡Ø§Ù†â€ŒØ³Ø§Ø²ÛŒ Ù‡Ù…Ù‡ Ú†ÛŒØ² Ø§Ø² Ø³Ø±ÙˆØ± {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø²ÛŒØ± Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù†Ù…Ø§ÛŒÙ‡Ù” Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨Ù‡ ØªÙ…Ø§Ù…ÛŒ Ù†Ø´Ø§Ù† Ù†Ø¯Ù‡Ø¯.",
   "account.domain_blocked": "Ø¯Ø§Ù…ÛŒÙ† Ù¾Ù†Ù‡Ø§Ù†â€ŒØ´Ø¯Ù‡",
   "account.edit_profile": "ÙˆÛŒØ±Ø§ÛŒØ´ Ù†Ù…Ø§ÛŒÙ‡",
+  "account.endorse": "Ù†Ù…Ø§ÛŒØ´ Ø¯Ø± Ù†Ù…Ø§ÛŒÙ‡",
   "account.follow": "Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯",
   "account.followers": "Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù†",
+  "account.followers.empty": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø³ÛŒ Ù¾ÛŒÚ¯ÛŒØ± Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ù†ÛŒØ³Øª.",
   "account.follows": "Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯",
+  "account.follows.empty": "Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø³ÛŒ Ø±Ø§ Ù¾ÛŒ Ù†Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯.",
   "account.follows_you": "Ù¾ÛŒÚ¯ÛŒØ± Ø´Ù…Ø§Ø³Øª",
   "account.hide_reblogs": "Ù¾Ù†Ù‡Ø§Ù† Ú©Ø±Ø¯Ù† Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ @{name}",
+  "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.media": "Ø¹Ú©Ø³ Ùˆ ÙˆÛŒØ¯ÛŒÙˆ",
   "account.mention": "Ù†Ø§Ù…â€ŒØ¨Ø±Ø¯Ù† Ø§Ø² @{name}",
   "account.moved_to": "{name} Ù…Ù†ØªÙ‚Ù„ Ø´Ø¯Ù‡ Ø§Ø³Øª Ø¨Ù‡:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Ù†Ø´Ø§Ù†â€ŒØ¯Ø§Ø¯Ù† Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ  @{name}",
   "account.unblock": "Ø±ÙØ¹ Ø§Ù†Ø³Ø¯Ø§Ø¯ @{name}",
   "account.unblock_domain": "Ø±ÙØ¹ Ù¾Ù†Ù‡Ø§Ù†â€ŒØ³Ø§Ø²ÛŒ Ø§Ø² {domain}",
+  "account.unendorse": "Ù†Ù‡ÙØªÙ† Ø§Ø² Ù†Ù…Ø§ÛŒÙ‡",
   "account.unfollow": "Ù¾Ø§ÛŒØ§Ù† Ù¾ÛŒÚ¯ÛŒØ±ÛŒ",
   "account.unmute": "Ø¨Ø§ØµØ¯Ø§ Ú©Ø±Ø¯Ù† @{name}",
   "account.unmute_notifications": "Ø¨Ø§ØµØ¯Ø§Ú©Ø±Ø¯Ù† Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ Ø§Ø² Ø·Ø±Ù @{name}",
@@ -53,8 +60,8 @@
   "column.public": "Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡â€ŒØ¬Ø§",
   "column_back_button.label": "Ø¨Ø§Ø²Ú¯Ø´Øª",
   "column_header.hide_settings": "Ù†Ù‡ÙØªÙ† ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
-  "column_header.moveLeft_settings": "Ø§Ù†ØªÙ‚Ø§Ù„ Ø³ØªÙˆÙ† Ø¨Ù‡ Ú†Ù¾",
-  "column_header.moveRight_settings": "Ø§Ù†ØªÙ‚Ø§Ù„ Ø³ØªÙˆÙ† Ø¨Ù‡ Ø±Ø§Ø³Øª",
+  "column_header.moveLeft_settings": "Ø§Ù†ØªÙ‚Ø§Ù„ Ø³ØªÙˆÙ† Ø¨Ù‡ Ø±Ø§Ø³Øª",
+  "column_header.moveRight_settings": "Ø§Ù†ØªÙ‚Ø§Ù„ Ø³ØªÙˆÙ† Ø¨Ù‡ Ú†Ù¾",
   "column_header.pin": "Ø«Ø§Ø¨Øªâ€ŒÚ©Ø±Ø¯Ù†",
   "column_header.show_settings": "Ù†Ù…Ø§ÛŒØ´ ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
   "column_header.unpin": "Ø±Ù‡Ø§Ú©Ø±Ø¯Ù†",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Ø¨ÛŒâ€ŒØµØ¯Ø§ Ú©Ù†",
   "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} Ù¾Ø§ÛŒØ§Ù† Ø¯Ù‡ÛŒØ¯ØŸ",
   "embed.instructions": "Ø¨Ø±Ø§ÛŒ Ø¬Ø§Ú¯Ø°Ø§Ø±ÛŒ Ø§ÛŒÙ† Ù†ÙˆØ´ØªÙ‡ Ø¯Ø± Ø³Ø§ÛŒØª Ø®ÙˆØ¯ØªØ§Ù†ØŒ Ú©Ø¯ Ø²ÛŒØ± Ø±Ø§ Ú©Ù¾ÛŒ Ú©Ù†ÛŒØ¯.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Ù†ØªØ§ÛŒØ¬ Ø¬Ø³ØªØ¬Ùˆ",
   "emoji_button.symbols": "Ù†Ù…Ø§Ø¯Ù‡Ø§",
   "emoji_button.travel": "Ø³ÙØ± Ùˆ Ù…Ú©Ø§Ù†",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "Ø´Ù…Ø§ Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø³ÛŒ Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§ÛŒØ¯.",
   "empty_column.community": "ÙÙ‡Ø±Ø³Øª Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒ Ø®Ø§Ù„ÛŒ Ø§Ø³Øª. Ú†ÛŒØ²ÛŒ Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯ ØªØ§ Ú†Ø±Ø®Ø´ Ø¨Ú†Ø±Ø®Ø¯!",
   "empty_column.direct": "Ø´Ù…Ø§ Ù‡ÛŒÚ† Ù¾ÛŒØºØ§Ù… Ù…Ø³ØªÙ‚ÛŒÙ…ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯. Ø§Ú¯Ø± Ú†Ù†ÛŒÙ† Ù¾ÛŒØºØ§Ù…ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯ ÛŒØ§ Ø¨ÙØ±Ø³ØªÛŒØ¯ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
+  "empty_column.domain_blocks": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ø¯Ø§Ù…ÛŒÙ†ÛŒ Ù¾Ù†Ù‡Ø§Ù† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+  "empty_column.favourited_statuses": "Ø´Ù…Ø§ Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ø¨ÙˆÙ‚ÛŒ Ø±Ø§ Ù†Ù¾Ø³Ù†Ø¯ÛŒØ¯Ù‡â€ŒØ§ÛŒØ¯. ÙˆÙ‚ØªÛŒ Ø¨ÙˆÙ‚ÛŒ Ø±Ø§ Ø¨Ù¾Ø³Ù†Ø¯ÛŒØ¯ØŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
+  "empty_column.favourites": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø³ÛŒ Ø§ÛŒÙ† Ø¨ÙˆÙ‚ Ø±Ø§ Ù†Ù¾Ø³Ù†Ø¯ÛŒØ¯Ù‡ Ø§Ø³Øª. ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ø¢Ù† Ø±Ø§ Ø¨Ù¾Ø³Ù†Ø¯Ø¯ØŒ Ù†Ø§Ù…Ø´ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
+  "empty_column.follow_requests": "Ø´Ù…Ø§ Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù¾ÛŒÚ¯ÛŒØ±ÛŒâ€ŒØ§ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯. ÙˆÙ‚ØªÛŒ Ú†Ù†ÛŒÙ† Ø¯Ø±Ø®ÙˆØ§Ø³ØªÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯ØŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
   "empty_column.hashtag": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú†ÛŒØ²ÛŒ Ø¨Ø§ Ø§ÛŒÙ† Ù‡Ø´ØªÚ¯ Ù†ÛŒØ³Øª.",
   "empty_column.home": "Ø´Ù…Ø§ Ù‡Ù†ÙˆØ² Ù¾ÛŒÚ¯ÛŒØ± Ú©Ø³ÛŒ Ù†ÛŒØ³ØªÛŒØ¯. {public} Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯ ÛŒØ§ Ú†ÛŒØ²ÛŒ Ø±Ø§ Ø¬Ø³ØªØ¬Ùˆ Ú©Ù†ÛŒØ¯ ØªØ§ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯ÛŒÚ¯Ø± Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯.",
   "empty_column.home.public_timeline": "ÙÙ‡Ø±Ø³Øª Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡â€ŒØ¬Ø§",
   "empty_column.list": "Ø¯Ø± Ø§ÛŒÙ† ÙÙ‡Ø±Ø³Øª Ù‡Ù†ÙˆØ² Ú†ÛŒØ²ÛŒ Ù†ÛŒØ³Øª. ÙˆÙ‚ØªÛŒ Ø§Ø¹Ø¶Ø§ÛŒ Ø§ÛŒÙ† ÙÙ‡Ø±Ø³Øª Ú†ÛŒØ²ÛŒ Ø¨Ù†ÙˆÛŒØ³Ù†Ø¯ØŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ø¸Ø§Ù‡Ø± Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯.",
+  "empty_column.lists": "Ø´Ù…Ø§ Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† ÙÙ‡Ø±Ø³ØªÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯. Ø§Ú¯Ø± ÙÙ‡Ø±Ø³ØªÛŒ Ø¨Ø³Ø§Ø²ÛŒØ¯ØŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
+  "empty_column.mutes": "Ø´Ù…Ø§ Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø±Ø§ Ø¨ÛŒâ€ŒØµØ¯Ø§ Ù†Ú©Ø±Ø¯Ù‡â€ŒØ§ÛŒØ¯.",
   "empty_column.notifications": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ø§Ø¹Ù„Ø§Ù†ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯. Ø¨Ù‡ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø±Ø§Ù† ÙˆØ§Ú©Ù†Ø´ Ù†Ø´Ø§Ù† Ø¯Ù‡ÛŒØ¯ ØªØ§ Ú¯ÙØªÚ¯Ùˆ Ø¢ØºØ§Ø² Ø´ÙˆØ¯.",
   "empty_column.public": "Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù‡Ù†ÙˆØ² Ú†ÛŒØ²ÛŒ Ù†ÛŒØ³Øª! Ø®ÙˆØ¯ØªØ§Ù† Ú†ÛŒØ²ÛŒ Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯ ÛŒØ§ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯ÛŒÚ¯Ø± Ø±Ø§ Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯ ØªØ§ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù¾Ø± Ø´ÙˆØ¯",
   "follow_request.authorize": "Ø§Ø¬Ø§Ø²Ù‡ Ø¯Ù‡ÛŒØ¯",
   "follow_request.reject": "Ø§Ø¬Ø§Ø²Ù‡ Ù†Ø¯Ù‡ÛŒØ¯",
   "getting_started.developers": "Ø¨Ø±Ø§ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ†ÙˆÛŒØ³Ø§Ù†",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Ø±Ø§Ù‡Ù†Ù…Ø§",
-  "getting_started.find_friends": "ÛŒØ§ÙØªÙ† Ø¯ÙˆØ³ØªØ§Ù† Ø§Ø² ØªÙˆÛŒÛŒØªØ±",
   "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}",
+  "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",
   "home.column_settings.basic": "Ø§ØµÙ„ÛŒ",
   "home.column_settings.show_reblogs": "Ù†Ù…Ø§ÛŒØ´ Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§",
   "home.column_settings.show_replies": "Ù†Ù…Ø§ÛŒØ´ Ù¾Ø§Ø³Ø®â€ŒÙ‡Ø§",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.pinned": "Ø¨Ø±Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù† ÙÙ‡Ø±Ø³Øª Ù†ÙˆØ´ØªÙ‡â€Œâ€ŒÙ‡Ø§ÛŒ Ø«Ø§Ø¨Øª",
+  "keyboard_shortcuts.profile": "Ú¯Ø´ÙˆØ¯Ù† Ù†Ù…Ø§ÛŒÙ‡Ù” Ù†ÙˆÛŒØ³Ù†Ø¯Ù‡",
   "keyboard_shortcuts.reply": "Ø¨Ø±Ø§ÛŒ Ù¾Ø§Ø³Ø®â€ŒØ¯Ø§Ø¯Ù†",
+  "keyboard_shortcuts.requests": "Ø¨Ø±Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù† ÙÙ‡Ø±Ø³Øª Ø¯Ø±Ø®ÙˆØ§Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ",
   "keyboard_shortcuts.search": "Ø¨Ø±Ø§ÛŒ ÙØ¹Ø§Ù„â€ŒÚ©Ø±Ø¯Ù† Ø¬Ø³ØªØ¬Ùˆ",
+  "keyboard_shortcuts.start": "Ø¨Ø±Ø§ÛŒ Ú¯Ø´ÙˆØ¯Ù† Ø³ØªÙˆÙ† Â«Ø¢ØºØ§Ø² Ú©Ù†ÛŒØ¯Â»",
   "keyboard_shortcuts.toggle_hidden": "Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´/Ù†Ù‡ÙØªÙ† Ù†ÙˆØ´ØªÙ‡Ù” Ù¾Ø´Øª Ù‡Ø´Ø¯Ø§Ø± Ù…ØØªÙˆØ§",
   "keyboard_shortcuts.toot": "Ø¨Ø±Ø§ÛŒ Ø¢ØºØ§Ø² ÛŒÚ© Ø¨ÙˆÙ‚ ØªØ§Ø²Ù‡",
   "keyboard_shortcuts.unfocus": "Ø¨Ø±Ø§ÛŒ Ø¨Ø±Ø¯Ø§Ø´ØªÙ† ØªÙˆØ¬Ù‡ Ø§Ø² Ù†ÙˆØ´ØªÙ†/Ø¬Ø³ØªØ¬Ùˆ",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯",
   "missing_indicator.sublabel": "Ø§ÛŒÙ† Ù…Ù†Ø¨Ø¹ Ù¾ÛŒØ¯Ø§ Ù†Ø´Ø¯",
   "mute_modal.hide_notifications": "Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± Ù¾Ù†Ù‡Ø§Ù† Ø´ÙˆØ¯ØŸ",
+  "navigation_bar.apps": "Ø§Ù¾â€ŒÙ‡Ø§ÛŒ Ù…ÙˆØ¨Ø§ÛŒÙ„",
   "navigation_bar.blocks": "Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡",
   "navigation_bar.community_timeline": "Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒ",
-  "navigation_bar.direct": "Ù¾ÛŒØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ø®ØµÙˆØµÛŒ",
+  "navigation_bar.compose": "Ù†ÙˆØ´ØªÙ† Ø¨ÙˆÙ‚ ØªØ§Ø²Ù‡",
+  "navigation_bar.direct": "Ù¾ÛŒØºØ§Ù…â€ŒÙ‡Ø§ÛŒ Ù…Ø³ØªÙ‚ÛŒÙ…",
   "navigation_bar.discover": "Ú¯Ø´Øª Ùˆ Ú¯Ø°Ø§Ø±",
   "navigation_bar.domain_blocks": "Ø¯Ø§Ù…ÛŒÙ†â€ŒÙ‡Ø§ÛŒ Ù¾Ù†Ù‡Ø§Ù†â€ŒØ´Ø¯Ù‡",
   "navigation_bar.edit_profile": "ÙˆÛŒØ±Ø§ÛŒØ´ Ù†Ù…Ø§ÛŒÙ‡",
   "navigation_bar.favourites": "Ù¾Ø³Ù†Ø¯ÛŒØ¯Ù‡â€ŒÙ‡Ø§",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "ÙˆØ§Ú˜Ú¯Ø§Ù† Ø¨ÛŒâ€ŒØµØ¯Ø§Ø´Ø¯Ù‡",
   "navigation_bar.follow_requests": "Ø¯Ø±Ø®ÙˆØ§Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ",
   "navigation_bar.info": "Ø§Ø·Ù„Ø§Ø¹Ø§Øª ØªÚ©Ù…ÛŒÙ„ÛŒ",
   "navigation_bar.keyboard_shortcuts": "Ù…ÛŒØ§Ù†â€ŒØ¨Ø±Ù‡Ø§ÛŒ ØµÙØÙ‡â€ŒÚ©Ù„ÛŒØ¯",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "ÙˆØ§Ù‚Ø¹Ø§Ù‹ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ù‡Ù…Ù‡Ù” Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒØªØ§Ù† Ø±Ø§ Ø¨Ø±Ø§ÛŒ Ù‡Ù…ÛŒØ´Ù‡ Ù¾Ø§Ú© Ú©Ù†ÛŒØ¯ØŸ",
   "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.follow": "Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù† ØªØ§Ø²Ù‡:",
   "notifications.column_settings.mention": "Ù†Ø§Ù…â€ŒØ¨Ø±Ø¯Ù†â€ŒÙ‡Ø§:",
   "notifications.column_settings.push": "Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ Ø§Ø² Ø³Ù…Øª Ø³Ø±ÙˆØ±",
-  "notifications.column_settings.push_meta": "Ø§ÛŒÙ† Ø¯Ø³ØªÚ¯Ø§Ù‡",
   "notifications.column_settings.reblog": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§:",
   "notifications.column_settings.show": "Ù†Ù…Ø§ÛŒØ´ Ø¯Ø± Ø³ØªÙˆÙ†",
   "notifications.column_settings.sound": "Ù¾Ø®Ø´ ØµØ¯Ø§",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} Ø§Ø¹Ù„Ø§Ù†",
-  "onboarding.done": "Ù¾Ø§ÛŒØ§Ù†",
-  "onboarding.next": "Ø¨Ø¹Ø¯ÛŒ",
-  "onboarding.page_five.public_timelines": "Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒ ÛŒØ¹Ù†ÛŒ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡Ù” Ú©Ø§Ø±Ø¨Ø±Ø§Ù† {domain}. Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡â€ŒØ¬Ø§ ÛŒØ¹Ù†ÛŒ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡Ù” Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† {domain} Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ù†Ø¯. Ø§ÛŒÙ† ÙÙ‡Ø±Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ Ø±Ø§Ù‡ Ø®ÙˆØ¨ÛŒ Ø¨Ø±Ø§ÛŒ ÛŒØ§ÙØªÙ† Ú©Ø§Ø±Ø¨Ø±Ø§Ù† ØªØ§Ø²Ù‡ Ù‡Ø³ØªÙ†Ø¯.",
-  "onboarding.page_four.home": "Ø³ØªÙˆÙ† Â«Ø®Ø§Ù†Ù‡Â» Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ú©Ø³Ø§Ù†ÛŒ Ø±Ø§ Ù†Ø´Ø§Ù† Ù…ÛŒâ€ŒØ¯Ù‡Ø¯ Ú©Ù‡ Ø´Ù…Ø§ Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±ÛŒØ¯.",
-  "onboarding.page_four.notifications": "Ø³ØªÙˆÙ† Â«Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§Â» Ø§Ø±ØªØ¨Ø§Ø·â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¨Ø§ Ø¯ÛŒÚ¯Ø±Ø§Ù† Ø±Ø§ Ù†Ø´Ø§Ù† Ù…ÛŒâ€ŒØ¯Ù‡Ø¯.",
-  "onboarding.page_one.federation": "Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø´Ø¨Ú©Ù‡â€ŒØ§ÛŒ Ø§Ø² Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ù…Ø³ØªÙ‚Ù„ Ø§Ø³Øª Ú©Ù‡ Ø¨Ø§ Ù¾ÛŒÙˆØ³ØªÙ† Ø¨Ù‡ ÛŒÚ©Ø¯ÛŒÚ¯Ø± ÛŒÚ© Ø´Ø¨Ú©Ù‡Ù” Ø§Ø¬ØªÙ…Ø§Ø¹ÛŒ Ø¨Ø²Ø±Ú¯ Ø±Ø§ ØªØ´Ú©ÛŒÙ„ Ù…ÛŒâ€ŒØ¯Ù‡Ù†Ø¯.",
-  "onboarding.page_one.full_handle": "Ø´Ù†Ø§Ø³Ù‡Ù” Ú©Ø§Ø±Ø¨Ø±ÛŒ Ú©Ø§Ù…Ù„ Ø´Ù…Ø§",
-  "onboarding.page_one.handle_hint": "Ø§ÛŒÙ† Ú†ÛŒØ²ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø¨Ø§ÛŒØ¯ Ø¨Ù‡ Ø¯ÙˆØ³ØªØ§Ù† Ø®ÙˆØ¯ Ø¨Ú¯ÙˆÛŒÛŒØ¯ ØªØ§ Ø¨ØªÙˆØ§Ù†Ù†Ø¯ Ø´Ù…Ø§ Ø±Ø§ Ù¾ÛŒØ¯Ø§ Ú©Ù†Ù†Ø¯.",
-  "onboarding.page_one.welcome": "Ø¨Ù‡ Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯!",
-  "onboarding.page_six.admin": "Ù†Ø´Ø§Ù†ÛŒ Ù…Ø³Ø¦ÙˆÙ„ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ {admin} Ø§Ø³Øª.",
-  "onboarding.page_six.almost_done": "Ø§Ù„Ø§Ù† ØªÙ‚Ø±ÛŒØ¨Ø§Ù‹ Ø¢Ù…Ø§Ø¯Ù‡â€ŒØ§ÛŒØ¯...",
-  "onboarding.page_six.appetoot": "Ø¨ÙˆÙ‚! Ø¨ÙˆÙ‚!",
-  "onboarding.page_six.apps_available": "Ø§Ù¾â€ŒÙ‡Ø§ÛŒ Ú¯ÙˆÙ†Ø§Ú¯ÙˆÙ†ÛŒ Ø¨Ø±Ø§ÛŒ Ø§Ù†Ø¯Ø±ÙˆÛŒØ¯ØŒ iOSØŒ Ùˆ Ø³ÛŒØ³ØªÙ…â€ŒÙ‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ù…ÙˆØ¬ÙˆØ¯ Ø§Ø³Øª.",
-  "onboarding.page_six.github": "Ù…Ø§Ø³ØªØ¯ÙˆÙ† ÛŒÚ© Ù†Ø±Ù…â€ŒØ§ÙØ²Ø§Ø± Ø¢Ø²Ø§Ø¯ Ùˆ Ú©Ø¯Ø¨Ø§Ø² Ø§Ø³Øª. Ø¯Ø± {github} Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ù…Ø´Ú©Ù„Ø§ØªØ´ Ø±Ø§ Ú¯Ø²Ø§Ø±Ø´ Ø¯Ù‡ÛŒØ¯ØŒ ÙˆÛŒÚ˜Ú¯ÛŒâ€ŒÙ‡Ø§ÛŒ ØªØ§Ø²Ù‡ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ú©Ù†ÛŒØ¯ØŒ ÛŒØ§ Ø¯Ø± Ú©Ø¯Ù‡Ø§ÛŒØ´ Ù…Ø´Ø§Ø±Ú©Øª Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯.",
-  "onboarding.page_six.guidelines": "Ø±Ù‡Ù†Ù…ÙˆØ¯Ù‡Ø§ÛŒ Ù‡Ù…Ø²ÛŒØ³ØªÛŒ Ø¯ÙˆØ³ØªØ§Ù†Ù‡Ù”",
-  "onboarding.page_six.read_guidelines": "Ù„Ø·ÙØ§Ù‹ {guidelines} {domain} Ø±Ø§ Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯!",
-  "onboarding.page_six.various_app": "Ø§Ù¾â€ŒÙ‡Ø§ÛŒ Ù…ÙˆØ¨Ø§ÛŒÙ„",
-  "onboarding.page_three.profile": "Ø¨Ø§ ÙˆÛŒØ±Ø§ÛŒØ´ Ù†Ù…Ø§ÛŒÙ‡ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ ØªØµÙˆÛŒØ± Ù†Ù…Ø§ÛŒÙ‡ØŒ Ù†ÙˆØ´ØªÙ‡Ù” Ù…Ø¹Ø±ÙÛŒØŒ Ùˆ Ù†Ø§Ù… Ù†Ù…Ø§ÛŒØ´ÛŒ Ø®ÙˆØ¯ Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯. ØªØ±Ø¬ÛŒØØ§Øª Ø¯ÛŒÚ¯Ø± Ø´Ù…Ø§ Ù‡Ù… Ø¢Ù†â€ŒØ¬Ø§Ø³Øª.",
-  "onboarding.page_three.search": "Ø¯Ø± Ù†ÙˆØ§Ø± Ø¬Ø³ØªØ¬Ùˆ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø¯ÛŒÚ¯Ø± Ø±Ø§ Ø¨ÛŒØ§Ø¨ÛŒØ¯ ÛŒØ§ Ù‡Ø´ØªÚ¯â€ŒÙ‡Ø§ Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯ØŒ Ù…Ø§Ù†Ù†Ø¯ {illustration} ÛŒØ§ {introductions}. Ø¨Ø±Ø§ÛŒ ÛŒØ§ÙØªÙ† Ø§ÙØ±Ø§Ø¯ÛŒ Ú©Ù‡ Ø±ÙˆÛŒ Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ù‡Ø³ØªÙ†Ø¯ØŒ Ø´Ù†Ø§Ø³Ù‡Ù” Ú©Ø§Ù…Ù„ Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯.",
-  "onboarding.page_two.compose": "Ø¯Ø± Ø³ØªÙˆÙ† Â«Ù†ÙˆØ´ØªÙ†Â» Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ ØªØ§Ø²Ù‡ Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯. Ù‡Ù…Ú†Ù†ÛŒÙ† Ø¨Ø§ Ø¯Ú©Ù…Ù‡â€ŒÙ‡Ø§ÛŒ Ø²ÛŒØ±Ø´ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ ØªØµÙˆÛŒØ± Ø§Ø¶Ø§ÙÙ‡ Ú©Ù†ÛŒØ¯ØŒ ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ù†ÙˆØ´ØªÙ‡ Ø±Ø§ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯ØŒ Ùˆ Ù‡Ø´Ø¯Ø§Ø± Ù…ØØªÙˆØ§ Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯.",
-  "onboarding.skip": "Ø±Ø¯ Ú©Ù†",
   "privacy.change": "ØªÙ†Ø¸ÛŒÙ… ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§",
   "privacy.direct.long": "ØªÙ†Ù‡Ø§ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ù†Ø§Ù…â€ŒØ¨Ø±Ø¯Ù‡â€ŒØ´Ø¯Ù‡ Ù†Ø´Ø§Ù† Ø¨Ø¯Ù‡",
   "privacy.direct.short": "Ù…Ø³ØªÙ‚ÛŒÙ…",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Ø¨ÙˆÙ‚â€ŒÙ‡Ø§",
   "search_results.total": "{count, number} {count, plural, one {Ù†ØªÛŒØ¬Ù‡} other {Ù†ØªÛŒØ¬Ù‡}}",
   "standalone.public_title": "Ù†Ú¯Ø§Ù‡ÛŒ Ø¨Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø§ÛŒÙ† Ø³Ø±ÙˆØ±...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ @{name}",
   "status.cancel_reblog_private": "ØØ°Ù Ø¨Ø§Ø²Ø¨ÙˆÙ‚",
   "status.cannot_reblog": "Ø§ÛŒÙ† Ù†ÙˆØ´ØªÙ‡ Ø±Ø§ Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯ Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯",
   "status.delete": "Ù¾Ø§Ú©â€ŒÚ©Ø±Ø¯Ù†",
+  "status.detailed_status": "Ù†Ù…Ø§ÛŒØ´ Ú©Ø§Ù…Ù„ Ú¯ÙØªÚ¯Ùˆ",
   "status.direct": "Ù¾ÛŒØºØ§Ù… Ù…Ø³ØªÙ‚ÛŒÙ… Ø¨Ù‡ @{name}",
   "status.embed": "Ø¬Ø§Ú¯Ø°Ø§Ø±ÛŒ",
   "status.favourite": "Ù¾Ø³Ù†Ø¯ÛŒØ¯Ù†",
@@ -267,9 +312,11 @@
   "status.open": "Ø§ÛŒÙ† Ù†ÙˆØ´ØªÙ‡ Ø±Ø§ Ø¨Ø§Ø² Ú©Ù†",
   "status.pin": "Ù†ÙˆØ´ØªÙ‡Ù” Ø«Ø§Ø¨Øª Ù†Ù…Ø§ÛŒÙ‡",
   "status.pinned": "Ø¨ÙˆÙ‚ Ø«Ø§Ø¨Øª",
+  "status.read_more": "Ø¨ÛŒØ´ØªØ± Ø¨Ø®ÙˆØ§Ù†ÛŒØ¯",
   "status.reblog": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯Ù†",
   "status.reblog_private": "Ø¨Ø§Ø²Ø¨ÙˆÙ‚ Ø¨Ù‡ Ù…Ø®Ø§Ø·Ø¨Ø§Ù† Ø§ÙˆÙ„ÛŒÙ‡",
   "status.reblogged_by": "â€«{name}â€¬ Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯",
+  "status.reblogs.empty": "Ù‡Ù†ÙˆØ² Ù‡ÛŒÚ† Ú©Ø³ÛŒ Ø§ÛŒÙ† Ø¨ÙˆÙ‚ Ø±Ø§ Ø¨Ø§Ø²Ù†Ø¨ÙˆÙ‚ÛŒØ¯Ù‡ Ø§Ø³Øª. ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ú†Ù†ÛŒÙ† Ú©Ø§Ø±ÛŒ Ú©Ù†Ø¯ØŒ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ù†Ù…Ø§ÛŒØ´ Ø®ÙˆØ§Ù‡Ø¯ ÛŒØ§ÙØª.",
   "status.redraft": "Ù¾Ø§Ú©â€ŒÚ©Ø±Ø¯Ù† Ùˆ Ø¨Ø§Ø²Ù†ÙˆÛŒØ³ÛŒ",
   "status.reply": "Ù¾Ø§Ø³Ø®",
   "status.replyAll": "Ø¨Ù‡ Ù†ÙˆØ´ØªÙ‡ Ù¾Ø§Ø³Ø® Ø¯Ù‡ÛŒØ¯",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Ù†Ù…Ø§ÛŒØ´ Ú©Ù…ØªØ± Ù‡Ù…Ù‡",
   "status.show_more": "Ù†Ù…Ø§ÛŒØ´",
   "status.show_more_all": "Ù†Ù…Ø§ÛŒØ´ Ø¨ÛŒØ´ØªØ± Ù‡Ù…Ù‡",
+  "status.show_thread": "Show thread",
   "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": "Ù…ØÙ„ÛŒ",
@@ -291,7 +341,7 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {Ù†ÙØ± Ù†ÙˆØ´ØªÙ‡ Ø§Ø³Øª} other {Ù†ÙØ± Ù†ÙˆØ´ØªÙ‡â€ŒØ§Ù†Ø¯}}",
   "ui.beforeunload": "Ø§Ú¯Ø± Ø§Ø² Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø®Ø§Ø±Ø¬ Ø´ÙˆÛŒØ¯ Ù¾ÛŒØ´â€ŒÙ†ÙˆÛŒØ³ Ø´Ù…Ø§ Ù¾Ø§Ú© Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯.",
   "upload_area.title": "Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø§ÛŒÙ†â€ŒØ¬Ø§ Ø¨Ú©Ø´ÛŒØ¯",
-  "upload_button.label": "Ø§ÙØ²ÙˆØ¯Ù† ØªØµÙˆÛŒØ±",
+  "upload_button.label": "Ø§ÙØ²ÙˆØ¯Ù† Ø¹Ú©Ø³ Ùˆ ÙˆÛŒØ¯ÛŒÙˆ (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Ù†ÙˆØ´ØªÙ‡Ù” ØªÙˆØ¶ÛŒØÛŒ Ø¨Ø±Ø§ÛŒ Ú©Ù…â€ŒØ¨ÛŒÙ†Ø§ÛŒØ§Ù† Ùˆ Ù†Ø§Ø¨ÛŒÙ†Ø§ÛŒØ§Ù†",
   "upload_form.focus": "Ø¨Ø±ÛŒØ¯Ù† Ù„Ø¨Ù‡â€ŒÙ‡Ø§",
   "upload_form.undo": "ØØ°Ù",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index dd7310a61046ebc4050a4ed976a4b9790a71ceec..c8d2586723b89f24451f5f8e3b0a893f3a46d5e3 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Botti",
   "account.block": "EstÃ¤ @{name}",
   "account.block_domain": "Piilota kaikki sisÃ¤ltÃ¶ verkkotunnuksesta {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Alla olevat kÃ¤yttÃ¤jÃ¤n profiilitiedot saattavat olla epÃ¤tÃ¤ydellisiÃ¤.",
   "account.domain_blocked": "Verkko-osoite piilotettu",
   "account.edit_profile": "Muokkaa",
+  "account.endorse": "Suosittele profiilissasi",
   "account.follow": "Seuraa",
   "account.followers": "Seuraajia",
+  "account.followers.empty": "TÃ¤llÃ¤ kÃ¤yttÃ¤jÃ¤llÃ¤ ei ole vielÃ¤ seuraajia.",
   "account.follows": "Seuraa",
+  "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.link_verified_on": "TÃ¤mÃ¤n linkin omistaja tarkistettiin {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": "Mainitse @{name}",
   "account.moved_to": "{name} on muuttanut instanssiin:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "NÃ¤ytÃ¤ buustaukset kÃ¤yttÃ¤jÃ¤ltÃ¤ @{name}",
   "account.unblock": "Salli @{name}",
   "account.unblock_domain": "NÃ¤ytÃ¤ {domain}",
+  "account.unendorse": "Poista suosittelu profiilistasi",
   "account.unfollow": "Lakkaa seuraamasta",
   "account.unmute": "Poista kÃ¤yttÃ¤jÃ¤n @{name} mykistys",
   "account.unmute_notifications": "Poista mykistys kÃ¤yttÃ¤jÃ¤n @{name} ilmoituksilta",
@@ -59,7 +66,7 @@
   "column_header.show_settings": "NÃ¤ytÃ¤ asetukset",
   "column_header.unpin": "Poista kiinnitys",
   "column_subheading.settings": "Asetukset",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Vain media",
   "compose_form.direct_message_warning": "TÃ¤mÃ¤ tuuttaus nÃ¤kyy vain mainituille kÃ¤yttÃ¤jille.",
   "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.",
@@ -84,8 +91,10 @@
   "confirmations.domain_block.message": "Haluatko aivan varmasti estÃ¤Ã¤ koko verkko-osoitteen {domain}? Useimmiten jokunen kohdistettu esto ja mykistys riittÃ¤Ã¤, ja se on suositeltavampi tapa toimia.",
   "confirmations.mute.confirm": "MykistÃ¤",
   "confirmations.mute.message": "Haluatko varmasti mykistÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤n {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
+  "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.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.message": "Haluatko varmasti lakata seuraamasta kÃ¤yttÃ¤jÃ¤Ã¤ {name}?",
   "embed.instructions": "Upota statuspÃ¤ivitys sivullesi kopioimalla alla oleva koodi.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "Et ole vielÃ¤ estÃ¤nyt yhtÃ¤Ã¤n kÃ¤yttÃ¤jÃ¤Ã¤.",
   "empty_column.community": "Paikallinen aikajana on tyhjÃ¤. Homma lÃ¤htee kÃ¤yntiin, kun kirjoitat jotain julkista!",
   "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Ã¤ piilotettu.",
+  "empty_column.favourited_statuses": "Et ole vielÃ¤ lisÃ¤nnyt tuuttauksia suosikkeihisi. Kun teet niin, tuuttaus nÃ¤kyy tÃ¤ssÃ¤.",
+  "empty_column.favourites": "Kukaan ei ole vielÃ¤ lisÃ¤nnyt tÃ¤tÃ¤ tuuttausta suosikkeihinsa. Kun joku tekee niin, nÃ¤kyy kyseinen henkilÃ¶ tÃ¤ssÃ¤.",
+  "empty_column.follow_requests": "Sinulla ei ole vielÃ¤ seurauspyyntÃ¶jÃ¤. Kun saat sellaisen, nÃ¤kyy se tÃ¤ssÃ¤.",
   "empty_column.hashtag": "TÃ¤llÃ¤ hashtagilla ei ole vielÃ¤ mitÃ¤Ã¤n.",
   "empty_column.home": "Kotiaikajanasi on tyhjÃ¤! {public} ja hakutoiminto auttavat alkuun ja kohtaamaan muita kÃ¤yttÃ¤jiÃ¤.",
   "empty_column.home.public_timeline": "yleinen aikajana",
   "empty_column.list": "Lista on vielÃ¤ tyhjÃ¤. Listan jÃ¤senten julkaisemat tilapÃ¤ivitykset tulevat tÃ¤hÃ¤n nÃ¤kyviin.",
+  "empty_column.lists": "Sinulla ei ole vielÃ¤ yhtÃ¤Ã¤n listaa. Kun luot sellaisen, nÃ¤kyy se tÃ¤ssÃ¤.",
+  "empty_column.mutes": "Et ole mykistÃ¤nyt vielÃ¤ yhtÃ¤Ã¤n kÃ¤yttÃ¤jÃ¤Ã¤.",
   "empty_column.notifications": "Sinulle ei ole vielÃ¤ ilmoituksia. Aloita keskustelu juttelemalla muille.",
   "empty_column.public": "TÃ¤Ã¤llÃ¤ ei ole mitÃ¤Ã¤n! Saat sisÃ¤ltÃ¶Ã¤, kun kirjoitat jotain julkisesti tai kÃ¤yt manuaalisesti seuraamassa muiden instanssien kÃ¤yttÃ¤jiÃ¤",
   "follow_request.authorize": "Valtuuta",
   "follow_request.reject": "HylkÃ¤Ã¤",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "KehittÃ¤jille",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Aloitus",
-  "getting_started.invite": "Invite people",
+  "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": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.security": "Tunnukset",
+  "getting_started.terms": "KÃ¤yttÃ¶ehdot",
+  "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.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",
   "home.column_settings.basic": "Perusasetukset",
   "home.column_settings.show_reblogs": "NÃ¤ytÃ¤ buustaukset",
   "home.column_settings.show_replies": "NÃ¤ytÃ¤ vastaukset",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "liiku taaksepÃ¤in",
+  "keyboard_shortcuts.blocked": "avaa lista estetyistÃ¤ kÃ¤yttÃ¤jistÃ¤",
   "keyboard_shortcuts.boost": "buustaa",
   "keyboard_shortcuts.column": "siirrÃ¤ fokus tietyn sarakkeen tilapÃ¤ivitykseen",
   "keyboard_shortcuts.compose": "siirry tekstinsyÃ¶ttÃ¶Ã¶n",
   "keyboard_shortcuts.description": "Kuvaus",
+  "keyboard_shortcuts.direct": "avaa pikaviestisarake",
   "keyboard_shortcuts.down": "siirry listassa alaspÃ¤in",
   "keyboard_shortcuts.enter": "avaa tilapÃ¤ivitys",
   "keyboard_shortcuts.favourite": "tykkÃ¤Ã¤",
+  "keyboard_shortcuts.favourites": "avaa lista suosikeista",
+  "keyboard_shortcuts.federated": "avaa yleinen aikajana",
   "keyboard_shortcuts.heading": "NÃ¤ppÃ¤inkomennot",
+  "keyboard_shortcuts.home": "avaa kotiaikajana",
   "keyboard_shortcuts.hotkey": "PikanÃ¤ppÃ¤in",
   "keyboard_shortcuts.legend": "nÃ¤ytÃ¤ tÃ¤mÃ¤ selite",
+  "keyboard_shortcuts.local": "avaa paikallinen aikajana",
   "keyboard_shortcuts.mention": "mainitse julkaisija",
+  "keyboard_shortcuts.muted": "avaa lista mykistetyistÃ¤ kÃ¤yttÃ¤jistÃ¤",
+  "keyboard_shortcuts.my_profile": "avaa profiilisi",
+  "keyboard_shortcuts.notifications": "avaa ilmoitukset-sarake",
+  "keyboard_shortcuts.pinned": "avaa lista kiinnitetyistÃ¤ tuuttauksista",
+  "keyboard_shortcuts.profile": "avaa kirjoittajan profiili",
   "keyboard_shortcuts.reply": "vastaa",
+  "keyboard_shortcuts.requests": "avaa lista seurauspyynnÃ¶istÃ¤",
   "keyboard_shortcuts.search": "siirry hakukenttÃ¤Ã¤n",
+  "keyboard_shortcuts.start": "avaa \"Aloitus\" -sarake",
   "keyboard_shortcuts.toggle_hidden": "nÃ¤ytÃ¤/piilota sisÃ¤ltÃ¶varoituksella merkitty teksti",
   "keyboard_shortcuts.toot": "ala kirjoittaa uutta tuuttausta",
   "keyboard_shortcuts.unfocus": "siirry pois tekstikentÃ¤stÃ¤ tai hakukentÃ¤stÃ¤",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Ei lÃ¶ytynyt",
   "missing_indicator.sublabel": "TÃ¤tÃ¤ resurssia ei lÃ¶ytynyt",
   "mute_modal.hide_notifications": "Piilota tÃ¤ltÃ¤ kÃ¤yttÃ¤jÃ¤ltÃ¤ tulevat ilmoitukset?",
+  "navigation_bar.apps": "Mobiiliapplikaatiot",
   "navigation_bar.blocks": "Estetyt kÃ¤yttÃ¤jÃ¤t",
   "navigation_bar.community_timeline": "Paikallinen aikajana",
+  "navigation_bar.compose": "Kirjoita uusi tuuttaus",
   "navigation_bar.direct": "Viestit",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Piilotetut verkkotunnukset",
   "navigation_bar.edit_profile": "Muokkaa profiilia",
   "navigation_bar.favourites": "Suosikit",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Mykistetyt sanat",
   "navigation_bar.follow_requests": "SeuraamispyynnÃ¶t",
   "navigation_bar.info": "Tietoa tÃ¤stÃ¤ instanssista",
   "navigation_bar.keyboard_shortcuts": "NÃ¤ppÃ¤inkomennot",
@@ -177,7 +233,7 @@
   "navigation_bar.pins": "Kiinnitetyt tuuttaukset",
   "navigation_bar.preferences": "Asetukset",
   "navigation_bar.public_timeline": "Yleinen aikajana",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "Tunnukset",
   "notification.favourite": "{name} tykkÃ¤si tilastasi",
   "notification.follow": "{name} seurasi sinua",
   "notification.mention": "{name} mainitsi sinut",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Haluatko varmasti poistaa kaikki ilmoitukset pysyvÃ¤sti?",
   "notifications.column_settings.alert": "TyÃ¶pÃ¶ytÃ¤ilmoitukset",
   "notifications.column_settings.favourite": "TykkÃ¤ykset:",
+  "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.follow": "Uudet seuraajat:",
   "notifications.column_settings.mention": "Maininnat:",
   "notifications.column_settings.push": "Push-ilmoitukset",
-  "notifications.column_settings.push_meta": "TÃ¤mÃ¤ laite",
   "notifications.column_settings.reblog": "Buustit:",
   "notifications.column_settings.show": "NÃ¤ytÃ¤ sarakkeessa",
   "notifications.column_settings.sound": "Ã„Ã¤nimerkki",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Valmis",
-  "onboarding.next": "Seuraava",
-  "onboarding.page_five.public_timelines": "Paikallisella aikajanalla nÃ¤ytetÃ¤Ã¤n instanssin {domain} kaikkien kÃ¤yttÃ¤jien julkiset julkaisut. YleisellÃ¤ aikajanalla nÃ¤ytetÃ¤Ã¤n kaikkien instanssin {domain} kÃ¤yttÃ¤jien seuraamien kÃ¤yttÃ¤jien julkiset julkaisut. NÃ¤mÃ¤ julkiset aikajanat ovat loistavia paikkoja lÃ¶ytÃ¤Ã¤ uusia ihmisiÃ¤.",
-  "onboarding.page_four.home": "Kotiaikajanalla nÃ¤ytetÃ¤Ã¤n seuraamiesi ihmisten julkaisut.",
-  "onboarding.page_four.notifications": "Ilmoitukset-sarakkeessa nÃ¤ytetÃ¤Ã¤n muiden sinuun liittyvÃ¤ toiminta.",
-  "onboarding.page_one.federation": "Mastodon on usean itsenÃ¤isen palvelimen muodostama yhteisÃ¶palvelu. NÃ¤itÃ¤ palvelimia kutsutaan instansseiksi.",
-  "onboarding.page_one.full_handle": "Koko kÃ¤yttÃ¤jÃ¤nimesi",
-  "onboarding.page_one.handle_hint": "TÃ¤llÃ¤ nimellÃ¤ ystÃ¤vÃ¤si lÃ¶ytÃ¤vÃ¤t sinut.",
-  "onboarding.page_one.welcome": "Tervetuloa Mastodoniin!",
-  "onboarding.page_six.admin": "Instanssin yllÃ¤pitÃ¤jÃ¤ on {admin}.",
-  "onboarding.page_six.almost_done": "Melkein valmista...",
-  "onboarding.page_six.appetoot": "Tuuttailun iloa!",
-  "onboarding.page_six.apps_available": "{apps} on saatavilla iOS:lle, Androidille ja muille alustoille.",
-  "onboarding.page_six.github": "Mastodon on ilmainen, vapaan lÃ¤hdekoodin ohjelma. Voit raportoida bugeja, ehdottaa ominaisuuksia tai osallistua kehittÃ¤miseen GitHubissa: {github}.",
-  "onboarding.page_six.guidelines": "yhteisÃ¶n sÃ¤Ã¤nnÃ¶t",
-  "onboarding.page_six.read_guidelines": "Ole hyvÃ¤ ja lue {domain}:n {guidelines}!",
-  "onboarding.page_six.various_app": "mobiilisovellukset",
-  "onboarding.page_three.profile": "Voit muuttaa profiilikuvaasi, esittelyÃ¤si ja nimimerkkiÃ¤si sekÃ¤ muita asetuksia muokkaamalla profiiliasi.",
-  "onboarding.page_three.search": "Etsi ihmisiÃ¤ ja hashtageja (esimerkiksi {illustration} tai {introductions}) hakukentÃ¤n avulla. Jos haet toista instanssia kÃ¤yttÃ¤vÃ¤Ã¤ henkilÃ¶Ã¤, kÃ¤ytÃ¤ hÃ¤nen koko kÃ¤yttÃ¤jÃ¤nimeÃ¤Ã¤n.",
-  "onboarding.page_two.compose": "Kirjoita julkaisuja kirjoitussarakkeessa. Voit ladata kuvia, vaihtaa nÃ¤kyvyysasetuksia ja lisÃ¤tÃ¤ sisÃ¤ltÃ¶varoituksia alla olevista painikkeista.",
-  "onboarding.skip": "Ohita",
   "privacy.change": "SÃ¤Ã¤dÃ¤ tuuttauksen nÃ¤kyvyyttÃ¤",
   "privacy.direct.long": "Julkaise vain mainituille kÃ¤yttÃ¤jille",
   "privacy.direct.short": "Suora viesti",
@@ -250,14 +292,17 @@
   "search_results.statuses": "Tuuttaukset",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "Kurkistus sisÃ¤lle...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "EstÃ¤ @{name}",
   "status.cancel_reblog_private": "Peru buustaus",
   "status.cannot_reblog": "TÃ¤tÃ¤ julkaisua ei voi buustata",
   "status.delete": "Poista",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Viesti kÃ¤yttÃ¤jÃ¤lle @{name}",
   "status.embed": "Upota",
   "status.favourite": "TykkÃ¤Ã¤",
-  "status.filtered": "Filtered",
+  "status.filtered": "Suodatettu",
   "status.load_more": "Lataa lisÃ¤Ã¤",
   "status.media_hidden": "Media piilotettu",
   "status.mention": "Mainitse @{name}",
@@ -267,10 +312,12 @@
   "status.open": "Laajenna tilapÃ¤ivitys",
   "status.pin": "KiinnitÃ¤ profiiliin",
   "status.pinned": "Kiinnitetty tuuttaus",
+  "status.read_more": "NÃ¤ytÃ¤ enemmÃ¤n",
   "status.reblog": "Buustaa",
   "status.reblog_private": "Buustaa alkuperÃ¤iselle yleisÃ¶lle",
   "status.reblogged_by": "{name} buustasi",
-  "status.redraft": "Delete & re-draft",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.redraft": "Poista & palauta muokattavaksi",
   "status.reply": "Vastaa",
   "status.replyAll": "Vastaa ketjuun",
   "status.report": "Raportoi @{name}",
@@ -281,8 +328,11 @@
   "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": "Show thread",
   "status.unmute_conversation": "Poista keskustelun mykistys",
   "status.unpin": "Irrota profiilista",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "Yleinen",
   "tabs_bar.home": "Koti",
   "tabs_bar.local_timeline": "Paikallinen",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 41cea6a82894bd3a007ae329c101722240345eb3..7628968879244b9e21781418621b6cce8727c4b8 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Ajouter ou retirer des listes",
   "account.badges.bot": "Bot",
   "account.block": "Bloquer @{name}",
   "account.block_domain": "Tout masquer venant de {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Les donnÃ©es ci-dessous peuvent ne pas reflÃ©ter ce profil dans sa totalitÃ©.",
   "account.domain_blocked": "Domaine cachÃ©",
   "account.edit_profile": "Modifier le profil",
+  "account.endorse": "Figure sur le profil",
   "account.follow": "Suivre",
   "account.followers": "AbonnÃ©â‹…eâ‹…s",
+  "account.followers.empty": "Personne ne suit cet utilisateur pour lâ€™instant.",
   "account.follows": "Abonnements",
+  "account.follows.empty": "Cet utilisateur ne suit personne pour lâ€™instant.",
   "account.follows_you": "Vous suit",
   "account.hide_reblogs": "Masquer les partages de @{name}",
+  "account.link_verified_on": "La propriÃ©tÃ© de ce lien a Ã©tÃ© vÃ©rifiÃ©e le {date}",
+  "account.locked_info": "Ce compte est verrouillÃ©. Son propriÃ©taire approuve manuellement qui peut le ou la suivre.",
   "account.media": "MÃ©dia",
   "account.mention": "Mentionner",
   "account.moved_to": "{name} a dÃ©mÃ©nagÃ© versâ€¯:",
@@ -21,16 +27,17 @@
   "account.posts": "Pouets",
   "account.posts_with_replies": "Pouets et rÃ©ponses",
   "account.report": "Signaler",
-  "account.requested": "En attente d'approbation. Cliquez pour annuler la requÃªte",
+  "account.requested": "En attente dâ€™approbation. Cliquez pour annuler la requÃªte",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
   "account.unblock": "DÃ©bloquer",
   "account.unblock_domain": "Ne plus masquer {domain}",
+  "account.unendorse": "Ne figure pas sur le profil",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer",
   "account.unmute_notifications": "RÃ©activer les notifications de @{name}",
   "account.view_full_profile": "Afficher le profil complet",
-  "alert.unexpected.message": "Une erreur non-attendue s'est produite.",
+  "alert.unexpected.message": "Une erreur non attendue sâ€™est produite.",
   "alert.unexpected.title": "Oupsâ€¯!",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
   "bundle_column_error.body": "Une erreur sâ€™est produite lors du chargement de ce composant.",
@@ -60,9 +67,9 @@
   "column_header.unpin": "Retirer",
   "column_subheading.settings": "ParamÃ¨tres",
   "community.column_settings.media_only": "MÃ©dia uniquement",
-  "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyÃ© qu'aux personnes mentionnÃ©es. Cependant, l'administration de votre instance et des instances rÃ©ceptrices pourront inspecter ce message.",
+  "compose_form.direct_message_warning": "Ce pouet sera uniquement envoyÃ© aux personnes mentionnÃ©es. Cependant, lâ€™administration de votre instance et des instances rÃ©ceptrices pourront inspecter ce message.",
   "compose_form.direct_message_warning_learn_more": "En savoir plus",
-  "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.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 pouets privÃ©s.",
   "compose_form.lock_disclaimer.lock": "verrouillÃ©",
   "compose_form.placeholder": "Quâ€™avez-vous en tÃªteâ€¯?",
@@ -71,7 +78,7 @@
   "compose_form.sensitive.marked": "MÃ©dia marquÃ© comme sensible",
   "compose_form.sensitive.unmarked": "MÃ©dia non marquÃ© comme sensible",
   "compose_form.spoiler.marked": "Le texte est cachÃ© derriÃ¨re un avertissement",
-  "compose_form.spoiler.unmarked": "Le texte n'est pas cachÃ©",
+  "compose_form.spoiler.unmarked": "Le texte nâ€™est pas cachÃ©",
   "compose_form.spoiler_placeholder": "Ã‰crivez ici votre avertissement",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.confirm": "Bloquer",
@@ -81,11 +88,13 @@
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "ÃŠtes-vous sÃ»r de vouloir supprimer dÃ©finitivement cette listeâ€¯?",
   "confirmations.domain_block.confirm": "Masquer le domaine entier",
-  "confirmations.domain_block.message": "ÃŠtes-vous vraiment, vraiment sÃ»râ‹…e de vouloir 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 lignes de temps publiques, ni dans vos notifications. Vos suiveurs utilisant ce domaine seront retirÃ©s.",
+  "confirmations.domain_block.message": "ÃŠtes-vous vraiment, vraiment sÃ»râ‹…e de vouloir 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Ã©Â·eÂ·s utilisant ce domaine seront retirÃ©Â·eÂ·s.",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.mute.message": "Confirmez-vous le masquage de {name}â€¯?",
   "confirmations.redraft.confirm": "Effacer et rÃ©-Ã©crire",
-  "confirmations.redraft.message": "ÃŠtes vous sÃ»r de vouloir effacer ce statut pour le rÃ©-Ã©crire ? Vous perdrez toutes ses rÃ©ponses, ses repartages et ses mises en favori.",
+  "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 perduÂ·eÂ·s et ses rÃ©ponses seront orphelines.",
+  "confirmations.reply.confirm": "RÃ©pondre",
+  "confirmations.reply.message": "RÃ©pondre maintenant Ã©crasera le message que vous Ãªtes en train de composer. Voulez-vous vraiment continuer ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous arrÃªter de suivre {name}â€¯?",
   "embed.instructions": "IntÃ©grez ce statut Ã  votre site en copiant le code ci-dessous.",
@@ -96,7 +105,7 @@
   "emoji_button.food": "Nourriture & Boisson",
   "emoji_button.label": "InsÃ©rer un Ã©moji",
   "emoji_button.nature": "Nature",
-  "emoji_button.not_found": "Pas d'emojisâ€¯!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.not_found": "Pas dâ€™Ã©mojiâ€¯!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "Objets",
   "emoji_button.people": "Personnages",
   "emoji_button.recent": "FrÃ©quemment utilisÃ©s",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "RÃ©sultats de la recherche",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Lieux & Voyages",
+  "empty_column.account_timeline": "Aucun pouet ici !",
+  "empty_column.blocks": "Vous nâ€™avez bloquÃ© aucun utilisateur pour le moment.",
   "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.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 cachÃ© pour le moment.",
+  "empty_column.favourited_statuses": "Vous nâ€™avez aucun pouet favoris pour le moment. Lorsque vous en mettrez un en favori, il apparaÃ®tra ici.",
+  "empty_column.favourites": "Personne nâ€™a encore mis ce pouet en favori. Lorsque quelquâ€™un le fera, il apparaÃ®tra ici.",
+  "empty_column.follow_requests": "Vous nâ€™avez pas encore de demande de suivi. Lorsque vous en recevrez une, elle apparaÃ®tra ici.",
   "empty_column.hashtag": "Il nâ€™y a encore aucun contenu associÃ© Ã  ce hashtag.",
   "empty_column.home": "Vous ne suivez personne. Visitez {public} ou utilisez la recherche pour trouver dâ€™autres personnes Ã  suivre.",
   "empty_column.home.public_timeline": "le fil public",
-  "empty_column.list": "Il n'y a rien dans cette liste pour l'instant. DÃ¨s que des personnes de cette liste publierons de nouveaux statuts, ils apparaÃ®tront ici.",
+  "empty_column.list": "Il nâ€™y a rien dans cette liste pour lâ€™instant. DÃ¨s que des personnes de cette liste publieront de nouveaux statuts, 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 pas encore mis des utilisateurs en silence.",
   "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 instances pour remplir le fil public",
   "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
   "getting_started.developers": "DÃ©veloppeurs",
+  "getting_started.directory": "Annuaire des profils",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Trouver des amis depuis Twitter",
   "getting_started.heading": "Pour commencer",
   "getting_started.invite": "Inviter des gens",
   "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et 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}",
+  "hashtag.column_settings.tag_mode.all": "Tous ces Ã©lÃ©ments",
+  "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": "Include additional tags in this column",
   "home.column_settings.basic": "Basique",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les rÃ©ponses",
+  "introduction.federation.action": "Suivant",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Les messages publics provenant d'autres serveurs du fediverse apparaÃ®tront dans le fil public global.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Les messages des personnes que vous suivez apparaÃ®tront dans votre fil d'accueil. Vous pouvez suivre n'importe qui sur n'importe quel serveur !",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Les messages publics de personnes se trouvant sur le mÃªme serveur que vous apparaÃ®tront sur le fil public local.",
+  "introduction.interactions.action": "Finir le tutoriel !",
+  "introduction.interactions.favourite.headline": "Favoris",
+  "introduction.interactions.favourite.text": "Vous pouvez garder un pouet pour plus tard, et faire savoir Ã  l'auteur que vous l'avez aimÃ©, en le favorisant.",
+  "introduction.interactions.reblog.headline": "Repartager",
+  "introduction.interactions.reblog.text": "Vous pouvez partager les pouets d'autres personnes avec vos suiveurs en les repartageant.",
+  "introduction.interactions.reply.headline": "RÃ©pondre",
+  "introduction.interactions.reply.text": "Vous pouvez rÃ©pondre aux pouets d'autres personnes et Ã  vos propres pouets, ce qui les enchaÃ®nera dans une conversation.",
+  "introduction.welcome.action": "Allons-y !",
+  "introduction.welcome.headline": "Premiers pas",
+  "introduction.welcome.text": "Bienvenue dans le fediverse ! Dans quelques instants, vous pourrez diffuser des messages et parler Ã  vos amis sur une grande variÃ©tÃ© de serveurs. Mais ce serveur, {domain}, est spÃ©cial - il hÃ©berge votre profil, alors souvenez-vous de son nom.",
   "keyboard_shortcuts.back": "revenir en arriÃ¨re",
+  "keyboard_shortcuts.blocked": "pour ouvrir une liste dâ€™utilisateurs bloquÃ©s",
   "keyboard_shortcuts.boost": "partager",
-  "keyboard_shortcuts.column": "focaliser un statut dans l'une des colonnes",
+  "keyboard_shortcuts.column": "focaliser un statut dans lâ€™une des colonnes",
   "keyboard_shortcuts.compose": "pour centrer la zone de rÃ©daction",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "pour ouvrir une colonne des messages directs",
   "keyboard_shortcuts.down": "pour descendre dans la liste",
   "keyboard_shortcuts.enter": "pour ouvrir le statut",
   "keyboard_shortcuts.favourite": "vers les favoris",
+  "keyboard_shortcuts.favourites": "pour ouvrir une liste de favoris",
+  "keyboard_shortcuts.federated": "pour ouvrir le fil public global",
   "keyboard_shortcuts.heading": "Raccourcis clavier",
+  "keyboard_shortcuts.home": "pour ouvrir lâ€™accueil",
   "keyboard_shortcuts.hotkey": "Raccourci",
   "keyboard_shortcuts.legend": "pour afficher cette lÃ©gende",
-  "keyboard_shortcuts.mention": "pour mentionner l'auteur",
+  "keyboard_shortcuts.local": "pour ouvrir le fil public local",
+  "keyboard_shortcuts.mention": "pour mentionner lâ€™auteurÂ·rice",
+  "keyboard_shortcuts.muted": "pour ouvrir la liste des utilisateurs rendus muets",
+  "keyboard_shortcuts.my_profile": "pour ouvrir votre profil",
+  "keyboard_shortcuts.notifications": "pour ouvrir votre colonne de notifications",
+  "keyboard_shortcuts.pinned": "pour ouvrir une liste des pouets Ã©pinglÃ©s",
+  "keyboard_shortcuts.profile": "pour ouvrir le profil de lâ€™auteurÂ·rice",
   "keyboard_shortcuts.reply": "pour rÃ©pondre",
+  "keyboard_shortcuts.requests": "pour ouvrir la liste de demandes de suivi",
   "keyboard_shortcuts.search": "pour cibler la recherche",
+  "keyboard_shortcuts.start": "pour ouvrir la colonne \"pour commencer\"",
   "keyboard_shortcuts.toggle_hidden": "pour afficher/cacher un texte derriÃ¨re CW",
   "keyboard_shortcuts.toot": "pour dÃ©marrer un tout nouveau pouet",
   "keyboard_shortcuts.unfocus": "pour recentrer composer textarea/search",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Non trouvÃ©",
   "missing_indicator.sublabel": "Ressource introuvable",
   "mute_modal.hide_notifications": "Masquer les notifications de cette personneâ€¯?",
+  "navigation_bar.apps": "Applications mobiles",
   "navigation_bar.blocks": "Comptes bloquÃ©s",
   "navigation_bar.community_timeline": "Fil public local",
+  "navigation_bar.compose": "RÃ©diger un nouveau toot",
   "navigation_bar.direct": "Messages directs",
   "navigation_bar.discover": "DÃ©couvrir",
   "navigation_bar.domain_blocks": "Domaines cachÃ©s",
   "navigation_bar.edit_profile": "Modifier le profil",
   "navigation_bar.favourites": "Favoris",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Mots silenciÃ©s",
   "navigation_bar.follow_requests": "Demandes de suivi",
   "navigation_bar.info": "Plus dâ€™informations",
   "navigation_bar.keyboard_shortcuts": "Raccourcis-clavier",
@@ -186,44 +242,30 @@
   "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notificationsâ€¯?",
   "notifications.column_settings.alert": "Notifications locales",
   "notifications.column_settings.favourite": "Favorisâ€¯:",
+  "notifications.column_settings.filter_bar.advanced": "Afficher toutes les catÃ©gories",
+  "notifications.column_settings.filter_bar.category": "Barre de recherche rapide",
+  "notifications.column_settings.filter_bar.show": "Afficher",
   "notifications.column_settings.follow": "Nouveauxâ‹…elles abonnÃ©â‹…eÂ·sâ€¯:",
   "notifications.column_settings.mention": "Mentionsâ€¯:",
   "notifications.column_settings.push": "Notifications",
-  "notifications.column_settings.push_meta": "Cet appareil",
   "notifications.column_settings.reblog": "Partagesâ€¯:",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Ã‰mettre un son",
+  "notifications.filter.all": "Tout",
+  "notifications.filter.boosts": "Repartages",
+  "notifications.filter.favourites": "Favoris",
+  "notifications.filter.follows": "Suiveurs",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "EffectuÃ©",
-  "onboarding.next": "Suivant",
-  "onboarding.page_five.public_timelines": "Le fil public global affiche les messages de toutes les personnes suivies par les membres de {domain}. Le fil public local est identique, mais se limite aux membres de {domain}.",
-  "onboarding.page_four.home": "Lâ€™accueil affiche les messages des personnes que vous suivez.",
-  "onboarding.page_four.notifications": "La colonne de notification vous avertit lors d'une interaction avec vous.",
-  "onboarding.page_one.federation": "Mastodon est un rÃ©seau de serveurs indÃ©pendants qui se joignent pour former un rÃ©seau social plus vaste. Nous appelons ces serveurs des instances.",
-  "onboarding.page_one.full_handle": "Votre identifiant complet",
-  "onboarding.page_one.handle_hint": "C'est ce que vos amis devront rechercher.",
-  "onboarding.page_one.welcome": "Bienvenue sur Mastodonâ€¯!",
-  "onboarding.page_six.admin": "Lâ€™administrateurâ‹…ice de votre instance est {admin}.",
-  "onboarding.page_six.almost_done": "Nous y sommes presqueâ€¦",
-  "onboarding.page_six.appetoot": "Bon appouÃ©titâ€¯!",
-  "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres.",
-  "onboarding.page_six.github": "Mastodon est un logiciel libre, gratuit et open-source. Vous pouvez rapporter des bogues, suggÃ©rer des fonctionnalitÃ©s, ou contribuer Ã  son dÃ©veloppement sur {github}.",
-  "onboarding.page_six.guidelines": "rÃ¨gles de la communautÃ©",
-  "onboarding.page_six.read_guidelines": "Sâ€™il vous plaÃ®t, nâ€™oubliez pas de lire les {guidelines}â€¯!",
-  "onboarding.page_six.various_app": "applications mobiles",
-  "onboarding.page_three.profile": "Modifiez votre profil pour changer votre avatar, votre description ainsi que votre nom. Vous y trouverez Ã©galement dâ€™autres prÃ©fÃ©rences.",
-  "onboarding.page_three.search": "Utilisez la barre de recherche pour trouver des utilisateurâ‹…iceâ‹…s ou regardez des hashtags tels que {illustration} et {introductions}. Pour trouver quelquâ€™un qui nâ€™est pas sur cette instance, utilisez son identifiant complet.",
-  "onboarding.page_two.compose": "Ã‰crivez depuis la colonne de composition. Vous pouvez ajouter des images, changer les rÃ©glages de confidentialitÃ©, et ajouter des avertissements de contenu (Content Warning) grÃ¢ce aux icÃ´nes en dessous.",
-  "onboarding.skip": "Passer",
   "privacy.change": "Ajuster la confidentialitÃ© du message",
-  "privacy.direct.long": "N'envoyer qu'aux personnes mentionnÃ©es",
+  "privacy.direct.long": "Nâ€™envoyer quâ€™aux personnes mentionnÃ©es",
   "privacy.direct.short": "Direct",
   "privacy.private.long": "Seulâ‹…eâ‹…s vos abonnÃ©â‹…eâ‹…s verront vos statuts",
   "privacy.private.short": "AbonnÃ©â‹…eâ‹…s uniquement",
   "privacy.public.long": "Afficher dans les fils publics",
   "privacy.public.short": "Public",
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
-  "privacy.unlisted.short": "Non-listÃ©",
+  "privacy.unlisted.short": "Non listÃ©",
   "regeneration_indicator.label": "Chargementâ€¦",
   "regeneration_indicator.sublabel": "Le flux de votre page principale est en cours de prÃ©parationâ€¯!",
   "relative_time.days": "{number} j",
@@ -233,8 +275,8 @@
   "relative_time.seconds": "{number} s",
   "reply_indicator.cancel": "Annuler",
   "report.forward": "TransfÃ©rer Ã  {target}",
-  "report.forward_hint": "Le compte provient d'un autre serveur. Envoyez Ã©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.forward_hint": "Le compte provient dâ€™un autre serveur. Envoyez Ã©galement une copie anonyme du rapportâ€¯?",
+  "report.hint": "Le rapport sera envoyÃ© aux modÃ©rateurÂ·riceÂ·s de votre instance. Vous pouvez expliquer pourquoi vous signalez le compte ci-dessousâ€¯:",
   "report.placeholder": "Commentaires additionnels",
   "report.submit": "Envoyer",
   "report.target": "Signalement",
@@ -250,14 +292,17 @@
   "search_results.statuses": "Pouets",
   "search_results.total": "{count, number} {count, plural, one {rÃ©sultat} other {rÃ©sultats}}",
   "standalone.public_title": "Un aperÃ§u â€¦",
+  "status.admin_account": "Ouvrir l'interface de modÃ©ration pour @{name}",
+  "status.admin_status": "Ouvrir ce statut dans l'interface de modÃ©ration",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "DÃ©-booster",
   "status.cannot_reblog": "Cette publication ne peut Ãªtre boostÃ©e",
   "status.delete": "Effacer",
+  "status.detailed_status": "Vue dÃ©taillÃ©e de la conversation",
   "status.direct": "Envoyer un message direct Ã  @{name}",
   "status.embed": "IntÃ©grer",
   "status.favourite": "Ajouter aux favoris",
-  "status.filtered": "Filtered",
+  "status.filtered": "FiltrÃ©",
   "status.load_more": "Charger plus",
   "status.media_hidden": "MÃ©dia cachÃ©",
   "status.mention": "Mentionner",
@@ -267,9 +312,11 @@
   "status.open": "DÃ©plier ce statut",
   "status.pin": "Ã‰pingler sur le profil",
   "status.pinned": "Pouet Ã©pinglÃ©",
+  "status.read_more": "En savoir plus",
   "status.reblog": "Partager",
-  "status.reblog_private": "Booster vers l'audience originale",
+  "status.reblog_private": "Booster vers lâ€™audience originale",
   "status.reblogged_by": "{name} a partagÃ©â€¯:",
+  "status.reblogs.empty": "Personne nâ€™a encore partagÃ© ce pouet. Lorsque quelquâ€™un le fera, il apparaÃ®tra ici.",
   "status.redraft": "Effacer et rÃ©-Ã©crire",
   "status.reply": "RÃ©pondre",
   "status.replyAll": "RÃ©pondre au fil",
@@ -281,23 +328,26 @@
   "status.show_less_all": "Tout replier",
   "status.show_more": "DÃ©plier",
   "status.show_more_all": "Tout dÃ©plier",
+  "status.show_thread": "Afficher le fil",
   "status.unmute_conversation": "Ne plus masquer la conversation",
   "status.unpin": "Retirer du profil",
+  "suggestions.dismiss": "Rejeter la suggestion",
+  "suggestions.header": "Vous pourriez Ãªtre intÃ©ressÃ© 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",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} discutent",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {personne} other {personnes}} discutent",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",
   "upload_area.title": "Glissez et dÃ©posez pour envoyer",
-  "upload_button.label": "Joindre un mÃ©dia",
-  "upload_form.description": "DÃ©crire pour les malvoyants",
-  "upload_form.focus": "Recadrer",
+  "upload_button.label": "Joindre un mÃ©dia (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "DÃ©crire pour les malvoyantÂ·eÂ·s",
+  "upload_form.focus": "Modifier lâ€™aperÃ§u",
   "upload_form.undo": "Supprimer",
   "upload_progress.label": "Envoi en coursâ€¦",
   "video.close": "Fermer la vidÃ©o",
-  "video.exit_fullscreen": "Quitter plein Ã©cran",
+  "video.exit_fullscreen": "Quitter le plein Ã©cran",
   "video.expand": "Agrandir la vidÃ©o",
   "video.fullscreen": "Plein Ã©cran",
   "video.hide": "Masquer la vidÃ©o",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index ff817d681f443eca1a164bd7a11841bdeeac5107..c1ece163d7e09de2435e47c2e68a011502589288 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Engadir ou Eliminar das listas",
   "account.badges.bot": "Bot",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Ocultar calquer contido de {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "A informaciÃ³n inferior poderÃa mostrar un perfil incompleto da usuaria.",
   "account.domain_blocked": "Dominio agochado",
   "account.edit_profile": "Editar perfil",
+  "account.endorse": "Mostrado no perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidoras",
+  "account.followers.empty": "NinguÃ©n estÃ¡ a seguir esta usuaria por agora.",
   "account.follows": "Seguindo",
+  "account.follows.empty": "Esta usuaria aÃnda non segue a ninguÃ©n.",
   "account.follows_you": "SÃ©guena",
   "account.hide_reblogs": "Ocultar repeticiÃ³ns de @{name}",
+  "account.link_verified_on": "A propiedade de esta ligazÃ³n foi comprobada en {date}",
+  "account.locked_info": "O estado da intimidade de esta conta estableceuse en pechado. A persoa dona da conta revisa quen pode seguila.",
   "account.media": "Medios",
   "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} marchou a:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Mostrar repeticiÃ³ns de @{name}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Non ocultar {domain}",
+  "account.unendorse": "Non mostrar no perfil",
   "account.unfollow": "Non seguir",
   "account.unmute": "Non acalar @{name}",
   "account.unmute_notifications": "Desbloquear as notificaciÃ³ns de @{name}",
@@ -59,9 +66,9 @@
   "column_header.show_settings": "Mostras axustes",
   "column_header.unpin": "Soltar",
   "column_subheading.settings": "Axustes",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "SÃ³ medios",
   "compose_form.direct_message_warning": "Este toot enviarase sÃ³ as usuarias mencionadas. PorÃ©n, a sÃºa proveedora de internet e calquera das instancias receptoras poderÃan examinar esta mensaxe.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.direct_message_warning_learn_more": "CoÃ±ecer mÃ¡is",
   "compose_form.hashtag_warning": "Esta mensaxe non serÃ¡ listada baixo ningunha etiqueta xa que estÃ¡ marcada como non listada. SÃ³ os toots pÃºblicos poden buscarse por etiquetas.",
   "compose_form.lock_disclaimer": "A sÃºa conta non estÃ¡ {locked}. Calquera pode seguila para ver as sÃºas mensaxes sÃ³-para-seguidoras.",
   "compose_form.lock_disclaimer.lock": "bloqueado",
@@ -84,14 +91,16 @@
   "confirmations.domain_block.message": "Realmente estÃ¡ segura de que quere bloquear por completo o dominio {domain}? Normalmente Ã© suficiente, e preferible, bloquear de xeito selectivo varios elementos. Non verÃ¡ contidos de ese dominio en ningunha liÃ±a temporal ou nas notificaciÃ³ns. As sÃºas seguidoras en ese dominio serÃ¡n eliminadas.",
   "confirmations.mute.confirm": "Acalar",
   "confirmations.mute.message": "EstÃ¡ segura de que quere acalar a {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.redraft.confirm": "Eliminar e reescribir",
+  "confirmations.redraft.message": "EstÃ¡ segura de querer eliminar este estado e voltalo a escribir? PerderÃ¡ rÃ©plicas e favoritas, e as respostas ao orixinal quedarÃ¡n orfas.",
+  "confirmations.reply.confirm": "Respostar",
+  "confirmations.reply.message": "Respostando agora sobreescribirÃ¡ a mensaxe que estÃ¡ a compoÃ±er. Segura de querer proceder?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Quere deixar de seguir a {name}?",
   "embed.instructions": "Copie o cÃ³digo inferior para incrustar no seu sitio web este estado.",
   "embed.preview": "AsÃ serÃ¡ mostrado:",
   "emoji_button.activity": "Actividade",
-  "emoji_button.custom": "Personalizado",
+  "emoji_button.custom": "Persoalizado",
   "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida e Bebida",
   "emoji_button.label": "Insertar emoji",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Resultados da busca",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viaxes e Lugares",
+  "empty_column.account_timeline": "Sen toots por aquÃ!",
+  "empty_column.blocks": "Non bloqueou ningunha usuaria polo de agora.",
   "empty_column.community": "A liÃ±a temporal local estÃ¡ baldeira. Escriba algo de xeito pÃºblico para que rule!",
   "empty_column.direct": "AÃnda non ten mensaxes directas. Cando envÃe ou reciba unha, aparecerÃ¡ aquÃ.",
+  "empty_column.domain_blocks": "AÃnda non  ocultou ningÃºn dominio.",
+  "empty_column.favourited_statuses": "AÃnda non ten toots favoritos. Cando favoreza algÃºn, aparecerÃ¡ aquÃ.",
+  "empty_column.favourites": "NinguÃ©n favoreceu este toot polo momento. Cando o faga alguÃ©n, aparecerÃ¡n aquÃ.",
+  "empty_column.follow_requests": "Non ten peticiÃ³ns de seguimento. Cando reciba unha, mostrarase aquÃ.",
   "empty_column.hashtag": "AÃnda non hai nada con esta etiqueta.",
   "empty_column.home": "A sÃºa liÃ±a temporal de inicio estÃ¡ baldeira! Visite {public} ou utilice a busca para atopar outras usuarias.",
   "empty_column.home.public_timeline": "a liÃ±a temporal pÃºblica",
   "empty_column.list": "AÃnda non hai nada en esta lista. Cando as usuarias incluÃdas na lista publiquen mensaxes, aparecerÃ¡n aquÃ.",
+  "empty_column.lists": "AÃnda non ten listas. Cando cree unha, mostrarase aquÃ.",
+  "empty_column.mutes": "Non acalou ningunha usuaria polo de agora.",
   "empty_column.notifications": "AÃnda non ten notificaciÃ³ns. InteractÃºe con outras para iniciar unha conversa.",
   "empty_column.public": "Nada por aquÃ! Escriba algo de xeito pÃºblico, ou siga manualmente usuarias de outras instancias para ir enchÃ©ndoa",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rexeitar",
-  "getting_started.developers": "Developers",
+  "getting_started.developers": "Desenvolvedoras",
+  "getting_started.directory": "Directorio do perfil",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Comezando",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Convide a xente",
   "getting_started.open_source_notice": "Mastodon Ã© software de cÃ³digo aberto. Pode contribuÃr ou informar de fallos en GitHub en {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.security": "Seguridade",
+  "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}",
+  "hashtag.column_settings.tag_mode.all": "Todos estos",
+  "hashtag.column_settings.tag_mode.any": "Calquera de estos",
+  "hashtag.column_settings.tag_mode.none": "NingÃºn de estos",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "BÃ¡sico",
   "home.column_settings.show_reblogs": "Mostrar repeticiÃ³ns",
   "home.column_settings.show_replies": "Mostrar respostas",
+  "introduction.federation.action": "Seguinte",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "PublicaciÃ³ns pÃºblicas desde outros servidores do fediverso aparecerÃ¡n na liÃ±a temporal federada.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "PublicaciÃ³ns de xente que vostede segue aparecerÃ¡n no TL de Inicio. Pode seguir a calquera en calquer servidor!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "PublicaciÃ³ns pÃºblicas de xente no seu mesmo servidor aparecerÃ¡n na liÃ±a temporal local.",
+  "introduction.interactions.action": "Rematar titorial!",
+  "introduction.interactions.favourite.headline": "Favorito",
+  "introduction.interactions.favourite.text": "Pode gardar un toot para mÃ¡is tarde, e facerlle saber a autora que lle gustou, dÃ¡ndolle a Favorito.",
+  "introduction.interactions.reblog.headline": "Promocionar",
+  "introduction.interactions.reblog.text": "Pode compartir os toots de outra xente coas sÃºas seguirodas promocionÃ¡ndoos.",
+  "introduction.interactions.reply.headline": "Respostar",
+  "introduction.interactions.reply.text": "Pode respostar aos toots de outras persoas e aos seus propios, asÃ quedarÃ¡n encadeados nunha conversa.",
+  "introduction.welcome.action": "Imos!",
+  "introduction.welcome.headline": "Primeiros pasos",
+  "introduction.welcome.text": "Benvida ao fediverso! Nun intre poderÃ¡ difundir mensaxes e falar cos seus amigos nun gran nÃºmero de servidores. Pero este servidor (dominio) Ã© especialâ€”hospeda o seu perfil, asÃ que lÃ©mbreo.",
   "keyboard_shortcuts.back": "voltar atrÃ¡s",
+  "keyboard_shortcuts.blocked": "abrir lista de usuarias bloqueadas",
   "keyboard_shortcuts.boost": "promover",
   "keyboard_shortcuts.column": "destacar un estado en unha das columnas",
   "keyboard_shortcuts.compose": "Foco no Ã¡rea de escritura",
   "keyboard_shortcuts.description": "DescriciÃ³n",
+  "keyboard_shortcuts.direct": "abrir columna de mensaxes directas",
   "keyboard_shortcuts.down": "ir hacia abaixo na lista",
   "keyboard_shortcuts.enter": "abrir estado",
   "keyboard_shortcuts.favourite": "marcar como favorito",
+  "keyboard_shortcuts.favourites": "abrir lista de favoritos",
+  "keyboard_shortcuts.federated": "abrir liÃ±a temporal federada",
   "keyboard_shortcuts.heading": "Atallos do teclado",
+  "keyboard_shortcuts.home": "abrir liÃ±a temporal de inicio",
   "keyboard_shortcuts.hotkey": "Tecla de acceso directo",
   "keyboard_shortcuts.legend": "para mostrar esta lenda",
+  "keyboard_shortcuts.local": "abrir liÃ±a temporal local",
   "keyboard_shortcuts.mention": "para mencionar o autor",
+  "keyboard_shortcuts.muted": "abrir lista de usuarias acaladas",
+  "keyboard_shortcuts.my_profile": "abrir o seu perfil",
+  "keyboard_shortcuts.notifications": "abrir columna de notificaciÃ³ns",
+  "keyboard_shortcuts.pinned": "abrir lista de toots fixados",
+  "keyboard_shortcuts.profile": "abrir perfil da autora",
   "keyboard_shortcuts.reply": "para responder",
+  "keyboard_shortcuts.requests": "abrir lista de peticiÃ³ns de seguimento",
   "keyboard_shortcuts.search": "para centrar a busca",
+  "keyboard_shortcuts.start": "abrir columna \"comezando\"",
   "keyboard_shortcuts.toggle_hidden": "mostrar/agochar un texto detrÃ¡s do AC",
   "keyboard_shortcuts.toot": "escribir un toot novo",
   "keyboard_shortcuts.unfocus": "quitar o foco do Ã¡rea de escritura/busca",
@@ -159,25 +213,27 @@
   "missing_indicator.label": "Non atopado",
   "missing_indicator.sublabel": "Non se puido atopar o recurso",
   "mute_modal.hide_notifications": "Esconder notificaciÃ³ns deste usuario?",
+  "navigation_bar.apps": "Apps mÃ³biles",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.community_timeline": "LiÃ±a temporal local",
+  "navigation_bar.compose": "Escribir novo toot",
   "navigation_bar.direct": "Mensaxes directas",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.discover": "Descubrir",
   "navigation_bar.domain_blocks": "Dominios agochados",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritas",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Palabras acaladas",
   "navigation_bar.follow_requests": "PeticiÃ³ns de seguimento",
   "navigation_bar.info": "Sobre esta instancia",
   "navigation_bar.keyboard_shortcuts": "Atallos",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
   "navigation_bar.mutes": "Usuarias acaladas",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Persoal",
   "navigation_bar.pins": "Mensaxes fixadas",
   "navigation_bar.preferences": "Preferencias",
   "navigation_bar.public_timeline": "LiÃ±a temporal federada",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "Seguridade",
   "notification.favourite": "{name} marcou como favorito o seu estado",
   "notification.follow": "{name} estÃ¡ a seguila",
   "notification.mention": "{name} mencionoute",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "EstÃ¡s seguro de que queres limpar permanentemente todas as tÃºas notificaciÃ³ns?",
   "notifications.column_settings.alert": "NotificaciÃ³ns de escritorio",
   "notifications.column_settings.favourite": "Favoritas:",
+  "notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorÃas",
+  "notifications.column_settings.filter_bar.category": "Barra de filtrado rÃ¡pido",
+  "notifications.column_settings.filter_bar.show": "Mostrar",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.mention": "MenciÃ³ns:",
   "notifications.column_settings.push": "Enviar notificaciÃ³ns",
-  "notifications.column_settings.push_meta": "Este aparello",
   "notifications.column_settings.reblog": "PromociÃ³ns:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir son",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Feito",
-  "onboarding.next": "Seguinte",
-  "onboarding.page_five.public_timelines": "A liÃ±a de tempo local mostra as publicaciÃ³ns pÃºblicas de todos en {domain}. A liÃ±a de tempo federada mostra as publicaciÃ³ns pÃºblicas de todos os que as persoas en {domain} seguen. Estas son as LiÃ±as de tempo pÃºblicas, unha boa forma de descubrir novas persoas.",
-  "onboarding.page_four.home": "A liÃ±a de tempo local mostra as publicaciÃ³ns das persoas que segues.",
-  "onboarding.page_four.notifications": "A columna de notificaciÃ³ns mostra cando alguÃ©n interactÃºa contigo.",
-  "onboarding.page_one.federation": "Mastodon Ã© unha rede de servidores independentes que se unen para facer unha rede social mÃ¡is grande. Chamamos instancias a estes servidores.",
-  "onboarding.page_one.full_handle": "O seu alcume completo",
-  "onboarding.page_one.handle_hint": "Esto Ã© o que lle debe dicir a quen queira seguila.",
-  "onboarding.page_one.welcome": "Benvido a Mastodon!",
-  "onboarding.page_six.admin": "O administrador da tÃºa instancia Ã© {admin}.",
-  "onboarding.page_six.almost_done": "Case feito...",
-  "onboarding.page_six.appetoot": "Que tootes ben!",
-  "onboarding.page_six.apps_available": "Hai {apps} dispoÃ±Ãbeis para iOS, Android e outras plataformas.",
-  "onboarding.page_six.github": "Mastodon Ã© un software gratuito e de cÃ³digo aberto. Pode informar de erros, solicitar novas funcionalidades ou contribuÃr ao cÃ³digo en {github}.",
-  "onboarding.page_six.guidelines": "directrices da comunidade",
-  "onboarding.page_six.read_guidelines": "Por favor, le as {guidelines} do {domain}!",
-  "onboarding.page_six.various_app": "aplicaciÃ³ns mÃ³biles",
-  "onboarding.page_three.profile": "Edita o teu perfil para cambiar o teu avatar, bio e nome. AlÃ, tamÃ©n atoparÃ¡s outras preferencias.",
-  "onboarding.page_three.search": "Utilice a barra de busca para atopar xente e descubrir etiquetas, como {illustration} e {introductions}. Para atopar unha usuaria que non estÃ¡ en esta instancia utilice o seu enderezo completo.",
-  "onboarding.page_two.compose": "Escriba mensaxes desde a columna de composiciÃ³n. Pode subir imaxes, mudar as opciÃ³ns de intimidade e engadir avisos sobre o contido coas iconas inferiores.",
-  "onboarding.skip": "Saltar",
+  "notifications.filter.all": "Todo",
+  "notifications.filter.boosts": "PromociÃ³ns",
+  "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.follows": "Seguimentos",
+  "notifications.filter.mentions": "MenciÃ³ns",
+  "notifications.group": "{count} notificaciÃ³ns",
   "privacy.change": "Axustar a intimidade do estado",
   "privacy.direct.long": "Enviar exclusivamente as usuarias mencionadas",
   "privacy.direct.short": "Directa",
@@ -250,14 +292,17 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count,plural,one {result} outros {results}}",
   "standalone.public_title": "Ollada dentro...",
+  "status.admin_account": "Abrir interface de moderaciÃ³n para @{name}",
+  "status.admin_status": "Abrir este estado na interface de moderaciÃ³n",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Non promover",
   "status.cannot_reblog": "Esta mensaxe non pode ser promovida",
   "status.delete": "Eliminar",
+  "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mensaxe directa @{name}",
   "status.embed": "Incrustar",
   "status.favourite": "Favorita",
-  "status.filtered": "Filtered",
+  "status.filtered": "Filtrado",
   "status.load_more": "Cargar mÃ¡is",
   "status.media_hidden": "Medios ocultos",
   "status.mention": "Mencionar @{name}",
@@ -267,10 +312,12 @@
   "status.open": "Expandir este estado",
   "status.pin": "Fixar no perfil",
   "status.pinned": "Toot fixado",
+  "status.read_more": "Lea mÃ¡is",
   "status.reblog": "Promover",
   "status.reblog_private": "Promover a audiencia orixinal",
   "status.reblogged_by": "{name} promoveu",
-  "status.redraft": "Delete & re-draft",
+  "status.reblogs.empty": "NinguÃ©n promoveu este toot polo de agora. Cando alguÃ©n o faga, mostrarÃ¡nse aquÃ.",
+  "status.redraft": "Eliminar & reescribir",
   "status.reply": "Resposta",
   "status.replyAll": "Resposta a conversa",
   "status.report": "Informar @{name}",
@@ -281,19 +328,22 @@
   "status.show_less_all": "Mostrar menos para todas",
   "status.show_more": "Mostrar mÃ¡is",
   "status.show_more_all": "Mostrar mÃ¡is para todas",
+  "status.show_thread": "Mostrar fÃo",
   "status.unmute_conversation": "Non acalar a conversa",
   "status.unpin": "Despegar do perfil",
+  "suggestions.dismiss": "Rexeitar suxestiÃ³n",
+  "suggestions.header": "PoderÃa estar interesada enâ€¦",
   "tabs_bar.federated_timeline": "Federado",
   "tabs_bar.home": "Inicio",
   "tabs_bar.local_timeline": "Local",
   "tabs_bar.notifications": "NotificaciÃ³ns",
   "tabs_bar.search": "Buscar",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} outras {people}} conversando",
   "ui.beforeunload": "O borrador perderase se sae de Mastodon.",
   "upload_area.title": "Arrastre e solte para subir",
-  "upload_button.label": "Engadir medios",
+  "upload_button.label": "Engadir medios (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Describa para deficientes visuais",
-  "upload_form.focus": "Recortar",
+  "upload_form.focus": "Cambiar vista previa",
   "upload_form.undo": "Eliminar",
   "upload_progress.label": "Subindo...",
   "video.close": "Pechar video",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 952c3d6db0c5238e42f38117d694a9e482df97cb..e27e7f09e6c883dd75ca567d4651ed2607fec833 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "×—×¡×™×ž×ª @{name}",
   "account.block_domain": "×œ×”×¡×ª×™×¨ ×”×›×œ ×ž×”×§×”×™×œ×” {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "×”×ž×™×“×¢ ×œ×”×œ×Ÿ ×¢×©×•×™ ×œ×”×™×•×ª ×œ× ×¢×“×›× ×™ ××• ×œ× ×©×œ×.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "×¢×¨×™×›×ª ×¤×¨×•×¤×™×œ",
+  "account.endorse": "Feature on profile",
   "account.follow": "×ž×¢×§×‘",
   "account.followers": "×¢×•×§×‘×™×",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "× ×¢×§×‘×™×",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "×‘×ž×¢×§×‘ ××—×¨×™×š",
   "account.hide_reblogs": "×œ×”×¡×ª×™×¨ ×”×™×“×”×•×“×™× ×ž××ª @{name}",
+  "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} ×”×•×¢×‘×¨ ××œ:",
@@ -22,16 +28,17 @@
   "account.posts_with_replies": "Toots with replies",
   "account.report": "×œ×“×•×•×— ×¢×œ @{name}",
   "account.requested": "×‘×”×ž×ª× ×” ×œ××™×©×•×¨",
-  "account.share": "×œ×©×ª×£ ××ª ××•×“×•×ª @{name}",
+  "account.share": "×œ×©×ª×£ ××ª ×”×¤×¨×•×¤×™×œ ×©×œ @{name}",
   "account.show_reblogs": "×œ×”×¨××•×ª ×”×“×”×•×“×™× ×ž××ª @{name}",
   "account.unblock": "×”×¡×¨×ª ×—×¡×™×ž×” ×ž×¢×œ @{name}",
   "account.unblock_domain": "×”×¡×¨ ×—×¡×™×ž×” ×ž×§×”×™×œ×ª {domain}",
+  "account.unendorse": "×œ× ×œ×”×¦×™×’ ×‘×¤×¨×•×¤×™×œ",
   "account.unfollow": "×”×¤×¡×§×ª ×ž×¢×§×‘",
   "account.unmute": "×”×¤×¡×§×ª ×”×©×ª×§×ª @{name}",
   "account.unmute_notifications": "×œ×”×¤×¡×™×§ ×”×¡×ª×¨×ª ×”×•×“×¢×•×ª ×ž×¢× @{name}",
-  "account.view_full_profile": "×”×¨××” ××•×“×•×ª ×ž×œ××•×ª",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
+  "account.view_full_profile": "×”×¦×’×ª ×¤×¨×•×¤×™×œ ×ž×œ×",
+  "alert.unexpected.message": "××™×¨×¢×” ×©×’×™××” ×‘×œ×ª×™ ×¦×¤×•×™×”.",
+  "alert.unexpected.title": "××•×¤×¡!",
   "boost_modal.combo": "× ×™×ª×Ÿ ×œ×”×§×™×© {combo} ×›×“×™ ×œ×“×œ×’ ×‘×¤×¢× ×”×‘××”",
   "bundle_column_error.body": "×ž×©×”×• ×”×©×ª×‘×© ×‘×¢×ª ×”×¦×’×ª ×”×¨×›×™×‘ ×”×–×”.",
   "bundle_column_error.retry": "×œ× ×¡×•×ª ×©×•×‘",
@@ -86,6 +93,8 @@
   "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.unfollow.message": "×œ×”×¤×¡×™×§ ×ž×¢×§×‘ ××—×¨×™ {name}?",
   "embed.instructions": "× ×™×ª×Ÿ ×œ×”×˜×ž×™×¢ ××ª ×”×”×•×“×¢×” ×‘××ª×¨×š ×¢\"×™ ×”×¢×ª×§×ª ×”×§×•×“ ×©×œ×”×œ×Ÿ.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "×ª×•×¦××•×ª ×—×™×¤×•×©",
   "emoji_button.symbols": "×¡×ž×œ×™×",
   "emoji_button.travel": "×˜×™×•×œ×™× ×•××ª×¨×™×",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "××™×Ÿ ×›×œ×•× ×‘×”××©×ª×’ ×”×–×” ×¢×“×™×™×Ÿ.",
   "empty_column.home": "××£ ××—×“ ×œ× ×‘×ž×¢×§×‘ ×¢×“×™×™×Ÿ. ××¤×©×¨ ×œ×‘×§×¨ ×‘{public} ××• ×œ×”×©×ª×ž×© ×‘×—×™×¤×•×© ×›×“×™ ×œ×”×ª×—×™×œ ×•×œ×”×›×™×¨ ×—×¦×•×¦×¨× ×™× ××—×¨×™×.",
   "empty_column.home.public_timeline": "×¦×™×¨ ×–×ž×Ÿ ×‘×™×Ÿ-×§×”×™×œ×ª×™",
   "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.notifications": "××™×Ÿ ×”×ª×¨××•×ª ×¢×“×™×™×Ÿ. ×™××œ×œ×”, ×”×’×™×¢ ×”×–×ž×Ÿ ×œ×”×ª×—×™×œ ×œ×”×ª×¢×¨×‘×‘.",
   "empty_column.public": "××™×Ÿ ×¤×” ×›×œ×•×! ×›×“×™ ×œ×ž×œ× ××ª ×”×˜×•×¨ ×”×–×” ××¤×©×¨ ×œ×›×ª×•×‘ ×ž×©×”×•, ××• ×œ×”×ª×—×™×œ ×œ×¢×§×•×‘ ××—×¨×™ ×× ×©×™× ×ž×§×”×™×œ×•×ª ××—×¨×•×ª",
   "follow_request.authorize": "×§×‘×œ×”",
   "follow_request.reject": "×“×—×™×”",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "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.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",
   "home.column_settings.basic": "×œ×ž×ª×—×™×œ×™×",
   "home.column_settings.show_reblogs": "×”×¦×’×ª ×”×“×”×•×“×™×",
   "home.column_settings.show_replies": "×”×¦×’×ª ×ª×’×•×‘×•×ª",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "× ×™×•×•×˜ ×—×–×¨×”",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "×œ×”×“×”×“",
   "keyboard_shortcuts.column": "×œ×”×ª×ž×§×“ ×‘×”×•×“×¢×” ×‘××—×“ ×ž×”×˜×•×¨×™×",
   "keyboard_shortcuts.compose": "×œ×”×ª×ž×§×“ ×‘×ª×™×‘×ª ×—×™×‘×•×¨ ×”×”×•×“×¢×•×ª",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "×œ× ×•×¢ ×‘×ž×•×¨×“ ×”×¨×©×™×ž×”",
   "keyboard_shortcuts.enter": "to open status",
   "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.hotkey": "×ž×§×© ×§×™×¦×•×¨",
   "keyboard_shortcuts.legend": "×œ×”×¦×™×’ ××ª ×”×¤×™×¨×•×©",
+  "keyboard_shortcuts.local": "to open local timeline",
   "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.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.search": "×œ×”×ª×ž×§×“ ×‘×—×œ×•×Ÿ ×”×—×™×¤×•×©",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "×œ×”×ª×—×™×œ ×—×™×¦×¨×•×¥ ×—×“×©",
   "keyboard_shortcuts.unfocus": "×œ×¦××ª ×ž×ª×™×‘×ª ×—×™×‘×•×¨/×—×™×¤×•×©",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "×œ× × ×ž×¦×",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "×œ×”×¡×ª×™×¨ ×”×•×“×¢×•×ª ×ž×—×©×‘×•×Ÿ ×–×”?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "×—×¡×™×ž×•×ª",
   "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",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "×œ×”×¡×™×¨ ××ª ×›×œ ×”×”×ª×¨××•×ª? ×‘×˜×•×—?",
   "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.follow": "×¢×•×§×‘×™× ×—×“×©×™×:",
   "notifications.column_settings.mention": "×¤× ×™×•×ª:",
   "notifications.column_settings.push": "×”×•×“×¢×•×ª ×‘×“×—×™×¤×”",
-  "notifications.column_settings.push_meta": "×ž×›×©×™×¨ ×–×”",
   "notifications.column_settings.reblog": "×”×“×”×•×“×™×:",
   "notifications.column_settings.show": "×”×¦×’×” ×‘×˜×•×¨",
   "notifications.column_settings.sound": "×©×ž×¢ ×ž×•×¤×¢×œ",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "×™×¦×™××”",
-  "onboarding.next": "×”×œ××”",
-  "onboarding.page_five.public_timelines": "×¦×™×¨ ×”×–×ž×Ÿ ×”×ž×§×•×ž×™ ×ž×¨××” ×”×•×“×¢×•×ª ×¤×•×ž×‘×™×•×ª ×ž×›×œ ×‘××™ ×§×”×™×œ×ª {domain}. ×¦×™×¨ ×”×–×ž×Ÿ ×”×¢×•×œ×ž×™ ×ž×¨××” ×”×•×“×¢×•×ª ×¤×•×ž×‘×™×•×ª ×ž××ª ×›×™ ×ž×™ ×©×‘××™ ×§×”×™×œ×ª {domain} ×¢×•×§×‘×™× ××—×¨×™×•. ××œ×• ×¦×™×¨×™ ×”×–×ž×Ÿ ×”×¤×•×ž×‘×™×™×, ×“×¨×š × ×”×“×¨×ª ×œ×’×œ×•×ª ×× ×©×™× ×—×“×©×™×.",
-  "onboarding.page_four.home": "×¦×™×¨ ×–×ž×Ÿ ×”×‘×™×ª ×ž×¨××” ×”×•×“×¢×•×ª ×ž×”× ×¢×§×‘×™× ×©×œ×š.",
-  "onboarding.page_four.notifications": "×˜×•×¨ ×”×”×ª×¨××•×ª ×ž×¨××” ×›×©×ž×™×©×”×• ×ž×ª×™×™×—×¡ ×œ×”×•×“×¢×•×ª ×©×œ×š.",
-  "onboarding.page_one.federation": "×ž×¡×˜×•×“×•×Ÿ ×”×™× ×¨×©×ª ×©×œ ×©×¨×ª×™× ×¢×¦×ž××™×™× ×ž×¦×•×¨×¤×™× ×‘×™×—×“ ×œ×›×“×™ ×¨×©×ª ×—×‘×¨×ª×™×ª ××—×ª ×’×“×•×œ×”. ×× ×—× ×• ×ž×›× ×™× ××ª ×”×©×¨×ª×™× ×”××œ×• ×§×”×™×œ×•×ª.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "×‘×¨×•×›×™× ×”×‘××™× ×œ×ž×¡×˜×•×“×•×Ÿ!",
-  "onboarding.page_six.admin": "×”×§×”×™×œ×” ×ž× ×•×”×œ×ª ×‘×™×“×™ {admin}.",
-  "onboarding.page_six.almost_done": "×›×ž×¢×˜ ×¡×™×™×ž× ×•...",
-  "onboarding.page_six.appetoot": "×‘×ª×•×ª××‘×•×Ÿ!",
-  "onboarding.page_six.apps_available": "×§×™×™×ž×™× {apps} ×–×ž×™× ×™× ×¢×‘×•×¨ ×× ×“×¨×•××™×“, ××™×™×¤×•×Ÿ ×•×¤×œ×˜×¤×•×¨×ž×•×ª × ×•×¡×¤×•×ª.",
-  "onboarding.page_six.github": "×ž×¡×˜×•×“×•×Ÿ ×”×•× ×ª×•×›× ×” ×—×•×¤×©×™×ª. × ×™×ª×Ÿ ×œ×“×•×•×— ×¢×œ ×‘××’×™×, ×œ×‘×§×© ×™×›×•×œ×•×ª, ××• ×œ×ª×¨×•× ×œ×§×•×“ ×‘××ª×¨ {github}.",
-  "onboarding.page_six.guidelines": "×—×•×§×™ ×”×§×”×™×œ×”",
-  "onboarding.page_six.read_guidelines": "× × ×œ×§×¨×•× ××ª {guidelines} ×©×œ {domain}!",
-  "onboarding.page_six.various_app": "×™×™×©×•×ž×•× ×™× × ×™×™×“×™×",
-  "onboarding.page_three.profile": "×¥×ª×—×ª '×¢×¨×™×›×ª ×¤×¨×•×¤×™×œ' × ×™×ª×Ÿ ×œ×”×—×œ×™×£ ××ª ×ª×ž×•× ×ª ×”×¤×¨×•×¤×™×œ ×©×œ×š, ×ª×™××•×¨ ×§×¦×¨, ×•×”×©× ×”×ž×•×¦×’. ×©× ×’× × ×™×ª×Ÿ ×œ×ž×¦×•× ××¤×©×¨×•×™×•×ª ×•×”×¢×“×¤×•×ª × ×•×¡×¤×•×ª.",
-  "onboarding.page_three.search": "×‘×—×œ×•× ×™×ª ×”×—×™×¤×•×© × ×™×ª×Ÿ ×œ×—×¤×© ×× ×©×™× ×•×”××©×ª×’×™×, ×›×ž×• ×œ×ž×©×œ {illustration} ××• {introductions}. ×›×“×™ ×œ×ž×¦×•× ×ž×™×©×”×• ×©×œ× ×¢×œ ×”××™× ×¡×˜× ×¡ ×”×ž×§×•×ž×™, ×™×© ×œ×”×©×ª×ž×© ×‘×›×™× ×•×™ ×”×ž×©×ª×ž×© ×”×ž×œ×.",
-  "onboarding.page_two.compose": "×”×•×“×¢×•×ª ×›×•×ª×‘×™× ×ž×˜×•×¨ ×”×›×ª×™×‘×”. × ×™×ª×Ÿ ×œ× ×¢×œ×•×ª ×ª×ž×•× ×•×ª, ×œ×©× ×•×ª ×”×’×“×¨×•×ª ×¤×¨×˜×™×•×ª, ×•×œ×”×•×¡×™×£ ××–×”×¨×•×ª ×ª×•×›×Ÿ ×‘×¢×–×¨×ª ×”××™×™×§×•× ×™× ×©×ž×ª×—×ª.",
-  "onboarding.skip": "×œ×“×œ×’",
   "privacy.change": "×©×™× ×•×™ ×¤×¨×˜×™×•×ª ×”×”×•×“×¢×”",
   "privacy.direct.long": "×”×¦×’ ×¨×§ ×œ×ž×™ ×©×”×•×“×¢×” ×–×• ×¤×•× ×” ××œ×™×•",
   "privacy.direct.short": "×”×•×“×¢×” ×™×©×™×¨×”",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {×ª×•×¦××”} other {×ª×•×¦××•×ª}}",
   "standalone.public_title": "×”×¦×¦×” ×¤× ×™×ž×”...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "×œ× × ×™×ª×Ÿ ×œ×”×“×”×“ ×”×•×“×¢×” ×–×•",
   "status.delete": "×ž×—×™×§×”",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "×”×˜×ž×¢×”",
   "status.favourite": "×—×™×‘×•×‘",
@@ -267,9 +312,11 @@
   "status.open": "×”×¨×—×‘×ª ×”×•×“×¢×”",
   "status.pin": "×œ×§×‘×¢ ×‘××•×“×•×ª",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "×”×“×”×•×“",
   "status.reblog_private": "Boost to original audience",
   "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.reply": "×ª×’×•×‘×”",
   "status.replyAll": "×ª×’×•×‘×” ×œ×›×•×œ×",
@@ -281,8 +328,11 @@
   "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.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": "×¦×™×¨ ×–×ž×Ÿ ×ž×§×•×ž×™",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index f8f1d0eb389df61bf285d233a50543e3fa69dcc5..71dd5319e77fc5d840c2b8d67ab97a2ddeb827dc 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Blokiraj @{name}",
   "account.block_domain": "Sakrij sve sa {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veÄ‡i.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Uredi profil",
+  "account.endorse": "Feature on profile",
   "account.follow": "Slijedi",
   "account.followers": "Sljedbenici",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Slijedi",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "te slijedi",
   "account.hide_reblogs": "Hide boosts from @{name}",
+  "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": "Spomeni @{name}",
   "account.moved_to": "{name} has moved to:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Show boosts from @{name}",
   "account.unblock": "Deblokiraj @{name}",
   "account.unblock_domain": "PoniÅ¡ti sakrivanje {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Prestani slijediti",
   "account.unmute": "PoniÅ¡ti utiÅ¡avanje @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "Jesi li siguran da Å¾eliÅ¡ utiÅ¡ati {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": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Putovanja & Mjesta",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "Lokalni timeline je prazan. NapiÅ¡i neÅ¡to javno kako bi pokrenuo 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": "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "JoÅ¡ ne postoji niÅ¡ta s ovim hashtagom.",
   "empty_column.home": "JoÅ¡ ne slijediÅ¡ nikoga. Posjeti {public} ili koristi traÅ¾ilicu kako bi poÄeo i upoznao druge korisnike.",
   "empty_column.home.public_timeline": "javni timeline",
   "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.notifications": "JoÅ¡ nemaÅ¡ notifikacija. Komuniciraj sa drugima kako bi zapoÄeo razgovor.",
   "empty_column.public": "Ovdje nema niÅ¡ta! NapiÅ¡i neÅ¡to javno, ili ruÄno slijedi korisnike sa drugih instanci kako bi popunio",
   "follow_request.authorize": "Autoriziraj",
   "follow_request.reject": "Odbij",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "PoÄnimo",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon je softver otvorenog koda. MoÅ¾eÅ¡ pridonijeti ili prijaviti probleme na GitHubu  {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.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",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "PokaÅ¾i boostove",
   "home.column_settings.show_replies": "PokaÅ¾i odgovore",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Nije naÄ‘en",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blokirani korisnici",
   "navigation_bar.community_timeline": "Lokalni timeline",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Å½eliÅ¡ li zaista obrisati sve svoje notifikacije?",
   "notifications.column_settings.alert": "Desktop notifikacije",
   "notifications.column_settings.favourite": "Favoriti:",
+  "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.follow": "Novi sljedbenici:",
   "notifications.column_settings.mention": "Spominjanja:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boostovi:",
   "notifications.column_settings.show": "PrikaÅ¾i u stupcu",
   "notifications.column_settings.sound": "Sviraj zvuk",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "UÄinjeno",
-  "onboarding.next": "SljedeÄ‡e",
-  "onboarding.page_five.public_timelines": "Lokalni timeline prikazuje javne postove sviju od svakog na {domain}. Federalni timeline prikazuje javne postove svakog koga ljudi na {domain} slijede. To su Javni Timelineovi, sjajan naÄin za otkriti nove ljude.",
-  "onboarding.page_four.home": "The home timeline prikazuje postove ljudi koje slijediÅ¡.",
-  "onboarding.page_four.notifications": "Stupac za notifikacije pokazuje poruke drugih upuÄ‡ene tebi.",
-  "onboarding.page_one.federation": "Mastodon Äini mreÅ¾a  neovisnih servera udruÅ¾enih u jednu veÄ‡u socialnu mreÅ¾u. Te servere nazivamo instancama.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Dobro doÅ¡li na Mastodon!",
-  "onboarding.page_six.admin": "Administrator tvoje instance je {admin}.",
-  "onboarding.page_six.almost_done": "JoÅ¡ malo pa gotovo...",
-  "onboarding.page_six.appetoot": "Å½ivjeli!",
-  "onboarding.page_six.apps_available": "Postoje {apps} dostupne za iOS, Android i druge platforme.",
-  "onboarding.page_six.github": "Mastodon je besplatan softver otvorenog koda. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "smjernice zajednice",
-  "onboarding.page_six.read_guidelines": "Molimo proÄitaj {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobilne aplikacije",
-  "onboarding.page_three.profile": "Uredi svoj profil promjenom svog avatara, biografije, i imena. Ovdje Ä‡eÅ¡ isto tako pronaÄ‡i i druge postavke.",
-  "onboarding.page_three.search": "Koristi traÅ¾ilicu kako bi pronaÅ¡ao ljude i traÅ¾io hashtags, kao Å¡to su {illustration} i {introductions}. Kako bi pronaÅ¡ao osobu koja nije na ovoj instanci, upotrijebi njen pun handle.",
-  "onboarding.page_two.compose": "PiÅ¡i postove u stupcu za sastavljanje. MoÅ¾eÅ¡ uploadati slike, promijeniti postavke privatnosti, i dodati upozorenja o sadrÅ¾aju s ikonama ispod.",
-  "onboarding.skip": "PreskoÄi",
   "privacy.change": "Podesi status privatnosti",
   "privacy.direct.long": "PrikaÅ¾i samo spomenutim korisnicima",
   "privacy.direct.short": "Direktno",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Ovaj post ne moÅ¾e biti boostan",
   "status.delete": "ObriÅ¡i",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "OznaÄi omiljenim",
@@ -267,9 +312,11 @@
   "status.open": "ProÅ¡iri ovaj status",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Podigni",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "{name} je podigao",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.reply": "Odgovori",
   "status.replyAll": "Odgovori na temu",
@@ -281,8 +328,11 @@
   "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": "Show thread",
   "status.unmute_conversation": "PoniÅ¡ti utiÅ¡avanje razgovora",
   "status.unpin": "Unpin from profile",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "Federalni",
   "tabs_bar.home": "Dom",
   "tabs_bar.local_timeline": "Lokalno",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 1b2397f70765560e39b589bac73ab7b6b19fe168..c2842aea7b677ad42a291f4eae30a5aa759fb772 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "@{name} letiltÃ¡sa",
   "account.block_domain": "Minden elrejtÃ©se innen: {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Az alul talÃ¡lhatÃ³ informÃ¡ciÃ³k hiÃ¡nyosan mutathatjÃ¡k be a felhasznÃ¡lÃ³t.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Profil szerkesztÃ©se",
+  "account.endorse": "Feature on profile",
   "account.follow": "KÃ¶vetÃ©s",
   "account.followers": "KÃ¶vetÅ‘k",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "KÃ¶vetve",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "KÃ¶vetnek tÃ©ged",
   "account.hide_reblogs": "Rejtsd el a tÃ¼lkÃ¶lÃ©st @{name}-tÃ³l/tÅ‘l",
+  "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Ã©dia",
   "account.mention": "@{name} emlÃtÃ©se",
   "account.moved_to": "{name} Ã¡tkÃ¶ltÃ¶zÃ¶tt:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "@{name} kedvenceinek mutatÃ¡sa",
   "account.unblock": "@{name} kiblokkolÃ¡sa",
   "account.unblock_domain": "{domain} mutatÃ¡sa",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "KÃ¶vetÃ©s abbahagyÃ¡sa",
   "account.unmute": "@{name} kinÃ©mÃtÃ¡sa",
   "account.unmute_notifications": "@{name} Ã©rtesÃtÃ©seinek kinÃ©mÃtÃ¡sa",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "Biztos benne, hogy nÃ©mÃtani szeretnÃ© {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": "KÃ¶vetÃ©s visszavonÃ¡sa",
   "confirmations.unfollow.message": "Biztos benne, hogy vissza szeretnÃ© vonni {name} kÃ¶vetÃ©sÃ©t?",
   "embed.instructions": "Ãgyazza be ezen stÃ¡tuszt weboldalÃ¡ba az alÃ¡bbi kÃ³d mÃ¡solÃ¡sÃ¡val.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "KeresÃ©si talÃ¡latok",
   "emoji_button.symbols": "SzimbÃ³lumok",
   "emoji_button.travel": "UtazÃ¡s Ã©s Helyek",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "A helyi idÅ‘vonal Ã¼res. Ãrj egy publikus stÃ¡stuszt, hogy elindÃtsd a labdÃ¡t!",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "Jelenleg nem talÃ¡lhatÃ³ semmi ezen hashtaggel.",
   "empty_column.home": "A hazai idÅ‘vonala Ã¼res! LÃ¡togasd meg a {public} vagy hasznÃ¡ld a keresÅ‘t, hogy ismerj meg mÃ¡s felhasznÃ¡lÃ³kat.",
   "empty_column.home.public_timeline": "publikus idÅ‘vonal",
   "empty_column.list": "A lista jelenleg Ã¼res. Mikor a listatagok Ãºj stÃ¡tuszt posztolnak itt meg fognak jelenni.",
+  "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": "Jelenleg nincsenek Ã©rtesÃtÃ©sei. LÃ©pj kapcsolatba mÃ¡sokkal, hogy indÃtsd el a beszÃ©lgetÃ©st.",
   "empty_column.public": "Jelenleg semmi nincs itt! Ãrj valamit publikusan vagy kÃ¶vess mÃ¡s szervereken levÅ‘ felhasznÃ¡lÃ³kat, hogy megtÃ¶ltsd",
   "follow_request.authorize": "EngedÃ©lyez",
   "follow_request.reject": "VisszautasÃt",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "ElsÅ‘ lÃ©pÃ©sek",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon egy nyÃlt forrÃ¡skÃ³dÃº szoftver. HozzÃ¡jÃ¡rulÃ¡s vagy problÃ©mÃ¡k jelentÃ©se a GitHub-on {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.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",
   "home.column_settings.basic": "Alap",
   "home.column_settings.show_reblogs": "IsmÃ©tlÃ©sek mutatÃ¡sa",
   "home.column_settings.show_replies": "VÃ¡laszok mutatÃ¡sa",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "vissza navigÃ¡lÃ¡s",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "ismÃ©tlÃ©s",
   "keyboard_shortcuts.column": "Ã¶sszpontosÃtson egy stÃ¡tuszra az egyik oszlopban",
   "keyboard_shortcuts.compose": "fÃ³kuszÃ¡lja a szerkesztÃ©si szÃ¶vegdobozt",
   "keyboard_shortcuts.description": "LeÃrÃ¡s",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "lefele navigÃ¡lÃ¡s a listÃ¡ban",
   "keyboard_shortcuts.enter": "stÃ¡tusz megnyitÃ¡sa",
   "keyboard_shortcuts.favourite": "kedvenccÃ© tÃ©tel",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "BillentyÅ± rÃ¶vidÃtÃ©sek",
+  "keyboard_shortcuts.home": "to open home timeline",
   "keyboard_shortcuts.hotkey": "GyorsbillentyÅ±",
   "keyboard_shortcuts.legend": "jelmagyarÃ¡zat megjelenÃtÃ©se",
+  "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "szerzÅ‘ megjelenÃtÃ©se",
+  "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.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "vÃ¡laszolÃ¡s",
+  "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "keresÅ‘ kiemelÃ©se",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "Ãºj tÃ¼lk megkezdÃ©se",
   "keyboard_shortcuts.unfocus": "tÃ¼lk szerkesztÃ©s/keresÃ©s fÃ³kuszpontbÃ³l valÃ³ kivÃ©tele",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Nincs talÃ¡lat",
   "missing_indicator.sublabel": "Ezen forrÃ¡s nem talÃ¡lhatÃ³",
   "mute_modal.hide_notifications": "Ã‰rtesÃtÃ©sek elrejtÃ©se ezen felhasznÃ¡lÃ³tÃ³l?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Tiltott felhasznÃ¡lÃ³k",
   "navigation_bar.community_timeline": "Helyi idÅ‘vonal",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Biztos benne, hogy vÃ©glegesen tÃ¶rÃ¶lni akarja az Ã¶sszes Ã©rtesÃtÃ©sÃ©t?",
   "notifications.column_settings.alert": "Asztali gÃ©pi Ã©rtesÃtÃ©sek",
   "notifications.column_settings.favourite": "Kedvencek:",
+  "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.follow": "Ãšj kÃ¶vetÅ‘k:",
   "notifications.column_settings.mention": "MegemÃtÃ©seim:",
   "notifications.column_settings.push": "Push Ã©rtesÃtÃ©sek",
-  "notifications.column_settings.push_meta": "Ezen eszkÃ¶z",
   "notifications.column_settings.reblog": "RebloggolÃ¡sok:",
   "notifications.column_settings.show": "Oszlopban mutatÃ¡s",
   "notifications.column_settings.sound": "Hang lejÃ¡tszÃ¡sa",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Befejezve",
-  "onboarding.next": "KÃ¶vetkezÅ‘",
-  "onboarding.page_five.public_timelines": "A helyi idÅ‘vonal mindenkinek a publikus posztjÃ¡t mutatja a(z) {domain}-n. A federÃ¡lt idÅ‘vonal mindenki publikus posztjÃ¡t mutatja akit {domain} felhasznÃ¡lÃ³i kÃ¶vetnek. Ezek a publikus idÅ‘vonalak, nagyszerÅ± mÃ³d Ãºj emberek megismerÃ©sÃ©re.",
-  "onboarding.page_four.home": "A hazai idÅ‘vonal azon emberek posztjait mutatja akiket te kÃ¶vetsz.",
-  "onboarding.page_four.notifications": "Az Ã©rtesÃtÃ©sek oszlop mÃ¡s felhasznÃ¡lÃ³k interakciÃ³jÃ¡t veled tÃ¼krÃ¶zi.",
-  "onboarding.page_one.federation": "Mastodon egy fÃ¼ggetlen szerverekbÅ‘l alkotott hÃ¡lÃ³zat melyek egyÃ¼ttmÅ±kÃ¶dÃ©se egy nagy szociÃ¡lis hÃ¡lÃ³t kÃ©pez. Ezeket a szervereket instanciÃ¡knak hÃvjuk.",
-  "onboarding.page_one.full_handle": "Teljes elÃ©rhetÅ‘sÃ©ged",
-  "onboarding.page_one.handle_hint": "Ez az amit a barÃ¡taidnak mondasz ha meg akarnak keresni.",
-  "onboarding.page_one.welcome": "ÃœdvÃ¶zÃ¶lÃ¼nk a Mastodon-on!",
-  "onboarding.page_six.admin": "Az instanciÃ¡d adminisztrÃ¡tora {admin}.",
-  "onboarding.page_six.almost_done": "Majdnem megvan...",
-  "onboarding.page_six.appetoot": "Bon AppetÃ¼lk!",
-  "onboarding.page_six.apps_available": "Vannak {apps} iOS-re, Androidra Ã©s mÃ¡s platformokra is.",
-  "onboarding.page_six.github": "Mastodon egy szabad Ã©s nyÃlt-forrÃ¡skÃ³dÃº szoftver. Jelentheted a bug-okat, kÃ©rhetsz Ãºj funkcionalitÃ¡sokat vagy hozzÃ¡jÃ¡rulhatsz a kÃ³dhoz {github}-on.",
-  "onboarding.page_six.guidelines": "kÃ¶zÃ¶ssÃ©gi ÃºtmutatÃ³",
-  "onboarding.page_six.read_guidelines": "KÃ©rjÃ¼k olvassa el a(z) {domain}-nak a {guidelines}jÃ¡t!",
-  "onboarding.page_six.various_app": "alkalmazÃ¡sok",
-  "onboarding.page_three.profile": "MÃ³dosÃtsa a profiljÃ¡t, hogy megvÃ¡ltoztassa az avatÃ¡rt, bio-t vagy nevet. Ott megtalÃ¡lja a tÃ¶bbi beÃ¡llÃtÃ¡st is.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "ÃtugrÃ¡s",
   "privacy.change": "StÃ¡tusz lÃ¡thatÃ³sÃ¡gÃ¡nak mÃ³dosÃtÃ¡sa",
   "privacy.direct.long": "PosztolÃ¡s csak az emlÃtett felhasznÃ¡lÃ³knak",
   "privacy.direct.short": "Egyenesen",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "BetekintÃ©s...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Ezen stÃ¡tusz nem rebloggolhatÃ³",
   "status.delete": "TÃ¶rlÃ©s",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "BeÃ¡gyaz",
   "status.favourite": "Kedvenc",
@@ -267,9 +312,11 @@
   "status.open": "StÃ¡tusz kinagyÃtÃ¡sa",
   "status.pin": "KitÅ±zÃ©s a profilra",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Reblog",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "{name} reblogolta",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.reply": "VÃ¡lasz",
   "status.replyAll": "VÃ¡laszolj a beszÃ©lgetÃ©sre",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "TÃ¶bbet",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "status.unmute_conversation": "BeszÃ©lgetÃ©s nÃ©mÃtÃ¡sÃ¡nak elvonÃ¡sa",
   "status.unpin": "KitÅ±zÃ©s eltÃ¡volÃtÃ¡sa a profilrÃ³l",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "FederÃ¡lt",
   "tabs_bar.home": "KezdÅ‘lap",
   "tabs_bar.local_timeline": "Local",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index d2e1bf03ef5342fe84f2f00cf8ad7b44aac5fa8a..6919948874fc5e814c32a582de975eacf9eb637c 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "account.block_domain": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ Õ¡Õ´Õ¥Õ¶Õ¨ Õ°Õ¥Õ¿Õ¥Ö‚ÕµÕ¡Õ¬ Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ«ÖÕ {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Õ†Õ¥Ö€Ö„Õ¸Õ°Õ«Õ·ÕµÕ¡Õ¬Õ¨ Õ¯Õ¡Ö€Õ¸Õ² Õ§ Õ¸Õ¹ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¡Ö€Õ¿Õ¡ÖÕ¸Õ¬Õ¥Õ¬ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ» Õ§Õ»Õ« Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö€Õ¨Ö‰",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Ô½Õ´Õ¢Õ¡Õ£Ö€Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¨",
+  "account.endorse": "Feature on profile",
   "account.follow": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬",
   "account.followers": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¾Õ¸Õ²Õ¶Õ¥Ö€",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Õ€Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ§ Ö„Õ¥Õ¦",
   "account.hide_reblogs": "Ô¹Õ¡Ö„ÖÕ¶Õ¥Õ¬ @{name}ÖŠÕ« Õ¿Õ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
+  "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}ÖŠÕ¨ Õ¿Õ¥Õ²Õ¡ÖƒÕ¸ÕÕ¾Õ¥Õ¬ Õ§Õ",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ @{name}ÖŠÕ« Õ¿Õ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
   "account.unblock": "Ô±ÕºÕ¡Õ¡Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "account.unblock_domain": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ {domain} Õ©Õ¡Ö„ÖÕ¾Õ¡Õ® Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ« Õ£Ö€Õ¡Õ¼Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Õ‰Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬",
   "account.unmute": "Ô±ÕºÕ¡Õ¬Õ¼Õ¥ÖÕ¶Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "account.unmute_notifications": "Õ„Õ«Õ¡ÖÕ¶Õ¥Õ¬ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ @{name}ÖŠÕ«Ö",
@@ -86,6 +93,8 @@
   "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.unfollow.message": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ Õ¡ÕµÕ¬Õ¥Ö‚Õ½ Õ¹Õ°Õ¥Õ¿Õ¥Ö‚Õ¥Õ¬ {name}ÖŠÕ«Õ¶Ö‰",
   "embed.instructions": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Ö„Õ¸ Õ¯Õ¡ÕµÖ„Õ¸Ö‚Õ´ Õ¶Õ¥Ö€Õ¤Õ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Õ¯Õ¡Ö€Õ¸Õ² Õ¥Õ½ ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Õ¬ Õ¶Õ¥Ö€Ö„Õ¸Õ°Õ«Õ·ÕµÕ¡Õ¬ Õ¯Õ¸Õ¤Õ¨Ö‰",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "ÕˆÖ€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¡Ö€Õ¤ÕµÕ¸Ö‚Õ¶Ö„Õ¶Õ¥Ö€",
   "emoji_button.symbols": "Õ†Õ·Õ¡Õ¶Õ¶Õ¥Ö€",
   "emoji_button.travel": "ÕˆÖ‚Õ²Õ¥Ö‚Õ¸Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ Õ¥Ö‚ Õ¿Õ¥Õ²Õ¡Õ¶Ö„Õ¶Õ¥Ö€",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "Ô±ÕµÕ½ ÕºÕ«Õ¿Õ¡Õ¯Õ¸Õ¾ Õ¤Õ¥Õ¼ Õ¸Õ¹Õ«Õ¶Õ¹ Õ¹Õ¯Õ¡Ö‰",
   "empty_column.home": "Õ”Õ¸ Õ°Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ Õ¤Õ¡Õ¿Õ¡Õ›Ö€Õ¯ Õ§Ö‰ Ô±ÕµÖÕ¥Õ¬Õ«Õ›Ö€ {public}Õ¨ Õ¯Õ¡Õ´ Ö…Õ£Õ¿Õ¾Õ«Ö€ Õ¸Ö€Õ¸Õ¶Õ¸Ö‚Õ´Õ«ÖÕ Õ¡ÕµÕ¬ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ°Õ¡Õ¶Õ¤Õ«ÕºÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "empty_column.home.public_timeline": "Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„",
   "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.notifications": "ÕˆÕ¹ Õ´Õ« Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´ Õ¤Õ¥Õ¼ Õ¹Õ¸Ö‚Õ¶Õ¥Õ½Ö‰ Ô²Õ¦Õ«Ö€ Õ´ÕµÕ¸Ö‚Õ½Õ¶Õ¥Ö€Õ«Õ¶Õ ÕÕ¸Õ½Õ¡Õ¯ÖÕ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ½Õ¯Õ½Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "empty_column.public": "Ô±ÕµÕ½Õ¿Õ¥Õ² Õ¢Õ¡Õ¶ Õ¹Õ¯Õ¡Õ›Ö‰ Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ´Õ« Õ¢Õ¡Õ¶ Õ£Ö€Õ«Ö€ Õ¯Õ¡Õ´ Õ°Õ¥Õ¿Õ¥Ö‚Õ«Ö€ Õ¡ÕµÕ¬ Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ¶Õ¥Ö€Õ«Ö Õ§Õ¡Õ¯Õ¶Õ¥Ö€Õ«Õ Õ¡ÕµÕ¶ Õ¬ÖÕ¶Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
   "follow_request.authorize": "ÕŽÕ¡Õ¾Õ¥Ö€Õ¡ÖÕ¶Õ¥Õ¬",
   "follow_request.reject": "Õ„Õ¥Ö€ÕªÕ¥Õ¬",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "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.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",
   "home.column_settings.basic": "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶",
   "home.column_settings.show_reblogs": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ¿Õ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ¨",
   "home.column_settings.show_replies": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¶Õ¥Ö€Õ¨",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "Õ¥Õ¿ Õ¶Õ¡Õ¾Õ¡Ö€Õ¯Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "Õ¿Õ¡Ö€Õ¡Õ®Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.column": "Õ½ÕµÕ¸Ö‚Õ¶Õ¥Ö€Õ«Ö Õ´Õ¥Õ¯Õ« Õ¾Ö€Õ¡ Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.compose": "Õ·Õ¡Ö€Õ¡Õ¤Ö€Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ«Õ¶ Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.description": "Õ†Õ¯Õ¡Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "ÖÕ¡Õ¶Õ¯Õ¸Õ¾ Õ¶Õ¥Ö€Ö„Õ¥Ö‚ Õ·Õ¡Ö€ÕªÕ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "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.home": "to open home timeline",
   "keyboard_shortcuts.hotkey": "Õ€Õ¡Õ¿Õ¸Ö‚Õ¯ Õ½Õ¿Õ¥Õ²Õ¶",
   "keyboard_shortcuts.legend": "Õ¡ÕµÕ½ Õ±Õ¥Õ¼Õ¶Õ¡Ö€Õ¯Õ¨ ÖÕ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.local": "to open local timeline",
   "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.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.search": "Õ¸Ö€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ«Õ¶ Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "Õ©Õ¡Ö€Õ´ Õ©Õ¸Ö‚Õ© Õ½Õ¯Õ½Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
   "keyboard_shortcuts.unfocus": "Õ¿Õ¥Ö„Õ½Õ¿Õ«/Õ¸Ö€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ«Ö Õ¡ÕºÕ¡Õ½Õ¥Ö‚Õ¥Õ¼Õ¾Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Õ‰Õ£Õ¿Õ¶Õ¾Õ¥Ö",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Ô¹Õ¡Ö„ÖÕ¶Õ¥ÕžÕ¬ ÖÕ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¶ Õ¡ÕµÕ½ Ö…Õ£Õ¿Õ¡Õ¿Õ«Ö€Õ¸Õ»Õ«ÖÖ‰",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¾Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€",
   "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",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "ÕŽÕ½Õ¿Õ¡ÕžÕ° Õ¥Õ½, Õ¸Ö€ Õ¸Ö‚Õ¦Õ¸Ö‚Õ´ Õ¥Õ½ Õ´Õ·Õ¿Õ¡ÕºÕ¥Õ½ Õ´Õ¡Ö„Ö€Õ¥Õ¬ Ö„Õ¸ Õ¢Õ¸Õ¬Õ¸Ö€ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨Ö‰",
   "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.follow": "Õ†Õ¸Ö€ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Õ²Õ¶Õ¥Ö€Õ",
   "notifications.column_settings.mention": "Õ†Õ·Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ",
   "notifications.column_settings.push": "Õ€Ö€Õ¥Õ¬Õ¸Ö‚ Õ®Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€",
-  "notifications.column_settings.push_meta": "Ô±ÕµÕ½ Õ½Õ¡Ö€Ö„Õ¨",
   "notifications.column_settings.reblog": "ÕÕ¡Ö€Õ¡Õ®Õ¡Õ®Õ¶Õ¥Ö€Õ«ÖÕ",
   "notifications.column_settings.show": "Õ‘Õ¸Ö‚ÖÕ¡Õ¤Ö€Õ¥Õ¬ Õ½ÕµÕ¸Ö‚Õ¶Õ¸Ö‚Õ´",
   "notifications.column_settings.sound": "ÕÕ¡ÕµÕ¶ Õ°Õ¡Õ¶Õ¥Õ¬",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "ÕŠÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§",
-  "onboarding.next": "Õ€Õ¡Õ»Õ¸Ö€Õ¤",
-  "onboarding.page_five.public_timelines": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ ÖÕ¸Ö‚ÕµÖ Õ§ Õ¿Õ¡Õ¬Õ«Õ½ {domain} Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ«Ö Õ¢Õ¸Õ¬Õ¸Ö€Õ« Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ©Õ©Õ¥Ö€Õ¨Ö‰ Ô´Õ¡Õ·Õ¶Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¨ ÖÕ¸Ö‚ÕµÖ Õ§ Õ¿Õ¡Õ¬Õ«Õ½ Õ°Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ©Õ©Õ¥Ö€Õ¨ Õ¢Õ¸Õ¬Õ¸Ö€Õ«Ö, Õ¸Ö‚Õ´ {domain} Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ« Õ´Õ¡Ö€Õ¤Õ«Õ¯ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ¶Ö‰ ÕÖ€Õ¡Õ¶Ö„ Õ€Ö€Õ¡ÕºÕ¡Ö€Õ¡Õ¯Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö„Õ¥Ö€Õ¶ Õ¥Õ¶Õ Õ¶Õ¸Ö€ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ¢Õ¡ÖÕ¡Õ°Õ¡ÕµÕ¿Õ¥Õ¬Õ¸Ö‚ Õ°Ö€Õ¡Õ·Õ¡Õ¬Õ« Õ´Õ«Õ»Õ¸ÖÖ‰",
-  "onboarding.page_four.home": "Õ€Õ«Õ´Õ¶Õ¡Õ¯Õ¡Õ¶ Õ°Õ¸Õ½Ö„Õ¨ ÖÕ¸Ö‚ÕµÖ Õ§ Õ¿Õ¡Õ¬Õ«Õ½ Õ¡ÕµÕ¶ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ©Õ©Õ¥Ö€Õ¨, Õ¸Ö‚Õ´ Õ°Õ¥Õ¿Õ¥Ö‚Õ¸Ö‚Õ´ Õ¥Õ½Ö‰",
-  "onboarding.page_four.notifications": "Ô¾Õ¡Õ¶Õ¸Ö‚ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€Õ« Õ½ÕµÕ¸Ö‚Õ¶Õ¨ ÖÕ¸Ö‚ÕµÖ Õ§ Õ¿Õ¡Õ¬Õ«Õ½, Õ¥Ö€Õ¢ Õ¸Ö€Õ¥Ö‚Õ§ Õ´Õ¥Õ¯Õ¨ ÖƒÕ¸ÕÕ£Õ¸Ö€Õ®Õ¡Õ¯ÖÕ¸Ö‚Õ´ Õ§ Õ°Õ¥Õ¿Õ¤Ö‰",
-  "onboarding.page_one.federation": "Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¨ Õ¡Õ¶Õ¯Õ¡Õ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€Õ« ÖÕ¡Õ¶Ö Õ§, Õ¸Ö€Õ¸Õ¶Ö„ Õ´Õ«Õ¡Õ½Õ¶Õ¡Õ¯Õ¡Õ¶ Õ½Õ¸ÖÕ«Õ¡Õ¬Õ¡Õ¯Õ¡Õ¶ ÖÕ¡Õ¶Ö Õ¥Õ¶ Õ¯Õ¡Õ¦Õ´Õ¸Ö‚Õ´Ö‰ Õ„Õ¥Õ¶Ö„ Õ¯Õ¸Õ¹Õ¸Ö‚Õ´ Õ¥Õ¶Ö„ Õ¡ÕµÕ¤ Õ½ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ«Õ¹Õ¶Õ¥Ö€Õ¨ Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ¶Õ¥Ö€Ö‰",
-  "onboarding.page_one.full_handle": "Õ”Õ¸ Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¡Õ¯Õ¡Õ¶ Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨",
-  "onboarding.page_one.handle_hint": "ÕÕ¡ Õ¡ÕµÕ¶ Õ§, Õ«Õ¶Õ¹ Õ¡Õ½Õ¥Õ¬Õ¸Ö‚ Õ¥Õ½ Õ¨Õ¶Õ¯Õ¥Ö€Õ¶Õ¥Ö€Õ«Õ¤Õ Ö„Õ¥Õ¦ ÖƒÕ¶Õ¿Ö€Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰",
-  "onboarding.page_one.welcome": "Ô²Õ¡Ö€Õ« Õ£Õ¡Õ¬Õ¸Ö‚Õ½Õ¿ Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸ÕœÕ¶",
-  "onboarding.page_six.admin": "Õ”Õ¸ Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ« Õ¡Õ¤Õ´Õ«Õ¶Õ¨ Õ¶Õ¡ Õ§Õ {admin}Ö‰",
-  "onboarding.page_six.almost_done": "Ô³Ö€Õ¥Õ©Õ¥ ÕºÕ¡Õ¿Ö€Õ¡Õ½Õ¿ Õ§â€¦",
-  "onboarding.page_six.appetoot": "Õ€Õ¡Õ»Õ¸Õ²Õ¸Ö‚Õ©Õ¸Ö‚Õ©ÕµÕ¸ÕœÖ‚Õ¶",
-  "onboarding.page_six.apps_available": "Õ†Õ¡Õ¥Ö‚ Õ¯Õ¡Õ¶ Õ¡ÕµÕ•ÕÕ«, Ô±Õ¶Õ¤Ö€Õ¸Õ«Õ¤Õ« Õ¥Ö‚ Õ¡ÕµÕ¬ Õ°Õ¡Ö€Õ©Õ¡Õ¯Õ¶Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€ {apps}Ö‰",
-  "onboarding.page_six.github": "Õ„Õ¡Õ½Õ¿Õ¸Õ¤Õ¸Õ¶Õ¶ Õ¡Õ¦Õ¡Õ¿ Õ¸Ö‚ Õ¢Õ¡Ö Õ¥Õ¬Õ¡Õ¿Õ¥Ö„Õ½Õ¿Õ¸Õ¾ Õ®Ö€Õ¡Õ£Ö€Õ¡Õ¯Õ¡Õ¦Õ´ Õ§Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¾Ö€Õ¥ÕºÕ¶Õ¥Ö€ Õ¦Õ¥Õ¯Õ¸Ö‚ÖÕ¥Õ¬, Õ¶Õ¸Ö€ Õ°Õ¡Õ¿Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ°Õ¡ÕµÖÕ¥Õ¬ Õ¯Õ¡Õ´ Õ¶Õ¥Ö€Õ¤Ö€Õ¸Ö‚Õ´ Õ¡Õ¶Õ¥Õ¬ {github}ÖŠÕ¸Ö‚Õ´Ö‰",
-  "onboarding.page_six.guidelines": "Õ°Õ¡Õ´Õ¡ÕµÕ¶Ö„Õ« Õ¯Õ¡Õ¶Õ¸Õ¶Õ¡Õ¯Õ¡Ö€Õ£",
-  "onboarding.page_six.read_guidelines": "Ô½Õ¶Õ¤Ö€Õ¸Ö‚Õ´ Õ¥Õ¶Ö„, Õ¯Õ¡Ö€Õ¤Õ¡ {domain} Õ¿Õ«Ö€Õ¸Ö‚ÕµÕ©Õ« {guidelines}Õ¨Ö‰",
-  "onboarding.page_six.various_app": "Õ°Õ¡Õ¾Õ¥Õ¬Õ¾Õ¡Õ®Õ¶Õ¥Ö€",
-  "onboarding.page_three.profile": "Ô¹Õ¡Ö€Õ´Õ¡ÖÖ€Õ¸Ö‚ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¤Õ Õ¶Õ¯Õ¡Ö€Õ¤, Õ¯Õ¥Õ¶Õ½Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¤ Õ¸Ö‚ Õ¡Õ¶Õ¸Ö‚Õ¶Õ¤ ÖƒÕ¸ÕÕ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰ Ô±ÕµÕ¶Õ¿Õ¥Õ² Õ¶Õ¡Õ¥Ö‚ Õ¡ÕµÕ¬ Õ¶Õ¡ÕÕ¡ÕºÕ¡Õ¿Õ¾Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€ Õ¯Õ£Õ¿Õ¶Õ¥Õ½Ö‰",
-  "onboarding.page_three.search": "Õ•Õ£Õ¿Õ¾Õ«Ö€ Õ¸Ö€Õ¸Õ¶Õ´Õ¡Õ¶ Õ¤Õ¡Õ·Õ¿Õ«ÖÕ Õ´Õ¡Ö€Õ¤Õ¯Õ¡Õ¶Ö Õ£Õ¿Õ¶Õ¥Õ¬Õ¸Ö‚ Õ¯Õ¡Õ´ ÕºÕ«Õ¿Õ¡Õ¯Õ¶Õ¥Ö€Õ«Õ¶Õ Ö…Ö€Õ«Õ¶Õ¡Õ¯ {illustration} Õ¸Ö‚ {introductions}, Õ®Õ¡Õ¶Õ¸Õ©Õ¡Õ¶Õ¡Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€Ö‰ ÕˆÕ¹ Õ¡ÕµÕ½ Õ°Õ¡Õ¶Õ£Õ¸Ö‚ÕµÖÕ« Õ¢Õ¶Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö€Õ«Õ¶ ÖƒÕ¶Õ¿Ö€Õ¥Õ¬Õ¸Ö‚ Õ°Õ¡Õ´Õ¡Ö€ Ö…Õ£Õ¿Õ¡Õ£Õ¸Ö€Õ®Õ«Ö€ Õ¶Ö€Õ¡Õ¶Ö Õ¡Õ´Õ¢Õ¸Õ²Õ»Õ¡Õ¯Õ¡Õ¶ Ö…Õ£Õ¿Õ¡Õ¶Õ¸Ö‚Õ¶Õ¨Ö‰",
-  "onboarding.page_two.compose": "Ô³Ö€Õ«Ö€ Õ©Õ©Õ¥Ö€Õ¤ Õ·Õ¡Ö€Õ¡Õ¤Ö€Õ´Õ¡Õ¶ Õ½ÕµÕ¸Ö‚Õ¶Õ¡Õ¯Õ¸Ö‚Õ´Ö‰ Ô¿Õ¡Ö€Õ¸Õ² Õ¥Õ½ Õ¶Õ¯Õ¡Ö€Õ¶Õ¥Ö€ Õ¾Õ¥Ö€Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬, ÖƒÕ¸ÖƒÕ¸ÕÕ¥Õ¬ Õ£Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¯Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¸Ö‚Õ´Õ¶Õ¥Ö€Õ¨ Õ¥Ö‚ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¾Õ¥Ö€Õ¡Õ¢Õ¥Ö€ÕµÕ¡Õ¬ Õ¶Õ¡ÕÕ¡Õ¦Õ£Õ¸Ö‚Õ·Õ¡ÖÕ¸Ö‚Õ´Õ¶Õ¥Ö€ Õ¡Õ¾Õ¥Õ¬Õ¡ÖÕ¶Õ¥Õ¬Õ Ö…Õ£Õ¿Õ¾Õ¥Õ¬Õ¸Õ¾ Õ¶Õ¥Ö€Ö„Õ¥Ö‚Õ« ÕºÕ¡Õ¿Õ¯Õ¥Ö€Õ¡Õ¯Õ¶Õ¥Ö€Õ«ÖÖ‰",
-  "onboarding.skip": "Ô²Õ¡Ö Õ©Õ¸Õ²Õ¶Õ¥Õ¬",
   "privacy.change": "Ô¿Õ¡Ö€Õ£Õ¡Õ¾Õ¸Ö€Õ¥Õ¬ Õ©Õ©Õ« Õ£Õ¡Õ²Õ¿Õ¶Õ«Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨",
   "privacy.direct.long": "Ô¹Õ©Õ¥Õ¬ Õ´Õ«Õ¡ÕµÕ¶ Õ¶Õ·Õ¾Õ¡Õ® Ö…Õ£Õ¿Õ¡Õ¿Õ¥Ö€Õ¥Ö€Õ« Õ°Õ¡Õ´Õ¡Ö€",
   "privacy.direct.short": "Õ€Õ¡Õ½ÖÕ¥Õ¡Õ£Ö€Õ¾Õ¡Õ®",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "Ô±ÕµÕ½ ÕºÕ¡Õ°Õ«Õ¶â€¦",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Ô±Ö€Õ£Õ¥Õ¬Õ¡ÖƒÕ¡Õ¯Õ¥Õ¬ @{name}ÖŠÕ«Õ¶",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Ô±ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨ Õ¹Õ« Õ¯Õ¡Ö€Õ¸Õ² Õ¿Õ¡Ö€Õ¡Õ®Õ¾Õ¥Õ¬",
   "status.delete": "Õ‹Õ¶Õ»Õ¥Õ¬",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Õ†Õ¥Ö€Õ¤Õ¶Õ¥Õ¬",
   "status.favourite": "Õ€Õ¡Õ¾Õ¡Õ¶Õ¥Õ¬",
@@ -267,9 +312,11 @@
   "status.open": "Ô¸Õ¶Õ¤Õ¡Ö€Õ±Õ¡Õ¯Õ¥Õ¬ Õ¡ÕµÕ½ Õ©Õ¸Ö‚Õ©Õ¨",
   "status.pin": "Ô±Õ´Ö€Õ¡ÖÕ¶Õ¥Õ¬ Õ¡Õ¶Õ±Õ¶Õ¡Õ¯Õ¡Õ¶ Õ§Õ»Õ¸Ö‚Õ´",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "ÕÕ¡Ö€Õ¡Õ®Õ¥Õ¬",
   "status.reblog_private": "Boost to original audience",
   "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.reply": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬",
   "status.replyAll": "ÕŠÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬ Õ©Õ¥Õ¬Õ«Õ¶",
@@ -281,8 +328,11 @@
   "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.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": "ÕÕ¥Õ²Õ¡Õ¯Õ¡Õ¶",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 06045ae998f88539361e977b1bb82050d6f46f05..eed61af707cce54c55980e3ecabeec8f554ceea7 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Blokir @{name}",
   "account.block_domain": "Sembunyikan segalanya dari {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Informasi di bawah mungkin tidak mencerminkan profil user secara lengkap.",
   "account.domain_blocked": "Domain disembunyikan",
   "account.edit_profile": "Ubah profil",
+  "account.endorse": "Feature on profile",
   "account.follow": "Ikuti",
   "account.followers": "Pengikut",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Mengikuti",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Mengikuti anda",
   "account.hide_reblogs": "Sembunyikan boosts dari @{name}",
+  "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": "Balasan @{name}",
   "account.moved_to": "{name} telah pindah ke:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Tampilkan boost dari @{name}",
   "account.unblock": "Hapus blokir @{name}",
   "account.unblock_domain": "Tampilkan {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
   "account.unmute_notifications": "Munculkan notifikasi dari @{name}",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "Apa anda yakin ingin membisukan {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": "Berhenti mengikuti",
   "confirmations.unfollow.message": "Apakah anda ingin berhenti mengikuti {name}?",
   "embed.instructions": "Sematkan status ini di website anda dengan menyalin kode di bawah ini.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Hasil pencarian",
   "emoji_button.symbols": "Simbol",
   "emoji_button.travel": "Tempat Wisata",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "Linimasa lokal masih kosong. Tulis sesuatu secara publik dan buat roda berputar!",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "Tidak ada apapun dalam hashtag ini.",
   "empty_column.home": "Linimasa anda kosong! Kunjungi {public} atau gunakan pencarian untuk memulai dan bertemu pengguna lain.",
   "empty_column.home.public_timeline": "linimasa publik",
   "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": "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": "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",
   "follow_request.authorize": "Izinkan",
   "follow_request.reject": "Tolak",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Mulai",
   "getting_started.invite": "Invite people",
   "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": "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.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",
   "home.column_settings.basic": "Dasar",
   "home.column_settings.show_reblogs": "Tampilkan boost",
   "home.column_settings.show_replies": "Tampilkan balasan",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "untuk kembali",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "untuk menyebarkan",
   "keyboard_shortcuts.column": "untuk fokus kepada sebuah status di sebuah kolom",
   "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
   "keyboard_shortcuts.description": "Deskripsi",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
   "keyboard_shortcuts.enter": "untuk membuka status",
   "keyboard_shortcuts.favourite": "untuk memfavoritkan",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Pintasan keyboard",
+  "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.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": "untuk fokus mencari",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Tidak ditemukan",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Pengguna diblokir",
   "navigation_bar.community_timeline": "Linimasa lokal",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Apa anda yakin hendak menghapus semua notifikasi anda?",
   "notifications.column_settings.alert": "Notifikasi desktop",
   "notifications.column_settings.favourite": "Favorit:",
+  "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.follow": "Pengikut baru:",
   "notifications.column_settings.mention": "Balasan:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boost:",
   "notifications.column_settings.show": "Tampilkan dalam kolom",
   "notifications.column_settings.sound": "Mainkan suara",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Selesei",
-  "onboarding.next": "Selanjutnya",
-  "onboarding.page_five.public_timelines": "Linimasa lokal menampilkan semua postingan publik dari semua orang di {domain}. Linimasa gabungan menampilkan postingan publik dari semua orang yang diikuti oleh {domain}. Ini semua adalah Linimasa Publik, cara terbaik untuk bertemu orang lain.",
-  "onboarding.page_four.home": "Linimasa beranda menampilkan postingan dari orang-orang yang anda ikuti.",
-  "onboarding.page_four.notifications": "Kolom notifikasi menampilkan ketika seseorang berinteraksi dengan anda.",
-  "onboarding.page_one.federation": "Mastodon adalah jaringan dari beberapa server independen yang bergabung untuk membuat jejaring sosial yang besar.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Selamat datang di Mastodon!",
-  "onboarding.page_six.admin": "Admin serveer anda adalah {admin}.",
-  "onboarding.page_six.almost_done": "Hampir selesei...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Ada beberapa apl yang tersedia untuk iOS, Android, dan platform lainnya.",
-  "onboarding.page_six.github": "Mastodon adalah software open-source. Anda bisa melaporkan bug, meminta fitur, atau berkontribusi dengan kode di {github}.",
-  "onboarding.page_six.guidelines": "pedoman komunitas",
-  "onboarding.page_six.read_guidelines": "Silakan baca {guidelines} {domain}!",
-  "onboarding.page_six.various_app": "apl handphone",
-  "onboarding.page_three.profile": "Ubah profil anda untuk mengganti avatar, bio, dan nama pengguna anda. Disitu, anda juga bisa mengatur opsi lainnya.",
-  "onboarding.page_three.search": "Gunakan kolom pencarian untuk mencari orang atau melihat hashtag, seperti {illustration} dan {introductions}. Untuk mencari pengguna yang tidak berada dalam server ini, gunakan nama pengguna mereka selengkapnya.",
-  "onboarding.page_two.compose": "Tulis postingan melalui kolom posting. Anda dapat mengunggah gambar, mengganti pengaturan privasi, dan menambahkan peringatan konten dengan ikon-ikon dibawah ini.",
-  "onboarding.skip": "Lewati",
   "privacy.change": "Tentukan privasi status",
   "privacy.direct.long": "Kirim hanya ke pengguna yang disebut",
   "privacy.direct.short": "Langsung",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {hasil} other {hasil}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Hapus",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "Difavoritkan",
@@ -267,9 +312,11 @@
   "status.open": "Tampilkan status ini",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Boost",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "di-boost {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.reply": "Balas",
   "status.replyAll": "Balas ke semua",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Tampilkan semua",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "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": "Gabungan",
   "tabs_bar.home": "Beranda",
   "tabs_bar.local_timeline": "Lokal",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 5f9175c4f55b4cfa7bea7d575263c57ba048d588..b26fa6c4ab415f1456c6701a4eceb130de45e7ad 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Blokusar @{name}",
   "account.block_domain": "Hide everything from {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Modifikar profilo",
+  "account.endorse": "Feature on profile",
   "account.follow": "Sequar",
   "account.followers": "Sequanti",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Sequas",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Sequas tu",
   "account.hide_reblogs": "Hide boosts from @{name}",
+  "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": "Mencionar @{name}",
   "account.moved_to": "{name} has moved to:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Show boosts from @{name}",
   "account.unblock": "Desblokusar @{name}",
   "account.unblock_domain": "Unhide {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Ne plus sequar",
   "account.unmute": "Ne plus celar @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
@@ -86,6 +93,8 @@
   "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? 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}?",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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.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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "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.public_timeline": "la publika tempolineo",
   "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.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.",
   "follow_request.authorize": "Yurizar",
   "follow_request.reject": "Refuzar",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "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.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",
   "home.column_settings.basic": "Simpla",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Ne trovita",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blokusita uzeri",
   "navigation_bar.community_timeline": "Lokala tempolineo",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Ka tu esas certa, ke tu volas efacar omna tua savigi?",
   "notifications.column_settings.alert": "Surtabla savigi",
   "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.follow": "Nova sequanti:",
   "notifications.column_settings.mention": "Mencioni:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Repeti:",
   "notifications.column_settings.show": "Montrar en kolumno",
   "notifications.column_settings.sound": "Plear sono",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
   "privacy.change": "Aranjar privateso di mesaji",
   "privacy.direct.long": "Sendar nur a mencionata uzeri",
   "privacy.direct.short": "Direte",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Efacar",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favorizar",
@@ -267,9 +312,11 @@
   "status.open": "Detaligar ca mesajo",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Repetar",
   "status.reblog_private": "Boost to original audience",
   "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.reply": "Respondar",
   "status.replyAll": "Respondar a filo",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Montrar plue",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "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": "Federata",
   "tabs_bar.home": "Hemo",
   "tabs_bar.local_timeline": "Lokala",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index b20263df66c30ab72a9aea790c78694b82d64b9c..1f52d37248bde2b2f067bf6efa9987c0bf20bf0c 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -1,17 +1,23 @@
 {
+  "account.add_or_remove_from_list": "Aggiungi o togli dalle liste",
   "account.badges.bot": "Bot",
   "account.block": "Blocca @{name}",
   "account.block_domain": "Nascondi tutto da {domain}",
   "account.blocked": "Bloccato",
-  "account.direct": "Direct Message @{name}",
+  "account.direct": "Invia messaggio diretto a @{name}",
   "account.disclaimer_full": "Il profilo dell'utente mostrato qui sotto potrebbe essere incompleto.",
   "account.domain_blocked": "Dominio nascosto",
   "account.edit_profile": "Modifica profilo",
+  "account.endorse": "Metti in evidenza sul profilo",
   "account.follow": "Segui",
   "account.followers": "Seguaci",
+  "account.followers.empty": "Ancora nessuno segue questo utente.",
   "account.follows": "Segue",
+  "account.follows.empty": "Questo utente non segue ancora nessuno.",
   "account.follows_you": "Ti segue",
   "account.hide_reblogs": "Nascondi condivisioni da @{name}",
+  "account.link_verified_on": "La proprietÃ  di questo link Ã¨ stata controllata il {date}",
+  "account.locked_info": "Il livello di privacy di questo account Ã¨ impostato a \"bloccato\". Il proprietario esamina manualmente le richieste di seguirlo.",
   "account.media": "Media",
   "account.mention": "Menziona @{name}",
   "account.moved_to": "{name} si Ã¨ trasferito su:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Mostra condivisioni da @{name}",
   "account.unblock": "Sblocca @{name}",
   "account.unblock_domain": "Non nascondere {domain}",
+  "account.unendorse": "Non mettere in evidenza sul profilo",
   "account.unfollow": "Non seguire",
   "account.unmute": "Non silenziare @{name}",
   "account.unmute_notifications": "Non silenziare piÃ¹ le notifiche da @{name}",
@@ -49,7 +56,7 @@
   "column.lists": "Liste",
   "column.mutes": "Utenti silenziati",
   "column.notifications": "Notifiche",
-  "column.pins": "Pinned toot",
+  "column.pins": "Toot fissati in cima",
   "column.public": "Timeline federata",
   "column_back_button.label": "Indietro",
   "column_header.hide_settings": "Nascondi impostazioni",
@@ -74,11 +81,11 @@
   "compose_form.spoiler.unmarked": "Il testo non Ã¨ nascosto",
   "compose_form.spoiler_placeholder": "Content warning",
   "confirmation_modal.cancel": "Annulla",
-  "confirmations.block.confirm": "Block",
+  "confirmations.block.confirm": "Blocca",
   "confirmations.block.message": "Sei sicuro di voler bloccare {name}?",
-  "confirmations.delete.confirm": "Delete",
+  "confirmations.delete.confirm": "Cancella",
   "confirmations.delete.message": "Sei sicuro di voler cancellare questo status?",
-  "confirmations.delete_list.confirm": "Delete",
+  "confirmations.delete_list.confirm": "Cancella",
   "confirmations.delete_list.message": "Sei sicuro di voler cancellare definitivamente questa lista?",
   "confirmations.domain_block.confirm": "Nascondi intero dominio",
   "confirmations.domain_block.message": "Sei davvero sicuro che vuoi bloccare l'intero {domain}? Nella maggior parte dei casi, pochi blocchi o silenziamenti mirati sono sufficienti e preferibili. Non vedrai nessun contenuto di quel dominio nÃ© nelle timeline pubbliche nÃ© nelle notifiche. I tuoi seguaci di quel dominio saranno eliminati.",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "Sei sicuro di voler silenziare {name}?",
   "confirmations.redraft.confirm": "Cancella e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler cancellare questo stato e riscriverlo? Perderai tutte le risposte, condivisioni e preferiti.",
+  "confirmations.reply.confirm": "Rispondi",
+  "confirmations.reply.message": "Se rispondi ora, il messaggio che stai componendo sarÃ  sovrascritto. Sei sicuro di voler continuare?",
   "confirmations.unfollow.confirm": "Smetti di seguire",
   "confirmations.unfollow.message": "Sei sicuro che non vuoi piÃ¹ seguire {name}?",
   "embed.instructions": "Inserisci questo status nel tuo sito copiando il codice qui sotto.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Risultati della ricerca",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Viaggi e luoghi",
+  "empty_column.account_timeline": "Non ci sono toot qui!",
+  "empty_column.blocks": "Non hai ancora bloccato nessun utente.",
   "empty_column.community": "La timeline locale Ã¨ vuota. Condividi qualcosa pubblicamente per dare inizio alla festa!",
   "empty_column.direct": "Non hai ancora nessun messaggio diretto. 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_requests": "Non hai ancora ricevuto nessuna richiesta di seguirti. Quando ne arriveranno, saranno mostrate 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.home.public_timeline": "la timeline pubblica",
-  "empty_column.list": "Non c'Ã¨ niente in questo elenco ancora. Quando i membri di questo elenco postano nuovi stati, questi appariranno qui.",
+  "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 aggiungi utenti da altri server per riempire questo spazio",
   "follow_request.authorize": "Autorizza",
   "follow_request.reject": "Rifiuta",
   "getting_started.developers": "Sviluppatori",
+  "getting_started.directory": "Directory del profilo",
   "getting_started.documentation": "Documentazione",
-  "getting_started.find_friends": "Trova amici da Twitter",
   "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",
+  "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.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",
   "home.column_settings.show_replies": "Mostra risposte",
+  "introduction.federation.action": "Avanti",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "I post pubblici provenienti da altri server del fediverse saranno mostrati nella timeline federata.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "I post scritti da persone che segui saranno mostrati nella timeline home. Puoi seguire chiunque su qualunque server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "I post pubblici scritti da persone sul tuo stesso server saranno mostrati nella timeline locale.",
+  "introduction.interactions.action": "Finisci il tutorial!",
+  "introduction.interactions.favourite.headline": "Apprezza",
+  "introduction.interactions.favourite.text": "Puoi salvare un toot e tenerlo per dopo, e far sapere all'autore che ti Ã¨ piaciuto, segnandolo come apprezzato.",
+  "introduction.interactions.reblog.headline": "Condividi",
+  "introduction.interactions.reblog.text": "Con la condivisione puoi segnalare i toot di altre persone ai tuoi seguaci .",
+  "introduction.interactions.reply.headline": "Rispondi",
+  "introduction.interactions.reply.text": "Puoi rispondere ai toot, sia a quelli di altri sia ai tuoi, e i toot saranno collegati a formare una conversazione.",
+  "introduction.welcome.action": "Andiamo!",
+  "introduction.welcome.headline": "Primi passi",
+  "introduction.welcome.text": "Benvenuto/a nel fediverse! Tra poco potrai inviare messaggi e parlare con i tuoi amici su una grande varietÃ  di server. Ma questo server, {domain}, Ã¨ speciale: ospita il tuo profilo, quindi ricordati il suo nome.",
   "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.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.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.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 delle richieste di seguirti",
   "keyboard_shortcuts.search": "per spostare il focus sulla ricerca",
+  "keyboard_shortcuts.start": "per aprire la colonna \"Come iniziare\"",
   "keyboard_shortcuts.toggle_hidden": "per mostrare/nascondere il testo dei CW",
   "keyboard_shortcuts.toot": "per iniziare a scrivere un toot completamente nuovo",
   "keyboard_shortcuts.unfocus": "per uscire dall'area di composizione o dalla ricerca",
@@ -154,19 +208,21 @@
   "lists.new.title_placeholder": "Titolo della nuova lista",
   "lists.search": "Cerca tra le persone che segui",
   "lists.subheading": "Le tue liste",
-  "loading_indicator.label": "Carico...",
+  "loading_indicator.label": "Caricamento...",
   "media_gallery.toggle_visible": "Imposta visibilitÃ ",
   "missing_indicator.label": "Non trovato",
   "missing_indicator.sublabel": "Risorsa non trovata",
   "mute_modal.hide_notifications": "Nascondere le notifiche da quest'utente?",
+  "navigation_bar.apps": "App per dispositivi mobili",
   "navigation_bar.blocks": "Utenti bloccati",
   "navigation_bar.community_timeline": "Timeline 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.filters": "Muted words",
+  "navigation_bar.filters": "Parole silenziate",
   "navigation_bar.follow_requests": "Richieste di amicizia",
   "navigation_bar.info": "Informazioni estese",
   "navigation_bar.keyboard_shortcuts": "Tasti di scelta rapida",
@@ -186,36 +242,22 @@
   "notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?",
   "notifications.column_settings.alert": "Notifiche desktop",
   "notifications.column_settings.favourite": "Apprezzati:",
+  "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 seguaci:",
   "notifications.column_settings.mention": "Menzioni:",
   "notifications.column_settings.push": "Notifiche push",
-  "notifications.column_settings.push_meta": "Questo dispositivo",
   "notifications.column_settings.reblog": "Post condivisi:",
   "notifications.column_settings.show": "Mostra in colonna",
   "notifications.column_settings.sound": "Riproduci suono",
+  "notifications.filter.all": "Tutti",
+  "notifications.filter.boosts": "Condivisioni",
+  "notifications.filter.favourites": "Apprezzati",
+  "notifications.filter.follows": "Seguaci",
+  "notifications.filter.mentions": "Menzioni",
   "notifications.group": "{count} notifiche",
-  "onboarding.done": "Fatto",
-  "onboarding.next": "Prossimo",
-  "onboarding.page_five.public_timelines": "La timeline locale mostra i post pubblici di tutti gli utenti di {domain}. La timeline federata mostra i post pubblici di tutti gli utenti seguiti da quelli di {domain}. Queste sono le timeline pubbliche, che vi danno grandi possibilitÃ  di scoprire nuovi utenti.",
-  "onboarding.page_four.home": "La timeline home mostra i post degli utenti che segui.",
-  "onboarding.page_four.notifications": "La colonna delle notifiche ti fa vedere quando qualcuno interagisce con te.",
-  "onboarding.page_one.federation": "Mastodon Ã¨ una rete di server indipendenti che si collegano tra loro per formare un grande social network. I singoli server sono detti istanze.",
-  "onboarding.page_one.full_handle": "Il tuo nome utente completo",
-  "onboarding.page_one.handle_hint": "Ãˆ ciÃ² che diresti ai tuoi amici di cercare per trovarti.",
-  "onboarding.page_one.welcome": "Benvenuto in Mastodon!",
-  "onboarding.page_six.admin": "L'amministratore della tua istanza Ã¨ {admin}.",
-  "onboarding.page_six.almost_done": "Quasi finito...",
-  "onboarding.page_six.appetoot": "Buon appetoot!",
-  "onboarding.page_six.apps_available": "Esistono {apps} per iOS, Android e altre piattaforme.",
-  "onboarding.page_six.github": "Mastodon Ã¨ software libero e open-source. Puoi segnalare bug, richiedere nuove funzionalitÃ , o contribuire al codice su {github}.",
-  "onboarding.page_six.guidelines": "linee guida per la comunitÃ ",
-  "onboarding.page_six.read_guidelines": "Ti preghiamo di leggere le {guidelines} di {domain}!",
-  "onboarding.page_six.various_app": "app per dispositivi mobili",
-  "onboarding.page_three.profile": "Puoi modificare il tuo profilo per cambiare i tuoi avatar, biografia e nome pubblico. E potrai trovarci altre preferenze.",
-  "onboarding.page_three.search": "Usa la barra di ricerca per trovare persone e hashtag, come {illustration} e {introductions}. Per trovare una persona che non Ã¨ su questa istanza, usa il suo nome utente completo.",
-  "onboarding.page_two.compose": "Puoi scrivere dei post dalla colonna di composizione. Puoi caricare immagini, modificare le impostazioni di privacy, e aggiungere avvisi sul contenuto con le icone qui sotto.",
-  "onboarding.skip": "Salta",
-  "privacy.change": "Modifica privacy post",
+  "privacy.change": "Modifica privacy del post",
   "privacy.direct.long": "Invia solo a utenti menzionati",
   "privacy.direct.short": "Diretto",
   "privacy.private.long": "Invia solo ai seguaci",
@@ -234,7 +276,7 @@
   "reply_indicator.cancel": "Annulla",
   "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 sara' invata ai tuoi moderatori di istanza. Di seguito, puoi fornire  il motivo per il quale stai segnalando questo account:",
+  "report.hint": "La segnalazione sarÃ  inviata ai moderatori della tua istanza. Di seguito, puoi fornire il motivo per il quale stai segnalando questo account:",
   "report.placeholder": "Commenti aggiuntivi",
   "report.submit": "Invia",
   "report.target": "Invio la segnalazione {target}",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toot",
   "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
   "standalone.public_title": "Un'occhiata all'interno...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Annulla condivisione",
   "status.cannot_reblog": "Questo post non puÃ² essere condiviso",
   "status.delete": "Elimina",
+  "status.detailed_status": "Vista conversazione dettagliata",
   "status.direct": "Messaggio diretto @{name}",
   "status.embed": "Incorpora",
   "status.favourite": "Apprezzato",
@@ -267,9 +312,11 @@
   "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.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",
@@ -281,28 +328,31 @@
   "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.unmute_conversation": "Annulla silenzia conversazione",
   "status.unpin": "Non fissare in cima al profilo",
+  "suggestions.dismiss": "Elimina suggerimento",
+  "suggestions.header": "Ti potrebbe interessareâ€¦",
   "tabs_bar.federated_timeline": "Federazione",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Locale",
   "tabs_bar.notifications": "Notifiche",
   "tabs_bar.search": "Cerca",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {persona ne sta} other {persone ne stanno}} parlando",
   "ui.beforeunload": "La bozza andrÃ  persa se esci da Mastodon.",
   "upload_area.title": "Trascina per caricare",
   "upload_button.label": "Aggiungi file multimediale",
   "upload_form.description": "Descrizione per utenti con disabilitÃ  visive",
-  "upload_form.focus": "Rifila",
+  "upload_form.focus": "Modifica anteprima",
   "upload_form.undo": "Cancella",
   "upload_progress.label": "Sto caricando...",
   "video.close": "Chiudi video",
   "video.exit_fullscreen": "Esci da modalitÃ  a schermo intero",
   "video.expand": "Espandi video",
-  "video.fullscreen": "Full screen",
+  "video.fullscreen": "Schermo intero",
   "video.hide": "Nascondi video",
   "video.mute": "Silenzia suono",
-  "video.pause": "Pause",
+  "video.pause": "Pausa",
   "video.play": "Avvia",
   "video.unmute": "Riattiva suono"
 }
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c742b883e908334d802a54c95751b7ac9f84fecf..cd4addd68679c00e5e5ca4c5653697ff9dd8d082 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "ãƒªã‚¹ãƒˆã«è¿½åŠ ã¾ãŸã¯å¤–ã™",
   "account.badges.bot": "Bot",
   "account.block": "@{name}ã•ã‚“ã‚’ãƒ–ãƒãƒƒã‚¯",
   "account.block_domain": "{domain}å…¨ä½“ã‚’éžè¡¨ç¤º",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "ä»¥ä¸‹ã®æƒ…å ±ã¯ä¸æ£ç¢ºãªå¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚",
   "account.domain_blocked": "ãƒ‰ãƒ¡ã‚¤ãƒ³éžè¡¨ç¤ºä¸",
   "account.edit_profile": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’ç·¨é›†",
+  "account.endorse": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã§ç´¹ä»‹ã™ã‚‹",
   "account.follow": "ãƒ•ã‚©ãƒãƒ¼",
   "account.followers": "ãƒ•ã‚©ãƒãƒ¯ãƒ¼",
+  "account.followers.empty": "ã¾ã èª°ã‚‚ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã¾ã›ã‚“ã€‚",
   "account.follows": "ãƒ•ã‚©ãƒãƒ¼",
+  "account.follows.empty": "ã¾ã èª°ã‚‚ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã¾ã›ã‚“ã€‚",
   "account.follows_you": "ãƒ•ã‚©ãƒãƒ¼ã•ã‚Œã¦ã„ã¾ã™",
   "account.hide_reblogs": "@{name}ã•ã‚“ã‹ã‚‰ã®ãƒ–ãƒ¼ã‚¹ãƒˆã‚’éžè¡¨ç¤º",
+  "account.link_verified_on": "ã“ã®ãƒªãƒ³ã‚¯ã®æ‰€æœ‰æ¨©ã¯{date}ã«ç¢ºèªã•ã‚Œã¾ã—ãŸ",
+  "account.locked_info": "ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯æ‰¿èªåˆ¶ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ã™ã€‚ç›¸æ‰‹ãŒç¢ºèªã™ã‚‹ã¾ã§ãƒ•ã‚©ãƒãƒ¼ã¯å®Œäº†ã—ã¾ã›ã‚“ã€‚",
   "account.media": "ãƒ¡ãƒ‡ã‚£ã‚¢",
   "account.mention": "@{name}ã•ã‚“ã«ãƒˆã‚¥ãƒ¼ãƒˆ",
   "account.moved_to": "{name}ã•ã‚“ã¯å¼•ã£è¶Šã—ã¾ã—ãŸ:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "@{name}ã•ã‚“ã‹ã‚‰ã®ãƒ–ãƒ¼ã‚¹ãƒˆã‚’è¡¨ç¤º",
   "account.unblock": "@{name}ã•ã‚“ã®ãƒ–ãƒãƒƒã‚¯ã‚’è§£é™¤",
   "account.unblock_domain": "{domain}ã‚’è¡¨ç¤º",
+  "account.unendorse": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‹ã‚‰å¤–ã™",
   "account.unfollow": "ãƒ•ã‚©ãƒãƒ¼è§£é™¤",
   "account.unmute": "@{name}ã•ã‚“ã®ãƒŸãƒ¥ãƒ¼ãƒˆã‚’è§£é™¤",
   "account.unmute_notifications": "@{name}ã•ã‚“ã‹ã‚‰ã®é€šçŸ¥ã‚’å—ã‘å–ã‚‹ã‚ˆã†ã«ã™ã‚‹",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "ãƒŸãƒ¥ãƒ¼ãƒˆ",
   "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}ã•ã‚“ã®ãƒ•ã‚©ãƒãƒ¼ã‚’è§£é™¤ã—ã¾ã™ã‹ï¼Ÿ",
   "embed.instructions": "ä¸‹è¨˜ã®ã‚³ãƒ¼ãƒ‰ã‚’ã‚³ãƒ”ãƒ¼ã—ã¦ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã«åŸ‹ã‚è¾¼ã¿ã¾ã™ã€‚",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "æ¤œç´¢çµæžœ",
   "emoji_button.symbols": "è¨˜å·",
   "emoji_button.travel": "æ—…è¡Œã¨å ´æ‰€",
+  "empty_column.account_timeline": "ãƒˆã‚¥ãƒ¼ãƒˆãŒã‚ã‚Šã¾ã›ã‚“ï¼",
+  "empty_column.blocks": "ã¾ã èª°ã‚‚ãƒ–ãƒãƒƒã‚¯ã—ã¦ã„ã¾ã›ã‚“ã€‚",
   "empty_column.community": "ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã¯ã¾ã ä½¿ã‚ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ä½•ã‹æ›¸ã„ã¦ã¿ã¾ã—ã‚‡ã†ï¼",
   "empty_column.direct": "ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ã¾ã ã‚ã‚Šã¾ã›ã‚“ã€‚ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ã‚„ã‚Šã¨ã‚Šã™ã‚‹ã¨ã€ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "empty_column.domain_blocks": "éžè¡¨ç¤ºã«ã—ã¦ã„ã‚‹ãƒ‰ãƒ¡ã‚¤ãƒ³ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚",
+  "empty_column.favourited_statuses": "ã¾ã ä½•ã‚‚ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã—ã¦ã„ã¾ã›ã‚“ã€‚ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã™ã‚‹ã¨ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "empty_column.favourites": "ã¾ã èª°ã‚‚ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã—ã¦ã„ã¾ã›ã‚“ã€‚ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã•ã‚Œã‚‹ã¨ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "empty_column.follow_requests": "ã¾ã ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å—ã‘ã¦ã„ã¾ã›ã‚“ã€‚ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å—ã‘ã‚‹ã¨ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
   "empty_column.hashtag": "ã“ã®ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã¯ã¾ã ä½¿ã‚ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
   "empty_column.home": "ã¾ã èª°ã‚‚ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã¾ã›ã‚“ã€‚{public}ã‚’è¦‹ã«è¡Œãã‹ã€æ¤œç´¢ã‚’ä½¿ã£ã¦ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’è¦‹ã¤ã‘ã¾ã—ã‚‡ã†ã€‚",
   "empty_column.home.public_timeline": "é€£åˆã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³",
   "empty_column.list": "ã“ã®ãƒªã‚¹ãƒˆã«ã¯ã¾ã ãªã«ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã®ãƒªã‚¹ãƒˆã®ãƒ¡ãƒ³ãƒãƒ¼ãŒæ–°ã—ã„ãƒˆã‚¥ãƒ¼ãƒˆã‚’ã™ã‚‹ã¨ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "empty_column.lists": "ã¾ã ãƒªã‚¹ãƒˆãŒã‚ã‚Šã¾ã›ã‚“ã€‚ãƒªã‚¹ãƒˆã‚’ä½œã‚‹ã¨ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "empty_column.mutes": "ã¾ã èª°ã‚‚ãƒŸãƒ¥ãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“ã€‚",
   "empty_column.notifications": "ã¾ã é€šçŸ¥ãŒã‚ã‚Šã¾ã›ã‚“ã€‚ä»–ã®äººã¨ãµã‚Œåˆã£ã¦ä¼šè©±ã‚’å§‹ã‚ã¾ã—ã‚‡ã†ã€‚",
   "empty_column.public": "ã“ã“ã«ã¯ã¾ã ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ï¼ å…¬é–‹ã§ä½•ã‹ã‚’æŠ•ç¨¿ã—ãŸã‚Šã€ä»–ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ãƒ•ã‚©ãƒãƒ¼ã—ãŸã‚Šã—ã¦ã„ã£ã±ã„ã«ã—ã¾ã—ã‚‡ã†",
   "follow_request.authorize": "è¨±å¯",
   "follow_request.reject": "æ‹’å¦",
   "getting_started.developers": "é–‹ç™º",
+  "getting_started.directory": "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª",
   "getting_started.documentation": "ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆ",
-  "getting_started.find_friends": "Twitterã®å‹é”ã‚’æŽ¢ã™",
   "getting_started.heading": "ã‚¹ã‚¿ãƒ¼ãƒˆ",
   "getting_started.invite": "æ‹›å¾…",
-  "getting_started.open_source_notice": "Mastodonã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚èª°ã§ã‚‚GitHubï¼ˆ{github}ï¼‰ã‹ã‚‰é–‹ç™ºã«å‚åŠ ã—ãŸã‚Šã€å•é¡Œã‚’å ±å‘Šã—ãŸã‚Šã§ãã¾ã™ã€‚",
+  "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} ã‚’é™¤ã)",
+  "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": "è¿”ä¿¡è¡¨ç¤º",
+  "introduction.federation.action": "æ¬¡ã¸",
+  "introduction.federation.federated.headline": "é€£åˆã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³",
+  "introduction.federation.federated.text": "Fediverseã®ä»–ã®ã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰ã®å…¬é–‹æŠ•ç¨¿ã¯é€£åˆã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "introduction.federation.home.headline": "ãƒ›ãƒ¼ãƒ ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³",
+  "introduction.federation.home.text": "ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹äººã€…ã®æŠ•ç¨¿ã¯ãƒ›ãƒ¼ãƒ ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã©ã“ã®ã‚µãƒ¼ãƒãƒ¼ã®èª°ã§ã‚‚ãƒ•ã‚©ãƒãƒ¼ã§ãã¾ã™ï¼",
+  "introduction.federation.local.headline": "ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³",
+  "introduction.federation.local.text": "åŒã˜ã‚µãƒ¼ãƒãƒ¼ã«ã„ã‚‹äººã€…ã®å…¬é–‹æŠ•ç¨¿ã¯ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
+  "introduction.interactions.action": "ã¯ã˜ã‚ã‚ˆã†ï¼",
+  "introduction.interactions.favourite.headline": "ãŠæ°—ã«å…¥ã‚Š",
+  "introduction.interactions.favourite.text": "ãŠæ°—ã«å…¥ã‚Šç™»éŒ²ã™ã‚‹ã“ã¨ã§å¾Œã‹ã‚‰è¦‹ã‚‰ã‚Œã‚‹ã‚ˆã†ä¿å˜ã—ãŸã‚Šã€ã€Œå¥½ãã€ã‚’ç›¸æ‰‹ã«ä¼ãˆãŸã‚Šã§ãã¾ã™ã€‚",
+  "introduction.interactions.reblog.headline": "ãƒ–ãƒ¼ã‚¹ãƒˆ",
+  "introduction.interactions.reblog.text": "ãƒ–ãƒ¼ã‚¹ãƒˆã™ã‚‹ã“ã¨ã§ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã«ãã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’å…±æœ‰ã§ãã¾ã™ã€‚",
+  "introduction.interactions.reply.headline": "è¿”ä¿¡",
+  "introduction.interactions.reply.text": "è‡ªèº«ã‚„äººã€…ã®ãƒˆã‚¥ãƒ¼ãƒˆã«è¿”ä¿¡ã™ã‚‹ã“ã¨ã§ã€ä¸€é€£ã®ä¼šè©±ã«ç¹‹ã’ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
+  "introduction.welcome.action": "ã¯ã˜ã‚ã‚‹ï¼",
+  "introduction.welcome.headline": "ã¯ã˜ã‚ã«",
+  "introduction.welcome.text": "Fediverseã®ä¸–ç•Œã¸ã‚ˆã†ã“ãï¼ã‚ã¨å°‘ã—ã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é…ä¿¡ã—ãŸã‚Šã€ã•ã¾ã–ã¾ãªã‚µãƒ¼ãƒãƒ¼ã‚’è¶ŠãˆãŸå‹é”ã¨è©±ã›ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ã¨ã“ã‚ã§ã“ã“{domain}ã¯ç‰¹åˆ¥ãªã‚µãƒ¼ãƒãƒ¼ã§ã™â€¦ã‚ãªãŸã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’æŒã¤ä¸»ä½“ã®ã‚µãƒ¼ãƒãƒ¼ã§ã™ã®ã§ã€åå‰ã‚’è¦šãˆã¦ãŠãã¾ã—ã‚‡ã†ã€‚",
   "keyboard_shortcuts.back": "æˆ»ã‚‹",
+  "keyboard_shortcuts.blocked": "ãƒ–ãƒãƒƒã‚¯ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒªã‚¹ãƒˆã‚’é–‹ã",
   "keyboard_shortcuts.boost": "ãƒ–ãƒ¼ã‚¹ãƒˆ",
   "keyboard_shortcuts.column": "å·¦ã‹ã‚‰nç•ªç›®ã®ã‚«ãƒ©ãƒ å†…æœ€æ–°ãƒˆã‚¥ãƒ¼ãƒˆã«ç§»å‹•",
   "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.pinned": "å›ºå®šã—ãŸãƒˆã‚¥ãƒ¼ãƒˆã®ãƒªã‚¹ãƒˆã‚’é–‹ã",
+  "keyboard_shortcuts.profile": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’é–‹ã",
   "keyboard_shortcuts.reply": "è¿”ä¿¡",
+  "keyboard_shortcuts.requests": "ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆã®ãƒªã‚¹ãƒˆã‚’é–‹ã",
   "keyboard_shortcuts.search": "æ¤œç´¢æ¬„ã«ç§»å‹•",
+  "keyboard_shortcuts.start": "\"ã‚¹ã‚¿ãƒ¼ãƒˆ\" ã‚«ãƒ©ãƒ ã‚’é–‹ã",
   "keyboard_shortcuts.toggle_hidden": "CWã§éš ã‚ŒãŸæ–‡ã‚’è¦‹ã‚‹/éš ã™",
   "keyboard_shortcuts.toot": "æ–°è¦ãƒˆã‚¥ãƒ¼ãƒˆ",
   "keyboard_shortcuts.unfocus": "ãƒˆã‚¥ãƒ¼ãƒˆå…¥åŠ›æ¬„ãƒ»æ¤œç´¢æ¬„ã‹ã‚‰é›¢ã‚Œã‚‹",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
   "missing_indicator.sublabel": "è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ",
   "mute_modal.hide_notifications": "ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‹ã‚‰ã®é€šçŸ¥ã‚’éš ã—ã¾ã™ã‹ï¼Ÿ",
+  "navigation_bar.apps": "ã‚¢ãƒ—ãƒª",
   "navigation_bar.blocks": "ãƒ–ãƒãƒƒã‚¯ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼",
   "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": "Muted words",
+  "navigation_bar.filters": "ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼è¨å®š",
   "navigation_bar.follow_requests": "ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆ",
   "navigation_bar.info": "ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«ã¤ã„ã¦",
   "navigation_bar.keyboard_shortcuts": "ãƒ›ãƒƒãƒˆã‚ãƒ¼",
@@ -186,36 +242,22 @@
   "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.mention": "è¿”ä¿¡:",
   "notifications.column_settings.push": "ãƒ—ãƒƒã‚·ãƒ¥é€šçŸ¥",
-  "notifications.column_settings.push_meta": "ã“ã®ãƒ‡ãƒã‚¤ã‚¹",
   "notifications.column_settings.reblog": "ãƒ–ãƒ¼ã‚¹ãƒˆ:",
   "notifications.column_settings.show": "ã‚«ãƒ©ãƒ ã«è¡¨ç¤º",
   "notifications.column_settings.sound": "é€šçŸ¥éŸ³ã‚’å†ç”Ÿ",
+  "notifications.filter.all": "ã™ã¹ã¦",
+  "notifications.filter.boosts": "ãƒ–ãƒ¼ã‚¹ãƒˆ",
+  "notifications.filter.favourites": "ãŠæ°—ã«å…¥ã‚Š",
+  "notifications.filter.follows": "ãƒ•ã‚©ãƒãƒ¼",
+  "notifications.filter.mentions": "è¿”ä¿¡",
   "notifications.group": "{count} ä»¶ã®é€šçŸ¥",
-  "onboarding.done": "å®Œäº†",
-  "onboarding.next": "æ¬¡ã¸",
-  "onboarding.page_five.public_timelines": "é€£åˆã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã¯{domain}ã®äººãŒãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹Mastodonå…¨ä½“ã§ã®å…¬é–‹æŠ•ç¨¿ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚åŒã˜ããƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã¯{domain}ã®ã¿ã®å…¬é–‹æŠ•ç¨¿ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚",
-  "onboarding.page_four.home": "ã€Œãƒ›ãƒ¼ãƒ ã€ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã§ã¯ã‚ãªãŸãŒãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹äººã®æŠ•ç¨¿ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚",
-  "onboarding.page_four.notifications": "ã€Œé€šçŸ¥ã€ã§ã¯ã‚ãªãŸã¸ã®ä»–ã®äººã‹ã‚‰ã®é–¢ã‚ã‚Šã‚’è¡¨ç¤ºã—ã¾ã™ã€‚",
-  "onboarding.page_one.federation": "Mastodonã¯ç‹¬ç«‹ã—ãŸã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ï¼ˆã‚µãƒ¼ãƒãƒ¼ï¼‰ã®é›†åˆä½“ã§ã™ã€‚",
-  "onboarding.page_one.full_handle": "ã‚ãªãŸã®ãƒ•ãƒ«ãƒãƒ³ãƒ‰ãƒ«",
-  "onboarding.page_one.handle_hint": "ã‚ãªãŸã‚’æŽ¢ã—ã¦ã„ã‚‹å‹é”ã«ä¼ãˆã‚‹ã¨ã„ã„ã§ã—ã‚‡ã†ã€‚",
-  "onboarding.page_one.welcome": "Mastodonã¸ã‚ˆã†ã“ãï¼",
-  "onboarding.page_six.admin": "ã‚ãªãŸã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ç®¡ç†è€…ã¯{admin}ã§ã™ã€‚",
-  "onboarding.page_six.almost_done": "ä»¥ä¸Šã§ã™ã€‚",
-  "onboarding.page_six.appetoot": "ãƒœãƒŠãƒšãƒˆã‚¥ãƒ¼ãƒˆï¼",
-  "onboarding.page_six.apps_available": "iOSã€Androidã‚ã‚‹ã„ã¯ä»–ã®ãƒ—ãƒ©ãƒƒãƒˆãƒ•ã‚©ãƒ¼ãƒ ã§ä½¿ãˆã‚‹{apps}ãŒã‚ã‚Šã¾ã™ã€‚",
-  "onboarding.page_six.github": "Mastodonã¯OSSã§ã™ã€‚ãƒã‚°å ±å‘Šã‚„æ©Ÿèƒ½è¦æœ›ã‚ã‚‹ã„ã¯è²¢çŒ®ã‚’{github}ã‹ã‚‰è¡Œãªãˆã¾ã™ã€‚",
-  "onboarding.page_six.guidelines": "ã‚³ãƒŸãƒ¥ãƒ‹ãƒ†ã‚£ã‚¬ã‚¤ãƒ‰ãƒ©ã‚¤ãƒ³",
-  "onboarding.page_six.read_guidelines": "{domain}ã®{guidelines}ã‚’èªã‚€ã“ã¨ã‚’å¿˜ã‚Œãªã„ã‚ˆã†ã«ã—ã¦ãã ã•ã„ï¼",
-  "onboarding.page_six.various_app": "ãƒ¢ãƒã‚¤ãƒ«ã‚¢ãƒ—ãƒª",
-  "onboarding.page_three.profile": "ã€Œãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’ç·¨é›†ã€ã‹ã‚‰ã€ã‚ãªãŸã®è‡ªå·±ç´¹ä»‹ã‚„è¡¨ç¤ºåã‚’å¤‰æ›´ã§ãã¾ã™ã€‚ã¾ãŸãã“ã§ã¯ä»–ã®è¨å®šãŒã§ãã¾ã™ã€‚",
-  "onboarding.page_three.search": "æ¤œç´¢ãƒãƒ¼ã§ã€{illustration}ã‚„{introductions}ã®ã‚ˆã†ã«ç‰¹å®šã®ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã®æŠ•ç¨¿ã‚’è¦‹ãŸã‚Šã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’æŽ¢ã—ãŸã‚Šã§ãã¾ã™ã€‚",
-  "onboarding.page_two.compose": "ãƒ•ã‚©ãƒ¼ãƒ ã‹ã‚‰æŠ•ç¨¿ã§ãã¾ã™ã€‚ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚„ã€å…¬é–‹ç¯„å›²ã®è¨å®šã‚„ã€è¡¨ç¤ºæ™‚ã®è¦å‘Šã®è¨å®šã¯ä¸‹éƒ¨ã®ã‚¢ã‚¤ã‚³ãƒ³ã‹ã‚‰è¡Œãˆã¾ã™ã€‚",
-  "onboarding.skip": "ã‚¹ã‚ãƒƒãƒ—",
-  "privacy.change": "æŠ•ç¨¿ã®ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ã‚’å¤‰æ›´",
+  "privacy.change": "å…¬é–‹ç¯„å›²ã‚’å¤‰æ›´",
   "privacy.direct.long": "ãƒ¡ãƒ³ã‚·ãƒ§ãƒ³ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã ã‘ã«å…¬é–‹",
   "privacy.direct.short": "ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆ",
   "privacy.private.long": "ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã ã‘ã«å…¬é–‹",
@@ -250,10 +292,13 @@
   "search_results.statuses": "ãƒˆã‚¥ãƒ¼ãƒˆ",
   "search_results.total": "{count, number}ä»¶ã®çµæžœ",
   "standalone.public_title": "ä»Šã“ã‚“ãªè©±ã‚’ã—ã¦ã„ã¾ã™...",
+  "status.admin_account": "@{name} ã®ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç”»é¢ã‚’é–‹ã",
+  "status.admin_status": "ã“ã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ç”»é¢ã§é–‹ã",
   "status.block": "@{name}ã•ã‚“ã‚’ãƒ–ãƒãƒƒã‚¯",
   "status.cancel_reblog_private": "ãƒ–ãƒ¼ã‚¹ãƒˆè§£é™¤",
   "status.cannot_reblog": "ã“ã®æŠ•ç¨¿ã¯ãƒ–ãƒ¼ã‚¹ãƒˆã§ãã¾ã›ã‚“",
   "status.delete": "å‰Šé™¤",
+  "status.detailed_status": "è©³ç´°ãªä¼šè©±ãƒ“ãƒ¥ãƒ¼",
   "status.direct": "@{name}ã•ã‚“ã«ãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸",
   "status.embed": "åŸ‹ã‚è¾¼ã¿",
   "status.favourite": "ãŠæ°—ã«å…¥ã‚Š",
@@ -267,9 +312,11 @@
   "status.open": "è©³ç´°ã‚’è¡¨ç¤º",
   "status.pin": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã«å›ºå®šè¡¨ç¤º",
   "status.pinned": "å›ºå®šã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆ",
+  "status.read_more": "ã‚‚ã£ã¨è¦‹ã‚‹",
   "status.reblog": "ãƒ–ãƒ¼ã‚¹ãƒˆ",
   "status.reblog_private": "ãƒ–ãƒ¼ã‚¹ãƒˆ",
   "status.reblogged_by": "{name}ã•ã‚“ãŒãƒ–ãƒ¼ã‚¹ãƒˆ",
+  "status.reblogs.empty": "ã¾ã èª°ã‚‚ãƒ–ãƒ¼ã‚¹ãƒˆã—ã¦ã„ã¾ã›ã‚“ã€‚ãƒ–ãƒ¼ã‚¹ãƒˆã•ã‚Œã‚‹ã¨ã“ã“ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚",
   "status.redraft": "å‰Šé™¤ã—ã¦ä¸‹æ›¸ãã«æˆ»ã™",
   "status.reply": "è¿”ä¿¡",
   "status.replyAll": "å…¨å“¡ã«è¿”ä¿¡",
@@ -281,8 +328,11 @@
   "status.show_less_all": "å…¨ã¦éš ã™",
   "status.show_more": "ã‚‚ã£ã¨è¦‹ã‚‹",
   "status.show_more_all": "å…¨ã¦è¦‹ã‚‹",
+  "status.show_thread": "ã‚¹ãƒ¬ãƒƒãƒ‰ã‚’è¡¨ç¤º",
   "status.unmute_conversation": "ä¼šè©±ã®ãƒŸãƒ¥ãƒ¼ãƒˆã‚’è§£é™¤",
   "status.unpin": "ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã®å›ºå®šè¡¨ç¤ºã‚’è§£é™¤",
+  "suggestions.dismiss": "éš ã™",
+  "suggestions.header": "èˆˆå‘³ã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“â€¦",
   "tabs_bar.federated_timeline": "é€£åˆ",
   "tabs_bar.home": "ãƒ›ãƒ¼ãƒ ",
   "tabs_bar.local_timeline": "ãƒãƒ¼ã‚«ãƒ«",
@@ -291,7 +341,7 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {äºº} other {äºº}} ãŒãƒˆã‚¥ãƒ¼ãƒˆ",
   "ui.beforeunload": "Mastodonã‹ã‚‰é›¢ã‚Œã‚‹ã¨é€ä¿¡å‰ã®æŠ•ç¨¿ã¯å¤±ã‚ã‚Œã¾ã™ã€‚",
   "upload_area.title": "ãƒ‰ãƒ©ãƒƒã‚°ï¼†ãƒ‰ãƒãƒƒãƒ—ã§ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰",
-  "upload_button.label": "ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’è¿½åŠ ",
+  "upload_button.label": "ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’è¿½åŠ  (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "è¦–è¦šéšœå®³è€…ã®ãŸã‚ã®èª¬æ˜Ž",
   "upload_form.focus": "ç„¦ç‚¹",
   "upload_form.undo": "å‰Šé™¤",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
new file mode 100644
index 0000000000000000000000000000000000000000..93a11027a689db304c5f90c218e178fab8a9c5ad
--- /dev/null
+++ b/app/javascript/mastodon/locales/ka.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "áƒ‘áƒáƒ¢áƒ˜",
+  "account.block": "áƒ“áƒáƒ‘áƒšáƒáƒ™áƒ” @{name}",
+  "account.block_domain": "áƒ“áƒáƒ˜áƒ›áƒáƒšáƒáƒ¡ áƒ§áƒ•áƒ”áƒšáƒáƒ¤áƒ”áƒ áƒ˜ áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ“áƒáƒœ {domain}",
+  "account.blocked": "áƒ“áƒáƒ˜áƒ‘áƒšáƒáƒ™áƒ",
+  "account.direct": "áƒžáƒ˜áƒ áƒ“áƒáƒžáƒ˜áƒ áƒ˜ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ @{name}-áƒ¡",
+  "account.disclaimer_full": "áƒ¥áƒ•áƒ”áƒ›áƒáƒ— áƒ›áƒáƒªáƒ”áƒ›áƒ£áƒšáƒ›áƒ áƒ˜áƒœáƒ¤áƒáƒ áƒ›áƒáƒªáƒ˜áƒáƒ› áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ¡áƒ áƒ£áƒšáƒáƒ“ áƒáƒ  áƒáƒ¡áƒáƒ®áƒáƒ¡ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜.",
+  "account.domain_blocked": "áƒ“áƒáƒ›áƒ”áƒœáƒ˜ áƒ“áƒáƒ›áƒáƒšáƒ£áƒšáƒ˜áƒ",
+  "account.edit_profile": "áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ",
+  "account.endorse": "áƒ’áƒáƒ›áƒáƒ áƒ©áƒ”áƒ•áƒ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ–áƒ”",
+  "account.follow": "áƒ’áƒáƒ§áƒáƒšáƒ",
+  "account.followers": "áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.follows": "áƒ›áƒ˜áƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "áƒ›áƒáƒ’áƒ§áƒ•áƒ”áƒ‘áƒáƒ—",
+  "account.hide_reblogs": "áƒ“áƒáƒ˜áƒ›áƒáƒšáƒáƒ¡ áƒ‘áƒ£áƒ¡áƒ¢áƒ”áƒ‘áƒ˜ @{name}-áƒ¡áƒ’áƒáƒœ",
+  "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.mute": "áƒ’áƒáƒáƒ©áƒ£áƒ›áƒ” @{name}",
+  "account.mute_notifications": "áƒ’áƒáƒáƒ©áƒ£áƒ›áƒ” áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ @{name}-áƒ¡áƒ’áƒáƒœ",
+  "account.muted": "áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ£áƒšáƒ˜",
+  "account.posts": "áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜",
+  "account.posts_with_replies": "áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜ áƒ“áƒ áƒžáƒáƒ¡áƒ£áƒ®áƒ”áƒ‘áƒ˜",
+  "account.report": "áƒ“áƒáƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒ” @{name}",
+  "account.requested": "áƒ“áƒáƒ›áƒ¢áƒ™áƒ˜áƒªáƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒšáƒáƒ“áƒ˜áƒœáƒ¨áƒ˜. áƒ“áƒáƒáƒ¬áƒ™áƒáƒžáƒ£áƒœáƒ”áƒ— áƒ áƒáƒ› áƒ£áƒáƒ áƒ§áƒáƒ— áƒ“áƒáƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒœáƒ•áƒ",
+  "account.share": "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” @{name}-áƒ˜áƒ¡ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜",
+  "account.show_reblogs": "áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒ‘áƒ£áƒ¡áƒ¢áƒ”áƒ‘áƒ˜ @{name}-áƒ¡áƒ’áƒáƒœ",
+  "account.unblock": "áƒ’áƒáƒœáƒ‘áƒšáƒáƒ™áƒ” @{name}",
+  "account.unblock_domain": "áƒ’áƒáƒ›áƒáƒáƒ©áƒ˜áƒœáƒ” {domain}",
+  "account.unendorse": "áƒáƒ  áƒ’áƒáƒ›áƒáƒ˜áƒ áƒ©áƒ”áƒ¡ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ–áƒ”",
+  "account.unfollow": "áƒœáƒ£áƒ¦áƒáƒ  áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜",
+  "account.unmute": "áƒœáƒ£áƒ¦áƒáƒ  áƒáƒ©áƒ£áƒ›áƒ”áƒ‘ @{name}-áƒ¡",
+  "account.unmute_notifications": "áƒœáƒ£áƒ¦áƒáƒ  áƒáƒ©áƒ£áƒ›áƒ”áƒ‘ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ¡ @{name}-áƒ¡áƒ’áƒáƒœ",
+  "account.view_full_profile": "áƒ¡áƒ áƒ£áƒšáƒ˜ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ",
+  "alert.unexpected.message": "áƒ¬áƒáƒ áƒ›áƒáƒ˜áƒ¨áƒ•áƒ áƒ›áƒáƒ£áƒšáƒáƒ“áƒœáƒ”áƒšáƒ˜ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ.",
+  "alert.unexpected.title": "áƒ£áƒžáƒ¡!",
+  "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.community": "áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜",
+  "column.direct": "áƒžáƒ˜áƒ áƒ“áƒáƒžáƒ˜áƒ áƒ˜ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ”áƒ‘áƒ˜",
+  "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.media_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.publish": "áƒ¢áƒ£áƒ¢áƒ˜",
+  "compose_form.publish_loud": "{publish}!",
+  "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.confirm": "áƒ‘áƒšáƒáƒ™áƒ˜",
+  "confirmations.block.message": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ“áƒáƒ‘áƒšáƒáƒ™áƒáƒ— {name}?",
+  "confirmations.delete.confirm": "áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ",
+  "confirmations.delete.message": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒáƒ— áƒ”áƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜?",
+  "confirmations.delete_list.confirm": "áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ",
+  "confirmations.delete_list.message": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ¡áƒáƒ›áƒ£áƒ“áƒáƒ›áƒáƒ“ áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒáƒ— áƒ”áƒ¡ áƒ¡áƒ˜áƒ?",
+  "confirmations.domain_block.confirm": "áƒ›áƒ—áƒ”áƒšáƒ˜ áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒšáƒ•áƒ",
+  "confirmations.domain_block.message": "áƒœáƒáƒ¦áƒ“áƒáƒ“, áƒœáƒáƒ¦áƒ“áƒáƒ“, áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ“áƒáƒ‘áƒšáƒáƒ™áƒáƒ— áƒ›áƒ—áƒ”áƒšáƒ˜ {domain}? áƒ£áƒ›áƒ”áƒ¢áƒ”áƒ¡ áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜ áƒ áƒáƒ›áƒ“áƒ”áƒœáƒ˜áƒ›áƒ” áƒ’áƒáƒ›áƒ˜áƒ–áƒœáƒ£áƒšáƒ˜ áƒ‘áƒšáƒáƒ™áƒ˜ áƒáƒœ áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ áƒ¡áƒáƒ™áƒ›áƒáƒ áƒ˜áƒ¡áƒ˜ áƒ“áƒ áƒ£áƒ™áƒ”áƒ—áƒ”áƒ¡áƒ˜áƒ. áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ¡ áƒáƒ› áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ“áƒáƒœ áƒ•áƒ”áƒ  áƒ˜áƒ®áƒ˜áƒšáƒáƒ•áƒ— áƒ•áƒ”áƒ áƒª áƒ”áƒ áƒ— áƒ¦áƒ˜áƒ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ–áƒ” áƒáƒœ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ¨áƒ˜. áƒáƒ› áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ“áƒáƒœ áƒáƒ áƒ¡áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜ áƒáƒ›áƒáƒ˜áƒ¨áƒšáƒ”áƒ‘áƒ.",
+  "confirmations.mute.confirm": "áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ",
+  "confirmations.mute.message": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ’áƒáƒáƒ©áƒ£áƒ›áƒáƒ— {name}?",
+  "confirmations.redraft.confirm": "áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ áƒ“áƒ áƒ’áƒáƒ“áƒáƒœáƒáƒ¬áƒ˜áƒšáƒ”áƒ‘áƒ",
+  "confirmations.redraft.message": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒáƒ— áƒ”áƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜ áƒ“áƒ áƒ’áƒáƒ“áƒáƒáƒœáƒáƒ¬áƒ˜áƒšáƒáƒ—? áƒ“áƒáƒ™áƒáƒ áƒ’áƒáƒ•áƒ— áƒ§áƒ•áƒ”áƒšáƒ áƒžáƒáƒ¡áƒ£áƒ®áƒ¡, áƒ‘áƒ£áƒ¡áƒ¢áƒ¡ áƒ“áƒ áƒ›áƒáƒ¡áƒ–áƒ”áƒ“ áƒáƒ áƒ¡áƒ”áƒ‘áƒ£áƒš áƒ¤áƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ¡.",
+  "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.unfollow.message": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒáƒ¦áƒáƒ  áƒ’áƒ¡áƒ£áƒ áƒ— áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒáƒ“áƒ”áƒ— {name}-áƒ¡?",
+  "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_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "empty_column.community": "áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜áƒ. áƒ“áƒáƒ¬áƒ”áƒ áƒ”áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒ¦áƒ˜áƒáƒ“ áƒáƒœ áƒ¥áƒ”áƒœáƒ˜áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒ¡áƒ®áƒ•áƒ!",
+  "empty_column.direct": "áƒ¯áƒ”áƒ  áƒžáƒ˜áƒ áƒ“áƒáƒžáƒ˜áƒ áƒ˜ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ—. áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ‘áƒ— áƒáƒœ áƒ’áƒáƒáƒ’áƒ–áƒáƒ•áƒœáƒ˜áƒ—, áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ‘áƒ áƒáƒ¥.",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
+  "empty_column.hashtag": "áƒáƒ› áƒ°áƒ”áƒ¨áƒ¢áƒ”áƒ’áƒ¨áƒ˜ áƒ¯áƒ”áƒ  áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜áƒ.",
+  "empty_column.home": "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒáƒ®áƒšáƒ˜áƒ¡ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜áƒ! áƒ”áƒ¡áƒ¢áƒ£áƒ›áƒ áƒ”áƒ— {public}-áƒ¡ áƒáƒœ áƒ“áƒáƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ— áƒ«áƒ”áƒ‘áƒœáƒ, áƒ áƒáƒ› áƒ¨áƒ”áƒ®áƒ•áƒ“áƒ”áƒ— áƒ¡áƒ®áƒ•áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡.",
+  "empty_column.home.public_timeline": "áƒ¦áƒ˜áƒ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜",
+  "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.notifications": "áƒ¯áƒ”áƒ  áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ—. áƒ¡áƒáƒ£áƒ‘áƒ áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒáƒ¬áƒ§áƒ”áƒ‘áƒáƒ“ áƒ˜áƒ£áƒ áƒ—áƒ˜áƒ”áƒ áƒ—áƒ¥áƒ›áƒ”áƒ“áƒ”áƒ— áƒ¡áƒ®áƒ•áƒ”áƒ‘áƒ—áƒáƒœ.",
+  "empty_column.public": "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜áƒ! áƒ¨áƒ”áƒ¡áƒáƒ•áƒ¡áƒ”áƒ‘áƒáƒ“, áƒ“áƒáƒ¬áƒ”áƒ áƒ”áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒ¦áƒ˜áƒáƒ“ áƒáƒœ áƒ®áƒ”áƒšáƒ˜áƒ— áƒ’áƒáƒ°áƒ§áƒ”áƒ•áƒ˜áƒ— áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒ¡áƒ®áƒ•áƒ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡áƒ’áƒáƒœ",
+  "follow_request.authorize": "áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ",
+  "follow_request.reject": "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ",
+  "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}",
+  "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",
+  "home.column_settings.basic": "áƒ«áƒ˜áƒ áƒ˜áƒ—áƒáƒ“áƒ˜",
+  "home.column_settings.show_reblogs": "áƒ‘áƒ£áƒ¡áƒ¢áƒ”áƒ‘áƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ",
+  "home.column_settings.show_replies": "áƒžáƒáƒ¡áƒ£áƒ®áƒ”áƒ‘áƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "keyboard_shortcuts.back": "áƒ£áƒ™áƒáƒœ áƒ’áƒáƒ“áƒáƒ¡áƒáƒ¡áƒ•áƒšáƒ”áƒšáƒáƒ“",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "áƒ“áƒáƒ¡áƒáƒ‘áƒ£áƒ¡áƒ¢áƒáƒ“",
+  "keyboard_shortcuts.column": "áƒ”áƒ áƒ—-áƒ”áƒ áƒ—áƒ˜ áƒ¡áƒ•áƒ”áƒ¢áƒ¨áƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ–áƒ” áƒ¤áƒáƒ™áƒ£áƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+  "keyboard_shortcuts.compose": "áƒ¨áƒ”áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢-áƒáƒ áƒ”áƒáƒ–áƒ” áƒ¤áƒáƒ™áƒ£áƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+  "keyboard_shortcuts.description": "áƒáƒ¦áƒ¬áƒ”áƒ áƒ˜áƒšáƒáƒ‘áƒ",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ¥áƒ•áƒ”áƒ›áƒáƒ— áƒ’áƒáƒ“áƒáƒ¡áƒáƒáƒ“áƒ’áƒ˜áƒšáƒ”áƒ‘áƒšáƒáƒ“",
+  "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.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "áƒªáƒ®áƒ”áƒšáƒ˜ áƒ™áƒšáƒáƒ•áƒ˜áƒ¨áƒ˜",
+  "keyboard_shortcuts.legend": "áƒáƒ› áƒšáƒ”áƒ’áƒ”áƒœáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ¡áƒáƒ©áƒ”áƒœáƒáƒ“",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "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.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ¡ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒ’áƒáƒ¡áƒáƒ®áƒ¡áƒœáƒ”áƒšáƒáƒ“",
+  "keyboard_shortcuts.reply": "áƒžáƒáƒ¡áƒ£áƒ®áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "áƒ«áƒ˜áƒ”áƒ‘áƒáƒ–áƒ” áƒ¤áƒáƒ™áƒ£áƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ™áƒáƒœ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ¡áƒáƒ©áƒ”áƒœáƒáƒ“/áƒ“áƒáƒ¡áƒáƒ›áƒáƒšáƒ•áƒáƒ“",
+  "keyboard_shortcuts.toot": "áƒáƒ®áƒáƒšáƒ˜ áƒ¢áƒ£áƒ¢áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒáƒ¬áƒ§áƒ”áƒ‘áƒáƒ“",
+  "keyboard_shortcuts.unfocus": "áƒ¨áƒ”áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢-áƒáƒ áƒ”áƒáƒ–áƒ” áƒ¤áƒáƒ™áƒ£áƒ¡áƒ˜áƒ¡ áƒ›áƒáƒ¡áƒáƒ¨áƒáƒ áƒ”áƒ‘áƒšáƒáƒ“",
+  "keyboard_shortcuts.up": "áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ–áƒ”áƒ›áƒáƒ— áƒ’áƒáƒ“áƒáƒ¡áƒáƒáƒ“áƒ’áƒ˜áƒšáƒ”áƒ‘áƒšáƒáƒ“",
+  "lightbox.close": "áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ",
+  "lightbox.next": "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜",
+  "lightbox.previous": "áƒ¬áƒ˜áƒœáƒ",
+  "lists.account.add": "áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
+  "lists.account.remove": "áƒ¡áƒ˜áƒ˜áƒ“áƒáƒœ áƒáƒ›áƒáƒ¨áƒšáƒ",
+  "lists.delete": "áƒ¡áƒ˜áƒ˜áƒ¡ áƒ¬áƒáƒ¨áƒšáƒ",
+  "lists.edit": "áƒ¡áƒ˜áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ",
+  "lists.new.create": "áƒ¡áƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
+  "lists.new.title_placeholder": "áƒáƒ®áƒáƒšáƒ˜ áƒ¡áƒ˜áƒ˜áƒ¡ áƒ¡áƒáƒ—áƒáƒ£áƒ áƒ˜",
+  "lists.search": "áƒ«áƒ”áƒ‘áƒœáƒ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ¡ áƒ¨áƒáƒ áƒ˜áƒ¡ áƒ áƒáƒ›áƒ”áƒšáƒ—áƒáƒª áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—",
+  "lists.subheading": "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜",
+  "loading_indicator.label": "áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ...",
+  "media_gallery.toggle_visible": "áƒ®áƒ˜áƒšáƒ•áƒáƒ“áƒáƒ‘áƒ˜áƒ¡ áƒ©áƒáƒ áƒ—áƒ•áƒ",
+  "missing_indicator.label": "áƒáƒ áƒáƒ áƒœáƒáƒžáƒáƒ•áƒœáƒ˜",
+  "missing_indicator.sublabel": "áƒáƒ› áƒ áƒ”áƒ¡áƒ£áƒ áƒ¡áƒ˜áƒ¡ áƒžáƒáƒ•áƒœáƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ",
+  "mute_modal.hide_notifications": "áƒ“áƒáƒ•áƒ›áƒáƒšáƒáƒ— áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒáƒ› áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡áƒ’áƒáƒœ?",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "áƒ“áƒáƒ‘áƒšáƒáƒ™áƒ˜áƒšáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜",
+  "navigation_bar.community_timeline": "áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜",
+  "navigation_bar.compose": "Compose new toot",
+  "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.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.mention": "{name}-áƒ›áƒ áƒ’áƒáƒ¡áƒáƒ®áƒ”áƒšáƒáƒ—",
+  "notification.reblog": "{name}-áƒ›áƒ áƒ“áƒáƒ‘áƒ£áƒ¡áƒ¢áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜",
+  "notifications.clear": "áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”áƒ‘áƒ",
+  "notifications.clear_confirmation": "áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—, áƒ’áƒ¡áƒ£áƒ áƒ— áƒ¡áƒáƒ›áƒ£áƒ“áƒáƒ›áƒáƒ“ áƒ¬áƒáƒ¨áƒáƒšáƒáƒ— áƒ§áƒ•áƒ”áƒšáƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ?",
+  "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.follow": "áƒáƒ®áƒáƒšáƒ˜ áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜:",
+  "notifications.column_settings.mention": "áƒ®áƒ¡áƒ”áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜:",
+  "notifications.column_settings.push": "áƒ¤áƒ£áƒ¨ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜",
+  "notifications.column_settings.reblog": "áƒ‘áƒ£áƒ¡áƒ¢áƒ”áƒ‘áƒ˜:",
+  "notifications.column_settings.show": "áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ¡ áƒ¡áƒ•áƒ”áƒ¢áƒ¨áƒ˜",
+  "notifications.column_settings.sound": "áƒ®áƒ›áƒ˜áƒ¡ áƒ“áƒáƒ™áƒ•áƒ áƒ",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ",
+  "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": "áƒ©áƒáƒ›áƒáƒ£áƒ—áƒ•áƒšáƒ”áƒšáƒ˜",
+  "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}áƒ¬áƒ›",
+  "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.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "áƒ¨áƒ˜áƒ“áƒ áƒ®áƒ”áƒ“áƒ˜...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "áƒ“áƒáƒ‘áƒšáƒáƒ™áƒ” @{name}",
+  "status.cancel_reblog_private": "áƒ‘áƒ£áƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒáƒ¨áƒáƒ áƒ”áƒ‘áƒ",
+  "status.cannot_reblog": "áƒ”áƒ¡ áƒžáƒáƒ¡áƒ¢áƒ˜ áƒ•áƒ”áƒ  áƒ“áƒáƒ˜áƒ‘áƒ£áƒ¡áƒ¢áƒ”áƒ‘áƒ",
+  "status.delete": "áƒ¬áƒáƒ¨áƒšáƒ",
+  "status.detailed_status": "Detailed conversation view",
+  "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": "Read more",
+  "status.reblog": "áƒ‘áƒ£áƒ¡áƒ¢áƒ˜",
+  "status.reblog_private": "áƒ“áƒáƒ˜áƒ‘áƒ£áƒ¡áƒ¢áƒáƒ¡ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡ áƒáƒ£áƒ“áƒ˜áƒ¢áƒáƒ áƒ˜áƒáƒ–áƒ”",
+  "status.reblogged_by": "{name} áƒ“áƒáƒ˜áƒ‘áƒ£áƒ¡áƒ¢áƒ",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
+  "status.redraft": "áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ”áƒ¡ áƒ“áƒ áƒ’áƒáƒ“áƒáƒœáƒáƒ¬áƒ˜áƒšáƒ“áƒ”áƒ¡",
+  "status.reply": "áƒžáƒáƒ¡áƒ£áƒ®áƒ˜",
+  "status.replyAll": "áƒ£áƒžáƒáƒ¡áƒ£áƒ®áƒ” áƒ—áƒ”áƒ›áƒáƒ¡",
+  "status.report": "áƒ“áƒáƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒ” @{name}",
+  "status.sensitive_toggle": "áƒ“áƒáƒáƒ¬áƒ™áƒáƒžáƒ£áƒœáƒ”áƒ— áƒ¡áƒáƒœáƒáƒ®áƒáƒ•áƒáƒ“",
+  "status.sensitive_warning": "áƒ›áƒ’áƒ áƒ«áƒœáƒáƒ‘áƒ˜áƒáƒ áƒ” áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ˜",
+  "status.share": "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ",
+  "status.show_less": "áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒœáƒáƒ™áƒšáƒ”áƒ‘áƒ˜",
+  "status.show_less_all": "áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒœáƒáƒ™áƒšáƒ”áƒ‘áƒ˜ áƒ§áƒ•áƒ”áƒšáƒáƒ–áƒ”",
+  "status.show_more": "áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒ›áƒ”áƒ¢áƒ˜",
+  "status.show_more_all": "áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒ›áƒ”áƒ¢áƒ˜ áƒ§áƒ•áƒ”áƒšáƒáƒ–áƒ”",
+  "status.show_thread": "Show thread",
+  "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": "áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜",
+  "tabs_bar.notifications": "áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜",
+  "tabs_bar.search": "áƒ«áƒ”áƒ‘áƒœáƒ",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} áƒ¡áƒáƒ£áƒ‘áƒ áƒáƒ‘áƒ¡",
+  "ui.beforeunload": "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ“áƒ áƒáƒ¤áƒ¢áƒ˜ áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ”áƒ‘áƒ áƒ—áƒ£ áƒ“áƒáƒ¢áƒáƒ•áƒ”áƒ‘áƒ— áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ¡.",
+  "upload_area.title": "áƒ’áƒáƒ“áƒ›áƒáƒ¬áƒ˜áƒ”áƒ— áƒ“áƒ áƒ©áƒáƒáƒ’áƒ“áƒ”áƒ— áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒáƒ—",
+  "upload_button.label": "áƒ›áƒ”áƒ“áƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ",
+  "upload_form.description": "áƒáƒ¦áƒ¬áƒ”áƒ áƒ˜áƒšáƒáƒ‘áƒ áƒ•áƒ˜áƒ–áƒ£áƒáƒšáƒ£áƒ áƒáƒ“ áƒ£áƒ¤áƒáƒ¡áƒ£áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡",
+  "upload_form.focus": "áƒ™áƒ áƒáƒžáƒ˜",
+  "upload_form.undo": "áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ",
+  "upload_progress.label": "áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ...",
+  "video.close": "áƒ•áƒ˜áƒ“áƒ”áƒáƒ¡ áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ",
+  "video.exit_fullscreen": "áƒ¡áƒ áƒ£áƒš áƒ”áƒ™áƒ áƒáƒœáƒ–áƒ” áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ—áƒ˜áƒ¨áƒ•áƒ",
+  "video.expand": "áƒ•áƒ˜áƒ“áƒ”áƒáƒ¡ áƒ’áƒáƒ¤áƒáƒ áƒ—áƒáƒ”áƒ‘áƒ",
+  "video.fullscreen": "áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ áƒ¡áƒ áƒ£áƒš áƒ”áƒ™áƒ áƒáƒœáƒ–áƒ”",
+  "video.hide": "áƒ•áƒ˜áƒ“áƒ”áƒáƒ¡ áƒ“áƒáƒ›áƒáƒšáƒ•áƒ",
+  "video.mute": "áƒ®áƒ›áƒ˜áƒ¡ áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ",
+  "video.pause": "áƒžáƒáƒ£áƒ–áƒ",
+  "video.play": "áƒ“áƒáƒ™áƒ•áƒ áƒ",
+  "video.unmute": "áƒ®áƒ›áƒ˜áƒ¡ áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ¨áƒáƒ áƒ”áƒ‘áƒ"
+}
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 8f4b57c2b6a99816096ee35f06792b4787f54957..ceb474a3e54974dd3941f0a912523b33f0d52c7d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "ë¦¬ìŠ¤íŠ¸ì— ì¶”ê°€ í˜¹ì€ ì‚ì œ",
   "account.badges.bot": "ë´‡",
   "account.block": "@{name}ì„ ì°¨ë‹¨",
   "account.block_domain": "{domain} ì „ì²´ë¥¼ ìˆ¨ê¹€",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "ì—¬ê¸° ìžˆëŠ” ì •ë³´ëŠ” ìœ ì €ì˜ í”„ë¡œíŒŒì¼ì„ ì •í™•ížˆ ë°˜ì˜í•˜ì§€ ëª» í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.",
   "account.domain_blocked": "ë„ë©”ì¸ ìˆ¨ê²¨ì§",
   "account.edit_profile": "í”„ë¡œí•„ íŽ¸ì§‘",
+  "account.endorse": "í”„ë¡œí•„ì— ë‚˜íƒ€ë‚´ê¸°",
   "account.follow": "íŒ”ë¡œìš°",
   "account.followers": "íŒ”ë¡œì›Œ",
+  "account.followers.empty": "ì•„ì§ ì•„ë¬´ë„ ì´ ìœ ì €ë¥¼ íŒ”ë¡œìš° í•˜ê³  ìžˆì§€ ì•ŠìŠµë‹ˆë‹¤.",
   "account.follows": "íŒ”ë¡œìš°",
+  "account.follows.empty": "ì´ ìœ ì €ëŠ” ì•„ì§ ì•„ë¬´ë„ íŒ”ë¡œìš° í•˜ê³  ìžˆì§€ ì•ŠìŠµë‹ˆë‹¤.",
   "account.follows_you": "ë‚  íŒ”ë¡œìš°í•©ë‹ˆë‹¤",
   "account.hide_reblogs": "@{name}ì˜ ë¶€ìŠ¤íŠ¸ë¥¼ ìˆ¨ê¸°ê¸°",
+  "account.link_verified_on": "{date}ì— ì´ ë§í¬ì˜ ì†Œìœ ê¶Œì´ í™•ì¸ ë¨",
+  "account.locked_info": "ì´ ê³„ì •ì˜ í”„ë¼ì´ë²„ì‹œ ì„¤ì •ì€ ìž ê¸ˆìœ¼ë¡œ ì„¤ì •ë˜ì–´ ìžˆìŠµë‹ˆë‹¤. ê³„ì • ì†Œìœ ìžê°€ ìˆ˜ë™ìœ¼ë¡œ íŒ”ë¡œì–´ë¥¼ ìŠ¹ì¸í•©ë‹ˆë‹¤.",
   "account.media": "ë¯¸ë””ì–´",
   "account.mention": "@{name}ì—ê²Œ ê¸€ì“°ê¸°",
   "account.moved_to": "{name}ëŠ” ê³„ì •ì„ ì´ë™í–ˆìŠµë‹ˆë‹¤:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "@{name}ì˜ ë¶€ìŠ¤íŠ¸ ë³´ê¸°",
   "account.unblock": "ì°¨ë‹¨ í•´ì œ",
   "account.unblock_domain": "{domain} ìˆ¨ê¹€ í•´ì œ",
+  "account.unendorse": "í”„ë¡œí•„ì— ë‚˜íƒ€ë‚´ì§€ ì•Šê¸°",
   "account.unfollow": "íŒ”ë¡œìš° í•´ì œ",
   "account.unmute": "ë®¤íŠ¸ í•´ì œ",
   "account.unmute_notifications": "@{name}ì˜ ì•Œë¦¼ ë®¤íŠ¸ í•´ì œ",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "ë®¤íŠ¸",
   "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}ë¥¼ ì–¸íŒ”ë¡œìš°í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
   "embed.instructions": "ì•„ëž˜ì˜ ì½”ë“œë¥¼ ë³µì‚¬í•˜ì—¬ ëŒ€í™”ë¥¼ ì›í•˜ëŠ” ê³³ìœ¼ë¡œ ê³µìœ í•˜ì„¸ìš”.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "ê²€ìƒ‰ ê²°ê³¼",
   "emoji_button.symbols": "ê¸°í˜¸",
   "emoji_button.travel": "ì—¬í–‰ê³¼ ìž¥ì†Œ",
+  "empty_column.account_timeline": "ì—¬ê¸´ íˆ¿ì´ ì—†ì–´ìš”!",
+  "empty_column.blocks": "ì•„ì§ ì•„ë¬´ë„ ì°¨ë‹¨í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
   "empty_column.community": "ë¡œì»¬ íƒ€ìž„ë¼ì¸ì— ì•„ë¬´ ê²ƒë„ ì—†ìŠµë‹ˆë‹¤. ì•„ë¬´ê±°ë‚˜ ì ì–´ ë³´ì„¸ìš”!",
   "empty_column.direct": "ì•„ì§ ë‹¤ì´ë ‰íŠ¸ ë©”ì‹œì§€ê°€ ì—†ìŠµë‹ˆë‹¤. ë‹¤ì´ë ‰íŠ¸ ë©”ì‹œì§€ë¥¼ ë³´ë‚´ê±°ë‚˜ ë°›ì€ ê²½ìš°, ì—¬ê¸°ì— í‘œì‹œ ë©ë‹ˆë‹¤.",
+  "empty_column.domain_blocks": "ì•„ì§ ìˆ¨ê²¨ì§„ ë„ë©”ì¸ì´ ì—†ìŠµë‹ˆë‹¤.",
+  "empty_column.favourited_statuses": "ì•„ì§ ì¦ê²¨ì°¾ê¸° í•œ íˆ¿ì´ ì—†ìŠµë‹ˆë‹¤. íˆ¿ì„ ì¦ê²¨ì°¾ê¸° í•˜ë©´ ì—¬ê¸°ì— ë‚˜íƒ€ë‚©ë‹ˆë‹¤.",
+  "empty_column.favourites": "ì•„ì§ ì•„ë¬´ë„ ì´ íˆ¿ì„ ì¦ê²¨ì°¾ê¸° í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ëˆ„êµ°ê°€ ì¦ê²¨ì°¾ê¸°ë¥¼ í•˜ë©´ ì—¬ê¸°ì— ê·¸ë“¤ì´ ë‚˜íƒ€ë‚©ë‹ˆë‹¤.",
+  "empty_column.follow_requests": "ì•„ì§ íŒ”ë¡œìš° ìš”ì²ì´ ì—†ìŠµë‹ˆë‹¤. ìš”ì²ì„ ë°›ì•˜ì„ ë•Œ ì—¬ê¸°ì— ë‚˜íƒ€ë‚©ë‹ˆë‹¤.",
   "empty_column.hashtag": "ì´ í•´ì‹œíƒœê·¸ëŠ” ì•„ì§ ì‚¬ìš©ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
   "empty_column.home": "ì•„ì§ ì•„ë¬´ë„ íŒ”ë¡œìš° í•˜ê³  ìžˆì§€ ì•ŠìŠµë‹ˆë‹¤. {public}ë¥¼ ë³´ëŸ¬ ê°€ê±°ë‚˜, ê²€ìƒ‰í•˜ì—¬ ë‹¤ë¥¸ ì‚¬ìš©ìžë¥¼ ì°¾ì•„ ë³´ì„¸ìš”.",
   "empty_column.home.public_timeline": "ì—°í•© íƒ€ìž„ë¼ì¸",
   "empty_column.list": "ë¦¬ìŠ¤íŠ¸ì— ì•„ì§ ì•„ë¬´ ê²ƒë„ ì—†ìŠµë‹ˆë‹¤.",
+  "empty_column.lists": "ì•„ì§ ë¦¬ìŠ¤íŠ¸ê°€ ì—†ìŠµë‹ˆë‹¤. ë¦¬ìŠ¤íŠ¸ë¥¼ ë§Œë“¤ë©´ ì—¬ê¸°ì— ë‚˜íƒ€ë‚©ë‹ˆë‹¤.",
+  "empty_column.mutes": "ì•„ì§ ì•„ë¬´ë„ ë®¤íŠ¸í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
   "empty_column.notifications": "ì•„ì§ ì•Œë¦¼ì´ ì—†ìŠµë‹ˆë‹¤. ë‹¤ë¥¸ ì‚¬ëžŒê³¼ ëŒ€í™”ë¥¼ ì‹œìž‘í•´ ë³´ì„¸ìš”.",
   "empty_column.public": "ì—¬ê¸°ì—” ì•„ì§ ì•„ë¬´ ê²ƒë„ ì—†ìŠµë‹ˆë‹¤! ê³µê°œì ìœ¼ë¡œ ë¬´ì–¸ê°€ í¬ìŠ¤íŒ…í•˜ê±°ë‚˜, ë‹¤ë¥¸ ì¸ìŠ¤í„´ìŠ¤ì˜ ìœ ì €ë¥¼ íŒ”ë¡œìš° í•´ì„œ ì±„ì›Œë³´ì„¸ìš”",
   "follow_request.authorize": "í—ˆê°€",
   "follow_request.reject": "ê±°ë¶€",
   "getting_started.developers": "ê°œë°œìž",
+  "getting_started.directory": "í”„ë¡œí•„ ë””ë ‰í„°ë¦¬",
   "getting_started.documentation": "ë¬¸ì„œ",
-  "getting_started.find_friends": "íŠ¸ìœ„í„°ì—ì„œ ì¹œêµ¬ ì°¾ê¸°",
   "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}ë¥¼ ì œì™¸)",
+  "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": "ê¸°ë³¸ ì„¤ì •",
   "home.column_settings.show_reblogs": "ë¶€ìŠ¤íŠ¸ í‘œì‹œ",
   "home.column_settings.show_replies": "ë‹µê¸€ í‘œì‹œ",
+  "introduction.federation.action": "ë‹¤ìŒ",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "íŽ˜ë””ë²„ìŠ¤ì˜ ë‹¤ë¥¸ ì„œë²„ì˜ ê³µê°œ ê²Œì‹œë¬¼ì´ ì—°í•© íƒ€ìž„ë¼ì¸ì— ë‚˜íƒ€ë‚©ë‹ˆë‹¤.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "ë‹¹ì‹ ì´ íŒ”ë¡œìš° í•˜ê³  ìžˆëŠ” ì‚¬ëžŒì˜ ê²Œì‹œë¬¼ì´ í™ˆ íƒ€ìž„ë¼ì¸ì— ë‚˜íƒ€ë‚©ë‹ˆë‹¤. ì–´ëŠ ì„œë²„ì— ìžˆëŠ” ì‚¬ëžŒì´ë¼ë„ íŒ”ë¡œìš°ê°€ ê°€ëŠ¥í•©ë‹ˆë‹¤!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "ê°™ì€ ì„œë²„ì— ìžˆëŠ” ê³µê°œ ê²Œì‹œë¬¼ì€ ë¡œì»¬ íƒ€ìž„ë¼ì¸ì— ë‚˜íƒ€ë‚©ë‹ˆë‹¤.",
+  "introduction.interactions.action": "íŠœí† ë¦¬ì–¼ ë§ˆì¹˜ê¸°!",
+  "introduction.interactions.favourite.headline": "ì¦ê²¨ì°¾ê¸°",
+  "introduction.interactions.favourite.text": "ë‚˜ì¤‘ì„ ìœ„í•´ íˆ¿ì„ ì €ìž¥í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤, ê·¸ë¦¬ê³  ìž‘ì„±ìžì—ê²Œ ë‹¹ì‹ ì´ ì´ ê¸€ì„ ë§ˆìŒì— ë“¤ì–´í•œë‹¤ëŠ” ê±¸ ì•Œë¦½ë‹ˆë‹¤.",
+  "introduction.interactions.reblog.headline": "ë¶€ìŠ¤íŠ¸",
+  "introduction.interactions.reblog.text": "ë¶€ìŠ¤íŠ¸ë¥¼ í†µí•´ ë‹¤ë¥¸ ì‚¬ëžŒì˜ íˆ¿ì„ ë‹¹ì‹ ì˜ íŒ”ë¡œì›Œë“¤ì—ê²Œ ê³µìœ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
+  "introduction.interactions.reply.headline": "ë‹µê¸€",
+  "introduction.interactions.reply.text": "ë‹¤ë¥¸ ì‚¬ëžŒì´ë‚˜ ë‚˜ì˜ íˆ¿ì— ë‹µê¸€ì„ ë‹¬ ìˆ˜ ìžˆìŠµë‹ˆë‹¤, ì´ ë‹µê¸€ì€ í•˜ë‚˜ì˜ íƒ€ëž˜ê¸€ë¡œ ì´ì–´ì§‘ë‹ˆë‹¤.",
+  "introduction.welcome.action": "ì¶œë°œ!",
+  "introduction.welcome.headline": "ì²«ê±¸ìŒ",
+  "introduction.welcome.text": "íŽ˜ë””ë²„ìŠ¤ì— ì˜¤ì‹  ê²ƒì„ í™˜ì˜í•©ë‹ˆë‹¤! ìž ì‹œ í›„, ë‹¹ì‹ ì€ ìˆ˜ ë§Žì€ ë‹¤ì–‘í•œ ì„œë²„ë“¤ì— ì¡´ìž¬í•˜ëŠ” ì¹œêµ¬ë“¤ì—ê²Œ ë©”ì‹œì§€ë¥¼ ë³´ë‚´ê³  ëŒ€í™” í•  ìˆ˜ ìžˆê²Œ ë©ë‹ˆë‹¤. í•˜ì§€ë§Œ ì´ ì„œë²„, {domain}ì€ íŠ¹ë³„í•©ë‹ˆë‹¤. ì´ ì„œë²„ëŠ” ë‹¹ì‹ ì˜ í”„ë¡œí•„ì„ ì œê³µí•˜ë‹ˆ ì´ë¦„ì„ ê¸°ì–µí•˜ì„¸ìš”.",
   "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.pinned": "ê³ ì • íˆ¿ ë¦¬ìŠ¤íŠ¸ ì—´ê¸°",
+  "keyboard_shortcuts.profile": "í”„ë¡œí•„ ì—´ê¸°",
   "keyboard_shortcuts.reply": "ë‹µìž¥",
+  "keyboard_shortcuts.requests": "íŒ”ë¡œìš° ìš”ì² ë¦¬ìŠ¤íŠ¸ ì—´ê¸°",
   "keyboard_shortcuts.search": "ê²€ìƒ‰ì°½ì— í¬ì»¤ìŠ¤",
+  "keyboard_shortcuts.start": "\"ì‹œìž‘í•˜ê¸°\" ì»¬ëŸ¼ ì—´ê¸°",
   "keyboard_shortcuts.toggle_hidden": "CWë¡œ ê°€ë ¤ì§„ í…ìŠ¤íŠ¸ë¥¼ í‘œì‹œ/ë¹„í‘œì‹œ",
   "keyboard_shortcuts.toot": "ìƒˆ íˆ¿ ìž‘ì„±",
   "keyboard_shortcuts.unfocus": "ìž‘ì„±ì°½ì—ì„œ í¬ì»¤ìŠ¤ í•´ì œ",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "ì°¾ì„ ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
   "missing_indicator.sublabel": "ì´ ë¦¬ì†ŒìŠ¤ë¥¼ ì°¾ì„ ìˆ˜ ì—†ì—ˆìŠµë‹ˆë‹¤",
   "mute_modal.hide_notifications": "ì´ ì‚¬ìš©ìžë¡œë¶€í„°ì˜ ì•Œë¦¼ì„ ë®¤íŠ¸í•˜ì‹œê² ìŠµë‹ˆê¹Œ?",
+  "navigation_bar.apps": "ëª¨ë°”ì¼ ì•±",
   "navigation_bar.blocks": "ì°¨ë‹¨í•œ ì‚¬ìš©ìž",
   "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": "Muted words",
+  "navigation_bar.filters": "ë®¤íŠ¸",
   "navigation_bar.follow_requests": "íŒ”ë¡œìš° ìš”ì²",
   "navigation_bar.info": "ì´ ì¸ìŠ¤í„´ìŠ¤ì— ëŒ€í•´ì„œ",
   "navigation_bar.keyboard_shortcuts": "ë‹¨ì¶•í‚¤",
@@ -186,35 +242,21 @@
   "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.mention": "ë‹µê¸€:",
   "notifications.column_settings.push": "í‘¸ì‹œ ì•Œë¦¼",
-  "notifications.column_settings.push_meta": "ì´ ìž¥ì¹˜",
   "notifications.column_settings.reblog": "ë¶€ìŠ¤íŠ¸:",
   "notifications.column_settings.show": "ì»¬ëŸ¼ì— í‘œì‹œ",
   "notifications.column_settings.sound": "íš¨ê³¼ìŒ ìž¬ìƒ",
+  "notifications.filter.all": "ëª¨ë‘",
+  "notifications.filter.boosts": "ë¶€ìŠ¤íŠ¸",
+  "notifications.filter.favourites": "ì¦ê²¨ì°¾ê¸°",
+  "notifications.filter.follows": "íŒ”ë¡œìš°",
+  "notifications.filter.mentions": "ë©˜ì…˜",
   "notifications.group": "{count} ê°œì˜ ì•Œë¦¼",
-  "onboarding.done": "ì™„ë£Œ",
-  "onboarding.next": "ë‹¤ìŒ",
-  "onboarding.page_five.public_timelines": "ì—°í•© íƒ€ìž„ë¼ì¸ì—ì„œëŠ” {domain}ì˜ ì‚¬ëžŒë“¤ì´ íŒ”ë¡œìš° ì¤‘ì¸ Mastodon ì „ì²´ ì¸ìŠ¤í„´ìŠ¤ì˜ ê³µê°œ í¬ìŠ¤íŠ¸ë¥¼ í‘œì‹œí•©ë‹ˆë‹¤. ë¡œì»¬ íƒ€ìž„ë¼ì¸ì—ì„œëŠ” {domain} ë§Œì˜ ê³µê°œ í¬ìŠ¤íŠ¸ë¥¼ í‘œì‹œí•©ë‹ˆë‹¤.",
-  "onboarding.page_four.home": "í™ˆ íƒ€ìž„ë¼ì¸ì—ì„œëŠ” ë‚´ê°€ íŒ”ë¡œìš° ì¤‘ì¸ ì‚¬ëžŒë“¤ì˜ í¬ìŠ¤íŠ¸ë¥¼ í‘œì‹œí•©ë‹ˆë‹¤.",
-  "onboarding.page_four.notifications": "ì•Œë¦¼ì—ì„œëŠ” ë‹¤ë¥¸ ì‚¬ëžŒë“¤ê³¼ì˜ ì—°ê²°ì„ í‘œì‹œí•©ë‹ˆë‹¤.",
-  "onboarding.page_one.federation": "ë§ˆìŠ¤í† ëˆì€ ëˆ„êµ¬ë‚˜ ì°¸ê°€í•  ìˆ˜ ìžˆëŠ” SNSìž…ë‹ˆë‹¤.",
-  "onboarding.page_one.full_handle": "ë‹¹ì‹ ì˜ í’€ í•¸ë“¤",
-  "onboarding.page_one.handle_hint": "ì´ê²ƒì„ ê²€ìƒ‰í•˜ì—¬ ì¹œêµ¬ë“¤ì´ ë‹¹ì‹ ì„ ì°¾ì„ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
-  "onboarding.page_one.welcome": "ë§ˆìŠ¤í† ëˆì— ì–´ì„œ ì˜¤ì„¸ìš”!",
-  "onboarding.page_six.admin": "ì´ ì¸ìŠ¤í„´ìŠ¤ì˜ ê´€ë¦¬ìžëŠ” {admin}ìž…ë‹ˆë‹¤.",
-  "onboarding.page_six.almost_done": "ì´ìƒìž…ë‹ˆë‹¤.",
-  "onboarding.page_six.appetoot": "ë³¸ ì•„íŽ˜íˆ¿!",
-  "onboarding.page_six.apps_available": "iOSã€Android ë˜ëŠ” ë‹¤ë¥¸ í”Œëž«í¼ì—ì„œ ì‚¬ìš©í•  ìˆ˜ ìžˆëŠ” {apps}ì´ ìžˆìŠµë‹ˆë‹¤.",
-  "onboarding.page_six.github": "ë§ˆìŠ¤í† ëˆì€ ì˜¤í”ˆ ì†ŒìŠ¤ ì†Œí”„íŠ¸ì›¨ì–´ìž…ë‹ˆë‹¤. ë²„ê·¸ ë³´ê³ ë‚˜ ê¸°ëŠ¥ ì¶”ê°€ ìš”ì², ê¸°ì—¬ëŠ” {github}ì—ì„œ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
-  "onboarding.page_six.guidelines": "ì»¤ë®¤ë‹ˆí‹° ê°€ì´ë“œë¼ì¸",
-  "onboarding.page_six.read_guidelines": "{domain}ì˜ {guidelines}ì„ í™•ì¸í•˜ëŠ” ê²ƒì„ ìžŠì§€ ë§ˆì„¸ìš”!",
-  "onboarding.page_six.various_app": "ë‹¤ì–‘í•œ ëª¨ë°”ì¼ ì• í”Œë¦¬ì¼€ì´ì…˜",
-  "onboarding.page_three.profile": "[í”„ë¡œí•„ íŽ¸ì§‘] ì—ì„œ ìžê¸° ì†Œê°œë‚˜ ì´ë¦„ì„ ë³€ê²½í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ë˜í•œ ë‹¤ë¥¸ ì„¤ì •ë„ ë³€ê²½í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
-  "onboarding.page_three.search": "ê²€ìƒ‰ ë°”ì—ì„œ {illustration} ë‚˜ {introductions} ì™€ ê°™ì´ íŠ¹ì • í•´ì‹œíƒœê·¸ê°€ ë‹¬ë¦° í¬ìŠ¤íŠ¸ë¥¼ ë³´ê±°ë‚˜, ì‚¬ìš©ìžë¥¼ ì°¾ì„ ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
-  "onboarding.page_two.compose": "ì´ í¼ì—ì„œ í¬ìŠ¤íŒ… í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ì´ë¯¸ì§€ë‚˜ ê³µê°œ ë²”ìœ„ ì„¤ì •, ìŠ¤í¬ì¼ëŸ¬ ê²½ê³  ì„¤ì •ì€ ì•„ëž˜ ì•„ì´ì½˜ìœ¼ë¡œ ì„¤ì •í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.",
-  "onboarding.skip": "ê±´ë„ˆë›°ê¸°",
   "privacy.change": "í¬ìŠ¤íŠ¸ì˜ í”„ë¼ì´ë²„ì‹œ ì„¤ì •ì„ ë³€ê²½",
   "privacy.direct.long": "ë©˜ì…˜í•œ ì‚¬ìš©ìžì—ê²Œë§Œ ê³µê°œ",
   "privacy.direct.short": "ë‹¤ì´ë ‰íŠ¸",
@@ -250,10 +292,13 @@
   "search_results.statuses": "íˆ¿",
   "search_results.total": "{count, number}ê±´ì˜ ê²°ê³¼",
   "standalone.public_title": "ì§€ê¸ˆ ì´ëŸ° ì´ì•¼ê¸°ë¥¼ í•˜ê³  ìžˆìŠµë‹ˆë‹¤â€¦",
+  "status.admin_account": "@{name}ì— ëŒ€í•œ ëª¨ë”ë ˆì´ì…˜ ì¸í„°íŽ˜ì´ìŠ¤ ì—´ê¸°",
+  "status.admin_status": "ëª¨ë”ë ˆì´ì…˜ ì¸í„°íŽ˜ì´ìŠ¤ì—ì„œ ì´ ê²Œì‹œë¬¼ ì—´ê¸°",
   "status.block": "@{name} ì°¨ë‹¨",
   "status.cancel_reblog_private": "ë¶€ìŠ¤íŠ¸ ì·¨ì†Œ",
   "status.cannot_reblog": "ì´ í¬ìŠ¤íŠ¸ëŠ” ë¶€ìŠ¤íŠ¸ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
   "status.delete": "ì‚ì œ",
+  "status.detailed_status": "ëŒ€í™” ìžì„¸ížˆ ë³´ê¸°",
   "status.direct": "@{name}ì—ê²Œ ë‹¤ì´ë ‰íŠ¸ ë©”ì‹œì§€",
   "status.embed": "ê³µìœ í•˜ê¸°",
   "status.favourite": "ì¦ê²¨ì°¾ê¸°",
@@ -267,9 +312,11 @@
   "status.open": "ìƒì„¸ ì •ë³´ í‘œì‹œ",
   "status.pin": "ê³ ì •",
   "status.pinned": "ê³ ì • ëœ íˆ¿",
+  "status.read_more": "ë” ë³´ê¸°",
   "status.reblog": "ë¶€ìŠ¤íŠ¸",
   "status.reblog_private": "ì›ëž˜ì˜ ìˆ˜ì‹ ìžë“¤ì—ê²Œ ë¶€ìŠ¤íŠ¸",
   "status.reblogged_by": "{name}ë‹˜ì´ ë¶€ìŠ¤íŠ¸ í–ˆìŠµë‹ˆë‹¤",
+  "status.reblogs.empty": "ì•„ì§ ì•„ë¬´ë„ ì´ íˆ¿ì„ ë¶€ìŠ¤íŠ¸í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ë¶€ìŠ¤íŠ¸ í•œ ì‚¬ëžŒë“¤ì´ ì—¬ê¸°ì— í‘œì‹œ ë©ë‹ˆë‹¤.",
   "status.redraft": "ì§€ìš°ê³  ë‹¤ì‹œ ì“°ê¸°",
   "status.reply": "ë‹µìž¥",
   "status.replyAll": "ì „ì›ì—ê²Œ ë‹µìž¥",
@@ -281,8 +328,11 @@
   "status.show_less_all": "ëª¨ë‘ ì ‘ê¸°",
   "status.show_more": "ë” ë³´ê¸°",
   "status.show_more_all": "ëª¨ë‘ íŽ¼ì¹˜ê¸°",
+  "status.show_thread": "ìŠ¤ë ˆë“œ ë³´ê¸°",
   "status.unmute_conversation": "ì´ ëŒ€í™”ì˜ ë®¤íŠ¸ í•´ì œí•˜ê¸°",
   "status.unpin": "ê³ ì • í•´ì œ",
+  "suggestions.dismiss": "ì¶”ì²œ ì§€ìš°ê¸°",
+  "suggestions.header": "ì´ê²ƒì— ê´€ì‹¬ì´ ìžˆì„ ê²ƒ ê°™ìŠµë‹ˆë‹¤â€¦",
   "tabs_bar.federated_timeline": "ì—°í•©",
   "tabs_bar.home": "í™ˆ",
   "tabs_bar.local_timeline": "ë¡œì»¬",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {ëª…} other {ëª…}} ì˜ ì‚¬ëžŒë“¤ì´ ë§í•˜ê³  ìžˆìŠµë‹ˆë‹¤",
   "ui.beforeunload": "ì§€ê¸ˆ ë‚˜ê°€ë©´ ì €ìž¥ë˜ì§€ ì•Šì€ í•ëª©ì„ ìžƒê²Œ ë©ë‹ˆë‹¤.",
   "upload_area.title": "ë“œëž˜ê·¸ & ë“œë¡ìœ¼ë¡œ ì—…ë¡œë“œ",
-  "upload_button.label": "ë¯¸ë””ì–´ ì¶”ê°€",
+  "upload_button.label": "ë¯¸ë””ì–´ ì¶”ê°€ (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "ì‹œê°ìž¥ì• ì¸ì„ ìœ„í•œ ì„¤ëª…",
-  "upload_form.focus": "í¬ë¡",
+  "upload_form.focus": "ë¯¸ë¦¬ë³´ê¸° ë³€ê²½",
   "upload_form.undo": "ì‚ì œ",
   "upload_progress.label": "ì—…ë¡œë“œ ì¤‘...",
   "video.close": "ë™ì˜ìƒ ë‹«ê¸°",
diff --git a/app/javascript/mastodon/locales/locale-data/co.js b/app/javascript/mastodon/locales/locale-data/co.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b071ecbd450ba67a5da952296883b8ab593e1df
--- /dev/null
+++ b/app/javascript/mastodon/locales/locale-data/co.js
@@ -0,0 +1,108 @@
+/*eslint eqeqeq: "off"*/
+/*eslint no-nested-ternary: "off"*/
+/*eslint quotes: "off"*/
+
+export default [{
+  locale: "co",
+  pluralRuleFunction: function (e, a) {
+    return a ? 1 == e ? "one" : "other" : e >= 0 && e < 2 ? "one" : "other";
+  },
+  fields: {
+    year: {
+      displayName: "annu",
+      relative: {
+        0: "quist'annu",
+        1: "l'annu chÃ¬ vene",
+        "-1": "l'annu passatu",
+      },
+      relativeTime: {
+        future: {
+          one: "in {0} annu",
+          other: "in {0} anni",
+        },
+        past: {
+          one: "{0} annu fÃ ",
+          other: "{0} anni fÃ ",
+        },
+      },
+    },
+    month: {
+      displayName: "mese",
+      relative: {
+        0: "Questu mese",
+        1: "u mese chÃ¬ vene",
+        "-1": "u mese passatu",
+      },
+      relativeTime: {
+        future: {
+          one: "in {0} mese",
+          other: "in {0} mesi",
+        },
+        past: {
+          one: "{0} mese fÃ ",
+          other: "{0} mesi fÃ ",
+        },
+      },
+    },
+    day: {
+      displayName: "ghjornu",
+      relative: {
+        0: "oghje",
+        1: "dumane",
+        "-1": "eri",
+      },
+      relativeTime: {
+        future: {
+          one: "in {0} ghjornu",
+          other: "in {0} ghjornu",
+        },
+        past: {
+          one: "{0} ghjornu fÃ ",
+          other: "{0} ghjorni fÃ ",
+        },
+      },
+    },
+    hour: {
+      displayName: "ora",
+      relativeTime: {
+        future: {
+          one: "in {0} ora",
+          other: "in {0} ore",
+        },
+        past: {
+          one: "{0} ora fÃ ",
+          other: "{0} ore fÃ ",
+        },
+      },
+    },
+    minute: {
+      displayName: "minuta",
+      relativeTime: {
+        future: {
+          one: "in {0} minuta",
+          other: "in {0} minute",
+        },
+        past: {
+          one: "{0} minuta fÃ ",
+          other: "{0} minute fÃ ",
+        },
+      },
+    },
+    second: {
+      displayName: "siconda",
+      relative: {
+        0: "avÃ ",
+      },
+      relativeTime: {
+        future: {
+          one: "in {0} siconda",
+          other: "in {0} siconde",
+        },
+        past: {
+          one: "{0} siconda fÃ ",
+          other: "{0} siconde fÃ ",
+        },
+      },
+    },
+  },
+}];
diff --git a/app/javascript/mastodon/locales/locale-data/oc.js b/app/javascript/mastodon/locales/locale-data/oc.js
index c4b56350b72d264da7741dfbd5d66b7b751b0bd1..d4adc42ebb6b018251ac5393ec813ee960c587f1 100644
--- a/app/javascript/mastodon/locales/locale-data/oc.js
+++ b/app/javascript/mastodon/locales/locale-data/oc.js
@@ -17,8 +17,8 @@ export default [{
       },
       relativeTime: {
         future: {
-          one: "dins {0} an",
-          other: "dins {0} ans",
+          one: "dâ€™aquÃ {0} an",
+          other: "dâ€™aquÃ {0} ans",
         },
         past: {
           one: "fa {0} an",
@@ -35,8 +35,8 @@ export default [{
       },
       relativeTime: {
         future: {
-          one: "dins {0} mes",
-          other: "dins {0} meses",
+          one: "dâ€™aquÃ {0} mes",
+          other: "dâ€™aquÃ {0} meses",
         },
         past: {
           one: "fa {0} mes",
@@ -53,8 +53,8 @@ export default [{
       },
       relativeTime: {
         future: {
-          one: "dins {0} jorn",
-          other: "dins {0} jorns",
+          one: "dâ€™aquÃ {0} jorn",
+          other: "dâ€™aquÃ {0} jorns",
         },
         past: {
           one: "fa {0} jorn",
@@ -66,8 +66,8 @@ export default [{
       displayName: "ora",
       relativeTime: {
         future: {
-          one: "dins {0} ora",
-          other: "dins {0} oras",
+          one: "dâ€™aquÃ {0} ora",
+          other: "dâ€™aquÃ {0} oras",
         },
         past: {
           one: "fa {0} ora",
@@ -79,8 +79,8 @@ export default [{
       displayName: "minuta",
       relativeTime: {
         future: {
-          one: "dins {0} minuta",
-          other: "dins {0} minutas",
+          one: "dâ€™aquÃ {0} minuta",
+          other: "dâ€™aquÃ {0} minutas",
         },
         past: {
           one: "fa {0} minuta",
@@ -95,8 +95,8 @@ export default [{
       },
       relativeTime: {
         future: {
-          one: "dins {0} segonda",
-          other: "dins {0} segondas",
+          one: "dâ€™aquÃ {0} segonda",
+          other: "dâ€™aquÃ {0} segondas",
         },
         past: {
           one: "fa {0} segonda",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d510d011fd988fa03addb3c713686883efb4131
--- /dev/null
+++ b/app/javascript/mastodon/locales/lv.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Hide everything from {domain}",
+  "account.blocked": "Blocked",
+  "account.direct": "Direct message @{name}",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.domain_blocked": "Domain hidden",
+  "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "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.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "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.view_full_profile": "View full profile",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "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.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "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.media_only": "Media 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.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "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.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.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.mute.confirm": "Mute",
+  "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}?",
+  "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_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "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_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.public_timeline": "the public timeline",
+  "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 instances to fill it up",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "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.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",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "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.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.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "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.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.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "Toggle visibility",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "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.info": "About this instance",
+  "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.mention": "{name} mentioned you",
+  "notification.reblog": "{name} boosted your status",
+  "notifications.clear": "Clear notifications",
+  "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.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.mention": "Mentions:",
+  "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.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} notifications",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Post to 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",
+  "regeneration_indicator.label": "Loadingâ€¦",
+  "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.seconds": "{number}s",
+  "reply_indicator.cancel": "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.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.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "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 toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost to original audience",
+  "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.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_toggle": "Click to view",
+  "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.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",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.focus": "Crop",
+  "upload_form.undo": "Delete",
+  "upload_progress.label": "Uploading...",
+  "video.close": "Close video",
+  "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/ms.json b/app/javascript/mastodon/locales/ms.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d510d011fd988fa03addb3c713686883efb4131
--- /dev/null
+++ b/app/javascript/mastodon/locales/ms.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Hide everything from {domain}",
+  "account.blocked": "Blocked",
+  "account.direct": "Direct message @{name}",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.domain_blocked": "Domain hidden",
+  "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "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.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "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.view_full_profile": "View full profile",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "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.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "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.media_only": "Media 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.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "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.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.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.mute.confirm": "Mute",
+  "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}?",
+  "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_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "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_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.public_timeline": "the public timeline",
+  "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 instances to fill it up",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "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.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",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "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.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.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "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.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.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "Toggle visibility",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "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.info": "About this instance",
+  "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.mention": "{name} mentioned you",
+  "notification.reblog": "{name} boosted your status",
+  "notifications.clear": "Clear notifications",
+  "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.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.mention": "Mentions:",
+  "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.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} notifications",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Post to 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",
+  "regeneration_indicator.label": "Loadingâ€¦",
+  "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.seconds": "{number}s",
+  "reply_indicator.cancel": "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.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.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "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 toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost to original audience",
+  "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.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_toggle": "Click to view",
+  "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.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",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.focus": "Crop",
+  "upload_form.undo": "Delete",
+  "upload_progress.label": "Uploading...",
+  "video.close": "Close video",
+  "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 63c902668a6aebbbe8c40ad3f9d2e8f33f0a7287..871142195df56ca878bacca7c153c7080ed1663a 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -1,17 +1,23 @@
 {
+  "account.add_or_remove_from_list": "Toevoegen of verwijderen vanuit lijsten",
   "account.badges.bot": "Bot",
   "account.block": "Blokkeer @{name}",
-  "account.block_domain": "Negeer alles van {domain}",
+  "account.block_domain": "Verberg alles van {domain}",
   "account.blocked": "Geblokkeerd",
   "account.direct": "Direct Message @{name}",
   "account.disclaimer_full": "De informatie hieronder kan mogelijk een incompleet beeld geven van dit gebruikersprofiel.",
   "account.domain_blocked": "Domein verborgen",
   "account.edit_profile": "Profiel bewerken",
+  "account.endorse": "Op profiel weergeven",
   "account.follow": "Volgen",
   "account.followers": "Volgers",
+  "account.followers.empty": "Niemand volgt nog deze gebruiker.",
   "account.follows": "Volgt",
+  "account.follows.empty": "Deze gebruiker volgt nog niemand.",
   "account.follows_you": "Volgt jou",
   "account.hide_reblogs": "Verberg boosts van @{name}",
+  "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.media": "Media",
   "account.mention": "Vermeld @{name}",
   "account.moved_to": "{name} is verhuisd naar:",
@@ -25,7 +31,8 @@
   "account.share": "Profiel van @{name} delen",
   "account.show_reblogs": "Toon boosts van @{name}",
   "account.unblock": "Deblokkeer @{name}",
-  "account.unblock_domain": "{domain} niet langer negeren",
+  "account.unblock_domain": "{domain} niet langer verbergen",
+  "account.unendorse": "Niet op profiel weergeven",
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet langer negeren",
   "account.unmute_notifications": "@{name} meldingen niet langer negeren",
@@ -42,7 +49,7 @@
   "column.blocks": "Geblokkeerde gebruikers",
   "column.community": "Lokale tijdlijn",
   "column.direct": "Directe berichten",
-  "column.domain_blocks": "Verborgen domeinen",
+  "column.domain_blocks": "Genegeerde servers",
   "column.favourites": "Favorieten",
   "column.follow_requests": "Volgverzoeken",
   "column.home": "Start",
@@ -80,12 +87,14 @@
   "confirmations.delete.message": "Weet je het zeker dat je deze toot wilt verwijderen?",
   "confirmations.delete_list.confirm": "Verwijderen",
   "confirmations.delete_list.message": "Weet je zeker dat je deze lijst definitief wilt verwijderen?",
-  "confirmations.domain_block.confirm": "Negeer alles van deze server",
+  "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.mute.confirm": "Negeren",
   "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 alle reacties, boosts en favorieten.",
+  "confirmations.redraft.message": "Weet je zeker dat je deze toot wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en reacties op de originele toot zitten niet meer aan de nieuwe toot vast.",
+  "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.unfollow.confirm": "Ontvolgen",
   "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
   "embed.instructions": "Embed deze toot op jouw website, door de onderstaande code te kopiÃ«ren.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Zoekresultaten",
   "emoji_button.symbols": "Symbolen",
   "emoji_button.travel": "Reizen en plekken",
+  "empty_column.account_timeline": "Hier zijn geen toots!",
+  "empty_column.blocks": "Jij hebt nog geen enkele gebruiker geblokkeerd.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Toot iets in het openbaar om de bal aan het rollen te krijgen!",
   "empty_column.direct": "Je hebt nog geen directe berichten. Wanneer je er een verzend of ontvangt, zijn deze hier te zien.",
+  "empty_column.domain_blocks": "Er zijn nog geen genegeerde 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.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": "Jij volgt nog niemand. Bezoek {public} of gebruik het zoekvenster om andere mensen te ontmoeten.",
   "empty_column.home.public_timeline": "de globale tijdlijn",
   "empty_column.list": "Er is nog niks in deze lijst. Wanneer lijstleden nieuwe toots publiceren, zijn deze hier te zien.",
+  "empty_column.lists": "Jij hebt nog 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",
   "follow_request.authorize": "Goedkeuren",
   "follow_request.reject": "Afkeuren",
   "getting_started.developers": "Ontwikkelaars",
+  "getting_started.directory": "Gebruikersgids",
   "getting_started.documentation": "Documentatie",
-  "getting_started.find_friends": "Vind vrienden van Twitter",
   "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": "Beveiliging",
   "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}",
+  "hashtag.column_settings.tag_mode.all": "Allemaal",
+  "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",
   "home.column_settings.basic": "Algemeen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
+  "introduction.federation.action": "Volgende",
+  "introduction.federation.federated.headline": "Globaal",
+  "introduction.federation.federated.text": "Openbare toots van mensen op andere servers in de fediverse verschijnen op de globale tijdlijn.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Toots van mensen die jij volgt verschijnen onder start. Je kunt iedereen op elke server volgen!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Openbare toots van mensen die ook op jouw server zitten verschijnen op de lokale tijdlijn.",
+  "introduction.interactions.action": "Introductie beÃ«indigen!",
+  "introduction.interactions.favourite.headline": "Favorieten",
+  "introduction.interactions.favourite.text": "Je kunt door een toot aan jouw favorieten toe te voegen, deze voor later bewaren en de auteur laten weten dat je de toot leuk vind.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "Je kunt toots van andere mensen met jouw volgers delen door deze te boosten.",
+  "introduction.interactions.reply.headline": "Reageren",
+  "introduction.interactions.reply.text": "Je kunt op toots van andere mensen en op die van jezelf reageren, waardoor er een gesprek ontstaat.",
+  "introduction.welcome.action": "Laten we beginnen!",
+  "introduction.welcome.headline": "Eerste stappen",
+  "introduction.welcome.text": "Welkom in de fediverse! Binnen enkele ogenblikken kun jij berichten (toots) versturen en met vrienden op veel verschillende servers praten. Maar deze server, {domain}, is speciaalâ€”het herbergt jouw profiel, onthou dus de naam.",
   "keyboard_shortcuts.back": "om terug te gaan",
+  "keyboard_shortcuts.blocked": "om de door jou geblokkeerde gebruikers te tonen",
   "keyboard_shortcuts.boost": "om te boosten",
   "keyboard_shortcuts.column": "om op een toot te focussen in Ã©Ã©n van de kolommen",
   "keyboard_shortcuts.compose": "om het tekstvak voor toots te focussen",
   "keyboard_shortcuts.description": "Omschrijving",
+  "keyboard_shortcuts.direct": "om jouw directe berichten te tonen",
   "keyboard_shortcuts.down": "om naar beneden door de lijst te bewegen",
   "keyboard_shortcuts.enter": "om toot volledig te tonen",
-  "keyboard_shortcuts.favourite": "om als favoriet te markeren",
+  "keyboard_shortcuts.favourite": "om aan jouw favorieten toe te voegen",
+  "keyboard_shortcuts.favourites": "om jouw lijst met favorieten te tonen",
+  "keyboard_shortcuts.federated": "om de globale tijdlijn te tonen",
   "keyboard_shortcuts.heading": "Sneltoetsen",
+  "keyboard_shortcuts.home": "om jouw starttijdlijn te tonen",
   "keyboard_shortcuts.hotkey": "Sneltoets",
   "keyboard_shortcuts.legend": "om deze legenda te tonen",
+  "keyboard_shortcuts.local": "om de lokale tijdlijn te tonen",
   "keyboard_shortcuts.mention": "om de auteur te vermelden",
+  "keyboard_shortcuts.muted": "om de door jou genegeerde gebruikers te tonen",
+  "keyboard_shortcuts.my_profile": "om jouw profiel te tonen",
+  "keyboard_shortcuts.notifications": "om jouw meldingen te tonen",
+  "keyboard_shortcuts.pinned": "om jouw vastgezette toots te tonen",
+  "keyboard_shortcuts.profile": "om het gebruikersprofiel te openen",
   "keyboard_shortcuts.reply": "om te reageren",
+  "keyboard_shortcuts.requests": "om jouw volgverzoeken te tonen",
   "keyboard_shortcuts.search": "om het zoekvak te focussen",
+  "keyboard_shortcuts.start": "om de \"Aan de slag\"-kolom te tonen",
   "keyboard_shortcuts.toggle_hidden": "om tekst achter een waarschuwing (CW) te tonen/verbergen",
   "keyboard_shortcuts.toot": "om een nieuwe toot te starten",
   "keyboard_shortcuts.unfocus": "om het tekst- en zoekvak te ontfocussen",
@@ -159,26 +213,28 @@
   "missing_indicator.label": "Niet gevonden",
   "missing_indicator.sublabel": "Deze hulpbron kan niet gevonden worden",
   "mute_modal.hide_notifications": "Verberg meldingen van deze persoon?",
+  "navigation_bar.apps": "Mobiele apps",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
   "navigation_bar.community_timeline": "Lokale tijdlijn",
+  "navigation_bar.compose": "Nieuw toot schrijven",
   "navigation_bar.direct": "Directe berichten",
   "navigation_bar.discover": "Ontdekken",
-  "navigation_bar.domain_blocks": "Verborgen domeinen",
+  "navigation_bar.domain_blocks": "Genegeerde domeinen",
   "navigation_bar.edit_profile": "Profiel bewerken",
   "navigation_bar.favourites": "Favorieten",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Filters",
   "navigation_bar.follow_requests": "Volgverzoeken",
   "navigation_bar.info": "Over deze server",
   "navigation_bar.keyboard_shortcuts": "Sneltoetsen",
   "navigation_bar.lists": "Lijsten",
-  "navigation_bar.logout": "Afmelden",
+  "navigation_bar.logout": "Uitloggen",
   "navigation_bar.mutes": "Genegeerde gebruikers",
   "navigation_bar.personal": "Persoonlijk",
   "navigation_bar.pins": "Vastgezette toots",
   "navigation_bar.preferences": "Instellingen",
   "navigation_bar.public_timeline": "Globale tijdlijn",
   "navigation_bar.security": "Beveiliging",
-  "notification.favourite": "{name} markeerde jouw toot als favoriet",
+  "notification.favourite": "{name} voegde jouw toot als favoriet toe",
   "notification.follow": "{name} volgt jou nu",
   "notification.mention": "{name} vermeldde jou",
   "notification.reblog": "{name} boostte jouw toot",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "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.follow": "Nieuwe volgers:",
   "notifications.column_settings.mention": "Vermeldingen:",
   "notifications.column_settings.push": "Pushmeldingen",
-  "notifications.column_settings.push_meta": "Dit apparaat",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
+  "notifications.filter.all": "Alles",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favorieten",
+  "notifications.filter.follows": "Die jij volgt",
+  "notifications.filter.mentions": "Vermeldingen",
   "notifications.group": "{count} meldingen",
-  "onboarding.done": "Klaar",
-  "onboarding.next": "Volgende",
-  "onboarding.page_five.public_timelines": "De lokale tijdlijn toont openbare toots van iedereen op {domain}. De globale tijdlijn toont openbare toots van iedereen die door gebruikers van {domain} worden gevolgd, dus ook mensen van andere Mastodonservers. Dit zijn de openbare tijdlijnen en vormen een uitstekende manier om nieuwe mensen te leren kennen.",
-  "onboarding.page_four.home": "Deze tijdlijn laat toots zien van mensen die jij volgt.",
-  "onboarding.page_four.notifications": "De kolom met meldingen toont alle interacties die je met andere Mastodongebruikers hebt.",
-  "onboarding.page_one.federation": "Mastodon is een netwerk van onafhankelijke servers die samen een groot sociaal netwerk vormen.",
-  "onboarding.page_one.full_handle": "Jouw volledige Mastodonadres",
-  "onboarding.page_one.handle_hint": "Dit is waarmee jouw vrienden je kunnen vinden.",
-  "onboarding.page_one.welcome": "Welkom op Mastodon!",
-  "onboarding.page_six.admin": "De beheerder van jouw Mastodonserver is {admin}.",
-  "onboarding.page_six.almost_done": "Bijna klaar...",
-  "onboarding.page_six.appetoot": "Veel succes!",
-  "onboarding.page_six.apps_available": "Er zijn {apps} beschikbaar voor iOS, Android en andere platformen.",
-  "onboarding.page_six.github": "Mastodon kost niets en is vrije software. Je kan bugs melden, nieuwe mogelijkheden aanvragen en als ontwikkelaar meewerken op {github}.",
-  "onboarding.page_six.guidelines": "communityrichtlijnen",
-  "onboarding.page_six.read_guidelines": "Vergeet niet de {guidelines} van {domain} te lezen!",
-  "onboarding.page_six.various_app": "mobiele apps",
-  "onboarding.page_three.profile": "Bewerk jouw profiel om jouw avatar, bio en weergavenaam te veranderen. Daar vind je ook andere instellingen.",
-  "onboarding.page_three.search": "Gebruik de zoekbalk linksboven om andere mensen op Mastodon te vinden en om te zoeken op hashtags, zoals {illustration} en {introductions}. Om iemand te vinden die niet op deze Mastodonserver zit, moet je het volledige Mastodonadres van deze persoon invoeren.",
-  "onboarding.page_two.compose": "Schrijf berichten (wij noemen dit toots) in het tekstvak in de linkerkolom. Je kan met de pictogrammen daaronder afbeeldingen uploaden, privacy-instellingen veranderen en je tekst een waarschuwing meegeven.",
-  "onboarding.skip": "Overslaan",
   "privacy.change": "Zichtbaarheid toot aanpassen",
   "privacy.direct.long": "Alleen aan vermelde gebruikers tonen",
   "privacy.direct.short": "Direct",
@@ -233,8 +275,8 @@
   "relative_time.seconds": "{number}s",
   "reply_indicator.cancel": "Annuleren",
   "report.forward": "Doorsturen naar {target}",
-  "report.forward_hint": "Het account bevindt zich op een andere server. Stuur daar eveneens een geanonimiseerde kopie van de gerapporteerde toot(s) naartoe?",
-  "report.hint": "De gerapporteerde toot(s) worden naar de moderatoren van  jouw server gestuurd. Je kunt hieronder een uitleg geven waarom je dit account rapporteert:",
+  "report.forward_hint": "Het account bevindt zich op een andere server. Stuur daar eveneens een geanonimiseerde kopie van de rapportage naartoe?",
+  "report.hint": "De rapportage wordt naar de moderatoren van jouw server gestuurd. Je kunt hieronder een uitleg geven waarom je dit account rapporteert:",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteer {target}",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
   "standalone.public_title": "Een kijkje binnenin...",
+  "status.admin_account": "Moderatie-omgeving van @{name} openen",
+  "status.admin_status": "Deze toot in de moderatie-omgeving openen",
   "status.block": "Blokkeer @{name}",
   "status.cancel_reblog_private": "Niet langer boosten",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
+  "status.detailed_status": "Uitgebreide gespreksweergave",
   "status.direct": "Directe toot @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favoriet",
@@ -267,9 +312,11 @@
   "status.open": "Toot volledig tonen",
   "status.pin": "Aan profielpagina vastmaken",
   "status.pinned": "Vastgemaakte toot",
+  "status.read_more": "Meer lezen",
   "status.reblog": "Boost",
   "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.redraft": "Verwijderen en herschrijven",
   "status.reply": "Reageren",
   "status.replyAll": "Reageer op iedereen",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Alles minder tonen",
   "status.show_more": "Meer tonen",
   "status.show_more_all": "Alles meer tonen",
-  "status.unmute_conversation": "Conversatie niet langer negeren",
+  "status.show_thread": "Gesprek tonen",
+  "status.unmute_conversation": "Gesprek niet langer negeren",
   "status.unpin": "Van profielpagina losmaken",
+  "suggestions.dismiss": "Voorstel verwerpen",
+  "suggestions.header": "Je bent waarschijnlijk ook geÃ¯nteresseerd inâ€¦",
   "tabs_bar.federated_timeline": "Globaal",
   "tabs_bar.home": "Start",
   "tabs_bar.local_timeline": "Lokaal",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {persoon praat} other {mensen praten}} hierover",
   "ui.beforeunload": "Je concept zal verloren gaan als je Mastodon verlaat.",
   "upload_area.title": "Hierin slepen om te uploaden",
-  "upload_button.label": "Media toevoegen",
+  "upload_button.label": "Media toevoegen (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Omschrijf dit voor mensen met een visuele beperking",
-  "upload_form.focus": "Bijsnijden",
+  "upload_form.focus": "Voorvertoning aanpassen",
   "upload_form.undo": "Verwijderen",
   "upload_progress.label": "Uploaden...",
   "video.close": "Video sluiten",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 31bbf76642d09432088fcba7fcd7e430d53818ac..fa08e8d73b486da5f1ae4351367f40ec175b1277 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "BlokkÃ©r @{name}",
   "account.block_domain": "Skjul alt fra {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Informasjonen nedenfor kan gi et ufullstendig bilde av brukerens profil.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Rediger profil",
+  "account.endorse": "Feature on profile",
   "account.follow": "FÃ¸lg",
   "account.followers": "FÃ¸lgere",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "FÃ¸lger",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "FÃ¸lger deg",
   "account.hide_reblogs": "Skjul fremhevinger fra @{name}",
+  "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": "Nevn @{name}",
   "account.moved_to": "{name} har flyttet til:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Vis boosts fra @{name}",
   "account.unblock": "Avblokker @{name}",
   "account.unblock_domain": "Vis {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "AvfÃ¸lg",
   "account.unmute": "Avdemp @{name}",
   "account.unmute_notifications": "Vis varsler fra @{name}",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "Er du sikker pÃ¥ at du vil dempe {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": "Slutt Ã¥ fÃ¸lge",
   "confirmations.unfollow.message": "Er du sikker pÃ¥ at du vil slutte Ã¥ fÃ¸lge {name}?",
   "embed.instructions": "Kopier koden under for Ã¥ bygge inn denne statusen pÃ¥ hjemmesiden din.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "SÃ¸keresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "Den lokale tidslinjen er tom. Skriv noe offentlig for Ã¥ fÃ¥ snÃ¸ballen til Ã¥ rulle!",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "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.home.public_timeline": "en offentlig tidslinje",
   "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": "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": "Du har ingen varsler ennÃ¥. Kommuniser med andre for Ã¥ begynne samtalen.",
   "empty_column.public": "Det er ingenting her! Skriv noe offentlig, eller fÃ¸lg brukere manuelt fra andre instanser for Ã¥ fylle den opp",
   "follow_request.authorize": "AutorisÃ©r",
   "follow_request.reject": "Avvis",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Kom i gang",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon er fri programvare. Du kan bidra eller rapportere problemer pÃ¥ GitHub pÃ¥ {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.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",
   "home.column_settings.basic": "Enkel",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "for Ã¥ navigere tilbake",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "Ã¥ fremheve",
   "keyboard_shortcuts.column": "Ã¥ fokusere en status i en av kolonnene",
   "keyboard_shortcuts.compose": "Ã¥ fokusere komponeringsfeltet",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "for Ã¥ flytte ned i listen",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "for Ã¥ favorittmarkere",
+  "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": "Lyntast",
   "keyboard_shortcuts.legend": "Ã¥ vise denne forklaringen",
+  "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "Ã¥ nevne forfatter",
+  "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.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "for Ã¥ svare",
+  "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "Ã¥ fokusere sÃ¸k",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "Ã¥ starte en helt ny tut",
   "keyboard_shortcuts.unfocus": "Ã¥ ufokusere komponerings-/sÃ¸kefeltet",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Ikke funnet",
   "missing_indicator.sublabel": "Denne ressursen ble ikke funnet",
   "mute_modal.hide_notifications": "Skjul varslinger fra denne brukeren?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blokkerte brukere",
   "navigation_bar.community_timeline": "Lokal tidslinje",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Er du sikker pÃ¥ at du vil fjerne alle dine varsler permanent?",
   "notifications.column_settings.alert": "Skrivebordsvarslinger",
   "notifications.column_settings.favourite": "Likt:",
+  "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.follow": "Nye fÃ¸lgere:",
   "notifications.column_settings.mention": "Nevnt:",
   "notifications.column_settings.push": "Push varsler",
-  "notifications.column_settings.push_meta": "Denne enheten",
   "notifications.column_settings.reblog": "Fremhevet:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spill lyd",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Ferdig",
-  "onboarding.next": "Neste",
-  "onboarding.page_five.public_timelines": "Den lokale tidslinjen viser offentlige poster fra alle pÃ¥ {domain}. Felles tidslinje viser offentlige poster fra alle som brukere pÃ¥ {domain} fÃ¸lger. Dette er de offentlige tidslinjene, et fint sted Ã¥ oppdage nye brukere.",
-  "onboarding.page_four.home": "Hjem er tidslinjen med alle brukere som du fÃ¸lger.",
-  "onboarding.page_four.notifications": "Kolonnen med varsler viser nÃ¥r noen interakterer med deg.",
-  "onboarding.page_one.federation": "Mastdodon er et nettverk med uavhengige servere som sammarbeider om Ã¥ danne et stort sosialt nettverk. Vi kaller disse serverene instanser.",
-  "onboarding.page_one.full_handle": "Ditt fulle kallenavn",
-  "onboarding.page_one.handle_hint": "Dette er hva du ber dine venner Ã¥ sÃ¸ke etter.",
-  "onboarding.page_one.welcome": "Velkommen til Mastodon!",
-  "onboarding.page_six.admin": "Administratoren pÃ¥ din instans er {admin}.",
-  "onboarding.page_six.almost_done": "Snart ferdig...",
-  "onboarding.page_six.appetoot": "Bon Appetut!",
-  "onboarding.page_six.apps_available": "Det er {apps} tilgjengelig for iOS, Android og andre plattformer.",
-  "onboarding.page_six.github": "Mastodon er programvare med fri og Ã¥pen kildekode. Du kan rapportere feil, be om hjelp eller foreslÃ¥ endringer pÃ¥ {github}.",
-  "onboarding.page_six.guidelines": "samfunnets retningslinjer",
-  "onboarding.page_six.read_guidelines": "Vennligst les {guidelines} for {domain}!",
-  "onboarding.page_six.various_app": "mobilapper",
-  "onboarding.page_three.profile": "Rediger profilen din for Ã¥ endre din avatar, biografi, og visningsnavn. Der finner du ogsÃ¥ andre innstillinger.",
-  "onboarding.page_three.search": "Bruk sÃ¸kemenyen for Ã¥ sÃ¸ke etter emneknagger eller brukere, slik som {illustration} og {introductions}. For Ã¥ sÃ¸ke pÃ¥ en bruker som ikke er pÃ¥ samme instans som deg bruk hele brukernavnet..",
-  "onboarding.page_two.compose": "Skriv innlegg fra forfatt-kolonnen. Du kan laste opp bilder, justere synlighet, og legge til innholdsvarsler med knappene under.",
-  "onboarding.skip": "Hopp over",
   "privacy.change": "JustÃ©r synlighet",
   "privacy.direct.long": "Post kun til nevnte brukere",
   "privacy.direct.short": "Direkte",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
   "standalone.public_title": "En titt inni...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Denne posten kan ikke fremheves",
   "status.delete": "Slett",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Bygge inn",
   "status.favourite": "Lik",
@@ -267,9 +312,11 @@
   "status.open": "Utvid denne statusen",
   "status.pin": "Fest pÃ¥ profilen",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Fremhev",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "Fremhevd av {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.reply": "Svar",
   "status.replyAll": "Svar til samtale",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Vis mer",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "status.unmute_conversation": "Ikke demp samtale",
   "status.unpin": "Angre festing pÃ¥ profilen",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "Felles",
   "tabs_bar.home": "Hjem",
   "tabs_bar.local_timeline": "Lokal",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index fb025594defc70247b56aeab493d339091d8ff23..c28e9f5b8344f3582f4821737e71ce84460b16ba 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Ajustar o tirar de las listas",
   "account.badges.bot": "RobÃ²t",
   "account.block": "Blocar @{name}",
   "account.block_domain": "Tot amagar del domeni {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Aquelas informacions de perfil pÃ²don Ã¨sser incomplÃ¨tas.",
   "account.domain_blocked": "Domeni amagat",
   "account.edit_profile": "Modificar lo perfil",
+  "account.endorse": "Mostrar pel perfil",
   "account.follow": "SÃ¨gre",
   "account.followers": "Seguidors",
+  "account.followers.empty": "Degun sÃ¨c pas aqueste utilizaire pel moment.",
   "account.follows": "Abonaments",
+  "account.follows.empty": "Aqueste utilizaire sÃ¨c pas degun pel moment.",
   "account.follows_you": "Vos sÃ¨c",
   "account.hide_reblogs": "Rescondre los partatges de @{name}",
+  "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â€¯:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Mostrar los partatges de @{name}",
   "account.unblock": "Desblocar @{name}",
   "account.unblock_domain": "Desblocar {domain}",
+  "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}",
@@ -62,7 +69,7 @@
   "community.column_settings.media_only": "Solament los mÃ¨dias",
   "compose_form.direct_message_warning": "Sols los mencionats poirÃ n veire aqueste tut.",
   "compose_form.direct_message_warning_learn_more": "Ne saber mai",
-  "compose_form.hashtag_warning": "Aqueste tut serÃ  pas ligat a cap dâ€™etiqueta estant quâ€™es pas listat. Ã’m pas cercar que los tuts publics per etiqueta.",
+  "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 monde pÃ²t vos sÃ¨gre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
   "compose_form.placeholder": "A de quÃ© pensatzâ€¯?",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Rescondre",
   "confirmations.mute.message": "VolÃ¨tz vertadiÃ¨rament rescondre {name}â€¯?",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
-  "confirmations.redraft.message": "VolÃ¨tz vertadiÃ¨rament escafar aqueste estatut e lo reformularâ€¯? Perdretz totas sas responsas, sos partiments e favorits.",
+  "confirmations.redraft.message": "VolÃ¨tz vertadiÃ¨rament escafar aqueste estatut e lo reformularâ€¯? Totes sos partiments e favorits serÃ n perduts, e sas responsas serÃ n orfanÃ¨las.",
+  "confirmations.reply.confirm": "Respondre",
+  "confirmations.reply.message": "Respondre remplaÃ§arÃ  lo messatge que sÃ¨tz a escriure. VolÃ¨tz vertadiÃ¨rament contunharâ€¯?",
   "confirmations.unfollow.confirm": "Quitar de sÃ¨gre",
   "confirmations.unfollow.message": "VolÃ¨tz vertadiÃ¨rament quitar de sÃ¨gre {name}â€¯?",
   "embed.instructions": "Embarcar aqueste estatut per lo far veire sus un site Internet en copiar lo cÃ²di Ã§ai-jos.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Resultats de recÃ¨rca",
   "emoji_button.symbols": "SimbÃ²ls",
   "emoji_button.travel": "Viatges & lÃ²cs",
+  "empty_column.account_timeline": "Cap de tuts aquÃâ€¯!",
+  "empty_column.blocks": "AvÃ¨tz pas blocat degun pel moment.",
   "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.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_requests": "AvÃ¨tz pas encara de demanda dâ€™abonament. Quand nâ€™auretz una apareisserÃ  aquÃ.",
   "empty_column.hashtag": "I a pas encara de contengut ligat a aquesta etiqueta.",
   "empty_column.home": "VÃ²stre flux dâ€™acuÃ¨lh es void. Visitatz {public} o utilizatz la recÃ¨rca per vos connectar a dâ€™autras personas.",
   "empty_column.home.public_timeline": "lo flux public",
   "empty_column.list": "I a pas res dins la lista pel moment. Quand de membres dâ€™aquesta lista publiquen de novÃ¨ls estatuts los veiretz aquÃ.",
+  "empty_column.lists": "Encara avÃ¨tz pas cap de lista. Quand ne creetz una, apareisserÃ  aquÃ.",
+  "empty_column.mutes": "Encara avÃ¨tz pas mes en silenci degun.",
   "empty_column.notifications": "AvÃ¨tz pas encara de notificacions. RespondÃ¨tz a qualquâ€™un per comenÃ§ar una conversacion.",
   "empty_column.public": "I a pas res aquÃâ€¯! EscrivÃ¨tz quicÃ²m de public, o seguÃ¨tz de personas dâ€™autras instÃ ncias per garnir lo flux public",
   "follow_request.authorize": "Acceptar",
   "follow_request.reject": "Regetar",
   "getting_started.developers": "Desvelopaires",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Trobar dâ€™amics de Twitter",
+  "getting_started.directory": "Annuari de perfils",
+  "getting_started.documentation": "Documentacion",
   "getting_started.heading": "Per comenÃ§ar",
   "getting_started.invite": "Convidar de monde",
   "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}",
+  "hashtag.column_settings.tag_mode.all": "Totes aquestes",
+  "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",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Mostrar los partatges",
   "home.column_settings.show_replies": "Mostrar las responsas",
+  "introduction.federation.action": "Seguent",
+  "introduction.federation.federated.headline": "Federat",
+  "introduction.federation.federated.text": "Los tuts publics dâ€™autres servidors del fediverse apareisserÃ n dins lo flux dâ€™actualitats.",
+  "introduction.federation.home.headline": "AcuÃ¨lh",
+  "introduction.federation.home.text": "Los tuts del monde que seguÃ¨tz apareisserÃ n dins vÃ²stre flux dâ€™acuÃ¨lh. PodÃ¨tz sÃ¨gre de monde ont que siasquen !",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Los tuts publics del monde del meteis servidor que vosautres apareisserÃ n dins lo flux local.",
+  "introduction.interactions.action": "Acabar la leiÃ§on !",
+  "introduction.interactions.favourite.headline": "Favorit",
+  "introduction.interactions.favourite.text": "PodÃ¨tz enregistrar un tut per mai tard, e avisar lâ€™autor que lâ€™avÃ¨tz aimat, en lâ€™ajustant als favorits.",
+  "introduction.interactions.reblog.headline": "Partejar",
+  "introduction.interactions.reblog.text": "PodÃ¨tz partejar los tuts dels autres amb vÃ²stres seguidors en los partejant.",
+  "introduction.interactions.reply.headline": "Respondre",
+  "introduction.interactions.reply.text": "PodÃ¨tz respondre als tuts dels autres e a vÃ²stres tuts, serÃ n amassats en una conversacion.",
+  "introduction.welcome.action": "Anem-i !",
+  "introduction.welcome.headline": "PrimiÃ¨rs passes",
+  "introduction.welcome.text": "La benvenguda al fediverse ! Dâ€™aquÃ un momenton, poiretz enviar de messatges e charrar amd dâ€™amics via mantuns servidors. Mas aqueste servidor, {domain}, es especial perque alberga vÃ²stre perfil, doncas oblidatz pas son nom.",
   "keyboard_shortcuts.back": "anar enrÃ¨ire",
+  "keyboard_shortcuts.blocked": "dobrir la lista dâ€™utilizaires blocats",
   "keyboard_shortcuts.boost": "partejar",
   "keyboard_shortcuts.column": "centrar un estatut a una colomna",
   "keyboard_shortcuts.compose": "anar al camp tÃ¨xte",
-  "keyboard_shortcuts.description": "Descripcion",
+  "keyboard_shortcuts.description": "descripcion",
+  "keyboard_shortcuts.direct": "dobrir la colomna de messatges dirÃ¨ctes",
   "keyboard_shortcuts.down": "far davalar dins la lista",
   "keyboard_shortcuts.enter": "dobrir los estatuts",
   "keyboard_shortcuts.favourite": "apondre als favorits",
+  "keyboard_shortcuts.favourites": "dobrir la lista de favorits",
+  "keyboard_shortcuts.federated": "dobrir lo flux public global",
   "keyboard_shortcuts.heading": "Acorchis claviÃ¨r",
+  "keyboard_shortcuts.home": "dobrir lo flux public local",
   "keyboard_shortcuts.hotkey": "Acorchis",
   "keyboard_shortcuts.legend": "mostrar aquesta legenda",
+  "keyboard_shortcuts.local": "dobrir lo flux public local",
   "keyboard_shortcuts.mention": "mencionar lâ€™autor",
+  "keyboard_shortcuts.muted": "dobrir la lista dels utilizaires silenciats",
+  "keyboard_shortcuts.my_profile": "dobrir vÃ²stre perfil",
+  "keyboard_shortcuts.notifications": "dobrir la colomna de notificacions",
+  "keyboard_shortcuts.pinned": "dobrir la lista dels tuts penjats",
+  "keyboard_shortcuts.profile": "dobrir lo perfil de lâ€™autor",
   "keyboard_shortcuts.reply": "respondre",
+  "keyboard_shortcuts.requests": "dorbir la lista de demanda dâ€™abonament",
   "keyboard_shortcuts.search": "anar a la recÃ¨rca",
+  "keyboard_shortcuts.start": "dobrir la colomna Â«â€¯Per comenÃ§arâ€¯Â»",
   "keyboard_shortcuts.toggle_hidden": "mostrar/amagar lo tÃ¨xte dels avertiments",
   "keyboard_shortcuts.toot": "comenÃ§ar un estatut tot novÃ¨l",
   "keyboard_shortcuts.unfocus": "quitar lo camp tÃ¨xte/de recÃ¨rca",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Pas trobat",
   "missing_indicator.sublabel": "Aquesta ressorsa es pas estada trobada",
   "mute_modal.hide_notifications": "Rescondre las notificacions dâ€™aquesta personaâ€¯?",
+  "navigation_bar.apps": "Aplicacions mobil",
   "navigation_bar.blocks": "Personas blocadas",
   "navigation_bar.community_timeline": "Flux public local",
+  "navigation_bar.compose": "Escriure un nÃ²u tut",
   "navigation_bar.direct": "Messatges dirÃ¨ctes",
   "navigation_bar.discover": "Trobar",
   "navigation_bar.domain_blocks": "Domenis resconduts",
   "navigation_bar.edit_profile": "Modificar lo perfil",
   "navigation_bar.favourites": "Favorits",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Mots ignorats",
   "navigation_bar.follow_requests": "Demandas dâ€™abonament",
   "navigation_bar.info": "Mai informacions",
   "navigation_bar.keyboard_shortcuts": "Acorchis claviÃ¨r",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "VolÃ¨tz vertadiÃ¨rament escafar totas vÃ²stras las notificacionsâ€¯?",
   "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.follow": "NÃ²us seguidorsâ€¯:",
   "notifications.column_settings.mention": "Mencionsâ€¯:",
   "notifications.column_settings.push": "Notificacions",
-  "notifications.column_settings.push_meta": "Aqueste periferic",
   "notifications.column_settings.reblog": "Partatgesâ€¯:",
   "notifications.column_settings.show": "Mostrar dins la colomna",
   "notifications.column_settings.sound": "Emetre un son",
+  "notifications.filter.all": "Totes",
+  "notifications.filter.boosts": "Partages",
+  "notifications.filter.favourites": "Favorits",
+  "notifications.filter.follows": "Seguiments",
+  "notifications.filter.mentions": "Mencions",
   "notifications.group": "{count} notificacions",
-  "onboarding.done": "Sortir",
-  "onboarding.next": "Seguent",
-  "onboarding.page_five.public_timelines": "Lo flux local mÃ²stra los estatuts publics del monde de vÃ²stra instÃ ncia, aquÃ {domain}. Lo flux federat mÃ²stra los estatuts publics de la gent que los de {domain} sÃ¨gon. Son los fluxes publics, un bon biais de trobar de mond.",
-  "onboarding.page_four.home": "Lo flux dâ€™acuÃ¨lh mÃ²stra los estatuts del monde que seguÃ¨tz.",
-  "onboarding.page_four.notifications": "La colomna de notificacions vos fa veire quand qualquâ€™un interagÃs amb vos.",
-  "onboarding.page_one.federation": "Mastodon es un malhum de servidors independents que comunican per construire un malhum mai larg. Ã’m los apÃ¨la instÃ ncias.",
-  "onboarding.page_one.full_handle": "VÃ²stre escais-nom complÃ¨t",
-  "onboarding.page_one.handle_hint": "Vos cal dire a vÃ²stres amics de cercar aquÃ².",
-  "onboarding.page_one.welcome": "Benvengut a Mastodonâ€¯!",
-  "onboarding.page_six.admin": "VÃ²stre administrator dâ€™instÃ ncia es {admin}.",
-  "onboarding.page_six.almost_done": "Gaireben acabatâ€¦",
-  "onboarding.page_six.appetoot": "Bon Appetutâ€¯!",
-  "onboarding.page_six.apps_available": "I a dâ€™aplicacions per mobil per iOS, Android e mai.",
-  "onboarding.page_six.github": "Mastodon es un logicial liure e open-source.  PodÃ¨tz senhalar de bugs, demandar de foncionalitats e contribuir al cÃ²di sus {github}.",
-  "onboarding.page_six.guidelines": "guida de la comunitat",
-  "onboarding.page_six.read_guidelines": "MercÃ©s de legir la {guidelines} de {domain}â€¯!",
-  "onboarding.page_six.various_app": "aplicacions per mobil",
-  "onboarding.page_three.profile": "Modificatz vÃ²stre perfil per cambiar vÃ²stre avatar, bio e escais-nom. I a enlÃ  totas las preferÃ©ncias.",
-  "onboarding.page_three.search": "Emplegatz la barra de recÃ¨rca per trobar de monde e engachatz las etiquetas coma {illustration} e {introductions}. Per trobar una persona dâ€™una autra instÃ ncia, picatz son identificant complÃ¨t.",
-  "onboarding.page_two.compose": "EscrivÃ¨tz un estatut dempuÃ¨i la colomna per compausar. PodÃ¨tz mandar un imatge, cambiar la confidencialitat e ajustar un avertiment amb las icÃ²nas cai-jos.",
-  "onboarding.skip": "Passar",
   "privacy.change": "Ajustar la confidencialitat del messatge",
   "privacy.direct.long": "Mostrar pas quâ€™a las personas mencionadas",
   "privacy.direct.short": "DirÃ¨cte",
@@ -243,17 +285,20 @@
   "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",
   "search_popout.tips.status": "estatut",
-  "search_popout.tips.text": "Lo tÃ¨xt brut tÃ²rna escais, noms dâ€™utilizaire e etiquetas correspondents",
+  "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.hashtags": "Etiquetas",
   "search_results.statuses": "Tuts",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
   "standalone.public_title": "Una ulhada dedinsâ€¦",
+  "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}",
   "status.cancel_reblog_private": "Quitar de partejar",
   "status.cannot_reblog": "Aqueste estatut pÃ²t pas Ã¨sser partejat",
   "status.delete": "Escafar",
+  "status.detailed_status": "Vista detalhada de la convÃ¨rsa",
   "status.direct": "Messatge per @{name}",
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
@@ -267,9 +312,11 @@
   "status.open": "Desplegar aqueste estatut",
   "status.pin": "Penjar al perfil",
   "status.pinned": "Tut penjat",
+  "status.read_more": "Ne legir mai",
   "status.reblog": "Partejar",
   "status.reblog_private": "Partejar a lâ€™audiÃ©ncia dâ€™origina",
   "status.reblogged_by": "{name} a partejat",
+  "status.reblogs.empty": "Degun a pas encara partejat aqueste tut. Quand qualquâ€™un o farÃ , apareisserÃ  aquÃ.",
   "status.redraft": "Escafar e tornar formular",
   "status.reply": "Respondre",
   "status.replyAll": "Respondre a la conversacion",
@@ -281,8 +328,11 @@
   "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.unmute_conversation": "Tornar mostrar la conversacion",
   "status.unpin": "Tirar del perfil",
+  "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",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} ne charra other {people}} ne charran",
   "ui.beforeunload": "VÃ²stre brolhon serÃ  perdut se quitatz Mastodon.",
   "upload_area.title": "Lisatz e depausatz per mandar",
-  "upload_button.label": "Ajustar un mÃ¨dia",
+  "upload_button.label": "Ajustar un mÃ¨dia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Descripcion pels mal vesents",
-  "upload_form.focus": "Retalhar",
+  "upload_form.focus": "Modificar lâ€™apercebut",
   "upload_form.undo": "Suprimir",
   "upload_progress.label": "MandadÃsâ€¦",
   "video.close": "Tampar la vidÃ¨o",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 4f1290121bc273a142264ad749edef6554c0ad15..0d16f7cfc0554f80289c85dcc12ba683bd68e240 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,20 +1,26 @@
 {
+  "account.add_or_remove_from_list": "Dodaj lub usuÅ„ z list",
   "account.badges.bot": "Bot",
   "account.block": "Blokuj @{name}",
   "account.block_domain": "Blokuj wszystko z {domain}",
-  "account.blocked": "Zablokowany",
+  "account.blocked": "Zablokowany(-a)",
   "account.direct": "WyÅ›lij wiadomoÅ›Ä‡ bezpoÅ›redniÄ… do @{name}",
   "account.disclaimer_full": "PoniÅ¼sze informacje mogÄ… nie odwzorowywaÄ‡ bezbÅ‚Ä™dnie profilu uÅ¼ytkownika.",
   "account.domain_blocked": "Ukryto domenÄ™",
   "account.edit_profile": "Edytuj profil",
+  "account.endorse": "Polecaj na profilu",
   "account.follow": "ÅšledÅº",
   "account.followers": "ÅšledzÄ…cy",
+  "account.followers.empty": "Nikt jeszcze nie Å›ledzi tego uÅ¼ytkownika.",
   "account.follows": "Åšledzeni",
+  "account.follows.empty": "Ten uÅ¼ytkownik nie Å›ledzi jeszcze nikogo.",
   "account.follows_you": "Åšledzi CiÄ™",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
+  "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.mention": "Wspomnij o @{name}",
-  "account.moved_to": "{name} przeniÃ³sÅ‚ siÄ™ do:",
+  "account.moved_to": "{name} przeniÃ³sÅ‚(-osÅ‚a) siÄ™ do:",
   "account.mute": "Wycisz @{name}",
   "account.mute_notifications": "Wycisz powiadomienia o @{name}",
   "account.muted": "Wyciszony",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenÄ™ {domain}",
+  "account.unendorse": "PrzestaÅ„ polecaÄ‡",
   "account.unfollow": "PrzestaÅ„ Å›ledziÄ‡",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "account.unmute_notifications": "Cofnij wyciszenie powiadomieÅ„ od @{name}",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Wycisz",
   "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? Utracisz wszystkie odpowiedzi, podbicia i polubienia dotyczÄ…ce go.",
+  "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}?",
   "embed.instructions": "OsadÅº ten wpis na swojej stronie wklejajÄ…c poniÅ¼szy kod.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Wyniki wyszukiwania",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "PodrÃ³Å¼e i miejsca",
+  "empty_column.account_timeline": "Brak wpisÃ³w tutaj!",
+  "empty_column.blocks": "Nie zablokowaÅ‚eÅ›(-aÅ›) jeszcze Å¼adnego uÅ¼ytkownika.",
   "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.hashtag": "Nie ma wpisÃ³w oznaczonych tym hashtagiem. MoÅ¼esz napisaÄ‡ pierwszy!",
+  "empty_column.domain_blocks": "Brak ukrytych domen.",
+  "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_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.home.public_timeline": "globalna oÅ› czasu",
   "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.",
+  "empty_column.mutes": "Nie wyciszyÅ‚eÅ›(-aÅ›) jeszcze Å¼adnego uÅ¼ytkownika.",
   "empty_column.notifications": "Nie masz Å¼adnych powiadomieÅ„. Rozpocznij interakcje z innymi uÅ¼ytkownikami.",
   "empty_column.public": "Tu nic nie ma! Napisz coÅ› publicznie, lub dodaj ludzi z innych instancji, aby to wyÅ›wietliÄ‡",
   "follow_request.authorize": "Autoryzuj",
   "follow_request.reject": "OdrzuÄ‡",
   "getting_started.developers": "Dla programistÃ³w",
+  "getting_started.directory": "Katalog profilÃ³w",
   "getting_started.documentation": "Dokumentacja",
-  "getting_started.find_friends": "ZnajdÅº znajomych z Twittera",
   "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.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",
   "home.column_settings.basic": "Podstawowe",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
+  "introduction.federation.action": "Dalej",
+  "introduction.federation.federated.headline": "OÅ› czasu federacji",
+  "introduction.federation.federated.text": "Publiczne wpisy osÃ³b z tego caÅ‚ego Fediwersum pojawiajÄ… siÄ™ na lokalnej osi czasu.",
+  "introduction.federation.home.headline": "Strona gÅ‚Ã³wna",
+  "introduction.federation.home.text": "Wpisy osÃ³b ktÃ³re Å›ledzisz pojawiÄ… siÄ™ na stronie gÅ‚Ã³wnej. MoÅ¼esz zaczÄ…Ä‡ Å›ledziÄ‡ uÅ¼ytkownikÃ³w dowolnego serwera!",
+  "introduction.federation.local.headline": "Lokalna oÅ› czasu",
+  "introduction.federation.local.text": "Publiczne wpisy osÃ³b z tego samego serwera pojawiajÄ… siÄ™ na lokalnej osi czasu.",
+  "introduction.interactions.action": "ZakoÅ„cz poradnik!",
+  "introduction.interactions.favourite.headline": "Ulubione",
+  "introduction.interactions.favourite.text": "MoÅ¼esz zapisaÄ‡ wpis na pÃ³Åºniej i pokazaÄ‡ autorowi, Å¼e Ci siÄ™ spodobaÅ‚, jeÅ¼eli dodasz go .",
+  "introduction.interactions.reblog.headline": "Podbicia",
+  "introduction.interactions.reblog.text": "MoÅ¼esz podzieliÄ‡ siÄ™ wpisem innego uÅ¼ytkownikami z osobami ktÃ³re CiÄ™ Å›ledzÄ… podbijajÄ…c go.",
+  "introduction.interactions.reply.headline": "Odpowiedzi",
+  "introduction.interactions.reply.text": "MoÅ¼esz odpowiadaÄ‡ na wpisy swoje i innych, tworzÄ…c konwersacjÄ™.",
+  "introduction.welcome.action": "Rozpocznij!",
+  "introduction.welcome.headline": "Pierwsze kroki",
+  "introduction.welcome.text": "Witmay w Fediwersum! Za chwilÄ™ dowiesz siÄ™, jak przekazywaÄ‡ wiadomoÅ›ci i rozmawiaÄ‡ ze znajomymi pomiÄ™dzy rÃ³Å¼nymi serwerami. Ale ten serwer â€“ {domain} jest wyjÄ…tkowy, poniewaÅ¼ zawiera TwÃ³j profil â€“ zapamiÄ™taj wiÄ™c jego nazwÄ™.",
   "keyboard_shortcuts.back": "aby cofnÄ…Ä‡ siÄ™",
+  "keyboard_shortcuts.blocked": "aby przejÅ›Ä‡ do listy zablokowanych uÅ¼ytkownikÃ³w",
   "keyboard_shortcuts.boost": "aby podbiÄ‡ wpis",
   "keyboard_shortcuts.column": "aby przejÅ›Ä‡ do wpisu z jednej z kolumn",
   "keyboard_shortcuts.compose": "aby przejÅ›Ä‡ do pola tworzenia wpisu",
   "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "aby otworzyÄ‡ kolumnÄ™ wiadomoÅ›ci bezpoÅ›rednich",
   "keyboard_shortcuts.down": "aby przejÅ›Ä‡ na dÃ³Å‚ listy",
   "keyboard_shortcuts.enter": "aby otworzyÄ‡ wpis",
   "keyboard_shortcuts.favourite": "aby dodaÄ‡ do ulubionych",
+  "keyboard_shortcuts.favourites": "aby przejÅ›Ä‡ do listy ulubionych wpisÃ³w",
+  "keyboard_shortcuts.federated": "aby otworzyÄ‡ oÅ› czasu federacji",
   "keyboard_shortcuts.heading": "SkrÃ³ty klawiszowe",
+  "keyboard_shortcuts.home": "aby otworzyÄ‡ stronÄ™ gÅ‚Ã³wnÄ…",
   "keyboard_shortcuts.hotkey": "Klawisz",
-  "keyboard_shortcuts.legend": "aby wyÅ›wietliÄ‡ tÄ… legendÄ™",
+  "keyboard_shortcuts.legend": "aby wyÅ›wietliÄ‡ tÄ™ legendÄ™",
+  "keyboard_shortcuts.local": "aby otworzyÄ‡ lokalnÄ… oÅ› czasu",
   "keyboard_shortcuts.mention": "aby wspomnieÄ‡ o autorze",
+  "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.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.search": "aby przejÅ›Ä‡ do pola wyszukiwania",
+  "keyboard_shortcuts.start": "aby otworzyÄ‡ kolumnÄ™ â€žRozpocznijâ€",
   "keyboard_shortcuts.toggle_hidden": "aby wyÅ›wietliÄ‡ lub ukryÄ‡ wpis spod CW",
   "keyboard_shortcuts.toot": "aby utworzyÄ‡ nowy wpis",
   "keyboard_shortcuts.unfocus": "aby opuÅ›ciÄ‡ pole wyszukiwania/pisania",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "Nie znaleziono",
   "missing_indicator.sublabel": "Nie moÅ¼na odnaleÅºÄ‡ tego zasobu",
   "mute_modal.hide_notifications": "Chcesz ukryÄ‡ powiadomienia od tego uÅ¼ytkownika?",
+  "navigation_bar.apps": "Aplikacje mobilne",
   "navigation_bar.blocks": "Zablokowani uÅ¼ytkownicy",
   "navigation_bar.community_timeline": "Lokalna oÅ› czasu",
+  "navigation_bar.compose": "UtwÃ³rz nowy wpis",
   "navigation_bar.direct": "WiadomoÅ›ci bezpoÅ›rednie",
   "navigation_bar.discover": "Odkrywaj",
   "navigation_bar.domain_blocks": "Ukryte domeny",
   "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.favourites": "Ulubione",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Wyciszone sÅ‚owa",
   "navigation_bar.follow_requests": "ProÅ›by o Å›ledzenie",
   "navigation_bar.info": "SzczegÃ³Å‚owe informacje",
   "navigation_bar.keyboard_shortcuts": "SkrÃ³ty klawiszowe",
@@ -178,43 +234,29 @@
   "navigation_bar.preferences": "Preferencje",
   "navigation_bar.public_timeline": "Globalna oÅ› czasu",
   "navigation_bar.security": "BezpieczeÅ„stwo",
-  "notification.favourite": "{name} dodaÅ‚ TwÃ³j wpis do ulubionych",
-  "notification.follow": "{name} zaczÄ…Å‚ CiÄ™ Å›ledziÄ‡",
-  "notification.mention": "{name} wspomniaÅ‚ o tobie",
-  "notification.reblog": "{name} podbiÅ‚ TwÃ³j wpis",
+  "notification.favourite": "{name} dodaÅ‚(a) TwÃ³j wpis do ulubionych",
+  "notification.follow": "{name} zaczÄ…Å‚(-Ä™Å‚a) CiÄ™ Å›ledziÄ‡",
+  "notification.mention": "{name} wspomniaÅ‚(a) o tobie",
+  "notification.reblog": "{name} podbiÅ‚(a) TwÃ³j wpis",
   "notifications.clear": "WyczyÅ›Ä‡ powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunÄ…Ä‡ wszystkie powiadomienia?",
   "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.mention": "Wspomnienia:",
   "notifications.column_settings.push": "Powiadomienia push",
-  "notifications.column_settings.push_meta": "To urzÄ…dzenie",
   "notifications.column_settings.reblog": "Podbicia:",
   "notifications.column_settings.show": "PokaÅ¼ w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dÅºwiÄ™k",
+  "notifications.filter.all": "Wszystkie",
+  "notifications.filter.boosts": "Podbicia",
+  "notifications.filter.favourites": "Ulubione",
+  "notifications.filter.follows": "Åšledzenia",
+  "notifications.filter.mentions": "Wspomienia",
   "notifications.group": "{count, number} {count, plural, one {powiadomienie} few {powiadomienia} many {powiadomieÅ„} more {powiadomieÅ„}}",
-  "onboarding.done": "Gotowe",
-  "onboarding.next": "Dalej",
-  "onboarding.page_five.public_timelines": "Lokalna oÅ› czasu zawiera wszystkie publiczne wpisy z {domain}. Globalna oÅ› czasu wyÅ›wietla publiczne wpisy Å›ledzonych przez czÅ‚onkÃ³w {domain}. SÄ… to publiczne osie czasu â€“ najlepszy sposÃ³b na poznanie nowych osÃ³b.",
-  "onboarding.page_four.home": "GÅ‚Ã³wna oÅ› czasu wyÅ›wietla publiczne wpisy.",
-  "onboarding.page_four.notifications": "Kolumna powiadomieÅ„ wyÅ›wietla, gdy ktoÅ› dokonuje interakcji z tobÄ….",
-  "onboarding.page_one.federation": "Mastodon jest sieciÄ… niezaleÅ¼nych serwerÃ³w poÅ‚Ä…czonych w jeden portal spoÅ‚ecznoÅ›ciowy. Nazywamy te serwery instancjami.",
-  "onboarding.page_one.full_handle": "TwÃ³j peÅ‚ny adres",
-  "onboarding.page_one.handle_hint": "NaleÅ¼y go podaÄ‡ znajomym, aby mogli CiÄ™ odnaleÅºÄ‡.",
-  "onboarding.page_one.welcome": "Witamy w Mastodon!",
-  "onboarding.page_six.admin": "Administratorem tej instancji jest {admin}.",
-  "onboarding.page_six.almost_done": "Prawie gotoweâ€¦",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "SÄ… dostÄ™pne {apps} dla Androida, iOS i innych platform.",
-  "onboarding.page_six.github": "Mastodon jest oprogramowaniem otwartoÅºrÃ³dÅ‚wym. MoÅ¼esz zgÅ‚aszaÄ‡ bÅ‚Ä™dy, proponowaÄ‡ funkcje i pomÃ³c w rozwoju na {github}.",
-  "onboarding.page_six.guidelines": "wytyczne dla spoÅ‚ecznoÅ›ci",
-  "onboarding.page_six.read_guidelines": "Przeczytaj {guidelines} {domain}!",
-  "onboarding.page_six.various_app": "aplikacje mobilne",
-  "onboarding.page_three.profile": "Edytuj profil, aby zmieniÄ‡ obraz profilowy, biografiÄ™, wyÅ›wietlanÄ… nazwÄ™ i inne ustawienia.",
-  "onboarding.page_three.search": "UÅ¼yj paska wyszukiwania aby znaleÅºÄ‡ ludzi i hashtagi, takie jak {illustration} i {introductions}. Aby znaleÅºÄ‡ osobÄ™ spoza tej instancji, musisz uÅ¼yÄ‡ peÅ‚nego adresu.",
-  "onboarding.page_two.compose": "UtwÃ³rz wpisy, aby wypeÅ‚niÄ‡ kolumnÄ™. MoÅ¼esz wysÅ‚aÄ‡ zdjÄ™cia, zmieniÄ‡ ustawienia prywatnoÅ›ci lub dodaÄ‡ ostrzeÅ¼enie o zawartoÅ›ci.",
-  "onboarding.skip": "PomiÅ„",
   "privacy.change": "Dostosuj widocznoÅ›Ä‡ wpisÃ³w",
   "privacy.direct.long": "Widoczny tylko dla wspomnianych",
   "privacy.direct.short": "BezpoÅ›rednio",
@@ -234,13 +276,13 @@
   "reply_indicator.cancel": "Anuluj",
   "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 Twojej instancji. PoniÅ¼ej moÅ¼esz teÅ¼ umieÅ›ciÄ‡ wyjaÅ›nieni dlaczego zgÅ‚aszasz to konto:",
+  "report.hint": "ZgÅ‚oszenie zostanie wysÅ‚ane moderatorom Twojej instancji. PoniÅ¼ej moÅ¼esz teÅ¼ umieÅ›ciÄ‡ wyjaÅ›nienie dlaczego zgÅ‚aszasz to konto:",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "WyÅ›lij",
   "report.target": "ZgÅ‚aszanie {target}",
   "search.placeholder": "Szukaj",
   "search_popout.search_format": "Zaawansowane wyszukiwanie",
-  "search_popout.tips.full_text": "Pozwala na wyszukiwanie wpisÃ³w ktÃ³re napisaÅ‚eÅ›, dodaÅ‚eÅ› do ulubionych, podbiÅ‚eÅ› w ktÃ³rych o Tobie wspomniano, oraz pasujÄ…ce nazwy uÅ¼ytkownikÃ³w, peÅ‚ne nazwy i hashtagi.",
+  "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": "hashtag",
   "search_popout.tips.status": "wpis",
   "search_popout.tips.text": "Proste wyszukiwanie pasujÄ…cych pseudonimÃ³w, nazw uÅ¼ytkownikÃ³w i hashtagÃ³w",
@@ -250,14 +292,17 @@
   "search_results.statuses": "Wpisy",
   "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wynikÃ³w} more {wynikÃ³w}}",
   "standalone.public_title": "Spojrzenie w gÅ‚Ä…bâ€¦",
+  "status.admin_account": "OtwÃ³rz interfejs moderacyjny dla @{name}",
+  "status.admin_status": "OtwÃ³rz ten wpis w interfejsie moderacyjnym",
   "status.block": "Zablokuj @{name}",
   "status.cancel_reblog_private": "Cofnij podbicie",
   "status.cannot_reblog": "Ten wpis nie moÅ¼e zostaÄ‡ podbity",
   "status.delete": "UsuÅ„",
+  "status.detailed_status": "SzczegÃ³Å‚owy widok konwersacji",
   "status.direct": "WyÅ›lij wiadomoÅ›Ä‡ bezpoÅ›redniÄ… do @{name}",
   "status.embed": "OsadÅº",
   "status.favourite": "Dodaj do ulubionych",
-  "status.filtered": "Filtrowany",
+  "status.filtered": "Filtrowany(-a)",
   "status.load_more": "ZaÅ‚aduj wiÄ™cej",
   "status.media_hidden": "ZawartoÅ›Ä‡ multimedialna ukryta",
   "status.mention": "Wspomnij o @{name}",
@@ -267,9 +312,11 @@
   "status.open": "Rozszerz ten wpis",
   "status.pin": "Przypnij do profilu",
   "status.pinned": "PrzypiÄ™ty wpis",
+  "status.read_more": "Czytaj dalej",
   "status.reblog": "Podbij",
   "status.reblog_private": "Podbij dla odbiorcÃ³w oryginalnego wpisu",
-  "status.reblogged_by": "{name} podbiÅ‚",
+  "status.reblogged_by": "{name} podbiÅ‚(a)",
+  "status.reblogs.empty": "Nikt nie podbiÅ‚ jeszcze tego wpisu. Gdy ktoÅ› to zrobi, pojawi siÄ™ tutaj.",
   "status.redraft": "UsuÅ„ i przeredaguj",
   "status.reply": "Odpowiedz",
   "status.replyAll": "Odpowiedz na wÄ…tek",
@@ -281,8 +328,11 @@
   "status.show_less_all": "ZwiÅ„ wszystkie",
   "status.show_more": "RozwiÅ„",
   "status.show_more_all": "RozwiÅ„ wszystkie",
+  "status.show_thread": "PokaÅ¼ wÄ…tek",
   "status.unmute_conversation": "Cofnij wyciszenie konwersacji",
   "status.unpin": "Odepnij z profilu",
+  "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",
@@ -291,11 +341,11 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {osoba rozmawia} few {osoby rozmawiajÄ…} other {osÃ³b rozmawia}} o tym",
   "ui.beforeunload": "Utracisz tworzony wpis, jeÅ¼eli opuÅ›cisz Mastodona.",
   "upload_area.title": "PrzeciÄ…gnij i upuÅ›Ä‡ aby wysÅ‚aÄ‡",
-  "upload_button.label": "Dodaj zawartoÅ›Ä‡ multimedialnÄ…",
+  "upload_button.label": "Dodaj zawartoÅ›Ä‡ multimedialnÄ… (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "WprowadÅº opis dla niewidomych i niedowidzÄ…cych",
-  "upload_form.focus": "Przytnij",
+  "upload_form.focus": "Dopasuj podglÄ…d",
   "upload_form.undo": "UsuÅ„",
-  "upload_progress.label": "WysyÅ‚anie",
+  "upload_progress.label": "WysyÅ‚anie...",
   "video.close": "Zamknij film",
   "video.exit_fullscreen": "OpuÅ›Ä‡ tryb peÅ‚noekranowy",
   "video.expand": "Rozszerz film",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 4ee02f75750edf9405857d3eea96931632b31f6f..392e7f485d2483091d1fa5a52e2e3a83f24b6a21 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Adicionar ou remover de listas",
   "account.badges.bot": "RobÃ´",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Esconder tudo de {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "As informaÃ§Ãµes abaixo podem refletir o perfil do usuÃ¡rio de maneira incompleta.",
   "account.domain_blocked": "DomÃnio escondido",
   "account.edit_profile": "Editar perfil",
+  "account.endorse": "Destacar no perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
+  "account.followers.empty": "NinguÃ©m segue esse usuÃ¡rio no momento.",
   "account.follows": "Segue",
+  "account.follows.empty": "Esse usuÃ¡rio nÃ£o segue ninguÃ©m no momento.",
   "account.follows_you": "Segue vocÃª",
   "account.hide_reblogs": "Esconder compartilhamentos de @{name}",
+  "account.link_verified_on": "A posse desse link foi verificada em {date}",
+  "account.locked_info": "Essa conta estÃ¡ trancada. Se vocÃª a seguir sua solicitaÃ§Ã£o serÃ¡ revisada manualmente.",
   "account.media": "MÃdia",
   "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} se mudou para:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Mostra compartilhamentos de @{name}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear {domain}",
+  "account.unendorse": "NÃ£o destacar no perfil",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "NÃ£o silenciar @{name}",
   "account.unmute_notifications": "Retirar silÃªncio das notificaÃ§Ãµes vindas de @{name}",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.mute.message": "VocÃª tem certeza de que quer silenciar {name}?",
   "confirmations.redraft.confirm": "Apagar & usar como rascunho",
-  "confirmations.redraft.message": "VocÃª tem certeza que deseja apagar esse status e usÃ¡-lo como rascunho? VocÃª vai perder todas as respostas, compartilhamentos e favoritos relacionados a ele.",
+  "confirmations.redraft.message": "VocÃª tem certeza que deseja apagar esse status e usÃ¡-lo como rascunho? Seus compartilhamentos e favoritos serÃ£o perdidos e as respostas ao toot original ficarÃ£o desconectadas.",
+  "confirmations.reply.confirm": "Responder",
+  "confirmations.reply.message": "Responder agora vai sobrescrever a mensagem que vocÃª estÃ¡ compondo. VocÃª tem certeza que quer continuar?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "VocÃª tem certeza de que quer deixar de seguir {name}?",
   "embed.instructions": "Incorpore esta postagem em seu site copiando o cÃ³digo abaixo.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Resultados da busca",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viagens & Lugares",
+  "empty_column.account_timeline": "NÃ£o hÃ¡ toots aqui!",
+  "empty_column.blocks": "VocÃª ainda nÃ£o bloqueou nenhum usuÃ¡rio.",
   "empty_column.community": "A timeline local estÃ¡ vazia. Escreva algo publicamente para comeÃ§ar!",
   "empty_column.direct": "VocÃª nÃ£o tem nenhuma mensagem direta ainda. Quando vocÃª enviar ou receber uma, as mensagens aparecerÃ£o por aqui.",
+  "empty_column.domain_blocks": "Ainda nÃ£o hÃ¡ nenhum domÃnio escondido.",
+  "empty_column.favourited_statuses": "VocÃª ainda nÃ£o tem nenhum toot favorito. Quando vocÃª favoritar um toot, ele aparecerÃ¡ aqui.",
+  "empty_column.favourites": "NinguÃ©m favoritou esse toot atÃ© agora. Quando alguÃ©m favoritar, a pessoa aparecerÃ¡ aqui.",
+  "empty_column.follow_requests": "VocÃª nÃ£o tem nenhum pedido de seguir por agora. Quando vocÃª receber um, ele aparecerÃ¡ aqui.",
   "empty_column.hashtag": "Ainda nÃ£o hÃ¡ qualquer conteÃºdo com essa hashtag.",
   "empty_column.home": "VocÃª ainda nÃ£o segue usuÃ¡rio algum. Visite a timeline {public} ou use o buscador para procurar e conhecer outros usuÃ¡rios.",
   "empty_column.home.public_timeline": "global",
   "empty_column.list": "Ainda nÃ£o hÃ¡ nada nesta lista. Quando membros dessa lista fizerem novas postagens, elas aparecerÃ£o aqui.",
+  "empty_column.lists": "VocÃª ainda nÃ£o tem nenhuma lista. Quando vocÃª criar uma, ela aparecerÃ¡ aqui.",
+  "empty_column.mutes": "VocÃª ainda nÃ£o silenciou nenhum usuÃ¡rio.",
   "empty_column.notifications": "VocÃª ainda nÃ£o possui notificaÃ§Ãµes. Interaja com outros usuÃ¡rios para comeÃ§ar a conversar.",
   "empty_column.public": "NÃ£o hÃ¡ nada aqui! Escreva algo publicamente ou siga manualmente usuÃ¡rios de outras instÃ¢ncias",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "getting_started.developers": "Desenvolvedores",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Encontre amizades do Twitter",
+  "getting_started.directory": "DiretÃ³rio de perfis",
+  "getting_started.documentation": "DocumentaÃ§Ã£o",
   "getting_started.heading": "Primeiros passos",
   "getting_started.invite": "Convide pessoas",
   "getting_started.open_source_notice": "Mastodon Ã© um software de cÃ³digo aberto. VocÃª pode contribuir ou reportar problemas na pÃ¡gina do 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}",
+  "hashtag.column_settings.tag_mode.all": "Todas essas",
+  "hashtag.column_settings.tag_mode.any": "Qualquer uma dessas",
+  "hashtag.column_settings.tag_mode.none": "Nenhuma dessas",
+  "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "home.column_settings.basic": "BÃ¡sico",
   "home.column_settings.show_reblogs": "Mostrar compartilhamentos",
   "home.column_settings.show_replies": "Mostrar as respostas",
+  "introduction.federation.action": "PrÃ³ximo",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Posts pÃºblicos de outros servidores do fediverso vÃ£o aparecer na timeline global.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts de pessoas que vocÃª segue vÃ£o aparecer na sua pÃ¡gina inicial. VocÃª pode seguir pessoas de qualquer servidor!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Posts pÃºblicos de pessoas no mesmo servidor que vocÃª vÃ£o aparecer na timeline local.",
+  "introduction.interactions.action": "Finalizar o tutorial!",
+  "introduction.interactions.favourite.headline": "Favoritos",
+  "introduction.interactions.favourite.text": "VocÃª pode salvar um toot pra mais tarde, e deixar a pessoa que postou saber que vocÃª gostou, favoritando-o.",
+  "introduction.interactions.reblog.headline": "Compartilhamento",
+  "introduction.interactions.reblog.text": "VocÃª pode mostrar toots de outras pessoas aos seus seguidores compartilhando.",
+  "introduction.interactions.reply.headline": "Responder",
+  "introduction.interactions.reply.text": "VocÃª pode responder a toots de outras pessoas e aos seus, e isso vai uni-los em uma conversa.",
+  "introduction.welcome.action": "Vamos!",
+  "introduction.welcome.headline": "Primeiros passos",
+  "introduction.welcome.text": "Boas vindas ao fediverso! Em alguns momentos, vocÃª vai poder transmitir mensagens e falar com pessoas amigas atravÃ©s de uma variedade de servidores. Mas esse servidor, {domain}, Ã© especialâ€”Ã© onde o seu perfil estÃ¡ hospedado, entÃ£o lembre do nome.",
   "keyboard_shortcuts.back": "para navegar de volta",
+  "keyboard_shortcuts.blocked": "para abrir a lista de usuÃ¡rios bloqueados",
   "keyboard_shortcuts.boost": "para compartilhar",
   "keyboard_shortcuts.column": "Focar um status em uma das colunas",
   "keyboard_shortcuts.compose": "para focar a Ã¡rea de redaÃ§Ã£o",
-  "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.description": "DescriÃ§Ã£o",
+  "keyboard_shortcuts.direct": "para abrir a coluna de mensagens diretas",
   "keyboard_shortcuts.down": "para mover para baixo na lista",
-  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.enter": "para expandir um status",
   "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.favourites": "para abrir a lista de favoritos",
+  "keyboard_shortcuts.federated": "para abrir a timeline global",
+  "keyboard_shortcuts.heading": "Atalhos de teclado",
+  "keyboard_shortcuts.home": "para abrir a pÃ¡gina inicial",
   "keyboard_shortcuts.hotkey": "Atalho",
   "keyboard_shortcuts.legend": "para mostrar essa legenda",
+  "keyboard_shortcuts.local": "para abrir a timeline local",
   "keyboard_shortcuts.mention": "para mencionar o autor",
+  "keyboard_shortcuts.muted": "para abrir a lista de usuÃ¡rios silenciados",
+  "keyboard_shortcuts.my_profile": "para abrir o seu perfil",
+  "keyboard_shortcuts.notifications": "para abrir a coluna de notificaÃ§Ãµes",
+  "keyboard_shortcuts.pinned": "para abrir a lista de toots fixados",
+  "keyboard_shortcuts.profile": "para abrir o perfil do autor",
   "keyboard_shortcuts.reply": "para responder",
+  "keyboard_shortcuts.requests": "para abrir a lista de seguidores pendentes",
   "keyboard_shortcuts.search": "para focar a pesquisa",
+  "keyboard_shortcuts.start": "para abrir a coluna \"primeiros passos\"",
   "keyboard_shortcuts.toggle_hidden": "mostrar/esconder o texto com aviso de conteÃºdo",
   "keyboard_shortcuts.toot": "para compor um novo toot",
   "keyboard_shortcuts.unfocus": "para remover o foco da Ã¡rea de composiÃ§Ã£o/pesquisa",
@@ -159,21 +213,23 @@
   "missing_indicator.label": "NÃ£o encontrado",
   "missing_indicator.sublabel": "Esse recurso nÃ£o pÃ´de ser encontrado",
   "mute_modal.hide_notifications": "Esconder notificaÃ§Ãµes deste usuÃ¡rio?",
+  "navigation_bar.apps": "Apps",
   "navigation_bar.blocks": "UsuÃ¡rios bloqueados",
   "navigation_bar.community_timeline": "Local",
+  "navigation_bar.compose": "Compor um novo toot",
   "navigation_bar.direct": "Mensagens diretas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "DomÃnios escondidos",
   "navigation_bar.edit_profile": "Editar perfil",
   "navigation_bar.favourites": "Favoritos",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Palavras silenciadas",
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.info": "Mais informaÃ§Ãµes",
   "navigation_bar.keyboard_shortcuts": "Atalhos de teclado",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
   "navigation_bar.mutes": "UsuÃ¡rios silenciados",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Pessoal",
   "navigation_bar.pins": "Postagens fixadas",
   "navigation_bar.preferences": "PreferÃªncias",
   "navigation_bar.public_timeline": "Global",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "VocÃª tem certeza de que quer limpar todas as suas notificaÃ§Ãµes permanentemente?",
   "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",
+  "notifications.column_settings.filter_bar.show": "Mostrar",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.mention": "MenÃ§Ãµes:",
   "notifications.column_settings.push": "Enviar notificaÃ§Ãµes",
-  "notifications.column_settings.push_meta": "Este aparelho",
   "notifications.column_settings.reblog": "Compartilhamento:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Reproduzir som",
+  "notifications.filter.all": "Tudo",
+  "notifications.filter.boosts": "Compartilhamentos",
+  "notifications.filter.favourites": "Favoritos",
+  "notifications.filter.follows": "Seguidores",
+  "notifications.filter.mentions": "MenÃ§Ãµes",
   "notifications.group": "{count} notificaÃ§Ãµes",
-  "onboarding.done": "Pronto",
-  "onboarding.next": "PrÃ³ximo",
-  "onboarding.page_five.public_timelines": "A timeline local mostra postagens pÃºblicas de todos os usuÃ¡rios no {domain}. A timeline federada mostra todas as postagens de todas as pessoas que pessoas no {domain} seguem. Estas sÃ£o as timelines pÃºblicas, uma Ã³tima maneira de conhecer novas pessoas.",
-  "onboarding.page_four.home": "A pÃ¡gina inicial mostra postagens de pessoas que vocÃª segue.",
-  "onboarding.page_four.notifications": "A coluna de notificaÃ§Ãµes te mostra quando alguÃ©m interage com vocÃª.",
-  "onboarding.page_one.federation": "Mastodon Ã© uma rede de servidores independentes que se juntam para fazer uma grande rede social. NÃ³s chamamos estes servidores de instÃ¢ncias.",
-  "onboarding.page_one.full_handle": "Seu nome de usuÃ¡rio completo",
-  "onboarding.page_one.handle_hint": "Isso Ã© o que vocÃª diz aos seus amigos para que eles possam te mandar mensagens ou te seguir a partir de outra instÃ¢ncia.",
-  "onboarding.page_one.welcome": "Boas-vindas ao Mastodon!",
-  "onboarding.page_six.admin": "O administrador de sua instÃ¢ncia Ã© {admin}.",
-  "onboarding.page_six.almost_done": "Quase acabando...",
-  "onboarding.page_six.appetoot": "Bom Apetoot!",
-  "onboarding.page_six.apps_available": "HÃ¡ {apps} disponÃveis para iOS, Android e outras plataformas.",
-  "onboarding.page_six.github": "Mastodon Ã© um software gratuito e de cÃ³digo aberto. VocÃª pode reportar bugs, prequisitar novas funÃ§Ãµes ou contribuir para o cÃ³digo no {github}.",
-  "onboarding.page_six.guidelines": "diretrizes da comunidade",
-  "onboarding.page_six.read_guidelines": "Por favor, leia as {guidelines} do {domain}!",
-  "onboarding.page_six.various_app": "aplicativos mÃ³veis",
-  "onboarding.page_three.profile": "Edite o seu perfil para mudar o seu o seu avatar, bio e nome de exibiÃ§Ã£o. No menu de configuraÃ§Ãµes, vocÃª tambÃ©m encontrarÃ¡ outras preferÃªncias.",
-  "onboarding.page_three.search": "Use a barra de buscas para encontrar pessoas e consultar hashtags, como #illustrations e #introductions. Para procurar por uma pessoa que nÃ£o estiver nesta instÃ¢ncia, use o nome de usuÃ¡rio completo dela.",
-  "onboarding.page_two.compose": "Escreva postagens na coluna de escrita. VocÃª pode hospedar imagens, mudar as configuraÃ§Ãµes de privacidade e adicionar alertas de conteÃºdo atravÃ©s dos Ãcones abaixo.",
-  "onboarding.skip": "Pular",
   "privacy.change": "Ajustar a privacidade da mensagem",
   "privacy.direct.long": "Apenas para usuÃ¡rios mencionados",
   "privacy.direct.short": "Direta",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "standalone.public_title": "DÃª uma espiada...",
+  "status.admin_account": "Abrir interface de moderaÃ§Ã£o para @{name}",
+  "status.admin_status": "Abrir esse status na interface de moderaÃ§Ã£o",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Desfazer compartilhamento",
   "status.cannot_reblog": "Esta postagem nÃ£o pode ser compartilhada",
   "status.delete": "Excluir",
+  "status.detailed_status": "VisÃ£o detalhada da conversa",
   "status.direct": "Enviar mensagem direta a @{name}",
   "status.embed": "Incorporar",
   "status.favourite": "Adicionar aos favoritos",
@@ -267,9 +312,11 @@
   "status.open": "Expandir",
   "status.pin": "Fixar no perfil",
   "status.pinned": "Toot fixado",
+  "status.read_more": "Ler mais",
   "status.reblog": "Compartilhar",
   "status.reblog_private": "Compartilhar com a audiÃªncia original",
   "status.reblogged_by": "{name} compartilhou",
+  "status.reblogs.empty": "NinguÃ©m compartilhou esse toot atÃ© agora. Quando alguÃ©m o fizer, eles aparecerÃ£o aqui.",
   "status.redraft": "Apagar & usar como rascunho",
   "status.reply": "Responder",
   "status.replyAll": "Responder Ã  sequÃªncia",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Mostrar menos para todas as mensagens",
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas as mensagens",
+  "status.show_thread": "Mostrar sequÃªncia",
   "status.unmute_conversation": "Desativar silÃªncio desta conversa",
   "status.unpin": "Desafixar do perfil",
+  "suggestions.dismiss": "Ignorar a sugestÃ£o",
+  "suggestions.header": "VocÃª pode se interessar porâ€¦",
   "tabs_bar.federated_timeline": "Global",
   "tabs_bar.home": "PÃ¡gina inicial",
   "tabs_bar.local_timeline": "Local",
@@ -291,7 +341,7 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {pessoa} other {pessoas}} falando sobre",
   "ui.beforeunload": "Seu rascunho serÃ¡ perdido se vocÃª sair do Mastodon.",
   "upload_area.title": "Arraste e solte para enviar",
-  "upload_button.label": "Adicionar mÃdia",
+  "upload_button.label": "Adicionar mÃdia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Descreva a imagem para deficientes visuais",
   "upload_form.focus": "Ajustar foco",
   "upload_form.undo": "Remover",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 686c05d729d9ce1a2b7922f333379c80a6c10f02..d4126704a2fcff0179efac7d5c2b45e080fadb1c 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Esconder tudo do domÃnio {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "As informaÃ§Ãµes abaixo podem refletir o perfil do usuÃ¡rio de forma incompleta.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Editar perfil",
+  "account.endorse": "Feature on profile",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Segue",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Ã‰ teu seguidor",
   "account.hide_reblogs": "Esconder partilhas de @{name}",
+  "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": "Mencionar @{name}",
   "account.moved_to": "{name} mudou a sua conta para:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Mostrar partilhas de @{name}",
   "account.unblock": "NÃ£o bloquear @{name}",
   "account.unblock_domain": "Mostrar {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "NÃ£o silenciar @{name}",
   "account.unmute_notifications": "Deixar de silenciar @{name}",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "De certeza que queres silenciar {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": "Deixar de seguir",
   "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
   "embed.instructions": "Publicar este post num outro site copiando o cÃ³digo abaixo.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Resultados da pesquisa",
   "emoji_button.symbols": "SÃmbolos",
   "emoji_button.travel": "Viagens & Lugares",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "Ainda nÃ£o existe conteÃºdo local para mostrar!",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "NÃ£o foram encontradas publicaÃ§Ãµes com essa hashtag.",
   "empty_column.home": "Ainda nÃ£o segues qualquer utilizador. Visita {public} ou utiliza a pesquisa para procurar outros utilizadores.",
   "empty_column.home.public_timeline": "global",
   "empty_column.list": "Ainda nÃ£o existem publicaÃ§Ãµes nesta lista. Quando membros desta lista fizerem novas publicaÃ§Ãµes, elas aparecerÃ£o aqui.",
+  "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": "NÃ£o tens notificaÃ§Ãµes. Interage com outros utilizadores para iniciar uma conversa.",
   "empty_column.public": "NÃ£o hÃ¡ nada aqui! Escreve algo publicamente ou segue outros utilizadores para ver aqui os conteÃºdos pÃºblicos",
   "follow_request.authorize": "Autorizar",
   "follow_request.reject": "Rejeitar",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Primeiros passos",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon Ã© software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {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.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",
   "home.column_settings.basic": "BÃ¡sico",
   "home.column_settings.show_reblogs": "Mostrar as partilhas",
   "home.column_settings.show_replies": "Mostrar as respostas",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "para voltar",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "para partilhar",
   "keyboard_shortcuts.column": "para focar uma publicaÃ§Ã£o numa das colunas",
   "keyboard_shortcuts.compose": "para focar na Ã¡rea de publicaÃ§Ã£o",
   "keyboard_shortcuts.description": "DescriÃ§Ã£o",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "para mover para baixo na lista",
   "keyboard_shortcuts.enter": "para expandir uma publicaÃ§Ã£o",
   "keyboard_shortcuts.favourite": "para adicionar aos favoritos",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Atalhos do teclado",
+  "keyboard_shortcuts.home": "to open home timeline",
   "keyboard_shortcuts.hotkey": "Atalho",
   "keyboard_shortcuts.legend": "para mostrar esta legenda",
+  "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "para mencionar o autor",
+  "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.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "para responder",
+  "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "para focar na pesquisa",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "para compor um novo post",
   "keyboard_shortcuts.unfocus": "para remover o foco da Ã¡rea de publicaÃ§Ã£o/pesquisa",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "NÃ£o encontrado",
   "missing_indicator.sublabel": "Este recurso nÃ£o foi encontrado",
   "mute_modal.hide_notifications": "Esconder notificaÃ§Ãµes deste utilizador?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Utilizadores bloqueados",
   "navigation_bar.community_timeline": "Local",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Queres mesmo limpar todas as notificaÃ§Ãµes?",
   "notifications.column_settings.alert": "NotificaÃ§Ãµes no computador",
   "notifications.column_settings.favourite": "Favoritos:",
+  "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.follow": "Novos seguidores:",
   "notifications.column_settings.mention": "MenÃ§Ãµes:",
   "notifications.column_settings.push": "NotificaÃ§Ãµes Push",
-  "notifications.column_settings.push_meta": "Este dispositivo",
   "notifications.column_settings.reblog": "Partilhas:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Reproduzir som",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Pronto",
-  "onboarding.next": "PrÃ³ximo",
-  "onboarding.page_five.public_timelines": "A timeline local mostra as publicaÃ§Ãµes de todos os utilizadores em {domain}. A timeline global mostra as publicaÃ§Ãµes de todas as pessoas que pessoas em {domain} seguem. Estas sÃ£o as timelines pÃºblicas, uma Ã³ptima forma de conhecer novas pessoas.",
-  "onboarding.page_four.home": "A timeline home mostra as publicaÃ§Ãµes de pessoas que tu segues.",
-  "onboarding.page_four.notifications": "A coluna de notificaÃ§Ãµes mostra-te quando alguÃ©m interage contigo.",
-  "onboarding.page_one.federation": "Mastodon Ã© uma rede de servidores independentes ligados entre si para fazer uma grande rede social. NÃ³s chamamos instÃ¢ncias a estes servidores.",
-  "onboarding.page_one.full_handle": "O teu nome de utilizador completo",
-  "onboarding.page_one.handle_hint": "Isto Ã© o que dizes aos teus amigos para pesquisar.",
-  "onboarding.page_one.welcome": "Boas-vindas ao Mastodon!",
-  "onboarding.page_six.admin": "O administrador da tua instÃ¢ncia Ã© {admin}.",
-  "onboarding.page_six.almost_done": "Quase pronto...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Existem {apps} disponÃveis para iOS, Android e outras plataformas.",
-  "onboarding.page_six.github": "Mastodon Ã© um software gratuito e de cÃ³digo aberto. Podes reportar bugs, solicitar novas funcionalidades e contribuir para o cÃ³digo em {github}.",
-  "onboarding.page_six.guidelines": "termos de utilizaÃ§Ã£o da comunidade",
-  "onboarding.page_six.read_guidelines": "Por favor, lÃª os {guidelines} de {domain}!",
-  "onboarding.page_six.various_app": "aplicaÃ§Ãµes de telemÃ³vel",
-  "onboarding.page_three.profile": "Edita o teu perfil para mudar a tua imagem, biografia e nome. LÃ¡ encontrarÃ¡s tambÃ©m outras preferÃªncias que podes personalizar.",
-  "onboarding.page_three.search": "Utiliza a caixa de pesquisa para procurar pessoas ou hashtags, exemplo {illustration} / {introductions}. Para procurar uma pessoa que nÃ£o estÃ¡ nesta instÃ¢ncia, utiliza o endereÃ§o completo.",
-  "onboarding.page_two.compose": "Escreve posts na coluna de publicaÃ§Ãµes. Podes publicar imagens, alterar a privacidade e adicionar alertas de conteÃºdo usando os Ãcones abaixo da caixa de composiÃ§Ã£o.",
-  "onboarding.skip": "Saltar",
   "privacy.change": "Ajustar a privacidade da mensagem",
   "privacy.direct.long": "Apenas para utilizadores mencionados",
   "privacy.direct.short": "Directo",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
   "standalone.public_title": "Espreitar lÃ¡ dentro...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Este post nÃ£o pode ser partilhado",
   "status.delete": "Eliminar",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Incorporar",
   "status.favourite": "Adicionar aos favoritos",
@@ -267,9 +312,11 @@
   "status.open": "Expandir",
   "status.pin": "Fixar no perfil",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Partilhar",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "{name} partilhou",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.reply": "Responder",
   "status.replyAll": "Responder Ã  conversa",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Mostrar mais",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "status.unmute_conversation": "Deixar de silenciar esta conversa",
   "status.unpin": "NÃ£o fixar no perfil",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "Global",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
new file mode 100644
index 0000000000000000000000000000000000000000..a1a514f4948b5f2878b561fbdf039f51b68c9492
--- /dev/null
+++ b/app/javascript/mastodon/locales/ro.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "AdaugÄƒ sau EliminÄƒ din liste",
+  "account.badges.bot": "Bot",
+  "account.block": "BlocheazÄƒ @{name}",
+  "account.block_domain": "Ascunde tot de la {domain}",
+  "account.blocked": "Blocat",
+  "account.direct": "Mesaj direct @{name}",
+  "account.disclaimer_full": "InformaÈ›iile de mai jos pot reflecta profilul utilizatorului incomplet.",
+  "account.domain_blocked": "Domeniu ascuns",
+  "account.edit_profile": "EditeazÄƒ profilul",
+  "account.endorse": "Redistribuie pe profil",
+  "account.follow": "UrmÄƒreÈ™te",
+  "account.followers": "UrmÄƒritori",
+  "account.followers.empty": "Acest utilizator nu are Ã®ncÄƒ urmÄƒritori.",
+  "account.follows": "UrmÄƒreÈ™te",
+  "account.follows.empty": "Acest utilizator nu urmÄƒreÈ™te pe nimeni incÄƒ.",
+  "account.follows_you": "Te urmÄƒreÈ™te",
+  "account.hide_reblogs": "Ascunde redistribuirile de la @{name}",
+  "account.link_verified_on": "DeÈ›inerea acestui link a fost verificatÄƒ la {date}",
+  "account.locked_info": "Acest profil este privat. AceastÄƒ persoanÄƒ gestioneaz manual cine o urmÄƒreÈ™te.",
+  "account.media": "Media",
+  "account.mention": "MenÈ›ioneazÄƒ @{name}",
+  "account.moved_to": "{name} a fost mutat la:",
+  "account.mute": "OpreÈ™te @{name}",
+  "account.mute_notifications": "OpreÈ™te notificÄƒrile de la @{name}",
+  "account.muted": "Oprit",
+  "account.posts": "PostÄƒri",
+  "account.posts_with_replies": "PostÄƒri È™i replici",
+  "account.report": "RaporteazÄƒ @{name}",
+  "account.requested": "Se aÈ™teaptÄƒ aprobarea. ApasÄƒ pentru a anula cererea de urmÄƒrire",
+  "account.share": "Distribuie profilul lui @{name}",
+  "account.show_reblogs": "AratÄƒ redistribuirile de la @{name}",
+  "account.unblock": "DeblocheazÄƒ @{name}",
+  "account.unblock_domain": "AratÄƒ {domain}",
+  "account.unendorse": "Nu promova pe profil",
+  "account.unfollow": "Nu mai urmÄƒri",
+  "account.unmute": "ActiveazÄƒ notificÄƒrile de la @{name}",
+  "account.unmute_notifications": "ActiveazÄƒ notificÄƒrile de la @{name}",
+  "account.view_full_profile": "Vezi profilul complet",
+  "alert.unexpected.message": "A apÄƒrut o eroare neaÈ™teptatÄƒ.",
+  "alert.unexpected.title": "Hopa!",
+  "boost_modal.combo": "PoÈ›i apÄƒsa {combo} pentru a omite asta data viitoare",
+  "bundle_column_error.body": "Ceva nu a funcÈ›ionat la Ã®ncÄƒrcarea acestui component.",
+  "bundle_column_error.retry": "ÃŽncearcÄƒ din nou",
+  "bundle_column_error.title": "Eroare de reÈ›ea",
+  "bundle_modal_error.close": "ÃŽnchide",
+  "bundle_modal_error.message": "Ceva nu a funcÈ›ionat Ã®n timupul Ã®ncÄƒrcÄƒrii acestui component.",
+  "bundle_modal_error.retry": "ÃŽncearcÄƒ din nou",
+  "column.blocks": "Utilizatori blocaÈ›i",
+  "column.community": "Fluxul Local",
+  "column.direct": "Mesaje directe",
+  "column.domain_blocks": "Domenii ascunse",
+  "column.favourites": "Favorite",
+  "column.follow_requests": "Cereri de urmÄƒrire",
+  "column.home": "AcasÄƒ",
+  "column.lists": "Liste",
+  "column.mutes": "Utilizatori opriÈ›i",
+  "column.notifications": "NotificÄƒri",
+  "column.pins": "PostÄƒri fixate",
+  "column.public": "Flux global",
+  "column_back_button.label": "ÃŽnapoi",
+  "column_header.hide_settings": "Ascunde setÄƒrile",
+  "column_header.moveLeft_settings": "MutÄƒ coloana la stÃ¢nga",
+  "column_header.moveRight_settings": "MutÄƒ coloana la dreapta",
+  "column_header.pin": "FixeazÄƒ",
+  "column_header.show_settings": "AratÄƒ setÄƒrile",
+  "column_header.unpin": "ElibereazÄƒ",
+  "column_subheading.settings": "SetÄƒri",
+  "community.column_settings.media_only": "Doar media",
+  "compose_form.direct_message_warning": "AceastÄƒ postare va fi trimisÄƒ doar utilizatorilor menÈ›ionaÈ›i.",
+  "compose_form.direct_message_warning_learn_more": "AflÄƒ mai multe",
+  "compose_form.hashtag_warning": "AceastÄƒ postare nu va fi listatÄƒ sub nici un hastag. Doar postÄƒrile publice pot fi gÄƒsite dupa un hastag.",
+  "compose_form.lock_disclaimer": "Contul tÄƒu nu este {locked}. Oricine te poate urmÄƒri fÄƒrÄƒ aprobarea ta È™i vedea toate postÄƒrile tale.",
+  "compose_form.lock_disclaimer.lock": "privat",
+  "compose_form.placeholder": "La ce te gÃ¢ndeÈ™ti?",
+  "compose_form.publish": "PosteazÄƒ",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "ConÈ›inutul media este marcat ca sensibil",
+  "compose_form.sensitive.unmarked": "ConÈ›inutul media nu este marcat ca sensibil",
+  "compose_form.spoiler.marked": "Textul este ascuns sub o avertizare",
+  "compose_form.spoiler.unmarked": "Textul nu este ascuns",
+  "compose_form.spoiler_placeholder": "Scrie averitzarea aici",
+  "confirmation_modal.cancel": "AnuleazÄƒ",
+  "confirmations.block.confirm": "BlocheazÄƒ",
+  "confirmations.block.message": "EÈ™ti sigur cÄƒ vrei sÄƒ blochezi {name}?",
+  "confirmations.delete.confirm": "È˜terge",
+  "confirmations.delete.message": "EÈ™ti È™igur cÄƒ vrei sÄƒ È™tergi asta?",
+  "confirmations.delete_list.confirm": "È˜terge",
+  "confirmations.delete_list.message": "EÈ™ti sigur cÄƒ vrei sÄƒ È™tergi permanent aceastÄƒ listÄƒ?",
+  "confirmations.domain_block.confirm": "Ascunde tot domeniul",
+  "confirmations.domain_block.message": "EÈ™ti absolut sigur cÄƒ vrei sÄƒ blochezi complet {domain}? ÃŽn cele mai multe cazuri raportarea sau oprirea anumitor lucruri este suficientÄƒ È™i de preferat. Nu vei mai vedea nici un conÈ›inut de la acest domeniu in nici un flux public sau Ã®n notificÄƒrile tale. UrmÄƒritorii tÄƒi de la acele domenii vor fi eliminaÈ›i.",
+  "confirmations.mute.confirm": "OpreÈ™te",
+  "confirmations.mute.message": "EÈ™ti sigur cÄƒ vrei sÄƒ opreÈ™ti {name}?",
+  "confirmations.redraft.confirm": "È˜terge È™i salveazÄƒ ca ciornÄƒ",
+  "confirmations.redraft.message": "EÈ™ti sigur cÄƒ vrei sÄƒ faci asta? Tot ce È›ine de aceastÄƒ postare, inclusiv rÄƒspunsurile vor fi deconectate.",
+  "confirmations.reply.confirm": "RÄƒspunde",
+  "confirmations.reply.message": "RÄƒspunzÃ¢nd la asta acum, mesajul pe care Ã®l compui Ã®n prezent se va È™terge. EÈ™ti sigur cÄƒ vrei sÄƒ continui?",
+  "confirmations.unfollow.confirm": "Nu mai urmÄƒri",
+  "confirmations.unfollow.message": "EÈ™ti sigur cÄƒ nu mai vrei sÄƒ Ã®l urmÄƒreÈ™ti pe {name}?",
+  "embed.instructions": "InsereazÄƒ aceastÄƒ postare pe site-ul tÄƒu adÄƒugÃ¢nd codul de mai jos.",
+  "embed.preview": "Cam aÈ™a va arÄƒta:",
+  "emoji_button.activity": "Activitate",
+  "emoji_button.custom": "Personalizat",
+  "emoji_button.flags": "Marcaje",
+  "emoji_button.food": "MÃ¢ncare È™i BÄƒuturi",
+  "emoji_button.label": "InsereazÄƒ un emoji",
+  "emoji_button.nature": "NaturÄƒ",
+  "emoji_button.not_found": "FarÄƒ emojiuri (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.objects": "Obiecte",
+  "emoji_button.people": "Persoane",
+  "emoji_button.recent": "Utilizate frecvent",
+  "emoji_button.search": "CautÄƒ...",
+  "emoji_button.search_results": "Rezultatele cÄƒutÄƒrii",
+  "emoji_button.symbols": "Simboluri",
+  "emoji_button.travel": "CÄƒlÄƒtorii si Locuri",
+  "empty_column.account_timeline": "Nici o postare aici!",
+  "empty_column.blocks": "Nu ai blocat nici un utilizator incÄƒ.",
+  "empty_column.community": "Fluxul local este gol. Scrie ceva public pentru a Ã®mpinge bila la vale!",
+  "empty_column.direct": "Nu ai nici un mesaj direct incÄƒ. CÃ¢nd trimiÈ›i sau primeÈ™ti unul, va fi afiÈ™at aici.",
+  "empty_column.domain_blocks": "Nu sunt domenii ascunse incÄƒ.",
+  "empty_column.favourited_statuses": "Nu ai nici o postare favoritÄƒ Ã®ncÄƒ. CÃ¢nd vei avea, vor fi afiÈ™ate aici.",
+  "empty_column.favourites": "Nimeni nu are aceastÄƒ postare adÄƒugatÄƒ la favorite. CÃ¢nd cineva o va face va fi afiÈ™at aici.",
+  "empty_column.follow_requests": "Nu ai Ã®ncÄƒ nici o cerere de urmÄƒrire. CÃ¢nd vei primi una, va fi afiÈ™atÄƒ aici.",
+  "empty_column.hashtag": "Acest hastag nu a fost folosit Ã®ncÄƒ.",
+  "empty_column.home": "Fluxul tÄƒu este gol. ViziteazÄƒ {public} sau fÄƒ o cÄƒutare pentru a Ã®ncepe sÄƒ cunoÈ™ti oameni noi.",
+  "empty_column.home.public_timeline": "fluxul public",
+  "empty_column.list": "Nu este nimic Ã®ncÄƒ Ã®n aceastÄƒ listÄƒ. CÃ¢nd membrii acestei liste vor Ã®ncepe sÄƒ posteze, va apÄƒrea aici.",
+  "empty_column.lists": "Nu ai Ã®ncÄƒ nici o listÄƒ. CÃ¢nd vei crea una, va apÄƒrea aici.",
+  "empty_column.mutes": "Nu ai oprit nici un utilizator incÄƒ.",
+  "empty_column.notifications": "Nu ai nici o notificare Ã®ncÄƒ. InteracÈ›ioneazÄƒ cu alÈ›ii pentru a Ã®ncepe o conversaÈ›ie.",
+  "empty_column.public": "Nu este nimci aici Ã®ncÄƒ! Scrie ceva public, sau urmÄƒreÈ™te alÈ›i utilizatori din alte instanÈ›e pentru a porni fluxul",
+  "follow_request.authorize": "AutorizeazÄƒ",
+  "follow_request.reject": "Respinge",
+  "getting_started.developers": "Dezvoltatori",
+  "getting_started.directory": "ExploreazÄƒ",
+  "getting_started.documentation": "DocumentaÈ›ie",
+  "getting_started.heading": "ÃŽncepe",
+  "getting_started.invite": "InvitÄƒ prieteni",
+  "getting_started.open_source_notice": "Mastodon este o reÈ›ea de socializare de tip open source. PuteÈ›i contribuii la dezvoltarea ei sau sÄƒ semnalaÈ›i erorile pe GitHub la {github}.",
+  "getting_started.security": "Securitate",
+  "getting_started.terms": "Termeni de Utilizare",
+  "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}",
+  "hashtag.column_settings.tag_mode.all": "Toate acestea",
+  "hashtag.column_settings.tag_mode.any": "Oricare din acestea",
+  "hashtag.column_settings.tag_mode.none": "Niciuna din aceastea",
+  "hashtag.column_settings.tag_toggle": "AdaugÄƒ etichete adiÈ›ionale pentru aceastÄƒ coloanÄƒ",
+  "home.column_settings.basic": "De bazÄƒ",
+  "home.column_settings.show_reblogs": "AratÄƒ redistribuirile",
+  "home.column_settings.show_replies": "AratÄƒ rÄƒspunsurile",
+  "introduction.federation.action": "UrmÄƒtorul",
+  "introduction.federation.federated.headline": "Federalizat",
+  "introduction.federation.federated.text": "PostÄƒrile publice de pe alte servere din reÈ›ea vor apÄƒrea in fluxul global.",
+  "introduction.federation.home.headline": "AcasÄƒ",
+  "introduction.federation.home.text": "PostÄƒrile de la persoanele pe care le urmÄƒreÈ™ti vor apÄƒrea in fluxul tÄƒu \"AcasÄƒ\". PoÈ›i urmÄƒri pe orice de pe orice server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "PostÄƒrile publice de la persoanele de pe acest server vor apÄƒrea Ã®n fluxul local.",
+  "introduction.interactions.action": "ÃŽncheie ghidul!",
+  "introduction.interactions.favourite.headline": "Favorite",
+  "introduction.interactions.favourite.text": "PoÈ›i salva o postare pentru a fi cititÄƒ mai tÃ¢rziu È™i poÈ›i lÄƒsa autorul sÄƒ È™tie cÄƒ iÈ›i place adÄƒugÃ¢ndo la favorite.",
+  "introduction.interactions.reblog.headline": "Redistribuie",
+  "introduction.interactions.reblog.text": "PoÈ›i Ã®mpÄƒrtÄƒÈ™i postÄƒrile altora cu urmÄƒritorii tÄƒi redistribuindule.",
+  "introduction.interactions.reply.headline": "RÄƒspunde",
+  "introduction.interactions.reply.text": "PoÈ›i rÄƒspunde la postÄƒrile tale È™i alte altora, care se vor lÄƒrgii Ã®n discuÈ›ii.",
+  "introduction.welcome.action": "SÄƒ Ã®ncepem!",
+  "introduction.welcome.headline": "Primii paÈ™i",
+  "introduction.welcome.text": "Bun Venit in federaÈ›ie! In cÃ¢teva momente, vei putea sÄƒ transmiÈ›i mesaje È™i sÄƒ participi la discuÈ›ii cu oameni noi intr-o varietate foarte largÄƒ de servere din Ã®ntreaga lume. Dar Ã®n special acest server, {domain},gÄƒzduieÈ™te profilul tÄƒu, deci reÈ›ine numele acestuia.",
+  "keyboard_shortcuts.back": "navigheazÄƒ inapoi",
+  "keyboard_shortcuts.blocked": "sÄƒ deschidÄƒ lista utilizatorilor blocaÈ›i",
+  "keyboard_shortcuts.boost": "sÄƒ redistribuie",
+  "keyboard_shortcuts.column": "sÄƒ focuzeze o postare in una dintre coloane",
+  "keyboard_shortcuts.compose": "sa focuzeze zona de compunere",
+  "keyboard_shortcuts.description": "Descriere",
+  "keyboard_shortcuts.direct": "sÄƒ deschidÄƒ coloana de mesaje directe",
+  "keyboard_shortcuts.down": "sÄƒ fie mutatÄƒ jos in lista",
+  "keyboard_shortcuts.enter": "sÄƒ deschidÄƒ un status",
+  "keyboard_shortcuts.favourite": "sÄƒ adauge la favorite",
+  "keyboard_shortcuts.favourites": "sÄƒ deschidÄƒ lista cu favorite",
+  "keyboard_shortcuts.federated": "sÄƒ deschidÄƒ fluxul global",
+  "keyboard_shortcuts.heading": "Comenzi rapide",
+  "keyboard_shortcuts.home": "sÄƒ deschidÄƒ fluxul AcasÄƒ",
+  "keyboard_shortcuts.hotkey": "PrescurtÄƒri",
+  "keyboard_shortcuts.legend": "sÄƒ afiÈ™eze aceastÄƒ legendÄƒ",
+  "keyboard_shortcuts.local": "sÄƒ deschidÄƒ fluxul local",
+  "keyboard_shortcuts.mention": "sÄƒ menÈ›ioneze autorul",
+  "keyboard_shortcuts.muted": "sÄƒ deschidÄƒ lista utilizatorilor opriÈ›i",
+  "keyboard_shortcuts.my_profile": "sÄƒ deschidÄƒ profilul tÄƒu",
+  "keyboard_shortcuts.notifications": "sÄƒ deschidÄƒ coloana cu notificÄƒri",
+  "keyboard_shortcuts.pinned": "sÄƒ deschidÄƒ lista postÄƒrilor fixate",
+  "keyboard_shortcuts.profile": "sÄƒ deschidÄƒ porfilul autorului",
+  "keyboard_shortcuts.reply": "sÄƒ rÄƒspundÄƒ",
+  "keyboard_shortcuts.requests": "sÄƒ deschidÄƒ lista cu cereri de urmÄƒrire",
+  "keyboard_shortcuts.search": "sÄƒ focuseze cÄƒutarea",
+  "keyboard_shortcuts.start": "sÄƒ deschidÄƒ coloana \"ÃŽncepere\"",
+  "keyboard_shortcuts.toggle_hidden": "sÄƒ arate/ascundÄƒ textul in spatele CW",
+  "keyboard_shortcuts.toot": "sÄƒ Ã®nceapÄƒ o postare nouÄƒ",
+  "keyboard_shortcuts.unfocus": "sÄƒ dezactiveze zona de compunere/cÄƒutare",
+  "keyboard_shortcuts.up": "sÄƒ mute mai sus Ã®n listÄƒ",
+  "lightbox.close": "ÃŽnchide",
+  "lightbox.next": "UrmÄƒtorul",
+  "lightbox.previous": "Precedentul",
+  "lists.account.add": "AdaugÄƒ Ã®n listÄƒ",
+  "lists.account.remove": "EliminÄƒ din listÄƒ",
+  "lists.delete": "È˜terge lista",
+  "lists.edit": "EditeazÄƒ lista",
+  "lists.new.create": "AdaugÄƒ listÄƒ",
+  "lists.new.title_placeholder": "Titlu pentru noua listÄƒ",
+  "lists.search": "CautÄƒ printre persoanale pe care le urmÄƒreÈ™ti",
+  "lists.subheading": "Listele tale",
+  "loading_indicator.label": "ÃŽncÄƒrcare...",
+  "media_gallery.toggle_visible": "ComutaÈ›i vizibilitatea",
+  "missing_indicator.label": "Nu a fost gÄƒsit",
+  "missing_indicator.sublabel": "AceastÄƒ resursÄƒ nu a putut fi gÄƒsitÄƒ",
+  "mute_modal.hide_notifications": "Ascunzi notificÄƒrile de la acest utilizator?",
+  "navigation_bar.apps": "AplicaÈ›ii mobile",
+  "navigation_bar.blocks": "Utilizatori blocaÈ›i",
+  "navigation_bar.community_timeline": "Flux local",
+  "navigation_bar.compose": "Compune o nouÄƒ postare",
+  "navigation_bar.direct": "Mesaje directe",
+  "navigation_bar.discover": "DescoperÄƒ",
+  "navigation_bar.domain_blocks": "Domenii ascunse",
+  "navigation_bar.edit_profile": "EditeazÄƒ profilul",
+  "navigation_bar.favourites": "Favorite",
+  "navigation_bar.filters": "Cuvinte oprite",
+  "navigation_bar.follow_requests": "Cereri de urmÄƒrire",
+  "navigation_bar.info": "Despre aceastÄƒ instanÈ›Äƒ",
+  "navigation_bar.keyboard_shortcuts": "PrescurtÄƒri",
+  "navigation_bar.lists": "Liste",
+  "navigation_bar.logout": "Deconectare",
+  "navigation_bar.mutes": "Utilizatori opriÈ›i",
+  "navigation_bar.personal": "Personal",
+  "navigation_bar.pins": "PostÄƒri fixate",
+  "navigation_bar.preferences": "PreferinÈ›e",
+  "navigation_bar.public_timeline": "Flux global",
+  "navigation_bar.security": "Securitate",
+  "notification.favourite": "{name} a adÄƒugat statusul tÄƒu la favorite",
+  "notification.follow": "{name} te urmÄƒreÈ™te",
+  "notification.mention": "{name} te-a menÈ›ionat",
+  "notification.reblog": "{name} a redistribuit postarea ta",
+  "notifications.clear": "È˜terge notificÄƒrile",
+  "notifications.clear_confirmation": "EÈ™ti sigur cÄƒ vrei sÄƒ È™tergi toate notificÄƒrile?",
+  "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": "AratÄƒ",
+  "notifications.column_settings.follow": "Noi urmÄƒritori:",
+  "notifications.column_settings.mention": "MenÈ›iuni:",
+  "notifications.column_settings.push": "NotificÄƒri push",
+  "notifications.column_settings.reblog": "Redistribuite:",
+  "notifications.column_settings.show": "AratÄƒ Ã®n coloanÄƒ",
+  "notifications.column_settings.sound": "RedÄƒ sunet",
+  "notifications.filter.all": "Toate",
+  "notifications.filter.boosts": "Redistribuiri",
+  "notifications.filter.favourites": "Favorite",
+  "notifications.filter.follows": "UrmÄƒreÈ™te",
+  "notifications.filter.mentions": "MenÈ›ionÄƒri",
+  "notifications.group": "{count} notificÄƒri",
+  "privacy.change": "Cine vede asta",
+  "privacy.direct.long": "PosteazÄƒ doar pentru utilizatorii menÈ›ionaÈ›i",
+  "privacy.direct.short": "Direct",
+  "privacy.private.long": "PosteazÄƒ doar pentru urmÄƒritori",
+  "privacy.private.short": "Doar urmÄƒritorii",
+  "privacy.public.long": "PosteazÄƒ Ã®n fluxul public",
+  "privacy.public.short": "Public",
+  "privacy.unlisted.long": "Nu afisa in fluxul public",
+  "privacy.unlisted.short": "Nelistat",
+  "regeneration_indicator.label": "ÃŽncÄƒrcareâ€¦",
+  "regeneration_indicator.sublabel": "Fluxul tÄƒu este Ã®n preparare!",
+  "relative_time.days": "{number}z",
+  "relative_time.hours": "{number}h",
+  "relative_time.just_now": "acum",
+  "relative_time.minutes": "{number}m",
+  "relative_time.seconds": "{number}s",
+  "reply_indicator.cancel": "AnuleazÄƒ",
+  "report.forward": "RedirecÈ›ioneazÄƒ catre {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 trimsÄƒ cÄƒtre moderatorii acestei instanÈ›e. PoÈ›i oferi o explicaÈ›ie pentru aceastÄƒ sesizare mai jos:",
+  "report.placeholder": "Comentarii opÈ›ionale",
+  "report.submit": "Trimite",
+  "report.target": "RaporteazÄƒ {target}",
+  "search.placeholder": "CautÄƒ",
+  "search_popout.search_format": "Formate pentru cÄƒutare avansatÄƒ",
+  "search_popout.tips.full_text": "Textele simple returneazÄƒ statusuri pe care le-ai scris, favorizat, redistribuit, sau Ã®n care sunt menÈ›ionate , deasmenea È™i utilizatorii sau hastagurile care se potrivesc.",
+  "search_popout.tips.hashtag": "hashtag",
+  "search_popout.tips.status": "status",
+  "search_popout.tips.text": "Textele simple returneazÄƒ nume, nume de utilizarori È™i hastagurile care se potrivesc",
+  "search_popout.tips.user": "utilizator",
+  "search_results.accounts": "Oameni",
+  "search_results.hashtags": "Hashtaguri",
+  "search_results.statuses": "PostÄƒri",
+  "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "Se Ã®ntÃ¢mplÄƒ acum...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "BlocheazÄƒ @{name}",
+  "status.cancel_reblog_private": "Nedistribuit",
+  "status.cannot_reblog": "AceastÄƒ postare nu poate fi redistribuitÄƒ",
+  "status.delete": "È˜terge",
+  "status.detailed_status": "ConversaÈ›ia detailatÄƒ",
+  "status.direct": "Mesaj direct @{name}",
+  "status.embed": "ÃŽncorporare",
+  "status.favourite": "Favorite",
+  "status.filtered": "Sortate",
+  "status.load_more": "ÃŽncarcÄƒ mai multe",
+  "status.media_hidden": "Media ascunsÄƒ",
+  "status.mention": "MentioneazÄƒ @{name}",
+  "status.more": "Mai mult",
+  "status.mute": "OpreÈ™te @{name}",
+  "status.mute_conversation": "OpreÈ™te conversaÈ›ia",
+  "status.open": "Extinde acest status",
+  "status.pin": "FixeazÄƒ pe profil",
+  "status.pinned": "Postare fixatÄƒ",
+  "status.read_more": "CiteÈ™te mai mult",
+  "status.reblog": "Redistribuie",
+  "status.reblog_private": "Redistribuie cÄƒtre audienÈ›a originalÄƒ",
+  "status.reblogged_by": "{name} a redistribuit",
+  "status.reblogs.empty": "Nimeni nu a redistribuit aceastÄƒ postare pÃ¢nÄƒ acum. CÃ¢nd cineva o va face, va apÄƒrea aici.",
+  "status.redraft": "È˜terge È™i adaugÄƒ la ciorne",
+  "status.reply": "RÄƒspunde",
+  "status.replyAll": "RÄƒspunde la topic",
+  "status.report": "RaporteazÄƒ @{name}",
+  "status.sensitive_toggle": "AfiÈ™eazÄƒ",
+  "status.sensitive_warning": "ConÈ›inut sensibil",
+  "status.share": "Distribuie",
+  "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Äƒ topicul",
+  "status.unmute_conversation": "ReporneÈ™te conversaÈ›ia",
+  "status.unpin": "ElibereazÄƒ din profil",
+  "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",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} vorbesc",
+  "ui.beforeunload": "Postarea se va pierde dacÄƒ pÄƒrÄƒseÈ™ti pagina.",
+  "upload_area.title": "Trage È™i elibereazÄƒ pentru a Ã®ncÄƒrca",
+  "upload_button.label": "AdaugÄƒ media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "AdaugÄƒ o descriere pentru persoanele cu deficienÈ›e de vedere",
+  "upload_form.focus": "SchimbÄƒ previzualizarea",
+  "upload_form.undo": "È˜terge",
+  "upload_progress.label": "Se ÃŽncarcÄƒ...",
+  "video.close": "ÃŽnchide video",
+  "video.exit_fullscreen": "ÃŽnchide",
+  "video.expand": "Extinde video",
+  "video.fullscreen": "Ecran Ã®ntreg",
+  "video.hide": "Ascunde video",
+  "video.mute": "OpreÈ™te sonorul",
+  "video.pause": "PauzÄƒ",
+  "video.play": "Redare",
+  "video.unmute": "ReporneÈ™te sunetul"
+}
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index ecde3fb2c07773cc5f617b34442d1f2d4f614d98..cb601089865c47fde78230d86cb292164bf5b611 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Ð‘Ð¾Ñ‚",
   "account.block": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ",
   "account.block_domain": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµ Ñ {domain}",
@@ -7,25 +8,31 @@
   "account.disclaimer_full": "ÐÐ¸Ð¶ÐµÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾ÑÑ‚ÑŒÑŽ Ð¾Ñ‚Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ.",
   "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ ÑÐºÑ€Ñ‹Ñ‚",
   "account.edit_profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ",
+  "account.endorse": "Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ðµ",
   "account.follow": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ",
   "account.followers": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹",
+  "account.followers.empty": "ÐÐ¸ÐºÑ‚Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð½Ð° ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ.",
   "account.follows": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸",
+  "account.follows.empty": "ÐÑ‚Ð¾Ñ‚ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð½Ð¸ Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½.",
   "account.follows_you": "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½(Ð°) Ð½Ð° Ð’Ð°Ñ",
   "account.hide_reblogs": "Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñ‚ @{name}",
-  "account.media": "ÐœÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚",
+  "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": "Ð£Ð¿Ð¾Ð¼ÑÐ½ÑƒÑ‚ÑŒ",
   "account.moved_to": "Ð˜Ñ‰Ð¸Ñ‚Ðµ {name} Ð·Ð´ÐµÑÑŒ:",
   "account.mute": "Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚ÑŒ",
   "account.mute_notifications": "Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ @{name}",
   "account.muted": "ÐŸÑ€Ð¸Ð³Ð»ÑƒÑˆÑ‘Ð½",
   "account.posts": "ÐŸÐ¾ÑÑ‚Ñ‹",
-  "account.posts_with_replies": "ÐŸÐ¾ÑÑ‚Ñ‹ Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð°Ð¼Ð¸",
+  "account.posts_with_replies": "ÐŸÐ¾ÑÑ‚Ñ‹ Ð¸ Ð¾Ñ‚Ð²ÐµÑ‚Ñ‹",
   "account.report": "ÐŸÐ¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒÑÑ",
   "account.requested": "ÐžÐ¶Ð¸Ð´Ð°ÐµÑ‚ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ",
   "account.share": "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÐµÐ¼ @{name}",
   "account.show_reblogs": "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñ‚ @{name}",
   "account.unblock": "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ",
   "account.unblock_domain": "Ð Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ {domain}",
+  "account.unendorse": "ÐÐµ Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ðµ",
   "account.unfollow": "ÐžÑ‚Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ",
   "account.unmute": "Ð¡Ð½ÑÑ‚ÑŒ Ð³Ð»ÑƒÑˆÐµÐ½Ð¸Ðµ",
   "account.unmute_notifications": "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ @{name}",
@@ -59,9 +66,9 @@
   "column_header.show_settings": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
   "column_header.unpin": "ÐžÑ‚ÐºÑ€ÐµÐ¿Ð¸Ñ‚ÑŒ",
   "column_subheading.settings": "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ñ Ð¼ÐµÐ´Ð¸Ð°",
   "compose_form.direct_message_warning": "ÐÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð±ÑƒÐ´ÐµÑ‚ Ð²Ð¸Ð´ÐµÐ½ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑƒÐ¿Ð¾Ð¼ÑÐ½ÑƒÑ‚Ñ‹Ð¼ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.direct_message_warning_learn_more": "Ð£Ð·Ð½Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÑŒÑˆÐµ",
   "compose_form.hashtag_warning": "ÐÑ‚Ð¾Ñ‚ Ð¿Ð¾ÑÑ‚ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ÑÑ Ð² Ð¿Ð¾Ð¸ÑÐºÐµ Ð¿Ð¾ Ñ…ÑÑˆÑ‚ÐµÐ³Ñƒ, Ñ‚.Ðº. Ð¾Ð½ Ð½ÐµÐ¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹. Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹ Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð² Ð¿Ð¾Ð¸ÑÐºÐµ Ð¿Ð¾ Ñ…ÑÑˆÑ‚ÐµÐ³Ñƒ.",
   "compose_form.lock_disclaimer": "Ð’Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ðµ {locked}. Ð›ÑŽÐ±Ð¾Ð¹ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° Ð’Ð°Ñ Ð¸ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾ÑÑ‚Ñ‹ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð².",
   "compose_form.lock_disclaimer.lock": "Ð·Ð°ÐºÑ€Ñ‹Ñ‚",
@@ -72,7 +79,7 @@
   "compose_form.sensitive.unmarked": "ÐœÐµÐ´Ð¸Ð°Ñ„Ð°Ð¹Ð»Ñ‹ Ð½Ðµ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ñ‹ ÐºÐ°Ðº Ñ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ",
   "compose_form.spoiler.marked": "Ð¢ÐµÐºÑÑ‚ ÑÐºÑ€Ñ‹Ñ‚ Ð·Ð° Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸ÐµÐ¼",
   "compose_form.spoiler.unmarked": "Ð¢ÐµÐºÑÑ‚ Ð½Ðµ ÑÐºÑ€Ñ‹Ñ‚",
-  "compose_form.spoiler_placeholder": "ÐÐ°Ð¿Ð¸ÑˆÐ¸Ñ‚Ðµ ÑÐ²Ð¾Ðµ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð·Ð´ÐµÑÑŒ",
+  "compose_form.spoiler_placeholder": "Ð¢ÐµÐºÑÑ‚ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ",
   "confirmation_modal.cancel": "ÐžÑ‚Ð¼ÐµÐ½Ð°",
   "confirmations.block.confirm": "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ",
   "confirmations.block.message": "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ {name}?",
@@ -84,8 +91,10 @@
   "confirmations.domain_block.message": "Ð’Ñ‹ Ð½Ð° ÑÐ°Ð¼Ð¾Ð¼ Ð´ÐµÐ»Ðµ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²ÐµÑÑŒ {domain}? Ð’ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ðµ ÑÐ»ÑƒÑ‡Ð°ÐµÐ² Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¸Ñ… Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð¾Ðº Ð¸Ð»Ð¸ Ð³Ð»ÑƒÑˆÐµÐ½Ð¸Ð¹ Ð´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾.",
   "confirmations.mute.confirm": "Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚ÑŒ",
   "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.redraft.confirm": "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ",
+  "confirmations.redraft.message": "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¸ Ð¿Ñ€ÐµÐ²Ñ€Ð°Ñ‚Ð¸Ñ‚ÑŒ Ð² Ñ‡ÐµÑ€Ð½Ð¾Ð²Ð¸Ðº? Ð’Ñ‹ Ð¿Ð¾Ñ‚ÐµÑ€ÑÐµÑ‚Ðµ Ð²ÑÐµ Ð¾Ñ‚Ð²ÐµÑ‚Ñ‹, Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¸ Ð¾Ñ‚Ð¼ÐµÑ‚ÐºÐ¸ 'Ð½Ñ€Ð°Ð²Ð¸Ñ‚ÑÑ' Ðº Ð½ÐµÐ¼Ñƒ.",
+  "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.unfollow.message": "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾Ñ‚Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð¾Ñ‚ {name}?",
   "embed.instructions": "Ð’ÑÑ‚Ñ€Ð¾Ð¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Ð’Ð°ÑˆÐµÐ¼ ÑÐ°Ð¹Ñ‚Ðµ, ÑÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð² ÐºÐ¾Ð´ Ð²Ð½Ð¸Ð·Ñƒ.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ‹ Ð¿Ð¾Ð¸ÑÐºÐ°",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ‹",
   "emoji_button.travel": "ÐŸÑƒÑ‚ÐµÑˆÐµÑÑ‚Ð²Ð¸Ñ",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "Ð’Ñ‹ ÐµÑ‰Ñ‘ Ð½Ð¸ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð»Ð¸.",
   "empty_column.community": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð¿ÑƒÑÑ‚Ð°. ÐÐ°Ð¿Ð¸ÑˆÐ¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ñ€Ð°Ð·Ð¾Ð³Ñ€ÐµÑ‚ÑŒ Ð½Ð°Ñ€Ð¾Ð´!",
   "empty_column.direct": "Ð£ Ð’Ð°Ñ Ð¿Ð¾ÐºÐ° Ð½ÐµÑ‚ Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹. ÐšÐ¾Ð³Ð´Ð° Ð’Ñ‹ Ð½Ð°Ñ‡Ð½Ñ‘Ñ‚Ðµ Ð¸Ñ… Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¸Ð»Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ, Ð¾Ð½Ð¸ Ð¿Ð¾ÑÐ²ÑÑ‚ÑÑ Ð·Ð´ÐµÑÑŒ.",
+  "empty_column.domain_blocks": "Ð¡ÐºÑ€Ñ‹Ñ‚Ñ‹Ñ… Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð² Ð¿Ð¾ÐºÐ° Ð½ÐµÑ‚.",
+  "empty_column.favourited_statuses": "Ð’Ñ‹ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ Ð½Ð¸ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÑ‚Ð°Ñ‚ÑƒÑÐ° Ð² 'Ð˜Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ'. ÐšÐ°Ðº Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð’Ñ‹ ÑÑ‚Ð¾ ÑÐ´ÐµÐ»Ð°ÐµÑ‚Ðµ, Ð¾Ð½Ð¸ Ð¿Ð¾ÑÐ²ÑÑ‚ÑÑ Ð·Ð´ÐµÑÑŒ.",
+  "empty_column.favourites": "ÐÐ¸ÐºÑ‚Ð¾ ÐµÑ‰Ñ‘ Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð» ÑÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð² 'Ð˜Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ'. ÐšÐ°Ðº Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÐºÑ‚Ð¾-Ñ‚Ð¾ ÑÑ‚Ð¾ ÑÐ´ÐµÐ»Ð°ÐµÑ‚, Ð¾Ð½Ð¸ Ð¿Ð¾ÑÐ²ÑÑ‚ÑÑ Ð·Ð´ÐµÑÑŒ.",
+  "empty_column.follow_requests": "Ð’Ð°Ð¼ ÐµÑ‰Ñ‘ Ð½Ðµ Ð¿Ñ€Ð¸Ñ…Ð¾Ð´Ð¸Ð»Ð¸ Ð·Ð°Ð¿Ñ€Ð¾ÑÑ‹ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑƒ. Ð’ÑÐµ Ð½Ð¾Ð²Ñ‹Ðµ Ð·Ð°Ð¿Ñ€Ð¾ÑÑ‹ Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ‹ Ð·Ð´ÐµÑÑŒ.",
   "empty_column.hashtag": "Ð¡Ñ‚Ð°Ñ‚ÑƒÑÐ¾Ð² Ñ Ñ‚Ð°ÐºÐ¸Ð¼ Ñ…ÑÑˆÑ‚ÐµÐ³Ð¾Ð¼ ÐµÑ‰Ðµ Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚.",
   "empty_column.home": "ÐŸÐ¾ÐºÐ° Ð’Ñ‹ Ð½Ð¸ Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹. ÐŸÐ¾Ð»Ð¸ÑÑ‚Ð°Ð¹Ñ‚Ðµ {public} Ð¸Ð»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð¿Ð¾Ð¸ÑÐº, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¾ÑÐ²Ð¾Ð¸Ñ‚ÑŒÑÑ Ð¸ Ð·Ð°Ð²ÐµÑÑ‚Ð¸ Ð½Ð¾Ð²Ñ‹Ðµ Ð·Ð½Ð°ÐºÐ¾Ð¼ÑÑ‚Ð²Ð°.",
   "empty_column.home.public_timeline": "Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»ÐµÐ½Ñ‚Ñ‹",
   "empty_column.list": "Ð’ ÑÑ‚Ð¾Ð¼ ÑÐ¿Ð¸ÑÐºÐµ Ð¿Ð¾ÐºÐ° Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚.",
+  "empty_column.lists": "Ð£ Ð’Ð°Ñ ÐµÑ‰Ñ‘ Ð½ÐµÑ‚ ÑÐ¿Ð¸ÑÐºÐ¾Ð². Ð’ÑÐµ ÑÐ¾Ð·Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð’Ð°Ð¼Ð¸ ÑÐ¿Ð¸ÑÐºÐ¸ Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ‹ Ð·Ð´ÐµÑÑŒ.",
+  "empty_column.mutes": "Ð’Ñ‹ ÐµÑ‰Ñ‘ Ð½Ð¸ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð·Ð°Ð³Ð»ÑƒÑˆÐ¸Ð»Ð¸.",
   "empty_column.notifications": "Ð£ Ð’Ð°Ñ ÐµÑ‰Ðµ Ð½ÐµÑ‚ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹. Ð—Ð°Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð·Ð½Ð°ÐºÐ¾Ð¼ÑÑ‚Ð²Ð¾ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼Ð¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð½Ð°Ñ‡Ð°Ñ‚ÑŒ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€.",
   "empty_column.public": "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚! ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÑƒÐ¹Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ Ð¸Ð»Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑˆÐ¸Ñ‚ÐµÑÑŒ Ð½Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… ÑƒÐ·Ð»Ð¾Ð², Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð»ÐµÐ½Ñ‚Ñƒ.",
   "follow_request.authorize": "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ñ‚ÑŒ",
   "follow_request.reject": "ÐžÑ‚ÐºÐ°Ð·Ð°Ñ‚ÑŒ",
-  "getting_started.developers": "Developers",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.developers": "Ð”Ð»Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ¾Ð²",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ",
   "getting_started.heading": "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "Mastodon - Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ Ð¸ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð¼Ð¾Ñ‡ÑŒ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ Ð¸Ð»Ð¸ ÑÐ¾Ð¾Ð±Ñ‰Ð¸Ñ‚ÑŒ Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°Ñ… Ð½Ð° GitHub Ð¿Ð¾ Ð°Ð´Ñ€ÐµÑÑƒ {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.invite": "ÐŸÑ€Ð¸Ð³Ð»Ð°ÑÐ¸Ñ‚ÑŒ Ð»ÑŽÐ´ÐµÐ¹",
+  "getting_started.open_source_notice": "Mastodon - ÑÐµÑ€Ð²Ð¸Ñ Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ Ð¸ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð¼Ð¾Ñ‡ÑŒ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ Ð¸Ð»Ð¸ ÑÐ¾Ð¾Ð±Ñ‰Ð¸Ñ‚ÑŒ Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð°Ñ… Ð½Ð° GitHub Ð¿Ð¾ Ð°Ð´Ñ€ÐµÑÑƒ {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}",
+  "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",
   "home.column_settings.basic": "ÐžÑÐ½Ð¾Ð²Ð½Ñ‹Ðµ",
   "home.column_settings.show_reblogs": "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ",
   "home.column_settings.show_replies": "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¾Ñ‚Ð²ÐµÑ‚Ñ‹",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.pinned": "Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð·Ð°ÐºÑ€ÐµÐ¿Ð»Ñ‘Ð½Ð½Ñ‹Ð¼ ÑÑ‚Ð°Ñ‚ÑƒÑÐ°Ð¼",
+  "keyboard_shortcuts.profile": "Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŽ Ð°Ð²Ñ‚Ð¾Ñ€Ð°",
   "keyboard_shortcuts.reply": "Ð¾Ñ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ",
+  "keyboard_shortcuts.requests": "Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð·Ð°Ð¿Ñ€Ð¾ÑÐ°Ð¼ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑƒ",
   "keyboard_shortcuts.search": "Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ð¿Ð¾Ð¸ÑÐºÑƒ",
+  "keyboard_shortcuts.start": "Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ðº Ñ€Ð°Ð·Ð´ÐµÐ»Ñƒ \"Ð´Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ\"",
   "keyboard_shortcuts.toggle_hidden": "Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ/ÑÐºÑ€Ñ‹Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚ Ð·Ð° Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸ÐµÐ¼",
   "keyboard_shortcuts.toot": "Ð½Ð°Ñ‡Ð°Ñ‚ÑŒ Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð¾ÑÑ‚",
   "keyboard_shortcuts.unfocus": "ÑƒÐ±Ñ€Ð°Ñ‚ÑŒ Ñ„Ð¾ÐºÑƒÑ Ñ Ð¿Ð¾Ð»Ñ Ð²Ð²Ð¾Ð´Ð°/Ð¿Ð¾Ð¸ÑÐºÐ°",
@@ -159,25 +213,27 @@
   "missing_indicator.label": "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾",
   "missing_indicator.sublabel": "Ð—Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°ÐµÐ¼Ñ‹Ð¹ Ñ€ÐµÑÑƒÑ€Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½",
   "mute_modal.hide_notifications": "Ð£Ð±Ñ€Ð°Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ ÑÑ‚Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸",
   "navigation_bar.community_timeline": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°",
+  "navigation_bar.compose": "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ ÑÑ‚Ð°Ñ‚ÑƒÑ",
   "navigation_bar.direct": "Ð›Ð¸Ñ‡Ð½Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ",
-  "navigation_bar.discover": "Discover",
+  "navigation_bar.discover": "Ð˜Ð·ÑƒÑ‡Ð°Ð¹Ñ‚Ðµ",
   "navigation_bar.domain_blocks": "Ð¡ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð´Ð¾Ð¼ÐµÐ½Ñ‹",
   "navigation_bar.edit_profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ",
   "navigation_bar.favourites": "ÐŸÐ¾Ð½Ñ€Ð°Ð²Ð¸Ð²ÑˆÐµÐµÑÑ",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "Ð—Ð°Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ‹Ðµ ÑÐ»Ð¾Ð²Ð°",
   "navigation_bar.follow_requests": "Ð—Ð°Ð¿Ñ€Ð¾ÑÑ‹ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑƒ",
   "navigation_bar.info": "ÐžÐ± ÑƒÐ·Ð»Ðµ",
   "navigation_bar.keyboard_shortcuts": "Ð¡Ð¾Ñ‡ÐµÑ‚Ð°Ð½Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ñˆ",
   "navigation_bar.lists": "Ð¡Ð¿Ð¸ÑÐºÐ¸",
   "navigation_bar.logout": "Ð’Ñ‹Ð¹Ñ‚Ð¸",
   "navigation_bar.mutes": "Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð³Ð»ÑƒÑˆÐµÐ½Ð¸Ñ",
-  "navigation_bar.personal": "Personal",
+  "navigation_bar.personal": "Ð›Ð¸Ñ‡Ð½Ð¾Ðµ",
   "navigation_bar.pins": "Ð—Ð°ÐºÑ€ÐµÐ¿Ð»Ñ‘Ð½Ð½Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹",
   "navigation_bar.preferences": "ÐžÐ¿Ñ†Ð¸Ð¸",
   "navigation_bar.public_timeline": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°",
-  "navigation_bar.security": "Security",
+  "navigation_bar.security": "Ð‘ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚ÑŒ",
   "notification.favourite": "{name} Ð¿Ð¾Ð½Ñ€Ð°Ð²Ð¸Ð»ÑÑ Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ",
   "notification.follow": "{name} Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð»ÑÑ(-Ð»Ð°ÑÑŒ) Ð½Ð° Ð’Ð°Ñ",
   "notification.mention": "{name} ÑƒÐ¿Ð¾Ð¼ÑÐ½ÑƒÐ»(Ð°) Ð’Ð°Ñ",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Ð’Ñ‹ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð²ÑÐµ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ?",
   "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.follow": "ÐÐ¾Ð²Ñ‹Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸:",
   "notifications.column_settings.mention": "Ð£Ð¿Ð¾Ð¼Ð¸Ð½Ð°Ð½Ð¸Ñ:",
   "notifications.column_settings.push": "Push-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ",
-  "notifications.column_settings.push_meta": "ÐÑ‚Ð¾ ÑƒÑÑ‚Ñ€Ð¾Ð¹ÑÑ‚Ð²Ð¾",
   "notifications.column_settings.reblog": "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ:",
   "notifications.column_settings.show": "ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð² ÐºÐ¾Ð»Ð¾Ð½ÐºÐµ",
   "notifications.column_settings.sound": "ÐŸÑ€Ð¾Ð¸Ð³Ñ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð·Ð²ÑƒÐº",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Ð“Ð¾Ñ‚Ð¾Ð²Ð¾",
-  "onboarding.next": "Ð”Ð°Ð»ÐµÐµ",
-  "onboarding.page_five.public_timelines": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹ Ð²ÑÐµÑ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ {domain}. Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð° Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð¿Ð¾ÑÑ‚Ñ‹ Ð²ÑÐµÑ… Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸ {domain}. ÐÑ‚Ð¾ - Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»ÐµÐ½Ñ‚Ñ‹, Ð¾Ñ‚Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ ÑÐ¿Ð¾ÑÐ¾Ð± Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð²Ñ‹Ðµ Ð·Ð½Ð°ÐºÐ¾Ð¼ÑÑ‚Ð²Ð°.",
-  "onboarding.page_four.home": "Ð”Ð¾Ð¼Ð°ÑˆÐ½ÑÑ Ð»ÐµÐ½Ñ‚Ð° Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÑ‚ Ð¿Ð¾ÑÑ‚Ñ‹ Ð¾Ñ‚ Ñ‚ÐµÑ…, Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð’Ñ‹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹.",
-  "onboarding.page_four.notifications": "ÐšÐ¾Ð»Ð¾Ð½ÐºÐ° ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ ÑÐ¾Ð¾Ð±Ñ‰Ð°ÐµÑ‚ Ð¾ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ð¸ Ñ Ð’Ð°Ð¼Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð»ÑŽÐ´ÐµÐ¹.",
-  "onboarding.page_one.federation": "Mastodon - ÑÑ‚Ð¾ ÑÐµÑ‚ÑŒ Ð½ÐµÐ·Ð°Ð²Ð¸ÑÐ¸Ð¼Ñ‹Ñ… ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð²Ð¼ÐµÑÑ‚Ðµ Ð¾Ð±Ñ€Ð°Ð·ÑƒÑŽÑ‚ ÐµÐ´Ð¸Ð½ÑƒÑŽ ÑÐ¾Ñ†Ð¸Ð°Ð»ÑŒÐ½ÑƒÑŽ ÑÐµÑ‚ÑŒ. ÐœÑ‹ Ð½Ð°Ð·Ñ‹Ð²Ð°ÐµÐ¼ ÑÑ‚Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ð° ÑƒÐ·Ð»Ð°Ð¼Ð¸.",
-  "onboarding.page_one.full_handle": "Ð’ÑÑ‘ Ð² Ð²Ð°ÑˆÐ¸Ñ… Ñ€ÑƒÐºÐ°Ñ…",
-  "onboarding.page_one.handle_hint": "ÐÑ‚Ð¾ Ñ‚Ð¾, Ñ‡Ñ‚Ð¾ Ð²Ñ‹ Ð¿Ð¾ÑÐ¾Ð²ÐµÑ‚ÑƒÐµÑ‚Ðµ Ð¸ÑÐºÐ°Ñ‚ÑŒ ÑÐ²Ð¾Ð¸Ð¼ Ð´Ñ€ÑƒÐ·ÑŒÑÐ¼.",
-  "onboarding.page_one.welcome": "Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Mastodon!",
-  "onboarding.page_six.admin": "ÐÐ´Ð¼Ð¸Ð½ Ð’Ð°ÑˆÐµÐ³Ð¾ ÑƒÐ·Ð»Ð° - {admin}.",
-  "onboarding.page_six.almost_done": "ÐŸÐ¾Ñ‡Ñ‚Ð¸ Ð³Ð¾Ñ‚Ð¾Ð²Ð¾...",
-  "onboarding.page_six.appetoot": "Ð£Ð´Ð°Ñ‡Ð¸!",
-  "onboarding.page_six.apps_available": "Ð”Ð»Ñ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ñ Mastodon ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‚ {apps} Ð´Ð»Ñ iOS, Android Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼.",
-  "onboarding.page_six.github": "Mastodon - ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ñ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ Ð¸ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐ¾Ð¾Ð±Ñ‰Ð¸Ñ‚ÑŒ Ð¾ Ð±Ð°Ð³Ðµ, Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ Ð¸Ð´ÐµÑŽ Ð¸Ð»Ð¸ Ð¿Ð¾ÑƒÑ‡Ð°ÑÑ‚Ð²Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐµ Ð½Ð° {github}.",
-  "onboarding.page_six.guidelines": "Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° Ð¿Ð¾Ð²ÐµÐ´ÐµÐ½Ð¸Ñ",
-  "onboarding.page_six.read_guidelines": "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ {guidelines} Ð´Ð»Ñ {domain}!",
-  "onboarding.page_six.various_app": "Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ñ‹Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ",
-  "onboarding.page_three.profile": "ÐžÑ‚Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ ÑÐ²Ð¾Ð¹ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð°Ð²Ð°Ñ‚Ð°Ñ€, ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÑƒÑŽ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾ Ð’Ð°Ñ, Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸.",
-  "onboarding.page_three.search": "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð¿Ð°Ð½ÐµÐ»ÑŒ Ð¿Ð¾Ð¸ÑÐºÐ°, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¸ÑÐºÐ°Ñ‚ÑŒ Ð»ÑŽÐ´ÐµÐ¹ Ð¸ Ñ…ÑÑˆÑ‚ÐµÐ³Ð¸, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, {illustration} Ð¸ {introductions}. Ð§Ñ‚Ð¾Ð±Ñ‹ Ð½Ð°Ð¹Ñ‚Ð¸ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ°, Ð½Ð°Ñ…Ð¾Ð´ÑÑ‰ÐµÐ³Ð¾ÑÑ Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¼ ÑƒÐ·Ð»Ðµ, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐµÐ³Ð¾ Ð¿Ð¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ.",
-  "onboarding.page_two.compose": "ÐŸÐ¸ÑˆÐ¸Ñ‚Ðµ Ð¿Ð¾ÑÑ‚Ñ‹ Ð² ÐºÐ¾Ð»Ð¾Ð½ÐºÐµ Ð°Ð²Ñ‚Ð¾Ñ€Ð°. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°Ñ‚ÑŒ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ, Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚Ð¸ Ð¸ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ðµ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ð¸ÐºÐ¾Ð½Ð¾Ðº Ð²Ð½Ð¸Ð·Ñƒ.",
-  "onboarding.skip": "ÐŸÑ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð».",
   "privacy.change": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑÐ°",
   "privacy.direct.long": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑƒÐ¿Ð¾Ð¼ÑÐ½ÑƒÑ‚Ñ‹Ð¼",
   "privacy.direct.short": "ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹",
@@ -250,29 +292,34 @@
   "search_results.statuses": "ÐŸÐ¾ÑÑ‚Ñ‹",
   "search_results.total": "{count, number} {count, plural, one {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚} few {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°} many {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð²} other {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð²}}",
   "standalone.public_title": "ÐŸÑ€ÑÐ¼Ð¾ ÑÐµÐ¹Ñ‡Ð°Ñ",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ @{name}",
   "status.cancel_reblog_private": "ÐÐµ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð³Ð°Ñ‚ÑŒ",
   "status.cannot_reblog": "ÐÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÑ‚",
   "status.delete": "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ",
+  "status.detailed_status": "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ð¹ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ Ð¾Ð±ÑÑƒÐ¶Ð´ÐµÐ½Ð¸Ñ",
   "status.direct": "ÐÐ°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ @{name}",
   "status.embed": "Ð’ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ",
   "status.favourite": "ÐÑ€Ð°Ð²Ð¸Ñ‚ÑÑ",
-  "status.filtered": "Filtered",
+  "status.filtered": "ÐžÑ‚Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²Ð°Ð½Ð¾",
   "status.load_more": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ ÐµÑ‰Ðµ",
-  "status.media_hidden": "ÐœÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ ÑÐºÑ€Ñ‹Ñ‚",
+  "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": "Read more",
   "status.reblog": "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÑ‚ÑŒ",
   "status.reblog_private": "ÐŸÑ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÑ‚ÑŒ Ð´Ð»Ñ ÑÐ²Ð¾ÐµÐ¹ Ð°ÑƒÐ´Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¸",
   "status.reblogged_by": "{name} Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÐ»(Ð°)",
-  "status.redraft": "Delete & re-draft",
+  "status.reblogs.empty": "ÐÐ¸ÐºÑ‚Ð¾ ÐµÑ‰Ñ‘ Ð½Ðµ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÐ» ÑÑ‚Ð¾Ñ‚ ÑÑ‚Ð°Ñ‚ÑƒÑ. ÐšÐ°Ðº Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÐºÑ‚Ð¾-Ñ‚Ð¾ ÑÑ‚Ð¾ ÑÐ´ÐµÐ»Ð°ÐµÑ‚, Ð¾Ð½Ð¸ Ð¿Ð¾ÑÐ²ÑÑ‚ÑÑ Ð·Ð´ÐµÑÑŒ.",
+  "status.redraft": "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¸ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ",
   "status.reply": "ÐžÑ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ",
-  "status.replyAll": "ÐžÑ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð½Ð° Ñ‚Ñ€ÐµÐ´",
+  "status.replyAll": "ÐžÑ‚Ð²ÐµÑ‚Ð¸Ñ‚ÑŒ Ð²ÑÐµÐ¼",
   "status.report": "ÐŸÐ¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒÑÑ",
   "status.sensitive_toggle": "ÐÐ°Ð¶Ð¼Ð¸Ñ‚Ðµ Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ð°",
   "status.sensitive_warning": "Ð§ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚",
@@ -281,14 +328,17 @@
   "status.show_less_all": "Ð¡Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð´Ð»Ñ Ð²ÑÐµÑ…",
   "status.show_more": "Ð Ð°Ð·Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ",
   "status.show_more_all": "Ð Ð°Ð·Ð²ÐµÑ€Ð½ÑƒÑ‚ÑŒ Ð´Ð»Ñ Ð²ÑÐµÑ…",
+  "status.show_thread": "Show thread",
   "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": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ",
   "tabs_bar.notifications": "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ",
   "tabs_bar.search": "ÐŸÐ¾Ð¸ÑÐº",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "trends.count_by_accounts": "ÐŸÐ¾Ð¿ÑƒÐ»ÑÑ€Ð½Ð¾ Ñƒ {count} {rawCount, plural, one {Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ°} few {Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº} many {Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº} other {Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº}}",
   "ui.beforeunload": "Ð’Ð°Ñˆ Ñ‡ÐµÑ€Ð½Ð¾Ð²Ð¸Ðº Ð±ÑƒÐ´ÐµÑ‚ ÑƒÑ‚ÐµÑ€ÑÐ½, ÐµÑÐ»Ð¸ Ð²Ñ‹ Ð¿Ð¾ÐºÐ¸Ð½ÐµÑ‚Ðµ Mastodon.",
   "upload_area.title": "ÐŸÐµÑ€ÐµÑ‚Ð°Ñ‰Ð¸Ñ‚Ðµ ÑÑŽÐ´Ð°, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ",
   "upload_button.label": "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index 47271f98ff116ce047f4a7a40101ae72ed428219..a3467785a434af2e084ef62365ac6718c23615ca 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Pridaj, alebo odstrÃ¡Åˆ zo zoznamov",
   "account.badges.bot": "Bot",
   "account.block": "Blokuj @{name}",
   "account.block_domain": "Ukry vÅ¡etko z {domain}",
@@ -7,30 +8,36 @@
   "account.disclaimer_full": "InofrmÃ¡cie uvedenÃ© niÅ¾Å¡ie nemusia byÅ¥ ÃºplnÃ½m odrazom uÅ¾ivateÄ¾ovho ÃºÄtu.",
   "account.domain_blocked": "DomÃ©na ukrytÃ¡",
   "account.edit_profile": "UpraviÅ¥ profil",
-  "account.follow": "NÃ¡sledovaÅ¥",
+  "account.endorse": "Zobrazuj na profile",
+  "account.follow": "NÃ¡sleduj",
   "account.followers": "SledujÃºci",
+  "account.followers.empty": "Tohto uÅ¾ÃvateÄ¾a eÅ¡te nikto nenÃ¡sleduje.",
   "account.follows": "NÃ¡sleduje",
+  "account.follows.empty": "Tento uÅ¾ÃvateÄ¾ tu eÅ¡te nikoho nenÃ¡sleduje.",
   "account.follows_you": "NÃ¡sleduje Å¥a",
   "account.hide_reblogs": "SkryÅ¥ povÃ½Å¡enia od @{name}",
+  "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.mute": "IgnorovaÅ¥ @{name}",
   "account.mute_notifications": "StÄºmiÅ¥ oboznÃ¡menia od @{name}",
   "account.muted": "UtÃÅ¡enÃ½/Ã¡",
-  "account.posts": "HlÃ¡Å¡ky",
-  "account.posts_with_replies": "PrÃspevky s odpoveÄami",
+  "account.posts": "PrÃspevky",
+  "account.posts_with_replies": "PrÃspevky aj s odpoveÄami",
   "account.report": "NahlÃ¡s @{name}",
   "account.requested": "ÄŒakÃ¡ na schvÃ¡lenie. Kliknite pre zruÅ¡enie Å¾iadosti",
   "account.share": "ZdieÄ¾aÅ¥ @{name} profil",
-  "account.show_reblogs": "UkÃ¡Å¾ povÃ½Å¡enia od @{name}",
-  "account.unblock": "OdblokovaÅ¥ @{name}",
-  "account.unblock_domain": "PrestaÅ¥ blokovaÅ¥ {domain}",
-  "account.unfollow": "PrestaÅ¥ nasledovaÅ¥",
-  "account.unmute": "PrestaÅ¥ ignorovaÅ¥ @{name}",
-  "account.unmute_notifications": "OdtÄºmiÅ¥ notifikÃ¡cie od @{name}",
+  "account.show_reblogs": "UkÃ¡Å¾ vyzdvihnutia od @{name}",
+  "account.unblock": "Odblokuj @{name}",
+  "account.unblock_domain": "PrestaÅˆ skrÃ½vaÅ¥ {domain}",
+  "account.unendorse": "Nezobrazuj na profile",
+  "account.unfollow": "PrestaÅˆ nÃ¡sledovaÅ¥",
+  "account.unmute": "PrestaÅˆ ignorovaÅ¥ @{name}",
+  "account.unmute_notifications": "OdtÄºm oboznÃ¡menia od @{name}",
   "account.view_full_profile": "Pozri celÃ½ profil",
-  "alert.unexpected.message": "Vyskytla sa neoÄakÃ¡vanÃ¡ chyba.",
+  "alert.unexpected.message": "Vyskytla sa neÄakanÃ¡ chyba.",
   "alert.unexpected.title": "Oops!",
   "boost_modal.combo": "NabudÃºce mÃ´Å¾eÅ¡ kliknÃºÅ¥ {combo} pre preskoÄenie",
   "bundle_column_error.body": "Pri naÄÃtanÃ tohto prvku nastala nejakÃ¡ chyba.",
@@ -63,7 +70,7 @@
   "compose_form.direct_message_warning": "Tento prÃspevok bude videnÃ½ vÃ½hradne iba spomenutÃ½mi uÅ¾ÃvateÄ¾mi. Ber ale na vedomie Å¾e sprÃ¡vci tvojej a vÅ¡etkÃ½ch inÃ½ch zahrnutÃ½ch instanciÃ majÃº moÅ¾nosÅ¥ skontrolovaÅ¥ tÃºto sprÃ¡vu.",
   "compose_form.direct_message_warning_learn_more": "ZistiÅ¥ viac",
   "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": "VÃ¡Å¡ ÃºÄet nie je zamknutÃ½. KtokoÄ¾vek Å¥a mÃ´Å¾e nasledovaÅ¥ a vidieÅ¥ tvoje sprÃ¡vy pre sledujÃºcich.",
+  "compose_form.lock_disclaimer": "VÃ¡Å¡ ÃºÄet nie je {locked}. KtokoÄ¾vek Å¥a mÃ´Å¾e nasledovaÅ¥ a vidieÅ¥ tvoje sprÃ¡vy pre sledujÃºcich.",
   "compose_form.lock_disclaimer.lock": "zamknutÃ½",
   "compose_form.placeholder": "ÄŒo mÃ¡Å¡ na mysli?",
   "compose_form.publish": "PoÅ¡li",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "Ignoruj",
   "confirmations.mute.message": "Naozaj chcete ignorovaÅ¥ {name}?",
   "confirmations.redraft.confirm": "VyÄistiÅ¥ a prepÃsaÅ¥",
-  "confirmations.redraft.message": "Si si istÃ½/Ã¡, Å¾e chceÅ¡ vymazaÅ¥ a prepÃsaÅ¥ tento prÃspevok? StratÃÅ¡ vÅ¡etky jeho nadobudnutÃ© odpovede, povÃ½Å¡enia a obÄ¾Ãºbenia.",
+  "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",
+  "confirmations.reply.message": "OdpovedanÃm akurÃ¡t teraz prepÃÅ¡eÅ¡ sprÃ¡vu, ktorÃº mÃ¡Å¡ prÃ¡ve rozpÃsanÃº. Si si istÃ½/Ã¡, Å¾e chceÅ¡ pokraÄovaÅ¥?",
   "confirmations.unfollow.confirm": "NesledovaÅ¥",
   "confirmations.unfollow.message": "Naozaj chcete prestaÅ¥ sledovaÅ¥ {name}?",
   "embed.instructions": "Umiestni kÃ³d uvedenÃ½ niÅ¾Å¡ie pre pridanie tohto statusu na tvoju web strÃ¡nku.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "NÃ¡jdenÃ©",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestovanie a miesta",
+  "empty_column.account_timeline": "NiesÃº tu Å¾iadne prÃspevky!",
+  "empty_column.blocks": "EÅ¡te si nikoho nezablokoval/a.",
   "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 sÃºkromnÃ© 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.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_requests": "EÅ¡te nemÃ¡Å¡ Å¾iadne poÅ¾iadavky o nÃ¡sledovanie. KeÄ nejakÃ© dostaneÅ¡, budÃº tu zobrazenÃ©.",
   "empty_column.hashtag": "Pod tÃ½mto hashtagom sa eÅ¡te niÄ nenachÃ¡dza.",
   "empty_column.home": "Tvoja lokÃ¡lna osa je zatiaÄ¾ prÃ¡zdna! Pre zaÄiatok navÅ¡tÃv {public}, alebo pouÅ¾i vyhÄ¾adÃ¡vanie a nÃ¡jdi tak aj inÃ½ch uÅ¾ÃvateÄ¾ov.",
   "empty_column.home.public_timeline": "verejnÃ¡ ÄasovÃ¡ os",
   "empty_column.list": "Tento zoznam je eÅ¡te prÃ¡zdny. KeÄ ale Älenovia tohoto zoznamu napÃÅ¡u novÃ© sprÃ¡vy, tak tie sa objavia priamo tu.",
-  "empty_column.notifications": "NemÃ¡Å¡ eÅ¡te Å¾iadne oznÃ¡menia. Zapoj sa s niekym do debaty a komunikuj s ostatnÃ½mi aby diskusia mohla zaÄaÅ¥.",
-  "empty_column.public": "EÅ¡te tu niÄ nie je. NapÃÅ¡ nieÄo verejne alebo zaÄnite sledovaÅ¥ uÅ¾ÃvateÄ¾ov z inÃ½ch Mastodon serverov, aby tu tak nieÄo pribudlo",
+  "empty_column.lists": "NemÃ¡Å¡ eÅ¡te Å¾iadne zoznamy. KeÄ nejakÃ½ vytvorÃÅ¡, bude zobrazenÃ½ prÃ¡ve tu.",
+  "empty_column.mutes": "EÅ¡te si nestÄºmil Å¾iadnÃ½ch uÅ¾ÃvateÄ¾ov.",
+  "empty_column.notifications": "EÅ¡te nemÃ¡Å¡ Å¾iadne oznÃ¡menia. ZaÄni komunikovaÅ¥ s ostatnÃ½mi, aby diskusia mohla zaÄaÅ¥.",
+  "empty_column.public": "EÅ¡te tu niÄ nie je. NapÃÅ¡ nieÄo verejne, alebo zaÄni sledovaÅ¥ uÅ¾ÃvateÄ¾ov z inÃ½ch Mastodon serverov, aby tu nieÄo pribudlo",
   "follow_request.authorize": "PovoÄ¾ prÃstup",
   "follow_request.reject": "Odmietni",
   "getting_started.developers": "VÃ½vojÃ¡ri",
+  "getting_started.directory": "DatabÃ¡za profilov",
   "getting_started.documentation": "DokumentÃ¡cia",
-  "getting_started.find_friends": "NÃ¡jdi priateÄ¾ov z Twitteru",
   "getting_started.heading": "ZaÄni tu",
   "getting_started.invite": "PozvaÅ¥ Ä¾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}",
+  "hashtag.column_settings.tag_mode.all": "VÅ¡etky tieto",
+  "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": "Include additional tags in this column",
   "home.column_settings.basic": "ZÃ¡kladnÃ©",
   "home.column_settings.show_reblogs": "ZobraziÅ¥ povÃ½Å¡enÃ©",
   "home.column_settings.show_replies": "UkÃ¡zaÅ¥ odpovede",
+  "introduction.federation.action": "ÄŽalej",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "VerejnÃ© prÃspevky z ostatnÃ½ch serverov vo fediverse budÃº zobrazenie vo federovanej Äasovej osi.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "PrÃspevky od Ä¾udÃ ktorÃ½ch nÃ¡sledujeÅ¡ sa zobrazia na tvojej domovskej nÃ¡stenke. MÃ´Å¾eÅ¡ nÃ¡sledovaÅ¥ hocikoho na ktoromkoÄ¾vek serveri!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "VerejnÃ© prÃspevky od Ä¾udÃ v rÃ¡mci toho istÃ©ho serveru na akom si aj ty, budÃº zobrazovanÃ© na miestnej Äasovej osi.",
+  "introduction.interactions.action": "UkonÄi nÃ¡vod!",
+  "introduction.interactions.favourite.headline": "ObÄ¾ÃºbenÃ©",
+  "introduction.interactions.favourite.text": "ObÄ¾ÃºbenÃm si mÃ´Å¾eÅ¡ prÃspevok uloÅ¾iÅ¥ na neskÃ´r, a zÃ¡roveÅˆ daÅ¥ jeho autorovi vedieÅ¥, Å¾e sa ti pÃ¡Äil.",
+  "introduction.interactions.reblog.headline": "PovÃ½Å¡",
+  "introduction.interactions.reblog.text": "MÃ´Å¾eÅ¡ zdieÄ¾aÅ¥ prÃspevky inÃ½ch Ä¾udÃ s vaÅ¡imi nÃ¡sledovateÄ¾mi tÃ½m, Å¾e ich povÃ½Å¡iÅ¡.",
+  "introduction.interactions.reply.headline": "Odpovedz",
+  "introduction.interactions.reply.text": "OdpovedaÅ¥ mÃ´Å¾eÅ¡ na prÃspevky inÃ½ch Ä¾udÃ, aj na svoje vlastnÃ©, ÄÃm sa sspolu prepoja do konverzÃ¡cie.",
+  "introduction.welcome.action": "PoÄme do toho!",
+  "introduction.welcome.headline": "PrvÃ© kroky",
+  "introduction.welcome.text": "Vitaj vo fediverse! Za malÃº chvÃÄ¾u budeÅ¡ mÃ´cÅ¥ posielaÅ¥ sprÃ¡vy a rozpovedaÅ¥ sa so svojÃmi priateÄ¾mi cez Å¡irokÃº Å¡kÃ¡lu rÃ´znorodÃ½ch serverov. Ale tento server, {domain}, je Å¡peciÃ¡lny v tom, Å¾e ukladÃ¡ tvoj profil, takÅ¾e si jeho nÃ¡zov zapametaj.",
   "keyboard_shortcuts.back": "dostaÅ¥ sa naspÃ¤Å¥",
+  "keyboard_shortcuts.blocked": "otvor zoznam blokovanÃ½ch uÅ¾ÃvateÄ¾ov",
   "keyboard_shortcuts.boost": "vyzdvihnÃºÅ¥",
   "keyboard_shortcuts.column": "zameraÅ¥ sa na status v jednom zo stÄºpcov",
   "keyboard_shortcuts.compose": "zameraÅ¥ sa na pÃsaciu plochu",
   "keyboard_shortcuts.description": "Popis",
+  "keyboard_shortcuts.direct": "otvor panel sÃºkromnÃ½ch sprÃ¡v",
   "keyboard_shortcuts.down": "posunÃºÅ¥ sa dole v zozname",
   "keyboard_shortcuts.enter": "otvoriÅ¥ sprÃ¡vu",
   "keyboard_shortcuts.favourite": "pridaÅ¥ do obÄ¾ÃºbenÃ½ch",
+  "keyboard_shortcuts.favourites": "otvor zoznam obÄ¾ÃºbenÃ½ch",
+  "keyboard_shortcuts.federated": "otvor federovanÃº ÄasovÃº os",
   "keyboard_shortcuts.heading": "KlÃ¡vesovÃ© skratky",
+  "keyboard_shortcuts.home": "otvor domÃ¡cu ÄasovÃº os",
   "keyboard_shortcuts.hotkey": "KlÃ¡vesa",
   "keyboard_shortcuts.legend": "zobraziÅ¥ tÃºto legendu",
+  "keyboard_shortcuts.local": "otvor miestnu ÄasovÃº os",
   "keyboard_shortcuts.mention": "spomenÃºÅ¥ autora",
+  "keyboard_shortcuts.muted": "otvor zoznam stÃÅ¡enÃ½ch uÅ¾ÃvateÄ¾ov",
+  "keyboard_shortcuts.my_profile": "otvor svoj profil",
+  "keyboard_shortcuts.notifications": "otvor panel oboznÃ¡menÃ",
+  "keyboard_shortcuts.pinned": "otvor zoznam pripnutÃ½ch prÃspevkov",
+  "keyboard_shortcuts.profile": "otvor autorov profil",
   "keyboard_shortcuts.reply": "odpovedaÅ¥",
+  "keyboard_shortcuts.requests": "otvor zoznam poÅ¾iadavok k nÃ¡sledovaniu",
   "keyboard_shortcuts.search": "zameraÅ¥ sa na vyhÄ¾adÃ¡vanie",
+  "keyboard_shortcuts.start": "otvor panel ''zaÄÃname''",
   "keyboard_shortcuts.toggle_hidden": "ukÃ¡Å¾/skry text za CW",
   "keyboard_shortcuts.toot": "zaÄaÅ¥ Ãºplne novÃº hlÃ¡Å¡ku",
   "keyboard_shortcuts.unfocus": "nesÃºstrediÅ¥ sa na pÃsaciu plochu, alebo hÄ¾adanie",
@@ -149,24 +203,26 @@
   "lists.account.add": "PridaÅ¥ do zoznamu",
   "lists.account.remove": "OdobraÅ¥ zo zoznamu",
   "lists.delete": "VymazaÅ¥ list",
-  "lists.edit": "UpraviÅ¥ zoznam",
-  "lists.new.create": "PridaÅ¥ zoznam",
+  "lists.edit": "Uprav zoznam",
+  "lists.new.create": "Pridaj zoznam",
   "lists.new.title_placeholder": "NÃ¡zov novÃ©ho zoznamu",
   "lists.search": "VyhÄ¾adÃ¡vajte medzi uÅ¾ÃvateÄ¾mi ktorÃ½ch sledujete",
   "lists.subheading": "Tvoje zoznamy",
   "loading_indicator.label": "NaÄÃtam...",
   "media_gallery.toggle_visible": "ZapnÃºÅ¥/VypnÃºÅ¥ viditeÄ¾nosÅ¥",
   "missing_indicator.label": "NenÃ¡jdenÃ©",
-  "missing_indicator.sublabel": "Tento zdroj sa nepodarilo nÃ¡jsÅ¥",
-  "mute_modal.hide_notifications": "SkryÅ¥ notifikÃ¡cie od tohoto uÅ¾ÃvateÄ¾a?",
+  "missing_indicator.sublabel": "Tento zdroj sa eÅ¡te nepodarilo nÃ¡jsÅ¥",
+  "mute_modal.hide_notifications": "SkryÅ¥ oboznÃ¡menia od tohoto uÅ¾ÃvateÄ¾a?",
+  "navigation_bar.apps": "MobilnÃ© aplikÃ¡cie",
   "navigation_bar.blocks": "BlokovanÃ uÅ¾Ãvatelia",
   "navigation_bar.community_timeline": "LokÃ¡lna ÄasovÃ¡ os",
+  "navigation_bar.compose": "NapÃÅ¡ novÃ½ prÃspevok",
   "navigation_bar.direct": "SÃºkromnÃ© sprÃ¡vy",
   "navigation_bar.discover": "Objavuj",
   "navigation_bar.domain_blocks": "SkrytÃ© domÃ©ny",
-  "navigation_bar.edit_profile": "UpraviÅ¥ profil",
+  "navigation_bar.edit_profile": "Uprav profil",
   "navigation_bar.favourites": "ObÄ¾ÃºbenÃ©",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "UtÄºmenÃ© slovÃ¡",
   "navigation_bar.follow_requests": "Å½iadosti o sledovanie",
   "navigation_bar.info": "O tomto Mastodon serveri",
   "navigation_bar.keyboard_shortcuts": "KlÃ¡vesovÃ© skratky",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Naozaj chcete nenÃ¡vratne preÄistiÅ¥ vÅ¡etky vaÅ¡e notifikÃ¡cie?",
   "notifications.column_settings.alert": "NotifikÃ¡cie 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.follow": "NovÃ nÃ¡sledujÃºci:",
   "notifications.column_settings.mention": "Zmienenia:",
   "notifications.column_settings.push": "Push notifikÃ¡cie",
-  "notifications.column_settings.push_meta": "Toto zariadenie",
   "notifications.column_settings.reblog": "Boosty:",
   "notifications.column_settings.show": "ZobraziÅ¥ v stÄºpci",
   "notifications.column_settings.sound": "PrehraÅ¥ zvuk",
+  "notifications.filter.all": "VÅ¡etky",
+  "notifications.filter.boosts": "Vyzdvihnutia",
+  "notifications.filter.favourites": "ObÄ¾ÃºbenÃ©",
+  "notifications.filter.follows": "Sledovania",
+  "notifications.filter.mentions": "Spomenutia",
   "notifications.group": "{count} oznÃ¡menia",
-  "onboarding.done": "Koniec",
-  "onboarding.next": "ÄŽalej",
-  "onboarding.page_five.public_timelines": "LokÃ¡lna ÄasovÃ¡ os zobrazuje verejnÃ© sprÃ¡vy od vÅ¡etkÃ½ch na {domain}. FederovanÃ¡ ÄasovÃ¡ os zobrazuje verejnÃ© sprÃ¡vy od vÅ¡etkÃ½ch tÃ½ch, Äo nÃ¡sledujÃº uÅ¾ÃvatrÄ¾ov {domain} z inÃ½ch serverov. Tieto sÃº takzvanÃ© VerejnÃ© ÄŒasovÃ© Osi, vÃ½bornÃ¡ moÅ¾nosÅ¥ ako nÃ¡jsÅ¥ a spoznaÅ¥ novÃ½ch Ä¾udÃ.",
-  "onboarding.page_four.home": "DomovskÃ¡ ÄasovÃ¡ os zobrazÃ sprÃ¡vy od Ä¾udÃ ktorÃ½ch sledujete.",
-  "onboarding.page_four.notifications": "StÄºpec s notifikÃ¡ciami zobrazÃ keÄ budete s niekÃ½m komunikovaÅ¥.",
-  "onboarding.page_one.federation": "Mastodon je sieÅ¥ nezÃ¡vislÃ½ch serverov, spojenÃm ktorÃ½ch vznikÃ¡ jedna veÄ¾kÃ¡ federovanÃ¡ sociÃ¡lna sieÅ¥.",
-  "onboarding.page_one.full_handle": "VaÅ¡a celÃ¡ prezÃ½vka aj s adresou",
-  "onboarding.page_one.handle_hint": "Toto je Äo by si povedal/a vaÅ¡Ãm kamarÃ¡tom, Å¾e majÃº hÄ¾adaÅ¥.",
-  "onboarding.page_one.welcome": "Vitaj na Mastodone!",
-  "onboarding.page_six.admin": "SprÃ¡vcom tvojej instancie je {admin}.",
-  "onboarding.page_six.almost_done": "Takmer hotovo...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "AplikÃ¡cie {apps} sÃº dostupnÃ© na pre iOS, Android and ÄalÅ¡ie platformy.",
-  "onboarding.page_six.github": "Mastodon je free open-source software. NahlÃ¡siÅ¥ chyby, zaujÃmaÅ¥ sa o novÃ© funkcie, alebo prispievaÅ¥ svojÃm kÃ³dom mÇ’Å¾eete na {github}.",
-  "onboarding.page_six.guidelines": "pravidlÃ¡ komunity",
-  "onboarding.page_six.read_guidelines": "ProsÃm preÄÃtajte si {domain} pravidlÃ¡ {guidelines}!",
-  "onboarding.page_six.various_app": "mobilnÃ© applikÃ¡cie",
-  "onboarding.page_three.profile": "Upravte svoj profil ak chcete zmeÅˆiÅ¥ svoj avatar, popis profilu a meno ktorÃ© bude zobrazenÃ©. V nastaveniach nÃ¡jdete ÄalÅ¡ie moÅ¾nosti.",
-  "onboarding.page_three.search": "PouÅ¾ite vyhÄ¾adÃ¡vacie polÃÄko na nÃ¡jdenie Ä¾udÃ a hashtagov, ako naprÃklad {slovensko}, {slovakia} alebo {pivo}. Na nÃ¡jdenie Äloveka ktorÃ½ je registrovanÃ½ na inom Mastodon serveri pouÅ¾i jeho celÃ½ nickname.",
-  "onboarding.page_two.compose": "SprÃ¡vy pÃÅ¡te zo stÄºpca na komponovanie. Je moÅ¾nÃ© nahrÃ¡vaÅ¥ obrÃ¡zky, meniÅ¥ nastavenia sÃºkromia sprÃ¡v a pridÃ¡vaÅ¥ varovania ikonkami niÅ¾Å¡ie.",
-  "onboarding.skip": "PreskoÄiÅ¥",
   "privacy.change": "ZmeÅˆiÅ¥ viditeÄ¾nosÅ¥ statusu",
   "privacy.direct.long": "PoslaÅ¥ priamo iba spomenutÃ½m pouÅ¾ÃvateÄ¾om",
   "privacy.direct.short": "SÃºkromne",
@@ -248,16 +290,19 @@
   "search_results.accounts": "Ä½udia",
   "search_results.hashtags": "HaÅ¡tagy",
   "search_results.statuses": "PrÃspevky",
-  "search_results.total": "{count, number} {count, plural, jeden {vÃ½sledok} ostatnÃ© {vÃ½sledky}}",
+  "search_results.total": "{count, number} {count, plural, one {vÃ½sledok} many {vÃ½sledkov} other {vÃ½sledky}}",
   "standalone.public_title": "NÃ¡hÄ¾ad dovnÃºtra...",
+  "status.admin_account": "Otvor moderovacie rozhranie uÅ¾ÃvateÄ¾a @{name}",
+  "status.admin_status": "Otvor tento prÃspevok v moderovacom rozhranÃ",
   "status.block": "BlokovaÅ¥ @{name}",
   "status.cancel_reblog_private": "NezdieÄ¾aj",
   "status.cannot_reblog": "Tento prÃspevok nemÃ´Å¾e byÅ¥ re-tootnutÃ½",
   "status.delete": "ZmazaÅ¥",
+  "status.detailed_status": "PodrobnÃ½ nÃ¡hÄ¾ad celej konverzÃ¡cie",
   "status.direct": "SÃºkromnÃ¡ sprÃ¡va @{name}",
   "status.embed": "VloÅ¾iÅ¥",
   "status.favourite": "PÃ¡Äi sa mi",
-  "status.filtered": "Filtered",
+  "status.filtered": "FiltrovanÃ©",
   "status.load_more": "UkÃ¡Å¾ viac",
   "status.media_hidden": "SkrytÃ© mÃ©diÃ¡",
   "status.mention": "SpomeÅˆ @{name}",
@@ -267,33 +312,38 @@
   "status.open": "OtvoriÅ¥ tento status",
   "status.pin": "Pripni na profil",
   "status.pinned": "PripnutÃ½ prÃspevok",
+  "status.read_more": "ÄŒÃtaj Äalej",
   "status.reblog": "PovÃ½Å¡iÅ¥",
   "status.reblog_private": "PovÃ½Å¡ k pÃ´vodnÃ©mu publiku",
   "status.reblogged_by": "{name} povÃ½Å¡il/a",
+  "status.reblogs.empty": "Nikto eÅ¡te nepovÃ½Å¡il tento prÃspevok. KeÄ tak niekto urobÃ, bude to zobrazenÃ© prÃ¡ve tu.",
   "status.redraft": "VymaÅ¾ a prepÃÅ¡",
   "status.reply": "OdpovedaÅ¥",
   "status.replyAll": "OdpovedaÅ¥ na diskusiu",
   "status.report": "NahlÃ¡siÅ¥ @{name}",
-  "status.sensitive_toggle": "Kliknite pre zobrazenie",
+  "status.sensitive_toggle": "Klikni pre zobrazenie",
   "status.sensitive_warning": "ChÃºlostivÃ½ obsah",
   "status.share": "ZdieÄ¾aÅ¥",
   "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.unmute_conversation": "PrestaÅ¥ ignorovaÅ¥ konverzÃ¡ciu",
-  "status.unpin": "OdopnÃºÅ¥ z profilu",
+  "status.show_thread": "UkÃ¡Å¾ diskusnÃ© vlÃ¡kno",
+  "status.unmute_conversation": "PrestaÅˆ ignorovaÅ¥ konverzÃ¡ciu",
+  "status.unpin": "Odopni z profilu",
+  "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": "LokÃ¡lna",
   "tabs_bar.notifications": "NotifikÃ¡cie",
   "tabs_bar.search": "HÄ¾adaj",
-  "trends.count_by_accounts": "{count} {rawCount, viacerÃ, jeden {person} inÃ {people}} diskutujÃº",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {Älovek vravÃ} other {Ä¾udia vravia}}",
   "ui.beforeunload": "ÄŒo mÃ¡Å¡ rozpÃsanÃ© sa stratÃ, ak opustÃÅ¡ Mastodon.",
   "upload_area.title": "Pretiahni a pusÅ¥ pre nahratie",
-  "upload_button.label": "PridaÅ¥ mÃ©diÃ¡",
+  "upload_button.label": "PridaÅ¥ mÃ©diÃ¡lny sÃºbor (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "Opis pre slabo vidiacich",
-  "upload_form.focus": "Vystrihni",
+  "upload_form.focus": "PozmeÅˆ nÃ¡hÄ¾ad",
   "upload_form.undo": "VymaÅ¾",
   "upload_progress.label": "NahrÃ¡va sa...",
   "video.close": "ZavrieÅ¥ video",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 73f31e8cf8c58e82b36bee596a7043acfb7e7130..cabad737d65871292ed0e92032a208c08f6377d6 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Robot",
   "account.block": "Blokiraj @{name}",
   "account.block_domain": "Skrij vse iz {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Spodnje informacije lahko nepopolno prikazujejo profil uporabnika.",
   "account.domain_blocked": "Skrita domena",
   "account.edit_profile": "Uredi profil",
+  "account.endorse": "ZmoÅ¾nost profila",
   "account.follow": "Sledi",
   "account.followers": "Sledilci",
+  "account.followers.empty": "NihÄe ne sledi temu uporabniku.",
   "account.follows": "Sledi",
+  "account.follows.empty": "Ta uporabnik Å¡e ne sledi nikomur.",
   "account.follows_you": "Ti sledi",
-  "account.hide_reblogs": "Skrij napuhke od @{name}",
+  "account.hide_reblogs": "Skrij sunke od @{name}",
+  "account.link_verified_on": "LastniÅ¡tvo te povezave je bilo preverjeno {date}",
+  "account.locked_info": "This account privacy status is set to locked. The owner manually reviews who can follow them.",
   "account.media": "Mediji",
   "account.mention": "Omeni @{name}",
   "account.moved_to": "{name} se je premaknil na:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "PokaÅ¾i delitve osebe @{name}",
   "account.unblock": "Odblokiraj @{name}",
   "account.unblock_domain": "Razkrij {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Prenehaj slediti",
   "account.unmute": "OdtiÅ¡aj @{name}",
   "account.unmute_notifications": "Vklopi obvestila od @{name}",
@@ -59,9 +66,9 @@
   "column_header.show_settings": "PrikaÅ¾i nastavitve",
   "column_header.unpin": "Odpni",
   "column_subheading.settings": "Nastavitve",
-  "community.column_settings.media_only": "Media Only",
+  "community.column_settings.media_only": "Samo mediji",
   "compose_form.direct_message_warning": "Ta tut bo viden le vsem omenjenim uporabnikom.",
-  "compose_form.direct_message_warning_learn_more": "Learn more",
+  "compose_form.direct_message_warning_learn_more": "NauÄi se veÄ",
   "compose_form.hashtag_warning": "Ta tut ne bo naveden pod nobenim hashtagom, ker ni dodan hashtag. Samo javne tute lahko iÅ¡Äete pod hashtagom.",
   "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",
@@ -84,8 +91,10 @@
   "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.",
   "confirmations.mute.confirm": "UtiÅ¡anje",
   "confirmations.mute.message": "Ali ste prepriÄani, da Å¾elite utiÅ¡ati {name}?",
-  "confirmations.redraft.confirm": "Delete & redraft",
+  "confirmations.redraft.confirm": "IzbriÅ¡i in preoblikuj",
   "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": "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}?",
   "embed.instructions": "Vstavi ta status na svojo spletno stran tako, da kopirate spodnjo kodo.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Rezultati iskanja",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Potovanja in Kraji",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "Niste Å¡e blokirali nobenega uporabnika.",
   "empty_column.community": "Lokalna Äasovnica je prazna. NapiÅ¡ite nekaj javnega, da se bo Å¾oga zakotalila!",
   "empty_column.direct": "Nimate Å¡e nobenih neposrednih sporoÄil. Ko ga poÅ¡ljete ali prejmete, se prikaÅ¾e tukaj.",
+  "empty_column.domain_blocks": "Å e vedno ni skritih domen.",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "V tem hashtagu Å¡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.public_timeline": "javna Äasovnica",
   "empty_column.list": "Na tem seznamu ni niÄesar. Ko bodo Älani tega seznama objavili nove statuse, se bodo pojavili tukaj.",
+  "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": "Nimate Å¡e nobenih obvestil. PoveÅ¾i 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 vozliÅ¡Ä",
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Zavrni",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "Prvi koraki",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon je odprtokodna programska oprema. V GitHubu na {github} lahko prispevate ali poroÄate o napakah.",
   "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.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",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "PokaÅ¾i sunke",
   "home.column_settings.show_replies": "PokaÅ¾i odgovore",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "za krmarjenje nazaj",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "suniti",
   "keyboard_shortcuts.column": "osredotoÄiti status v enega od stolpcev",
   "keyboard_shortcuts.compose": "osredotoÄiti na sestavljanje besedila",
   "keyboard_shortcuts.description": "Opis",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "premakniti navzdol po seznamu",
   "keyboard_shortcuts.enter": "odpreti status",
   "keyboard_shortcuts.favourite": "to favourite",
+  "keyboard_shortcuts.favourites": "to open favourites list",
+  "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "Tipkovne bliÅ¾njice",
+  "keyboard_shortcuts.home": "to open home timeline",
   "keyboard_shortcuts.hotkey": "Hitra tipka",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "da zaÄnete povsem nov tut",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "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",
@@ -186,35 +242,21 @@
   "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.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetut!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
   "privacy.direct.short": "Direct",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Tuti",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
@@ -267,9 +312,11 @@
   "status.open": "Expand this status",
   "status.pin": "Pin on profile",
   "status.pinned": "Pripeti tut",
+  "status.read_more": "Read more",
   "status.reblog": "Suni",
   "status.reblog_private": "Suni v prvotno obÄinstvo",
   "status.reblogged_by": "{name} sunjen",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.reply": "Odgovori",
   "status.replyAll": "Odgovori na objavo",
@@ -281,8 +328,11 @@
   "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": "Show thread",
   "status.unmute_conversation": "OdtiÅ¡aj pogovor",
   "status.unpin": "Odpni iz profila",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "ZdruÅ¾eno",
   "tabs_bar.home": "Domov",
   "tabs_bar.local_timeline": "Lokalno",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index e3bf2189b448950899656cf2c7b5d3d3a479a484..c8513dbe1809c75cbb002d186e6500051fd27bf1 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Blokiraj korisnika @{name}",
   "account.block_domain": "Sakrij sve sa domena {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Navedene informacije moÅ¾da ne odslikavaju korisniÄki profil u potpunosti.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Izmeni profil",
+  "account.endorse": "Feature on profile",
   "account.follow": "Zaprati",
   "account.followers": "Pratioca",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Prati",
+  "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.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.mention": "Pomeni korisnika @{name}",
   "account.moved_to": "{name} se pomerio na:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "PrikaÅ¾i podrÅ¡ke od korisnika @{name}",
   "account.unblock": "Odblokiraj korisnika @{name}",
   "account.unblock_domain": "Odblokiraj domen {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Otprati",
   "account.unmute": "Ukloni uÄ‡utkavanje korisniku @{name}",
   "account.unmute_notifications": "UkljuÄi nazad obaveÅ¡tenja od korisnika @{name}",
@@ -86,6 +93,8 @@
   "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.unfollow.confirm": "Otprati",
   "confirmations.unfollow.message": "Da li ste sigurni da Å¾elite da otpratite korisnika {name}?",
   "embed.instructions": "Ugradi ovaj status na VaÅ¡ veb sajt kopiranjem koda ispod.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Rezultati pretrage",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Putovanja & mesta",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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_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.public_timeline": "javna lajna",
   "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",
   "follow_request.authorize": "Odobri",
   "follow_request.reject": "Odbij",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "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.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",
   "home.column_settings.basic": "Osnovno",
   "home.column_settings.show_reblogs": "PrikaÅ¾i i podrÅ¾avanja",
   "home.column_settings.show_replies": "PrikaÅ¾i odgovore",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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",
   "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.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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "da zapoÄnete skroz novi tut",
   "keyboard_shortcuts.unfocus": "da ne budete viÅ¡e na pretrazi/pravljenju novog tuta",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Nije pronaÄ‘eno",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Sakrij obaveÅ¡tenja od ovog korisnika?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blokirani korisnici",
   "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",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Da li ste sigurno da trajno Å¾elite da oÄistite VaÅ¡a obaveÅ¡tenja?",
   "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.follow": "Novi pratioci:",
   "notifications.column_settings.mention": "Pominjanja:",
   "notifications.column_settings.push": "Guraj obaveÅ¡tenja",
-  "notifications.column_settings.push_meta": "Ovaj ureÄ‘aj",
   "notifications.column_settings.reblog": "PodrÅ¡ki:",
   "notifications.column_settings.show": "PrikaÅ¾i u koloni",
   "notifications.column_settings.sound": "PuÅ¡taj zvuk",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Gotovo",
-  "onboarding.next": "SledeÄ‡e",
-  "onboarding.page_five.public_timelines": "Lokalna lajna prikazuje sve javne statuse od svih na domenu {domain}. Federisana lajna prikazuje javne statuse od svih ljudi koje prate korisnici sa domena {domain}. Ovo su javne lajne, sjajan naÄin da otkrijete nove ljude.",
-  "onboarding.page_four.home": "PoÄetna lajna prikazuje statuse ljudi koje Vi pratite.",
-  "onboarding.page_four.notifications": "Kolona sa obaveÅ¡tenjima Vam prikazuje kada neko priÄa sa Vama.",
-  "onboarding.page_one.federation": "Mastodont je mreÅ¾a nezavisnih servera koji se uvezuju da naprave jednu veÄ‡u druÅ¡tvenu mreÅ¾u. Ove servere zovemo instancama.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "DobrodoÅ¡li na Mastodont!",
-  "onboarding.page_six.admin": "Administrator VaÅ¡e instance je {admin}.",
-  "onboarding.page_six.almost_done": "JoÅ¡ malo, pa gotovo...",
-  "onboarding.page_six.appetoot": "Prijatutno!",
-  "onboarding.page_six.apps_available": "Postoje {apps} dostupne za iOS, Android i druge platforme.",
-  "onboarding.page_six.github": "Mastodont je slobodan softver otvorenog koda. MoÅ¾ete prijavljivati greÅ¡ke, potraÅ¾ivati nove funckionalnosti, ili uÄestvujuÄ‡i u programiranju. NaÅ¡ izvorni kod je ovde: {github}.",
-  "onboarding.page_six.guidelines": "smernice zajednice",
-  "onboarding.page_six.read_guidelines": "ProÄitejte {guidelines} domena {domain}!",
-  "onboarding.page_six.various_app": "mobilne aplikacije",
-  "onboarding.page_three.profile": "Izmenite profil da promenite avatar, biografiju i ime za prikaz. Tamo Ä‡ete naÄ‡i i ostala podeÅ¡avanja.",
-  "onboarding.page_three.search": "Korisite pretragu da naÄ‘ete ljude i gledate heÅ¡tegove, kao Å¡to su {illustration} i {introductions}. Da naÄ‘ete osobu koja nije na ovoj instanci, koristite njenu punu identifikaciju.",
-  "onboarding.page_two.compose": "PiÅ¡ite statuse iz prve kolone. MoÅ¾ete otpremati slike, menjati podeÅ¡avanja privatnosti, i dodavati upozorenja za osetljiv sadrÅ¾aj preko ikonica ispod.",
-  "onboarding.skip": "PreskoÄi",
   "privacy.change": "Podesi status privatnosti",
   "privacy.direct.long": "Objavi samo korisnicima koji su pomenuti",
   "privacy.direct.short": "Direktno",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {rezultat} few {rezultata} other {rezultata}}",
   "standalone.public_title": "Pogled iznutra...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Ovaj status ne moÅ¾e da se podrÅ¾i",
   "status.delete": "ObriÅ¡i",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Ugradi na sajt",
   "status.favourite": "Omiljeno",
@@ -267,9 +312,11 @@
   "status.open": "ProÅ¡iri ovaj status",
   "status.pin": "PrikaÄi na profil",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "PodrÅ¾i",
   "status.reblog_private": "Boost to original audience",
   "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.reply": "Odgovori",
   "status.replyAll": "Odgovori na diskusiju",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "PrikaÅ¾i viÅ¡e",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "status.unmute_conversation": "UkljuÄi prepisku",
   "status.unpin": "OtkaÄi sa profila",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "Federisano",
   "tabs_bar.home": "PoÄetna",
   "tabs_bar.local_timeline": "Lokalno",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index ba84a4d24e73685caaa25cd6818f52a989771f87..6e0ac6eca7c3f1b9d398feff379d20fc3d9cd185 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -1,37 +1,44 @@
 {
-  "account.badges.bot": "Bot",
-  "account.block": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Ð‘Ð¾Ñ‚",
+  "account.block": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ @{name}",
   "account.block_domain": "Ð¡Ð°ÐºÑ€Ð¸Ñ˜ ÑÐ²Ðµ ÑÐ° Ð´Ð¾Ð¼ÐµÐ½Ð° {domain}",
-  "account.blocked": "Blocked",
-  "account.direct": "Direct Message @{name}",
+  "account.blocked": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½",
+  "account.direct": "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð½Ð° Ð¿Ð¾Ñ€ÑƒÐºÐ° @{name}",
   "account.disclaimer_full": "ÐÐ°Ð²ÐµÐ´ÐµÐ½Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð¾Ð´ÑÐ»Ð¸ÐºÐ°Ð²Ð°Ñ˜Ñƒ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» Ñƒ Ð¿Ð¾Ñ‚Ð¿ÑƒÐ½Ð¾ÑÑ‚Ð¸.",
-  "account.domain_blocked": "Domain hidden",
+  "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ ÑÐ°ÐºÑ€Ð¸Ð²ÐµÐ½",
   "account.edit_profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»",
+  "account.endorse": "ÐŸÑ€Ð¸ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ",
   "account.follow": "Ð—Ð°Ð¿Ñ€Ð°Ñ‚Ð¸",
-  "account.followers": "ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð°",
+  "account.followers": "ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸",
+  "account.followers.empty": "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸ Ð¾Ð²Ð¾Ð³ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°.",
   "account.follows": "ÐŸÑ€Ð°Ñ‚Ð¸",
+  "account.follows.empty": "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸ Ð½Ð¸ÐºÐ¾Ð³Ð°.",
   "account.follows_you": "ÐŸÑ€Ð°Ñ‚Ð¸ Ð’Ð°Ñ",
   "account.hide_reblogs": "Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ð¿Ð¾Ð´Ñ€ÑˆÐºÐµ ÐºÐ¾Ñ˜Ðµ Ð´Ð°Ñ˜Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
+  "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.mute": "Ð£Ñ›ÑƒÑ‚ÐºÐ°Ñ˜ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
   "account.mute_notifications": "Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
-  "account.muted": "Muted",
-  "account.posts": "Ð¡Ñ‚Ð°Ñ‚ÑƒÑÐ°",
-  "account.posts_with_replies": "Toots with replies",
+  "account.muted": "Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð½",
+  "account.posts": "Ð¢Ñ€ÑƒÐ±Ðµ",
+  "account.posts_with_replies": "Ð¢Ñ€ÑƒÐ±Ðµ Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ð¸",
   "account.report": "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸ @{name}",
   "account.requested": "Ð§ÐµÐºÐ°Ð¼ Ð¾Ð´Ð¾Ð±Ñ€ÐµÑšÐµ. ÐšÐ»Ð¸ÐºÐ½Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ð¾Ð½Ð¸ÑˆÑ‚Ð¸Ñ‚Ðµ Ð·Ð°Ñ…Ñ‚ÐµÐ² Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµ",
   "account.share": "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
   "account.show_reblogs": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ð´Ñ€ÑˆÐºÐµ Ð¾Ð´ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
   "account.unblock": "ÐžÐ´Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
   "account.unblock_domain": "ÐžÐ´Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð´Ð¾Ð¼ÐµÐ½ {domain}",
+  "account.unendorse": "ÐÐµ Ð¸ÑÑ‚Ð¸Ñ‡Ð¸ Ð½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ",
   "account.unfollow": "ÐžÑ‚Ð¿Ñ€Ð°Ñ‚Ð¸",
   "account.unmute": "Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑƒÑ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÑƒ @{name}",
   "account.unmute_notifications": "Ð£ÐºÑ™ÑƒÑ‡Ð¸ Ð½Ð°Ð·Ð°Ð´ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
   "account.view_full_profile": "Ð’Ð¸Ð´Ð¸ Ñ†ÐµÐ¾ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
+  "alert.unexpected.message": "ÐŸÐ¾Ñ˜Ð°Ð²Ð¸Ð»Ð° ÑÐµ Ð½ÐµÐ¾Ñ‡ÐµÐºÐ¸Ð²Ð°Ð½Ð° Ð³Ñ€ÐµÑˆÐºÐ°.",
+  "alert.unexpected.title": "Ð£Ð¿Ñ!",
   "boost_modal.combo": "ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¸Ñ‚Ð¸ÑÐ½ÑƒÑ‚Ð¸ {combo} Ð´Ð° Ð¿Ñ€ÐµÑÐºÐ¾Ñ‡Ð¸Ñ‚Ðµ Ð¾Ð²Ð¾ ÑÐ»ÐµÐ´ÐµÑ›Ð¸ Ð¿ÑƒÑ‚",
   "bundle_column_error.body": "ÐÐµÑˆÑ‚Ð¾ Ñ˜Ðµ Ð¿Ð¾ÑˆÐ»Ð¾ Ð¿Ð¾ Ð·Ð»Ñƒ Ð¿Ñ€Ð¸Ð»Ð¸ÐºÐ¾Ð¼ ÑƒÑ‡Ð¸Ñ‚Ð°Ð²Ð°ÑšÐ° Ð¾Ð²Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ.",
   "bundle_column_error.retry": "ÐŸÐ¾ÐºÑƒÑˆÐ°Ñ˜Ñ‚Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾",
@@ -40,17 +47,17 @@
   "bundle_modal_error.message": "ÐÐµÑˆÑ‚Ð¾ Ð½Ð¸Ñ˜Ðµ Ð±Ð¸Ð»Ð¾ Ñƒ Ñ€ÐµÐ´Ñƒ Ð¿Ñ€Ð¸ ÑƒÑ‡Ð¸Ñ‚Ð°Ð²Ð°ÑšÑƒ Ð¾Ð²Ðµ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ðµ.",
   "bundle_modal_error.retry": "ÐŸÐ¾ÐºÑƒÑˆÐ°Ñ˜Ñ‚Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾",
   "column.blocks": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
-  "column.community": "Ð›Ð¾ÐºÐ°Ð»Ð½Ð° Ð»Ð°Ñ˜Ð½Ð°",
-  "column.direct": "Direct messages",
-  "column.domain_blocks": "Hidden domains",
-  "column.favourites": "ÐžÐ¼Ð¸Ñ™ÐµÐ½Ð¸",
+  "column.community": "Ð›Ð¾ÐºÐ°Ð»Ð½Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð°",
+  "column.direct": "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð½Ðµ Ð¿Ð¾Ñ€ÑƒÐºÐµ",
+  "column.domain_blocks": "Ð¡ÐºÑ€Ð¸Ð²ÐµÐ½Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð¸",
+  "column.favourites": "ÐžÐ¼Ð¸Ñ™ÐµÐ½Ðµ",
   "column.follow_requests": "Ð—Ð°Ñ…Ñ‚ÐµÐ²Ð¸ Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµ",
   "column.home": "ÐŸÐ¾Ñ‡ÐµÑ‚Ð½Ð°",
   "column.lists": "Ð›Ð¸ÑÑ‚Ðµ",
   "column.mutes": "Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
   "column.notifications": "ÐžÐ±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
-  "column.pins": "ÐŸÑ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ð¸ Ñ‚ÑƒÑ‚Ð¾Ð²Ð¸",
-  "column.public": "Ð¤ÐµÐ´ÐµÑ€Ð¸ÑÐ°Ð½Ð° Ð»Ð°Ñ˜Ð½Ð°",
+  "column.pins": "ÐŸÑ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ",
+  "column.public": "Ð—Ð´Ñ€ÑƒÐ¶ÐµÐ½Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð°",
   "column_back_button.label": "ÐÐ°Ð·Ð°Ð´",
   "column_header.hide_settings": "Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ",
   "column_header.moveLeft_settings": "ÐŸÐ¾Ð¼ÐµÑ€Ð¸ ÐºÐ¾Ð»Ð¾Ð½Ñƒ ÑƒÐ»ÐµÐ²Ð¾",
@@ -59,19 +66,19 @@
   "column_header.show_settings": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐºÐµ",
   "column_header.unpin": "ÐžÑ‚ÐºÐ°Ñ‡Ð¸",
   "column_subheading.settings": "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐµ",
-  "community.column_settings.media_only": "Media 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.",
+  "community.column_settings.media_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.publish": "Ð¢ÑƒÑ‚Ð½Ð¸",
+  "compose_form.publish": "Ð¢Ñ€ÑƒÐ±Ð¸",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "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.sensitive.marked": "ÐœÐµÐ´Ð¸Ñ˜Ð¸ ÑÑƒ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ ÐºÐ°Ð¾ Ð¾ÑÐµÑ‚Ñ™Ð¸Ð²Ð¸",
+  "compose_form.sensitive.unmarked": "ÐœÐµÐ´Ð¸Ñ˜Ð¸ ÑÑƒ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸ ÐºÐ°Ð¾ Ð½Ðµ-Ð¾ÑÐµÑ‚Ñ™Ð¸Ð²Ð¸",
+  "compose_form.spoiler.marked": "Ð¢ÐµÐºÑÑ‚ Ñ˜Ðµ ÑÐ°ÐºÑ€Ð¸Ð²ÐµÐ½ Ð¸Ð·Ð° ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐ°",
+  "compose_form.spoiler.unmarked": "Ð¢ÐµÐºÑÑ‚ Ð½Ð¸Ñ˜Ðµ ÑÐ°ÐºÑ€Ð¸Ð²ÐµÐ½",
   "compose_form.spoiler_placeholder": "ÐžÐ²Ð´Ðµ ÑƒÐ¿Ð¸ÑˆÐ¸Ñ‚Ðµ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ",
   "confirmation_modal.cancel": "ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸",
   "confirmations.block.confirm": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜",
@@ -81,11 +88,13 @@
   "confirmations.delete_list.confirm": "ÐžÐ±Ñ€Ð¸ÑˆÐ¸",
   "confirmations.delete_list.message": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸ Ð´Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð±ÐµÑÐ¿Ð¾Ð²Ñ€Ð°Ñ‚Ð½Ð¾ Ð¾Ð±Ñ€Ð¸ÑˆÐµÑ‚Ðµ Ð¾Ð²Ñƒ Ð»Ð¸ÑÑ‚Ñƒ?",
   "confirmations.domain_block.confirm": "Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ñ†ÐµÐ¾ Ð´Ð¾Ð¼ÐµÐ½",
-  "confirmations.domain_block.message": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÑ‚Ð²Ð°Ñ€Ð½Ð¾, ÑÑ‚Ð²Ð°Ñ€Ð½Ð¾ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾ Ð´Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ‚Ðµ Ñ†ÐµÐ¾ Ð´Ð¾Ð¼ÐµÐ½ {domain}? Ð£ Ð²ÐµÑ›Ð¸Ð½Ð¸ ÑÐ»ÑƒÑ‡Ð°Ñ˜ÐµÐ²Ð°, Ð¿Ð°Ñ€ Ð´Ð¾Ð±Ñ€Ð¸Ñ… Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°ÑšÐ° Ð¸Ð»Ð¸ ÑƒÑ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐ° ÑÑƒ Ð´Ð¾Ð²Ð¾Ñ™Ð½Ð° Ð¸ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡Ñ™Ð¸Ð²Ð°.",
+  "confirmations.domain_block.message": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ Ð·Ð°Ð¸ÑÑ‚Ð° ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸ Ð´Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ‚Ðµ Ñ†ÐµÐ¾ Ð´Ð¾Ð¼ÐµÐ½ {domain}? Ð£ Ð²ÐµÑ›Ð¸Ð½Ð¸ ÑÐ»ÑƒÑ‡Ð°Ñ˜ÐµÐ²Ð°, Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð´Ð¾Ð±Ñ€Ð¾ Ð¿Ñ€Ð¾Ð¼Ð¸ÑˆÑ™ÐµÐ½Ð¸Ñ… Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°ÑšÐ° Ð¸Ð»Ð¸ ÑƒÑ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐ° ÑÑƒ Ð´Ð¾Ð²Ð¾Ñ™Ð½Ð° Ð¸ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑƒÑ‡Ñ™Ð¸Ð²Ð°.",
   "confirmations.mute.confirm": "Ð£Ñ›ÑƒÑ‚ÐºÐ°Ñ˜",
   "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.redraft.confirm": "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð¸ Ð¿Ñ€ÐµÐ¿Ñ€Ð°Ð²Ð¸",
+  "confirmations.redraft.message": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸ Ð´Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐµÑ‚Ðµ Ð¾Ð²Ð°Ñ˜ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¸ Ð´Ð° Ð³Ð° Ð¿Ñ€ÐµÐ¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ? Ð¡Ð²Ð° ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐ° Ñƒ Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ, ÐºÐ°Ð¾ Ð¸ Ð¿Ð¾Ð´Ñ€ÑˆÐºÐµ Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¸Ð·Ð³ÑƒÐ±Ñ™ÐµÐ½Ðµ, Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ð¸ Ð½Ð° Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð¸ Ð¿Ð¾ÑÑ‚ Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð½Ð¸ÑˆÑ‚ÐµÐ½Ð¸.",
+  "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.unfollow.message": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸ Ð´Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° {name}?",
   "embed.instructions": "Ð£Ð³Ñ€Ð°Ð´Ð¸ Ð¾Ð²Ð°Ñ˜ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Ð’Ð°Ñˆ Ð²ÐµÐ± ÑÐ°Ñ˜Ñ‚ ÐºÐ¾Ð¿Ð¸Ñ€Ð°ÑšÐµÐ¼ ÐºÐ¾Ð´Ð° Ð¸ÑÐ¿Ð¾Ð´.",
@@ -93,55 +102,100 @@
   "emoji_button.activity": "ÐÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚",
   "emoji_button.custom": "ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¾",
   "emoji_button.flags": "Ð—Ð°ÑÑ‚Ð°Ð²Ðµ",
-  "emoji_button.food": "Ð¥Ñ€Ð°Ð½Ð° & Ð¿Ð¸Ñ›Ðµ",
-  "emoji_button.label": "Ð£Ð±Ð°Ñ†Ð¸ ÑÐ¼Ð°Ñ˜Ð»Ð¸",
+  "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.search": "ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð³Ð°...",
   "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð¸ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ðµ",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð±Ð¾Ð»Ð¸",
-  "emoji_button.travel": "ÐŸÑƒÑ‚Ð¾Ð²Ð°ÑšÐ° & Ð¼ÐµÑÑ‚Ð°",
-  "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.hashtag": "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð° Ð½Ð° Ð¾Ð²Ð¾Ð¼ Ñ…ÐµÑˆÑ‚ÐµÐ³Ñƒ.",
-  "empty_column.home": "Ð’Ð°ÑˆÐ° Ð»Ð°Ñ˜Ð½Ð° Ñ˜Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°! ÐŸÐ¾ÑÐµÑ‚Ð¸Ñ‚Ðµ {public} Ð¸Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ñƒ Ð´Ð° Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ Ð¸ ÑƒÐ¿Ð¾Ð·Ð½Ð°Ñ˜ÐµÑ‚Ðµ Ð½Ð¾Ð²Ðµ Ñ™ÑƒÐ´Ðµ.",
-  "empty_column.home.public_timeline": "Ñ˜Ð°Ð²Ð½Ð° Ð»Ð°Ñ˜Ð½Ð°",
-  "empty_column.list": "Ð£ Ð¾Ð²Ð¾Ñ˜ Ð»Ð¸ÑÑ‚Ð¸ Ñ˜Ð¾Ñˆ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³Ð°. ÐšÐ°Ð´Ð° Ñ‡Ð»Ð°Ð½Ð¾Ð²Ð¸ Ð»Ð¸ÑÑ‚Ðµ Ð¾Ð±Ñ˜Ð°Ð²Ðµ Ð½Ð¾Ð²Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ, Ð¾Ð½Ð¸ Ñ›Ðµ ÑÐµ Ð¿Ð¾Ñ˜Ð°Ð²Ñ™Ð¸Ð²Ð°Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ.",
-  "empty_column.notifications": "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°. Ð”Ñ€ÑƒÐ¶Ð¸Ñ‚Ðµ ÑÐµ Ð¼Ð°Ð»Ð¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ðµ.",
+  "emoji_button.travel": "ÐŸÑƒÑ‚Ð¾Ð²Ð°ÑšÐ° Ð¸ Ð¼ÐµÑÑ‚Ð°",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°.",
+  "empty_column.community": "Ð›Ð¾ÐºÐ°Ð»Ð½Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð° Ñ˜Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°. ÐÐ°Ð¿Ð¸ÑˆÐ¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾ Ñ˜Ð°Ð²Ð½Ð¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ!",
+  "empty_column.direct": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð½Ð¸Ñ… Ð¿Ð¾Ñ€ÑƒÐºÐ°. ÐšÐ°Ð´Ð° Ð¿Ð¾ÑˆÐ°Ñ™ÐµÑ‚Ðµ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ð¼Ð¸Ñ‚Ðµ Ñ˜ÐµÐ´Ð½Ñƒ, Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ›Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.",
+  "empty_column.domain_blocks": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð° ÑÐ°ÐºÑ€Ð¸Ð²ÐµÐ½Ð¸Ñ… Ð´Ð¾Ð¼ÐµÐ½Ð°.",
+  "empty_column.favourited_statuses": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ñ‚Ñ€ÑƒÐ±Ð° ÐºÐ¾Ñ˜Ðµ ÑÑƒ Ð²Ð°Ð¼ ÑÐµ ÑÐ²Ð¸Ð´ÐµÐ»Ðµ. ÐšÐ°Ð´Ð° Ð²Ð°Ð¼ ÑÐµ Ñ˜ÐµÐ´Ð½Ð° ÑÐ²Ð¸Ð´Ð¸, Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ›Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.",
+  "empty_column.favourites": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº ÑÐµ Ð½Ð¸ÐºÐ¾Ð¼Ðµ Ð½Ð¸Ñ˜Ðµ ÑÐ²Ð¸Ð´ÐµÐ»Ð° Ð¾Ð²Ð° Ñ‚Ñ€ÑƒÐ±Ð°. ÐšÐ°Ð´Ð° ÑÐµ Ð½ÐµÐºÐ¾Ð¼Ðµ ÑÐ²Ð¸Ð´Ð¸, Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ›Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.",
+  "empty_column.follow_requests": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð° Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµ. ÐšÐ°Ð´Ð° Ð¿Ñ€Ð¸Ð¼Ð¸Ñ‚Ðµ Ð·Ð°Ñ…Ñ‚ÐµÐ², Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ›Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.",
+  "empty_column.hashtag": "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð° Ð½Ð° Ð¾Ð²Ð¾Ñ˜ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾Ñ˜ Ñ‚Ð°Ñ€Ð°Ð±Ð¸.",
+  "empty_column.home": "Ð’Ð°ÑˆÐ° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð° Ñ˜Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°! ÐŸÐ¾ÑÐµÑ‚Ð¸Ñ‚Ðµ {public} Ð¸Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ñƒ Ð´Ð° Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ Ð¸ Ð´Ð° ÑƒÐ¿Ð¾Ð·Ð½Ð°Ñ‚Ðµ Ð½Ð¾Ð²Ðµ Ñ™ÑƒÐ´Ðµ.",
+  "empty_column.home.public_timeline": "Ñ˜Ð°Ð²Ð½Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð°",
+  "empty_column.list": "Ð£ Ð¾Ð²Ð¾Ñ˜ Ð»Ð¸ÑÑ‚Ð¸ Ñ˜Ð¾Ñˆ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³Ð°. ÐšÐ°Ð´Ð° Ñ‡Ð»Ð°Ð½Ð¾Ð²Ð¸ Ð»Ð¸ÑÑ‚Ðµ Ð¾Ð±Ñ˜Ð°Ð²Ðµ Ð½Ð¾Ð²Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ, Ð¾Ð½Ð¸ Ñ›Ðµ ÑÐµ Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ.",
+  "empty_column.lists": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð½Ð¸Ñ˜ÐµÐ´Ð½Ñƒ Ð»Ð¸ÑÑ‚Ñƒ. ÐšÐ°Ð´Ð° Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ Ñ˜ÐµÐ´Ð½Ñƒ, Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ›Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.",
+  "empty_column.mutes": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½ÐµÐ¼Ð°Ñ‚Ðµ ÑƒÑ›ÑƒÑ‚ÐºÐ°Ð½Ð¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°.",
+  "empty_column.notifications": "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°. Ð”Ñ€ÑƒÐ¶Ð¸Ñ‚Ðµ ÑÐµ Ð¼Ð°Ð»Ð¾ Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€.",
   "empty_column.public": "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³Ð°! ÐÐ°Ð¿Ð¸ÑˆÐ¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾ Ñ˜Ð°Ð²Ð½Ð¾, Ð¸Ð»Ð¸ Ð½Ð°Ñ’Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐµ ÑÐ° Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸ ÐºÐ¾Ñ˜Ðµ Ñ›ÐµÑ‚Ðµ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð´Ð° Ð¿Ð¾Ð¿ÑƒÐ½Ð¸Ñ‚Ðµ Ð¾Ð²Ñƒ Ð¿Ñ€Ð°Ð·Ð½Ð¸Ð½Ñƒ",
   "follow_request.authorize": "ÐžÐ´Ð¾Ð±Ñ€Ð¸",
   "follow_request.reject": "ÐžÐ´Ð±Ð¸Ñ˜",
-  "getting_started.developers": "Developers",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.developers": "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ÐµÑ€Ð¸",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ˜Ð°",
   "getting_started.heading": "Ð”Ð° Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ",
-  "getting_started.invite": "Invite people",
-  "getting_started.open_source_notice": "ÐœÐ°ÑÑ‚oÐ´Ð¾Ð½Ñ‚ Ñ˜Ðµ ÑÐ¾Ñ„Ñ‚Ð²ÐµÑ€ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð´Ð°. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¼Ñƒ Ð´Ð¾Ð¿Ñ€Ð¸Ð½ÐµÑ‚Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ðµ Ð¿Ñ€ÐµÐºÐ¾ GitHub-Ð° Ð½Ð° {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "getting_started.invite": "ÐŸÐ¾Ð·Ð¾Ð²Ð¸Ñ‚Ðµ Ñ™ÑƒÐ´Ðµ",
+  "getting_started.open_source_notice": "ÐœÐ°ÑÑ‚oÐ´Ð¾Ð½ Ñ˜Ðµ ÑÐ¾Ñ„Ñ‚Ð²ÐµÑ€ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð´Ð°. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¼Ñƒ Ð´Ð¾Ð¿Ñ€Ð¸Ð½ÐµÑ‚Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ðµ Ð¿Ñ€ÐµÐºÐ¾ Ð“Ð¸Ñ‚Ð¥Ð°Ð±Ð° Ð½Ð° {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}",
+  "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",
   "home.column_settings.basic": "ÐžÑÐ½Ð¾Ð²Ð½Ð¾",
   "home.column_settings.show_reblogs": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¸ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð²Ð°ÑšÐ°",
   "home.column_settings.show_replies": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ðµ",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.pinned": "Ð´Ð° Ð¾Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð»Ð¸ÑÑ‚Ñƒ Ð·Ð°ÐºÐ°Ñ‡ÐµÐ½Ð¸Ñ… Ñ‚Ñ€ÑƒÐ±Ð°",
+  "keyboard_shortcuts.profile": "Ð´Ð° Ð¾Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» Ð°ÑƒÑ‚Ð¾Ñ€Ð°",
   "keyboard_shortcuts.reply": "Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ",
+  "keyboard_shortcuts.requests": "Ð´Ð° Ð¾Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð»Ð¸ÑÑ‚Ñƒ Ð¿Ñ€Ð¸Ð¼Ñ™ÐµÐ½Ð¸Ñ… Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð° Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµ",
   "keyboard_shortcuts.search": "Ð´Ð° ÑÐµ Ð¿Ñ€ÐµÐ±Ð°Ñ†Ð¸Ñ‚Ðµ Ð½Ð° Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ñƒ",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "keyboard_shortcuts.toot": "Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ ÑÐºÑ€Ð¾Ð· Ð½Ð¾Ð²Ð¸ Ñ‚ÑƒÑ‚",
-  "keyboard_shortcuts.unfocus": "Ð´Ð° Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚Ðµ Ð²Ð¸ÑˆÐµ Ð½Ð° Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð·Ð¸/Ð¿Ñ€Ð°Ð²Ñ™ÐµÑšÑƒ Ð½Ð¾Ð²Ð¾Ð³ Ñ‚ÑƒÑ‚Ð°",
+  "keyboard_shortcuts.start": "Ð´Ð° Ð¾Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ ÐºÐ¾Ð»Ð¾Ð½Ñƒ \"Ð¿Ð¾Ñ‡Ð½Ð¸Ð¼Ð¾\"",
+  "keyboard_shortcuts.toggle_hidden": "Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð¶ÐµÑ‚Ðµ/ÑÐ°ÐºÑ€Ð¸Ñ˜Ñ‚Ðµ Ñ‚ÐµÐºÑÑ‚ Ð¸Ð·Ð° CW-Ð°",
+  "keyboard_shortcuts.toot": "Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ‡Ð½ÐµÑ‚Ðµ ÑÐºÑ€Ð¾Ð· Ð½Ð¾Ð²Ñƒ Ñ‚Ñ€ÑƒÐ±Ñƒ",
+  "keyboard_shortcuts.unfocus": "Ð´Ð° Ð¾Ð´Ñ„Ð¾ÐºÑƒÑÐ¸Ñ€Ð°Ñ‚Ðµ/Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚Ðµ Ð²Ð¸ÑˆÐµ Ð½Ð° Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð·Ð¸/Ð¿Ñ€Ð°Ð²Ñ™ÐµÑšÑƒ Ð½Ð¾Ð²Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ",
   "keyboard_shortcuts.up": "Ð´Ð° ÑÐµ Ð¿Ð¾Ð¼ÐµÑ€Ð¸Ñ‚Ðµ Ð½Ð° Ð³Ð¾Ñ€Ðµ Ñƒ Ð»Ð¸ÑÑ‚Ð¸",
   "lightbox.close": "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸",
   "lightbox.next": "Ð¡Ð»ÐµÐ´ÐµÑ›Ð¸",
@@ -157,16 +211,18 @@
   "loading_indicator.label": "Ð£Ñ‡Ð¸Ñ‚Ð°Ð²Ð°Ð¼...",
   "media_gallery.toggle_visible": "Ð£ÐºÑ™ÑƒÑ‡Ð¸/Ð¸ÑÐºÑ™ÑƒÑ‡Ð¸ Ð²Ð¸Ð´Ñ™Ð¸Ð²Ð¾ÑÑ‚",
   "missing_indicator.label": "ÐÐ¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½Ð¾",
-  "missing_indicator.sublabel": "This resource could not be found",
+  "missing_indicator.sublabel": "ÐžÐ²Ð°Ñ˜ Ñ€ÐµÑÑƒÑ€Ñ Ð½Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½",
   "mute_modal.hide_notifications": "Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ Ð¾Ð²Ð¾Ð³ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°?",
+  "navigation_bar.apps": "ÐœÐ¾Ð±Ð¸Ð»Ð½Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ",
   "navigation_bar.blocks": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
-  "navigation_bar.community_timeline": "Ð›Ð¾ÐºÐ°Ð»Ð½Ð° Ð»Ð°Ñ˜Ð½Ð°",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "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": "Muted words",
+  "navigation_bar.favourites": "ÐžÐ¼Ð¸Ñ™ÐµÐ½Ðµ",
+  "navigation_bar.filters": "ÐŸÑ€Ð¸Ð³ÑƒÑˆÐµÐ½Ðµ Ñ€ÐµÑ‡Ð¸",
   "navigation_bar.follow_requests": "Ð—Ð°Ñ…Ñ‚ÐµÐ²Ð¸ Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµ",
   "navigation_bar.info": "Ðž Ð¾Ð²Ð¾Ñ˜ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸",
   "navigation_bar.keyboard_shortcuts": "ÐŸÑ€ÐµÑ‡Ð¸Ñ†Ðµ Ð½Ð° Ñ‚Ð°ÑÑ‚Ð°Ñ‚ÑƒÑ€Ð¸",
@@ -174,47 +230,33 @@
   "navigation_bar.logout": "ÐžÐ´Ñ˜Ð°Ð²Ð°",
   "navigation_bar.mutes": "Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸",
   "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "ÐŸÑ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ð¸ Ñ‚ÑƒÑ‚Ð¾Ð²Ð¸",
+  "navigation_bar.pins": "ÐŸÑ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ",
   "navigation_bar.preferences": "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°",
-  "navigation_bar.public_timeline": "Ð¤ÐµÐ´ÐµÑ€Ð¸ÑÐ°Ð½Ð° Ð»Ð°Ñ˜Ð½Ð°",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name} Ñ˜Ðµ ÑÑ‚Ð°Ð²Ð¸Ð¾ Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ°Ð¾ Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ð¸",
-  "notification.follow": "{name} Ð’Ð°Ñ Ñ˜Ðµ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾",
-  "notification.mention": "{name} Ð’Ð°Ñ Ñ˜Ðµ Ð¿Ð¾Ð¼ÐµÐ½ÑƒÐ¾",
-  "notification.reblog": "{name} Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾(Ð»Ð°) Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ",
+  "navigation_bar.public_timeline": "Ð—Ð´Ñ€ÑƒÐ¶ÐµÐ½Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð°",
+  "navigation_bar.security": "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ‚",
+  "notification.favourite": "{name} Ñ˜Ðµ ÑÑ‚Ð°Ð²Ð¸Ð¾/Ð»Ð° Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ°Ð¾ Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ð¸",
+  "notification.follow": "{name} Ð’Ð°Ñ Ñ˜Ðµ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾/Ð»Ð°",
+  "notification.mention": "{name} Ð’Ð°Ñ Ñ˜Ðµ Ð¿Ð¾Ð¼ÐµÐ½ÑƒÐ¾/Ð»Ð°",
+  "notification.reblog": "{name} Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾/Ð»Ð° Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ",
   "notifications.clear": "ÐžÑ‡Ð¸ÑÑ‚Ð¸ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
   "notifications.clear_confirmation": "Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾ Ð´Ð° Ñ‚Ñ€Ð°Ñ˜Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð’Ð°ÑˆÐ° Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°?",
   "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.follow": "ÐÐ¾Ð²Ð¸ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸:",
   "notifications.column_settings.mention": "ÐŸÐ¾Ð¼Ð¸ÑšÐ°ÑšÐ°:",
   "notifications.column_settings.push": "Ð“ÑƒÑ€Ð°Ñ˜ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
-  "notifications.column_settings.push_meta": "ÐžÐ²Ð°Ñ˜ ÑƒÑ€ÐµÑ’Ð°Ñ˜",
   "notifications.column_settings.reblog": "ÐŸÐ¾Ð´Ñ€ÑˆÐºÐ¸:",
   "notifications.column_settings.show": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ñƒ ÐºÐ¾Ð»Ð¾Ð½Ð¸",
   "notifications.column_settings.sound": "ÐŸÑƒÑˆÑ‚Ð°Ñ˜ Ð·Ð²ÑƒÐº",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Ð“Ð¾Ñ‚Ð¾Ð²Ð¾",
-  "onboarding.next": "Ð¡Ð»ÐµÐ´ÐµÑ›Ðµ",
-  "onboarding.page_five.public_timelines": "Ð›Ð¾ÐºÐ°Ð»Ð½Ð° Ð»Ð°Ñ˜Ð½Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·ÑƒÑ˜Ðµ ÑÐ²Ðµ Ñ˜Ð°Ð²Ð½Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ð¾Ð´ ÑÐ²Ð¸Ñ… Ð½Ð° Ð´Ð¾Ð¼ÐµÐ½Ñƒ {domain}. Ð¤ÐµÐ´ÐµÑ€Ð¸ÑÐ°Ð½Ð° Ð»Ð°Ñ˜Ð½Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·ÑƒÑ˜Ðµ Ñ˜Ð°Ð²Ð½Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ð¾Ð´ ÑÐ²Ð¸Ñ… Ñ™ÑƒÐ´Ð¸ ÐºÐ¾Ñ˜Ðµ Ð¿Ñ€Ð°Ñ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸ ÑÐ° Ð´Ð¾Ð¼ÐµÐ½Ð° {domain}. ÐžÐ²Ð¾ ÑÑƒ Ñ˜Ð°Ð²Ð½Ðµ Ð»Ð°Ñ˜Ð½Ðµ, ÑÑ˜Ð°Ñ˜Ð°Ð½ Ð½Ð°Ñ‡Ð¸Ð½ Ð´Ð° Ð¾Ñ‚ÐºÑ€Ð¸Ñ˜ÐµÑ‚Ðµ Ð½Ð¾Ð²Ðµ Ñ™ÑƒÐ´Ðµ.",
-  "onboarding.page_four.home": "ÐŸÐ¾Ñ‡ÐµÑ‚Ð½Ð° Ð»Ð°Ñ˜Ð½Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·ÑƒÑ˜Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ñ™ÑƒÐ´Ð¸ ÐºÐ¾Ñ˜Ðµ Ð’Ð¸ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ.",
-  "onboarding.page_four.notifications": "ÐšÐ¾Ð»Ð¾Ð½Ð° ÑÐ° Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ¸Ð¼Ð° Ð’Ð°Ð¼ Ð¿Ñ€Ð¸ÐºÐ°Ð·ÑƒÑ˜Ðµ ÐºÐ°Ð´Ð° Ð½ÐµÐºÐ¾ Ð¿Ñ€Ð¸Ñ‡Ð° ÑÐ° Ð’Ð°Ð¼Ð°.",
-  "onboarding.page_one.federation": "ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ñ˜Ðµ Ð¼Ñ€ÐµÐ¶Ð° Ð½ÐµÐ·Ð°Ð²Ð¸ÑÐ½Ð¸Ñ… ÑÐµÑ€Ð²ÐµÑ€Ð° ÐºÐ¾Ñ˜Ð¸ ÑÐµ ÑƒÐ²ÐµÐ·ÑƒÑ˜Ñƒ Ð´Ð° Ð½Ð°Ð¿Ñ€Ð°Ð²Ðµ Ñ˜ÐµÐ´Ð½Ñƒ Ð²ÐµÑ›Ñƒ Ð´Ñ€ÑƒÑˆÑ‚Ð²ÐµÐ½Ñƒ Ð¼Ñ€ÐµÐ¶Ñƒ. ÐžÐ²Ðµ ÑÐµÑ€Ð²ÐµÑ€Ðµ Ð·Ð¾Ð²ÐµÐ¼Ð¾ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð°Ð¼Ð°.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Ð”Ð¾Ð±Ñ€Ð¾Ð´Ð¾ÑˆÐ»Ð¸ Ð½Ð° ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚!",
-  "onboarding.page_six.admin": "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð’Ð°ÑˆÐµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ Ñ˜Ðµ {admin}.",
-  "onboarding.page_six.almost_done": "ÐˆÐ¾Ñˆ Ð¼Ð°Ð»Ð¾, Ð¿Ð° Ð³Ð¾Ñ‚Ð¾Ð²Ð¾...",
-  "onboarding.page_six.appetoot": "ÐŸÑ€Ð¸Ñ˜Ð°Ñ‚ÑƒÑ‚Ð½Ð¾!",
-  "onboarding.page_six.apps_available": "ÐŸÐ¾ÑÑ‚Ð¾Ñ˜Ðµ {apps} Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ðµ Ð·Ð° iOS, ÐÐ½Ð´Ñ€Ð¾Ð¸Ð´ Ð¸ Ð´Ñ€ÑƒÐ³Ðµ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ðµ.",
-  "onboarding.page_six.github": "ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ñ˜Ðµ ÑÐ»Ð¾Ð±Ð¾Ð´Ð°Ð½ ÑÐ¾Ñ„Ñ‚Ð²ÐµÑ€ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð´Ð°. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñ™Ð¸Ð²Ð°Ñ‚Ð¸ Ð³Ñ€ÐµÑˆÐºÐµ, Ð¿Ð¾Ñ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‚Ð¸ Ð½Ð¾Ð²Ðµ Ñ„ÑƒÐ½Ñ†ÐºÐ¸Ð¾Ð½Ð°Ð»Ð½Ð¾ÑÑ‚Ð¸, Ð¸Ð»Ð¸ ÑƒÑ‡ÐµÑÑ‚Ð²ÑƒÑ˜ÑƒÑ›Ð¸ Ñƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸Ñ€Ð°ÑšÑƒ. ÐÐ°Ñˆ Ð¸Ð·Ð²Ð¾Ñ€Ð½Ð¸ ÐºÐ¾Ð´ Ñ˜Ðµ Ð¾Ð²Ð´Ðµ: {github}.",
-  "onboarding.page_six.guidelines": "ÑÐ¼ÐµÑ€Ð½Ð¸Ñ†Ðµ Ð·Ð°Ñ˜ÐµÐ´Ð½Ð¸Ñ†Ðµ",
-  "onboarding.page_six.read_guidelines": "ÐŸÑ€Ð¾Ñ‡Ð¸Ñ‚ÐµÑ˜Ñ‚Ðµ {guidelines} Ð´Ð¾Ð¼ÐµÐ½Ð° {domain}!",
-  "onboarding.page_six.various_app": "Ð¼Ð¾Ð±Ð¸Ð»Ð½Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ",
-  "onboarding.page_three.profile": "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» Ð´Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð°Ð²Ð°Ñ‚Ð°Ñ€, Ð±Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ˜Ñƒ Ð¸ Ð¸Ð¼Ðµ Ð·Ð° Ð¿Ñ€Ð¸ÐºÐ°Ð·. Ð¢Ð°Ð¼Ð¾ Ñ›ÐµÑ‚Ðµ Ð½Ð°Ñ›Ð¸ Ð¸ Ð¾ÑÑ‚Ð°Ð»Ð° Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°.",
-  "onboarding.page_three.search": "ÐšÐ¾Ñ€Ð¸ÑÐ¸Ñ‚Ðµ Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ñƒ Ð´Ð° Ð½Ð°Ñ’ÐµÑ‚Ðµ Ñ™ÑƒÐ´Ðµ Ð¸ Ð³Ð»ÐµÐ´Ð°Ñ‚Ðµ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð²Ðµ, ÐºÐ°Ð¾ ÑˆÑ‚Ð¾ ÑÑƒ {illustration} Ð¸ {introductions}. Ð”Ð° Ð½Ð°Ñ’ÐµÑ‚Ðµ Ð¾ÑÐ¾Ð±Ñƒ ÐºÐ¾Ñ˜Ð° Ð½Ð¸Ñ˜Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ˜ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸, ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ ÑšÐµÐ½Ñƒ Ð¿ÑƒÐ½Ñƒ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ñƒ.",
-  "onboarding.page_two.compose": "ÐŸÐ¸ÑˆÐ¸Ñ‚Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ð¸Ð· Ð¿Ñ€Ð²Ðµ ÐºÐ¾Ð»Ð¾Ð½Ðµ. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°Ñ‚Ð¸ ÑÐ»Ð¸ÐºÐµ, Ð¼ÐµÑšÐ°Ñ‚Ð¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸, Ð¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ‚Ð¸ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐ° Ð·Ð° Ð¾ÑÐµÑ‚Ñ™Ð¸Ð² ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð¿Ñ€ÐµÐºÐ¾ Ð¸ÐºÐ¾Ð½Ð¸Ñ†Ð° Ð¸ÑÐ¿Ð¾Ð´.",
-  "onboarding.skip": "ÐŸÑ€ÐµÑÐºÐ¾Ñ‡Ð¸",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
   "privacy.change": "ÐŸÐ¾Ð´ÐµÑÐ¸ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸",
   "privacy.direct.long": "ÐžÐ±Ñ˜Ð°Ð²Ð¸ ÑÐ°Ð¼Ð¾ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸Ð¼Ð° ÐºÐ¾Ñ˜Ð¸ ÑÑƒ Ð¿Ð¾Ð¼ÐµÐ½ÑƒÑ‚Ð¸",
   "privacy.direct.short": "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð½Ð¾",
@@ -222,55 +264,60 @@
   "privacy.private.short": "Ð¡Ð°Ð¼Ð¾ Ð·Ð° Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ðµ",
   "privacy.public.long": "ÐžÐ±Ñ˜Ð°Ð²Ð¸ Ð½Ð° Ñ˜Ð°Ð²Ð½Ð¾Ñ˜ Ð»Ð°Ñ˜Ð½Ð¸",
   "privacy.public.short": "ÐˆÐ°Ð²Ð½Ð¾",
-  "privacy.unlisted.long": "ÐÐµ Ð¾Ð±Ñ˜Ð°Ð²Ñ™ÑƒÑ˜ Ð½Ð° Ñ˜Ð°Ð²Ð½Ð¸Ð¼ Ð»Ð°Ñ˜Ð½Ð°Ð¼Ð°",
+  "privacy.unlisted.long": "ÐÐµ Ð¾Ð±Ñ˜Ð°Ð²Ñ™ÑƒÑ˜ Ð½Ð° Ñ˜Ð°Ð²Ð½Ð¸Ð¼ Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ¸Ð¼ Ð»Ð¸Ð½Ð¸Ñ˜Ð°Ð¼Ð°",
   "privacy.unlisted.short": "ÐÐµÐ¸Ð·Ð»Ð¸ÑÑ‚Ð°Ð½Ð¾",
-  "regeneration_indicator.label": "Loadingâ€¦",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "regeneration_indicator.label": "Ð£Ñ‡Ð¸Ñ‚Ð°Ð²Ð°ÑšÐµâ€¦",
+  "regeneration_indicator.sublabel": "Ð’Ð°ÑˆÐ° Ð¿Ð¾Ñ‡ÐµÑ‚Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° ÑÐµ Ð¿Ñ€Ð¸Ð¿Ñ€ÐµÐ¼Ð°!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}h",
   "relative_time.just_now": "ÑÐ°Ð´Ð°",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "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.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": "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": "ÑÑ‚Ð°Ñ‚ÑƒÑ",
   "search_popout.tips.text": "Ð¢Ñ€Ð°Ð¶ÐµÑšÐµÐ¼ Ð¾Ð±Ð¸Ñ‡Ð½Ð¾Ð³ Ñ‚ÐµÐºÑÑ‚Ð° Ñ›ÐµÑ‚Ðµ Ð´Ð¾Ð±Ð¸Ñ‚Ð¸ ÑÐ²Ð° Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½Ð° Ð¸Ð¼ÐµÐ½Ð°, ÑÐ²Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ° Ð¸Ð¼ÐµÐ½Ð° Ð¸ ÑÐ²Ðµ Ð½Ð°Ñ’ÐµÐ½Ðµ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð²Ðµ",
   "search_popout.tips.user": "ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº",
-  "search_results.accounts": "People",
-  "search_results.hashtags": "Hashtags",
-  "search_results.statuses": "Toots",
+  "search_results.accounts": "Ð‰ÑƒÐ´Ð¸",
+  "search_results.hashtags": "Ð¢Ð°Ñ€Ð°Ð±Ðµ",
+  "search_results.statuses": "Ð¢Ñ€ÑƒÐ±Ðµ",
   "search_results.total": "{count, number} {count, plural, one {Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚} few {Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð°} other {Ñ€ÐµÐ·ÑƒÐ»Ñ‚Ð°Ñ‚Ð°}}",
   "standalone.public_title": "ÐŸÐ¾Ð³Ð»ÐµÐ´ Ð¸Ð·Ð½ÑƒÑ‚Ñ€Ð°...",
-  "status.block": "Block @{name}",
-  "status.cancel_reblog_private": "Unboost",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ @{name}",
+  "status.cancel_reblog_private": "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð¿Ð¾Ð´Ñ€ÑˆÐºÑƒ",
   "status.cannot_reblog": "ÐžÐ²Ð°Ñ˜ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ð¾Ð´Ñ€Ð¶Ð¸",
   "status.delete": "ÐžÐ±Ñ€Ð¸ÑˆÐ¸",
-  "status.direct": "Direct message @{name}",
+  "status.detailed_status": "Ð”ÐµÑ‚Ð°Ñ™Ð½Ð¸ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð°",
+  "status.direct": "Ð”Ð¸Ñ€ÐµÐºÑ‚Ð½Ð° Ð¿Ð¾Ñ€ÑƒÐºÐ° @{name}",
   "status.embed": "Ð£Ð³Ñ€Ð°Ð´Ð¸ Ð½Ð° ÑÐ°Ñ˜Ñ‚",
   "status.favourite": "ÐžÐ¼Ð¸Ñ™ÐµÐ½Ð¾",
-  "status.filtered": "Filtered",
+  "status.filtered": "Ð¤Ð¸Ð»Ñ‚Ñ€Ð¸Ñ€Ð°Ð½Ð¾",
   "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.pin": "Ð—Ð°ÐºÐ°Ñ‡Ð¸ Ð½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»",
+  "status.pinned": "Ð—Ð°ÐºÐ°Ñ‡ÐµÐ½Ð° Ñ‚Ñ€ÑƒÐ±Ð°",
+  "status.read_more": "Read more",
   "status.reblog": "ÐŸÐ¾Ð´Ñ€Ð¶Ð¸",
-  "status.reblog_private": "Boost to original audience",
-  "status.reblogged_by": "{name} Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾(Ð»Ð°)",
-  "status.redraft": "Delete & re-draft",
+  "status.reblog_private": "ÐŸÐ¾Ð´Ñ€Ð¶Ð¸ Ð´Ð° Ð²Ð¸Ð´Ð¸ Ð¿Ñ€Ð²Ð¾Ð±Ð¸Ñ‚Ð½Ð° Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°",
+  "status.reblogged_by": "{name} Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾/Ð»Ð°",
+  "status.reblogs.empty": "ÐˆÐ¾Ñˆ ÑƒÐ²ÐµÐº Ð½Ð¸ÐºÐ¾ Ð½Ð¸Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾ Ð¾Ð²Ñƒ Ñ‚Ñ€ÑƒÐ±Ñƒ. ÐšÐ°Ð´Ð° Ð±ÑƒÐ´Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð½Ð°, Ð¿Ð¾Ñ˜Ð°Ð²Ð¸Ñ›Ðµ ÑÐµ Ð¾Ð²Ð´Ðµ.",
+  "status.redraft": "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸ Ð¸ Ð¿Ñ€ÐµÐ¿Ñ€Ð°Ð²Ð¸",
   "status.reply": "ÐžÐ´Ð³Ð¾Ð²Ð¾Ñ€Ð¸",
   "status.replyAll": "ÐžÐ´Ð³Ð¾Ð²Ð¾Ñ€Ð¸ Ð½Ð° Ð´Ð¸ÑÐºÑƒÑÐ¸Ñ˜Ñƒ",
   "status.report": "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° @{name}",
@@ -278,23 +325,26 @@
   "status.sensitive_warning": "ÐžÑÐµÑ‚Ñ™Ð¸Ð² ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜",
   "status.share": "ÐŸÐ¾Ð´ÐµÐ»Ð¸",
   "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_more_all": "ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð²Ð¸ÑˆÐµ Ð·Ð° ÑÐ²Ðµ",
+  "status.show_thread": "Show thread",
   "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": "Ð›Ð¾ÐºÐ°Ð»Ð½Ð¾",
   "tabs_bar.notifications": "ÐžÐ±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°",
-  "tabs_bar.search": "Search",
-  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "tabs_bar.search": "ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð³Ð°",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {Ñ‡Ð¾Ð²ÐµÐº} other {Ñ™ÑƒÐ´Ð¸}} Ð¿Ñ€Ð¸Ñ‡Ð°",
   "ui.beforeunload": "ÐÐºÐ¾ Ð½Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚, Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ›ÐµÑ‚Ðµ Ð½Ð°Ð¿Ð¸ÑÐ°Ð½Ð¸ Ð½Ð°Ñ†Ñ€Ñ‚.",
   "upload_area.title": "ÐŸÑ€ÐµÐ²ÑƒÑ†Ð¸Ñ‚Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ",
-  "upload_button.label": "Ð”Ð¾Ð´Ð°Ñ˜ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ñƒ",
-  "upload_form.description": "ÐžÐ¿Ð¸ÑˆÐ¸ Ð·Ð° ÑÐ»Ð°Ð±Ð¾Ð²Ð¸Ð´Ðµ Ð¾ÑÐ¾Ð±Ðµ",
-  "upload_form.focus": "Crop",
-  "upload_form.undo": "ÐžÐ¿Ð¾Ð·Ð¾Ð²Ð¸",
+  "upload_button.label": "Ð”Ð¾Ð´Ð°Ñ˜ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ñƒ (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "ÐžÐ¿Ð¸ÑˆÐ¸Ñ‚Ðµ Ð·Ð° Ð¾ÑÐ¾Ð±Ðµ ÑÐ° Ð¾ÑˆÑ‚ÐµÑ›ÐµÐ½Ð¸Ð¼ Ð²Ð¸Ð´Ð¾Ð¼",
+  "upload_form.focus": "ÐŸÐ¾Ð´ÐµÑÐ¸Ñ‚Ðµ",
+  "upload_form.undo": "ÐžÐ±Ñ€Ð¸ÑˆÐ¸",
   "upload_progress.label": "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼...",
   "video.close": "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸ Ð²Ð¸Ð´ÐµÐ¾",
   "video.exit_fullscreen": "ÐÐ°Ð¿ÑƒÑÑ‚Ð¸ Ñ†ÐµÐ¾ ÐµÐºÑ€Ð°Ð½",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 64d488324f334fcb8a62be23680554b11ea3418b..47ce8497a65b624616d257c41a7caa3d60ea9f84 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -1,17 +1,23 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Robot",
   "account.block": "Blockera @{name}",
   "account.block_domain": "DÃ¶lj allt frÃ¥n {domain}",
   "account.blocked": "Blockerad",
-  "account.direct": "Direct Message @{name}",
+  "account.direct": "Direktmeddelande @{name}",
   "account.disclaimer_full": "Informationen nedan kan spegla anvÃ¤ndarens profil ofullstÃ¤ndigt.",
-  "account.domain_blocked": "DomÃ¤n gÃ¶md",
+  "account.domain_blocked": "DomÃ¤n dold",
   "account.edit_profile": "Redigera profil",
+  "account.endorse": "Feature on profile",
   "account.follow": "FÃ¶lj",
   "account.followers": "FÃ¶ljare",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "FÃ¶ljer",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "FÃ¶ljer dig",
   "account.hide_reblogs": "DÃ¶lj knuffar frÃ¥n @{name}",
+  "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": "NÃ¤mna @{name}",
   "account.moved_to": "{name} har flyttat till:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Visa knuffar frÃ¥n @{name}",
   "account.unblock": "Avblockera @{name}",
   "account.unblock_domain": "Ta fram {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Sluta fÃ¶lja",
   "account.unmute": "Ta bort tystad @{name}",
   "account.unmute_notifications": "Ã…teraktivera notifikationer frÃ¥n @{name}",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "Ã„r du sÃ¤ker du vill tysta ner {name}?",
   "confirmations.redraft.confirm": "Radera och gÃ¶r om",
   "confirmations.redraft.message": "Ã„r du sÃ¤ker pÃ¥ att du vill radera meddelandet och gÃ¶ra om det? Du kommer fÃ¶rlora alla svar, knuffar och favoriter som hÃ¤nvisar till meddelandet.",
+  "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": "Sluta fÃ¶lja",
   "confirmations.unfollow.message": "Ã„r du sÃ¤ker pÃ¥ att du vill sluta fÃ¶lja {name}?",
   "embed.instructions": "BÃ¤dda in den hÃ¤r statusen pÃ¥ din webbplats genom att kopiera koden nedan.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "SÃ¶kresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Resor & Platser",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "Den lokala tidslinjen Ã¤r tom. Skriv nÃ¥got offentligt fÃ¶r att fÃ¥ bollen att rulla!",
   "empty_column.direct": "Du har inga direktmeddelanden Ã¤n. NÃ¤r du skickar eller tar emot kommer den att dyka upp hÃ¤r.",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "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.public_timeline": "den publika tidslinjen",
   "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.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": "Du har inga meddelanden Ã¤n. Interagera med andra fÃ¶r att starta konversationen.",
   "empty_column.public": "Det finns inget hÃ¤r! Skriv nÃ¥got offentligt, eller fÃ¶lj manuellt anvÃ¤ndarna frÃ¥n andra instanser fÃ¶r att fylla pÃ¥ det",
   "follow_request.authorize": "GodkÃ¤nn",
   "follow_request.reject": "Avvisa",
   "getting_started.developers": "Utvecklare",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Hitta vÃ¤nner frÃ¥n Twitter",
   "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": "SÃ¤kerhet",
   "getting_started.terms": "AnvÃ¤ndarvillkor",
+  "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.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",
   "home.column_settings.basic": "GrundlÃ¤ggande",
   "home.column_settings.show_reblogs": "Visa knuffar",
   "home.column_settings.show_replies": "Visa svar",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "att navigera tillbaka",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "att knuffa",
   "keyboard_shortcuts.column": "att fokusera en status i en av kolumnerna",
   "keyboard_shortcuts.compose": "att fokusera komponera text fÃ¤ltet",
   "keyboard_shortcuts.description": "Description",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "att flytta ner i listan",
   "keyboard_shortcuts.enter": "to open status",
   "keyboard_shortcuts.favourite": "att favorisera",
+  "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": "Snabbvalstangent",
   "keyboard_shortcuts.legend": "att visa denna Ã¶versikt",
+  "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "att nÃ¤mna fÃ¶rfattaren",
+  "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.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "to open author's profile",
   "keyboard_shortcuts.reply": "att svara",
+  "keyboard_shortcuts.requests": "to open follow requests list",
   "keyboard_shortcuts.search": "att fokusera sÃ¶kfÃ¤ltet",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "att visa/gÃ¶mma text bakom CW",
   "keyboard_shortcuts.toot": "att bÃ¶rja en helt ny toot",
   "keyboard_shortcuts.unfocus": "att avfokusera komponera text fÃ¤lt / sÃ¶kfÃ¤lt",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Hittades inte",
   "missing_indicator.sublabel": "Den hÃ¤r resursen kunde inte hittas",
   "mute_modal.hide_notifications": "DÃ¶lj notifikationer frÃ¥n denna anvÃ¤ndare?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blockerade anvÃ¤ndare",
   "navigation_bar.community_timeline": "Lokal tidslinje",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direktmeddelanden",
   "navigation_bar.discover": "UpptÃ¤ck",
   "navigation_bar.domain_blocks": "Dolda domÃ¤ner",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "Ã„r du sÃ¤ker pÃ¥ att du vill radera alla dina meddelanden permanent?",
   "notifications.column_settings.alert": "Skrivbordsmeddelanden",
   "notifications.column_settings.favourite": "Favoriter:",
+  "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.follow": "Nya fÃ¶ljare:",
   "notifications.column_settings.mention": "OmnÃ¤mningar:",
   "notifications.column_settings.push": "Push meddelanden",
-  "notifications.column_settings.push_meta": "Denna anordning",
   "notifications.column_settings.reblog": "Knuffar:",
   "notifications.column_settings.show": "Visa i kolumnen",
   "notifications.column_settings.sound": "Spela upp ljud",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} aviseringar",
-  "onboarding.done": "Klart",
-  "onboarding.next": "NÃ¤sta",
-  "onboarding.page_five.public_timelines": "Den lokala tidslinjen visar offentliga inlÃ¤gg frÃ¥n alla pÃ¥ {domain}. Den fÃ¶renade tidslinjen visar offentliga inlÃ¤gg frÃ¥n alla personer pÃ¥ {domain} som fÃ¶ljer. Dom hÃ¤r offentliga tidslinjerna Ã¤r ett bra sÃ¤tt att upptÃ¤cka nya mÃ¤nniskor.",
-  "onboarding.page_four.home": "Hemmatidslinjen visar inlÃ¤gg frÃ¥n personer du fÃ¶ljer.",
-  "onboarding.page_four.notifications": "Meddelandekolumnen visar nÃ¤r nÃ¥gon interagerar med dig.",
-  "onboarding.page_one.federation": "Mastodon Ã¤r ett nÃ¤tverk av oberoende servrar som ansluter fÃ¶r att skapa ett stÃ¶rre socialt nÃ¤tverk. Vi kallar dessa servrar instanser.",
-  "onboarding.page_one.full_handle": "Ditt fullstÃ¤ndiga anvÃ¤ndarnamn/mastodonadress",
-  "onboarding.page_one.handle_hint": "Det hÃ¤r Ã¤r vad du skulle berÃ¤tta fÃ¶r dina vÃ¤nner att sÃ¶ka efter.",
-  "onboarding.page_one.welcome": "VÃ¤lkommen till Mastodon!",
-  "onboarding.page_six.admin": "Din instansadmin Ã¤r {admin}.",
-  "onboarding.page_six.almost_done": "Snart klart...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Det finns {apps} tillgÃ¤ngligt fÃ¶r iOS, Android och andra plattformar.",
-  "onboarding.page_six.github": "Mastodon Ã¤r fri programvara med Ã¶ppen kÃ¤llkod. Du kan rapportera fel, efterfrÃ¥ga funktioner eller bidra till koden pÃ¥ {github}.",
-  "onboarding.page_six.guidelines": "gemenskapsriktlinjer",
-  "onboarding.page_six.read_guidelines": "VÃ¤nligen lÃ¤s {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobilappar",
-  "onboarding.page_three.profile": "Redigera din profil fÃ¶r att Ã¤ndra ditt avatar, bio och visningsnamn. DÃ¤r hittar du Ã¤ven andra instÃ¤llningar.",
-  "onboarding.page_three.search": "AnvÃ¤nd sÃ¶kfÃ¤ltet fÃ¶r att hitta personer och titta pÃ¥ hashtags, till exempel {illustration} och {introductions}. FÃ¶r att leta efter en person som inte befinner sig i detta fall anvÃ¤nd deras fulla handhavande.",
-  "onboarding.page_two.compose": "Skriv inlÃ¤gg frÃ¥n skrivkolumnen. Du kan ladda upp bilder, Ã¤ndra integritetsinstÃ¤llningar och lÃ¤gga till varningar med ikonerna nedan.",
-  "onboarding.skip": "Hoppa Ã¶ver",
   "privacy.change": "Justera sekretess",
   "privacy.direct.long": "Skicka endast till nÃ¤mnda anvÃ¤ndare",
   "privacy.direct.short": "Direkt",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, ett {result} andra {results}}",
   "standalone.public_title": "En titt inuti...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Ta bort knuff",
   "status.cannot_reblog": "Detta inlÃ¤gg kan inte knuffas",
   "status.delete": "Ta bort",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direktmeddela @{name}",
   "status.embed": "BÃ¤dda in",
   "status.favourite": "Favorit",
@@ -267,9 +312,11 @@
   "status.open": "Utvidga denna status",
   "status.pin": "FÃ¤st i profil",
   "status.pinned": "FÃ¤st toot",
+  "status.read_more": "Read more",
   "status.reblog": "Knuff",
   "status.reblog_private": "Knuffa till de ursprungliga Ã¥hÃ¶rarna",
   "status.reblogged_by": "{name} knuffade",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Radera & gÃ¶r om",
   "status.reply": "Svara",
   "status.replyAll": "Svara pÃ¥ trÃ¥den",
@@ -281,8 +328,11 @@
   "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": "Show thread",
   "status.unmute_conversation": "Ã–ppna konversation",
   "status.unpin": "Ã…ngra fÃ¤st i profil",
+  "suggestions.dismiss": "Dismiss suggestion",
+  "suggestions.header": "You might be interested inâ€¦",
   "tabs_bar.federated_timeline": "FÃ¶renad",
   "tabs_bar.home": "Hem",
   "tabs_bar.local_timeline": "Lokal",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d510d011fd988fa03addb3c713686883efb4131
--- /dev/null
+++ b/app/javascript/mastodon/locales/ta.json
@@ -0,0 +1,358 @@
+{
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Bot",
+  "account.block": "Block @{name}",
+  "account.block_domain": "Hide everything from {domain}",
+  "account.blocked": "Blocked",
+  "account.direct": "Direct message @{name}",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.domain_blocked": "Domain hidden",
+  "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
+  "account.follow": "Follow",
+  "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
+  "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
+  "account.follows_you": "Follows you",
+  "account.hide_reblogs": "Hide boosts from @{name}",
+  "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.posts": "Toots",
+  "account.posts_with_replies": "Toots and replies",
+  "account.report": "Report @{name}",
+  "account.requested": "Awaiting approval. Click to cancel follow request",
+  "account.share": "Share @{name}'s profile",
+  "account.show_reblogs": "Show boosts from @{name}",
+  "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.view_full_profile": "View full profile",
+  "alert.unexpected.message": "An unexpected error occurred.",
+  "alert.unexpected.title": "Oops!",
+  "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.community": "Local timeline",
+  "column.direct": "Direct messages",
+  "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.media_only": "Media 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.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive.marked": "Media is marked as sensitive",
+  "compose_form.sensitive.unmarked": "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.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.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.mute.confirm": "Mute",
+  "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}?",
+  "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_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
+  "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_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.public_timeline": "the public timeline",
+  "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 instances to fill it up",
+  "follow_request.authorize": "Authorize",
+  "follow_request.reject": "Reject",
+  "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.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",
+  "home.column_settings.basic": "Basic",
+  "home.column_settings.show_reblogs": "Show boosts",
+  "home.column_settings.show_replies": "Show replies",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "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.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.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
+  "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.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.new.create": "Add list",
+  "lists.new.title_placeholder": "New list title",
+  "lists.search": "Search among people you follow",
+  "lists.subheading": "Your lists",
+  "loading_indicator.label": "Loading...",
+  "media_gallery.toggle_visible": "Toggle visibility",
+  "missing_indicator.label": "Not found",
+  "missing_indicator.sublabel": "This resource could not be found",
+  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
+  "navigation_bar.blocks": "Blocked users",
+  "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.info": "About this instance",
+  "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.mention": "{name} mentioned you",
+  "notification.reblog": "{name} boosted your status",
+  "notifications.clear": "Clear notifications",
+  "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.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
+  "notifications.column_settings.follow": "New followers:",
+  "notifications.column_settings.mention": "Mentions:",
+  "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.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} notifications",
+  "privacy.change": "Adjust status privacy",
+  "privacy.direct.long": "Post to 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",
+  "regeneration_indicator.label": "Loadingâ€¦",
+  "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.seconds": "{number}s",
+  "reply_indicator.cancel": "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.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.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
+  "status.block": "Block @{name}",
+  "status.cancel_reblog_private": "Unboost",
+  "status.cannot_reblog": "This post cannot be boosted",
+  "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
+  "status.direct": "Direct message @{name}",
+  "status.embed": "Embed",
+  "status.favourite": "Favourite",
+  "status.filtered": "Filtered",
+  "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 toot",
+  "status.read_more": "Read more",
+  "status.reblog": "Boost",
+  "status.reblog_private": "Boost to original audience",
+  "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.reply": "Reply",
+  "status.replyAll": "Reply to thread",
+  "status.report": "Report @{name}",
+  "status.sensitive_toggle": "Click to view",
+  "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.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",
+  "tabs_bar.home": "Home",
+  "tabs_bar.local_timeline": "Local",
+  "tabs_bar.notifications": "Notifications",
+  "tabs_bar.search": "Search",
+  "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
+  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "upload_area.title": "Drag & drop to upload",
+  "upload_button.label": "Add media (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.focus": "Crop",
+  "upload_form.undo": "Delete",
+  "upload_progress.label": "Uploading...",
+  "video.close": "Close video",
+  "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/te.json b/app/javascript/mastodon/locales/te.json
index 7e405b8c29c5e9f6d660ce1f416a6cddc87b62bc..7306ec00194d2a5ee59790186792b5e8d9a7a761 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "à°œà°¾à°¬à°¿à°¤à°¾à°² à°¨à±à°‚à°¡à°¿ à°šà±‡à°°à±à°šà± à°²à±‡à°¦à°¾ à°¤à±€à°¸à°¿à°µà±‡à°¯à°¿",
   "account.badges.bot": "à°¬à°¾à°Ÿà±",
   "account.block": "@{name} à°¨à± à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°¿",
   "account.block_domain": "{domain} à°¨à±à°‚à°šà°¿ à°…à°¨à±à°¨à±€ à°¦à°¾à°šà°¿à°ªà±†à°Ÿà±à°Ÿà±",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "à°•à±à°°à°¿à°‚à°¦à°¿ à°¸à°®à°¾à°šà°¾à°°à°‚ à°µà°¾à°¡à±à°•à°°à°¿ à°¯à±Šà°•à±à°• à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à± à°…à°¸à°‚à°ªà±‚à°°à±à°¤à°¿à°—à°¾ à°ªà±à°°à°¤à°¿à°¬à°¿à°‚à°¬à°¿à°‚à°šà°µà°šà±à°šà±.",
   "account.domain_blocked": "à°¡à±Šà°®à±ˆà°¨à± à°¦à°¾à°šà°¿à°ªà±†à°Ÿà±à°Ÿà°¬à°¡à°¿à°¨à°¦à°¿",
   "account.edit_profile": "à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à°¿ à°¸à°µà°°à°¿à°‚à°šà°‚à°¡à°¿",
+  "account.endorse": "à°ªà±à°°à±Šà°«à±ˆà°²à±à°²à±‹ à°šà±‚à°ªà°¿à°‚à°šà±",
   "account.follow": "à°…à°¨à±à°¸à°°à°¿à°‚à°šà±",
   "account.followers": "à°…à°¨à±à°šà°°à±à°²à±",
+  "account.followers.empty": "à°ˆ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°¡à°¿à°¨à°¿ à°‡à°‚à°•à°¾ à°Žà°µà°°à±‚ à°…à°¨à±à°¸à°°à°¿à°‚à°šà°¡à°‚à°²à±‡à°¦à±.",
   "account.follows": "à°…à°¨à±à°¸à°°à°¿à°¸à±à°¤à±à°¨à±à°¨à°µà°¿",
+  "account.follows.empty": "à°ˆ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à°¿ à°‡à°‚à°•à°¾ à°Žà°µà°°à°¿à°¨à±€ à°…à°¨à±à°¸à°°à°¿à°‚à°šà°¡à°‚à°²à±‡à°¦à±.",
   "account.follows_you": "à°®à°¿à°®à±à°®à°²à±à°¨à°¿ à°…à°¨à±à°¸à°°à°¿à°¸à±à°¤à±à°¨à±à°¨à°¾à°°à±",
   "account.hide_reblogs": "@{name} à°¨à±à°‚à°šà°¿ à°¬à±‚à°¸à±à°Ÿà± à°²à°¨à± à°¦à°¾à°šà°¿à°ªà±†à°Ÿà±à°Ÿà±",
+  "account.link_verified_on": "à°ˆ à°²à°‚à°•à±† à°¯à±Šà°•à±à°• à°¯à°¾à°œà°®à°¾à°¨à±à°¯à°‚ {date}à°¨ à°ªà°°à±€à°•à±à°·à°¿à°‚à°šà°¬à°¡à°¿à°‚à°¦à°¿",
+  "account.locked_info": "à°ˆ à°–à°¾à°¤à°¾ à°¯à±Šà°•à±à°• à°—à±‹à°ªà±à°¯à°¤ à°¸à±à°¥à°¿à°¤à°¿ à°²à°¾à°•à± à°šà±‡à°¯à°¬à°¡à°¿ à°µà±à°‚à°¦à°¿. à°ˆ à°–à°¾à°¤à°¾à°¨à± à°Žà°µà°°à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà°µà°šà±à°šà±‹ à°¯à°œà°®à°¾à°¨à±‡ à°¨à°¿à°°à±à°£à°¯à°‚ à°¤à±€à°¸à±à°•à±à°‚à°Ÿà°¾à°°à±.",
   "account.media": "à°®à±€à°¡à°¿à°¯à°¾",
   "account.mention": "@{name}à°¨à± à°ªà±à°°à°¸à±à°¤à°¾à°µà°¿à°‚à°šà±",
   "account.moved_to": "{name} à°‡à°•à±à°•à°¡à°¿à°•à°¿ à°®à°¾à°°à°¾à°°à±:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "@{name}à°¨à±à°‚à°šà°¿ à°¬à±‚à°¸à±à°Ÿà± à°²à°¨à± à°šà±‚à°ªà°¿à°‚à°šà±",
   "account.unblock": "@{name}à°ªà±ˆ à°¬à±à°²à°¾à°•à± à°¨à± à°¤à±Šà°²à°—à°¿à°‚à°šà±",
   "account.unblock_domain": "{domain}à°¨à± à°¦à°¾à°šà°µà°¦à±à°¦à±",
+  "account.unendorse": "à°ªà±à°°à±Šà°«à±ˆà°²à±à°²à±‹ à°šà±‚à°ªà°¿à°‚à°šà°µà°¦à±à°¦à±",
   "account.unfollow": "à°…à°¨à±à°¸à°°à°¿à°‚à°šà°µà°¦à±à°¦à±",
   "account.unmute": "@{name}à°ªà±ˆ à°®à±à°¯à±‚à°Ÿà± à°¨à°¿ à°¤à±Šà°²à°—à°¿à°‚à°šà±",
   "account.unmute_notifications": "@{name} à°¨à±à°‚à°šà°¿ à°ªà±à°°à°•à°Ÿà°¨à°²à°ªà±ˆ à°®à±à°¯à±‚à°Ÿà± à°¨à°¿ à°¤à±Šà°²à°—à°¿à°‚à°šà±",
@@ -65,7 +72,7 @@
   "compose_form.hashtag_warning": "à°ˆ à°Ÿà±‚à°Ÿà± à°…à°¨à±à°²à°¿à°¸à±à°Ÿà±†à°¡à± à°•à°¾à°¬à°Ÿà±à°Ÿà°¿ à° à°¹à°¾à°·à± à°Ÿà±à°¯à°¾à°—à± à°•à±à°°à°¿à°‚à°¦à°•à±‚ à°°à°¾à°¦à±. à°ªà°¬à±à°²à°¿à°•à± à°Ÿà±‚à°Ÿà± à°²à°¨à± à°®à°¾à°¤à±à°°à°®à±‡ à°¹à°¾à°·à± à°Ÿà±à°¯à°¾à°—à± à°¦à±à°µà°¾à°°à°¾ à°¶à±‹à°§à°¿à°‚à°šà°µà°šà±à°šà±.",
   "compose_form.lock_disclaimer": "à°®à±€ à°–à°¾à°¤à°¾ {locked} à°šà±‡à°¯à°¬à°¡à°²à±‡à°¦à±. à°Žà°µà°°à±ˆà°¨à°¾ à°®à°¿à°®à±à°®à°²à±à°¨à°¿ à°…à°¨à±à°¸à°°à°¿à°‚à°šà°¿ à°®à±€ à°…à°¨à±à°šà°°à±à°²à°•à±-à°®à°¾à°¤à±à°°à°®à±‡ à°ªà±‹à°¸à±à°Ÿà±à°²à°¨à± à°µà±€à°•à±à°·à°¿à°‚à°šà°µà°šà±à°šà±.",
   "compose_form.lock_disclaimer.lock": "à°¬à°¿à°—à°¿à°‚à°šà°¬à°¡à°¿à°¨à°¦à°¿",
-  "compose_form.placeholder": "à°®à±€ à°®à°¨à°¸à±à°¸à±à°²à±‹ à°à°®à°¿ à°‰à°‚à°¦à°¿?",
+  "compose_form.placeholder": "à°®à±€ à°®à°¨à°¸à±à°¸à±à°²à±‹ à°à°®à±à°‚à°¦à°¿?",
   "compose_form.publish": "à°Ÿà±‚à°Ÿà±",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive.marked": "à°®à±€à°¡à°¿à°¯à°¾ à°¸à±à°¨à±à°¨à°¿à°¤à°®à±ˆà°¨à°¦à°¿à°—à°¾ à°—à±à°°à±à°¤à°¿à°‚à°šà°¬à°¡à°¿à°‚à°¦à°¿",
@@ -85,7 +92,9 @@
   "confirmations.mute.confirm": "à°®à±à°¯à±‚à°Ÿà± à°šà±‡à°¯à°¿",
   "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}à°¨à± à°®à±€à°°à± à°–à°šà±à°šà°¿à°¤à°‚à°—à°¾ à°…à°¨à±à°¸à°°à°¿à°‚à°šà°µà°¦à±à°¦à°¨à±à°•à±à°‚à°Ÿà±à°¨à±à°¨à°¾à°°à°¾?",
   "embed.instructions": "à°¦à°¿à°—à±à°µ à°•à±‹à°¡à±à°¨à± à°•à°¾à°ªà±€ à°šà±‡à°¯à°¡à°‚ à°¦à±à°µà°¾à°°à°¾ à°®à±€ à°µà±†à°¬à±à°¸à±ˆà°Ÿà±à°²à±‹ à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à± à°¨à°¿ à°ªà±Šà°‚à°¦à±à°ªà°°à°šà°‚à°¡à°¿.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "à°¶à±‹à°§à°¨ à°«à°²à°¿à°¤à°¾à°²à±",
   "emoji_button.symbols": "à°šà°¿à°¹à±à°¨à°¾à°²à±",
   "emoji_button.travel": "à°ªà±à°°à°¯à°¾à°£à°‚ & à°ªà±à°°à°¦à±‡à°¶à°¾à°²à±",
+  "empty_column.account_timeline": "à°‡à°•à±à°•à°¡ à° à°Ÿà±‚à°Ÿà±à°²à±‚ à°²à±‡à°µà±!No toots here!",
+  "empty_column.blocks": "à°®à±€à°°à± à°‡à°‚à°•à°¾ à° à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°¨à±‚ à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°²à±‡à°¦à±.",
   "empty_column.community": "à°¸à±à°¥à°¾à°¨à°¿à°• à°•à°¾à°²à°•à±à°°à°®à°‚ à°–à°¾à°³à±€à°—à°¾ à°‰à°‚à°¦à°¿. à°®à±Šà°¦à°²à±à°ªà±†à°Ÿà±à°Ÿà°¡à°¾à°¨à°¿à°•à°¿ à°¬à°¹à°¿à°°à°‚à°—à°‚à°—à°¾ à°à°¦à±‹ à°’à°•à°Ÿà°¿ à°µà±à°°à°¾à°¯à°‚à°¡à°¿!",
   "empty_column.direct": "à°®à±€à°•à± à°‡à°‚à°•à°¾ à° à°ªà±à°°à°¤à±à°¯à°•à±à°· à°¸à°‚à°¦à±‡à°¶à°¾à°²à± à°²à±‡à°µà±. à°®à±€à°°à± à°’à°•à°¦à°¾à°¨à±à°¨à°¿ à°ªà°‚à°ªà°¿à°¨à°ªà±à°ªà±à°¡à± à°²à±‡à°¦à°¾ à°¸à±à°µà±€à°•à°°à°¿à°‚à°šà°¿à°¨à°ªà±à°ªà±à°¡à±, à°…à°¦à°¿ à°‡à°•à±à°•à°¡ à°šà±‚à°ªà°¬à°¡à±à°¤à±à°‚à°¦à°¿.",
+  "empty_column.domain_blocks": "à°¦à°¾à°šà°¬à°¡à°¿à°¨ à°¡à±Šà°®à±ˆà°¨à±à°²à± à°‡à°‚à°•à°¾ à°à°®à±€ à°²à±‡à°µà±.",
+  "empty_column.favourited_statuses": "à°®à±€à°•à± à°‡à°·à±à°Ÿà°ªà°¡à°¿à°¨ à°Ÿà±‚à°Ÿà±à°²à± à°‡à°‚à°•à°¾ à°Žà°®à±€ à°²à±‡à°µà±. à°®à±€à°°à± à°’à°•à°¦à°¾à°¨à°¿à°¨à°¿ à°‡à°·à±à°Ÿà°ªà°¡à°¿à°¨à°ªà±à°ªà±à°¡à±, à°…à°¦à°¿ à°‡à°•à±à°•à°¡ à°•à°¨à°¿à°ªà°¿à°¸à±à°¤à±à°‚à°¦à°¿.",
+  "empty_column.favourites": "à°ˆ à°Ÿà±‚à°Ÿà±à°¨à± à°‡à°‚à°•à°¾ à°Žà°µà°°à±‚ à°‡à°·à±à°Ÿà°ªà°¡à°²à±‡à°¦à±. à°Žà°µà°°à±ˆà°¨à°¾ à°…à°²à°¾ à°šà±‡à°¸à°¿à°¨à°ªà±à°ªà±à°¡à±, à°…à°µà°¿ à°‡à°•à±à°•à°¡ à°•à°¨à°¬à°¡à°¤à°¾à°¯à°¿.",
+  "empty_column.follow_requests": "à°®à±€à°•à± à°‡à°‚à°•à°¾ à°«à°¾à°²à±‹ à°°à°¿à°•à±à°µà±†à°¸à±à°Ÿà±à°²à± à°à°®à±€ à°°à°¾à°²à±‡à°¦à±. à°®à±€à°•à± à°’à°•à°Ÿà°¿ à°°à°¾à°—à°¾à°¨à±‡, à°…à°¦à°¿ à°‡à°•à±à°•à°¡ à°•à°¨à°¬à°¡à±à°¤à±à°‚à°¦à°¿.",
   "empty_column.hashtag": "à°‡à°‚à°•à°¾ à°¹à°¾à°·à± à°Ÿà±à°¯à°¾à°—à±à°²à±‹ à°à°®à±€ à°²à±‡à°¦à±.",
   "empty_column.home": "à°®à±€ à°¹à±‹à°®à± à°•à°¾à°²à°•à±à°°à°®à°‚ à°–à°¾à°³à±€à°—à°¾ à°‰à°‚à°¦à°¿! {Public} à°¨à± à°¸à°‚à°¦à°°à±à°¶à°¿à°‚à°šà°‚à°¡à°¿ à°²à±‡à°¦à°¾ à°‡à°¤à°° à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°¨à± à°•à°²à±à°¸à±à°•à±‹à°µà°¡à°¾à°¨à°¿à°•à°¿ à°®à°°à°¿à°¯à± à°…à°¨à±à°µà±‡à°·à°£ à°•à±‹à°¸à°‚ à°¶à±‹à°§à°¨à°¨à± à°‰à°ªà°¯à±‹à°—à°¿à°‚à°šà°‚à°¡à°¿.",
   "empty_column.home.public_timeline": "à°ªà±à°°à°œà°¾ à°•à°¾à°²à°•à±à°°à°®à°‚",
   "empty_column.list": "à°‡à°‚à°•à°¾ à°ˆ à°œà°¾à°¬à°¿à°¤à°¾à°²à±‹ à°à°¦à±€ à°²à±‡à°¦à±. à°ˆ à°œà°¾à°¬à°¿à°¤à°¾à°²à±‹à°¨à°¿ à°¸à°à±à°¯à±à°²à± à°•à±Šà°¤à±à°¤ à°¸à±à°Ÿà±‡à°Ÿà°¸à± à°²à°¨à± à°ªà±‹à°¸à±à°Ÿà± à°šà±‡à°¸à°¿à°¨à°ªà±à°ªà±à°¡à±, à°…à°µà°¿ à°‡à°•à±à°•à°¡ à°•à°¨à°¿à°ªà°¿à°¸à±à°¤à°¾à°¯à°¿.",
+  "empty_column.lists": "à°®à±€à°•à± à°‡à°‚à°•à°¾ à°œà°¾à°¬à°¿à°¤à°¾à°²à± à°à°®à±€ à°²à±‡à°µà±. à°®à±€à°°à± à°’à°•à°Ÿà°¿ à°¸à±ƒà°·à±à°Ÿà°¿à°‚à°šà°—à°¾à°¨à±‡, à°…à°¦à°¿ à°‡à°•à±à°•à°¡ à°•à°¨à°¬à°¡à±à°¤à±à°‚à°¦à°¿.",
+  "empty_column.mutes": "à°®à±€à°°à± à°‡à°‚à°•à°¾ à° à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°¨à±‚ à°®à±à°¯à±‚à°Ÿà± à°šà±‡à°¯à°²à±‡à°¦à±.",
   "empty_column.notifications": "à°®à±€à°•à± à°‡à°‚à°•à°¾ à° à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°²à± à°²à±‡à°µà±. à°¸à°‚à°à°¾à°·à°£à°¨à± à°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà°¡à°¾à°¨à°¿à°•à°¿ à°‡à°¤à°°à±à°²à°¤à±‹ à°ªà±à°°à°¤à°¿à°¸à±à°ªà°‚à°¦à°¿à°‚à°šà°‚à°¡à°¿.",
   "empty_column.public": "à°‡à°•à±à°•à°¡ à°à°®à±€ à°²à±‡à°¦à±! à°¦à±€à°¨à±à°¨à°¿ à°¨à°¿à°‚à°ªà°¡à°¾à°¨à°¿à°•à°¿ à°¬à°¹à°¿à°°à°‚à°—à°‚à°—à°¾ à°à°¦à±ˆà°¨à°¾ à°µà±à°°à°¾à°¯à°‚à°¡à°¿, à°²à±‡à°¦à°¾ à°‡à°¤à°° à°¦à±ƒà°·à±à°Ÿà°¾à°‚à°¤à°¾à°²à±à°²à±‹à°¨à°¿ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°¨à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà°‚à°¡à°¿",
   "follow_request.authorize": "à°…à°¨à±à°®à°¤à°¿à°‚à°šà±",
   "follow_request.reject": "à°¤à°¿à°°à°¸à±à°•à°°à°¿à°‚à°šà±",
   "getting_started.developers": "à°¡à±†à°µà°²à°ªà°°à±à°²à±",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "à°Ÿà±à°µà°¿à°Ÿà±à°Ÿà°°à± à°¨à±à°‚à°¡à°¿ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à°¨à± à°•à°¨à±à°—à±Šà°¨à°‚à°¡à°¿",
+  "getting_started.directory": "à°ªà±à°°à±Šà°«à±ˆà°²à± à°¡à±ˆà°°à±†à°•à±à°Ÿà°°à±€Profile 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} à°²à±‡à°•à±à°‚à°¡à°¾",
+  "hashtag.column_settings.tag_mode.all": "à°‡à°µà°¨à±à°¨à±€All of these",
+  "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": "à°ªà±à°°à°¾à°¥à°®à°¿à°•",
   "home.column_settings.show_reblogs": "à°¬à±‚à°¸à±à°Ÿà± à°²à°¨à± à°šà±‚à°ªà°¿à°‚à°šà±",
   "home.column_settings.show_replies": "à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°¾à°²à°¨à± à°šà±‚à°ªà°¿à°‚à°šà±",
+  "introduction.federation.action": "à°¤à°°à±à°µà°¾à°¤",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "à°«à±†à°¡à°¿à°µà°°à±à°¸à± à°²à±‹à°¨à°¿ à°‡à°¤à°° à°¸à°°à±à°µà°°à±à°²à°•à± à°šà±†à°‚à°¦à°¿à°¨ à°ªà°¬à±à°²à°¿à°•à± à°Ÿà±‚à°Ÿà±à°²à± à°«à±†à°¡à°°à±‡à°Ÿà±†à°¡à± à°Ÿà±ˆà°‚à°²à±ˆà°¨à± à°²à±‹ à°•à°¨à°¿à°ªà°¿à°¸à±à°¤à°¾à°¯à°¿.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "à°®à±€à°°à± à°…à°¨à±à°¸à°°à°¿à°¸à±à°¤à±à°¨à±à°¨ à°–à°¾à°¤à°¾à°² à°Ÿà±‚à°Ÿà±à°²à± à°¹à±‹à°‚ à°«à±€à°¡à± à°²à±‹ à°•à°¨à°¿à°ªà°¿à°¸à±à°¤à°¾à°¯à°¿. à° à°¸à°°à±à°µà°°à±à°²à±‹ à°Žà°µà°°à°¿à°¨à±ˆà°¨à°¾ à°®à±€à°°à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà°µà°šà±à°šà±!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "à°ˆ à°¸à°°à±à°µà°°à±à°•à± à°šà±†à°‚à°¦à°¿à°¨ à°–à°¾à°¤à°¾à°² à°ªà°¬à±à°²à°¿à°•à± à°Ÿà±‚à°Ÿà±à°²à± à°²à±‹à°•à°²à± à°Ÿà±ˆà°‚à°²à±ˆà°¨à± à°²à±‹ à°•à°¨à°¿à°ªà°¿à°¸à±à°¤à°¾à°¯à°¿.",
+  "introduction.interactions.action": "à°¬à±‹à°§à°¨à°¨à± à°®à±à°—à°¿à°‚à°šà±!",
+  "introduction.interactions.favourite.headline": "à°‡à°·à±à°Ÿà°‚",
+  "introduction.interactions.favourite.text": "à°®à±€à°°à± à°à°¦à±ˆà°¨à°¾ à°Ÿà±‚à°Ÿà±â€Œà°¨à± à°à°µà°¿à°·à±à°¯à°¤à±à°¤à± à°•à±‹à°¸à°‚ à°¦à°¾à°šà±à°•à±‹à°µà°šà±à°šà± à°®à°°à°¿à°¯à± à°®à±€à°•à± à°† à°Ÿà±‚à°Ÿà± à°¨à°šà±à°šà°¿à°¨à°‚à°¦à°¨à°¿ à°¤à±†à°²à°¿à°¯à°œà±‡à°¯à°¡à°‚ à°•à±‹à°¸à°‚ \"à°‡à°·à±à°Ÿà°‚\" à°¨à± à°¨à±Šà°•à±à°•à°¿ à°°à°šà°¯à°¿à°¤à°•à± à°¤à±†à°²à°¿à°¯à°œà±‡à°¯à°µà°šà±à°šà±.",
+  "introduction.interactions.reblog.headline": "à°¬à±‚à°¸à±à°Ÿà±",
+  "introduction.interactions.reblog.text": "à°µà±‡à°°à±‡ à°µà±à°¯à°•à±à°¤à±à°² à°Ÿà±‚à°Ÿà±à°²à°¨à± à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¯à°¡à°‚ à°¦à±à°µà°¾à°°à°¾ à°† à°Ÿà±‚à°Ÿà±â€Œà°¨à± à°®à±€ à°…à°¨à±à°šà°°à±à°²à°¤à±‹ à°ªà°‚à°šà±à°•à±‹à°µà°šà±à°šà±.",
+  "introduction.interactions.reply.headline": "à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°‚",
+  "introduction.interactions.reply.text": "à°®à±€à°°à± à°‡à°¤à°° à°µà±à°¯à°•à±à°¤à±à°² à°Ÿà±‚à°Ÿà±à°²à°•à±, à°®à±€ à°¸à±à°µà°‚à°¤ à°Ÿà±‚à°¤à±à°²à°•à± à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°‚ à°‡à°µà±à°µà°¡à°‚ à°µà°²à±à°² à°—à±Šà°²à±à°¸à± à°šà°°à±à°š à°ªà±à°°à°¾à°°à°‚à°à°®à°µà±à°¤à±à°‚à°¦à°¿.",
+  "introduction.welcome.action": "à°‡à°• à°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà±!",
+  "introduction.welcome.headline": "à°®à±Šà°¦à°Ÿà°¿ à°®à±†à°Ÿà±à°²à±",
+  "introduction.welcome.text": "à°«à±†à°¡à°¿à°µà°°à±à°¸à± à°•à± à°¸à±à°µà°¾à°—à°¤à°‚! à°®à°°à°¿ à°•à±Šà°‚à°¤à°¸à±‡à°ªà°Ÿà±à°²à±‹ à°®à±€à°°à± à°¸à°‚à°¦à±‡à°¶à°¾à°²à°¨à± à°ªà±à°°à°¸à°¾à°°à°‚ à°šà±‡à°¯à°µà°šà±à°šà± à°®à°°à°¿à°¯à± à°µà±‡à°°à±à°µà±‡à°°à± à°¸à°°à±à°µà°°à±à°²à°²à±‹ à°µà±à°¨à±à°¨ à°®à±€ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à°¤à±‹ à°®à°¾à°Ÿà±à°²à°¾à°¡à°µà°šà±à°šà±. à°•à°¾à°¨à±€ à°ˆ à°¸à°°à±à°µà°°à±, {domain}, à°ªà±à°°à°¤à±à°¯à±‡à°•à°®à±ˆà°¨à°¦à°¿ - à°‡à°¦à°¿ à°®à±€ à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à± à°¹à±‹à°¸à±à°Ÿà± à°šà±‡à°¸à±à°¤à±à°‚à°¦à°¿, à°•à°¾à°¬à°Ÿà±à°Ÿà°¿ à°ˆ à°¸à°°à±à°µà°°à± à°ªà±‡à°°à±à°¨à± à°—à±à°°à±à°¤à±à°‚à°šà±à°•à±‹à°‚à°¡à°¿.",
   "keyboard_shortcuts.back": "à°µà±†à°¨à°•à±à°•à°¿ à°¤à°¿à°°à°¿à°—à°¿ à°µà±†à°³à±à°³à°¡à°¾à°¨à°¿à°•à°¿",
+  "keyboard_shortcuts.blocked": "à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°¬à°¡à°¿à°¨ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°² à°œà°¾à°¬à°¿à°¤à°¾à°¨à± à°¤à±†à°°à°µà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.boost": "à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¯à°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.column": "à°¨à°¿à°²à±à°µà± à°µà°°à±à°¸à°²à°²à±‹ à°’à°•à°¦à°¾à°¨à°¿à°ªà±ˆ à°¦à±ƒà°·à±à°Ÿà°¿ à°ªà±†à°Ÿà±à°Ÿà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.compose": "à°•à°‚à°ªà±‹à°œà± à°Ÿà±†à°•à±à°¸à±à°Ÿà±à°à°°à°¿à°¯à°¾ à°ªà±ˆ à°¦à±ƒà°·à±à°Ÿà°¿ à°ªà±†à°Ÿà±à°Ÿà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.description": "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.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.pinned": "à°…à°¤à°¿à°•à°¿à°‚à°šà°¬à°¡à°¿à°¨ à°Ÿà±‚à°Ÿà±à°² à°œà°¾à°¬à°¿à°¤à°¾à°¨à± à°¤à±†à°°à°µà°¡à°¾à°¨à°¿à°•à°¿",
+  "keyboard_shortcuts.profile": "à°°à°šà°¯à°¿à°¤ à°ªà±à°°à±Šà°«à±ˆà°²à± à°¨à± à°¤à±†à°°à°µà°¾à°²à°‚à°Ÿà±‡",
   "keyboard_shortcuts.reply": "à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°‚ à°‡à°µà±à°µà°¡à°¾à°¨à°¿à°•à°¿",
+  "keyboard_shortcuts.requests": "à°«à°¾à°²à±‹ à°°à°¿à°•à±à°µà±†à°¸à±à°Ÿà±à°² à°œà°¾à°¬à°¿à°¤à°¾à°¨à± à°¤à±†à°°à°µà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.search": "à°¶à±‹à°§à°¨à°ªà±ˆ à°¦à±ƒà°·à±à°Ÿà°¿ à°ªà±†à°Ÿà±à°Ÿà°‚à°¡à°¿",
+  "keyboard_shortcuts.start": "\"à°‡à°•à±à°•à°¡ à°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà°‚à°¡à°¿\" à°¨à°¿à°²à±à°µà± à°µà°°à±à°¸à°¨à± à°¤à±†à°°à°µà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.toggle_hidden": "CW à°µà±†à°¨à±à°• à°‰à°¨à±à°¨ à°ªà°¾à° à±à°¯à°¾à°¨à±à°¨à°¿ à°šà±‚à°ªà°¡à°¾à°¨à°¿à°•à°¿ / à°¦à°¾à°šà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.toot": "à°’à°• à°¸à°°à°¿à°•à±Šà°¤à±à°¤ à°Ÿà±‚à°Ÿà±à°¨à± à°ªà±à°°à°¾à°°à°‚à°à°¿à°‚à°šà°¡à°¾à°¨à°¿à°•à°¿",
   "keyboard_shortcuts.unfocus": "à°ªà°¾à° à±à°¯à°‚ à°µà±à°°à°¾à°¸à±‡ à°à°°à°¿à°¯à°¾/à°¶à±‹à°§à°¨ à°ªà°Ÿà±à°Ÿà°¿à°• à°¨à±à°‚à°¡à°¿ à°¬à°¯à°Ÿà°•à± à°°à°¾à°µà°¡à°¾à°¨à°¿à°•à°¿",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "à°¦à±Šà°°à°•à°²à±‡à°¦à±",
   "missing_indicator.sublabel": "à°ˆ à°µà°¨à°°à± à°•à°¨à±à°—à±Šà°¨à°¬à°¡à°²à±‡à°¦à±",
   "mute_modal.hide_notifications": "à°ˆ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à± à°¨à±à°‚à°¡à°¿ à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°²à°¨à± à°¦à°¾à°šà°¾à°²à°¾?",
+  "navigation_bar.apps": "à°®à±Šà°¬à±ˆà°²à± à°†à°ªà± à°²à±",
   "navigation_bar.blocks": "à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°¬à°¡à°¿à°¨ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à±",
   "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": "Muted words",
+  "navigation_bar.filters": "à°®à±à°¯à±‚à°Ÿà± à°šà±‡à°¯à°¬à°¡à°¿à°¨ à°ªà°¦à°¾à°²à±",
   "navigation_bar.follow_requests": "à°…à°¨à±à°¸à°°à°¿à°‚à°šà°¡à°¾à°¨à°¿à°•à°¿ à°…à°à±à°¯à°°à±à°§à°¨à°²à±",
   "navigation_bar.info": "à°ˆ à°¦à±ƒà°·à±à°Ÿà°¾à°‚à°¤à°‚ à°—à±à°°à°¿à°‚à°šà°¿",
   "navigation_bar.keyboard_shortcuts": "à°¹à°¾à°Ÿà± à°•à±€à°²à±",
@@ -186,35 +242,21 @@
   "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.mention": "à°ªà±à°°à°¸à±à°¤à°¾à°µà°¨à°²à±:",
   "notifications.column_settings.push": "à°ªà±à°·à± à°ªà±à°°à°•à°Ÿà°¨à°²à±",
-  "notifications.column_settings.push_meta": "à°ˆ à°ªà°°à°¿à°•à°°à°‚",
   "notifications.column_settings.reblog": "à°¬à±‚à°¸à±à°Ÿà± à°²à±:",
   "notifications.column_settings.show": "à°¨à°¿à°²à±à°µà± à°µà°°à±à°¸à°²à±‹ à°šà±‚à°ªà±",
   "notifications.column_settings.sound": "à°§à±à°µà°¨à°¿à°¨à°¿ à°ªà±à°²à±‡ à°šà±‡à°¯à°¿",
+  "notifications.filter.all": "à°…à°¨à±à°¨à±€",
+  "notifications.filter.boosts": "à°¬à±‚à°¸à±à°Ÿà±à°²à±",
+  "notifications.filter.favourites": "à°‡à°·à±à°Ÿà°¾à°²à±",
+  "notifications.filter.follows": "à°…à°¨à±à°¸à°°à°¿à°¸à±à°¤à±à°¨à±à°¨à°µà°¿",
+  "notifications.filter.mentions": "à°ªà±‡à°°à±à°•à±Šà°¨à±à°¨à°µà°¿",
   "notifications.group": "{count} à°ªà±à°°à°•à°Ÿà°¨à°²à±",
-  "onboarding.done": "à°ªà±‚à°°à±à°¤à°¯à°¿à°‚à°¦à°¿",
-  "onboarding.next": "à°¤à°°à±à°µà°¾à°¤",
-  "onboarding.page_five.public_timelines": "à°¸à±à°¥à°¾à°¨à°¿à°• à°•à°¾à°²à°•à±à°°à°®à°‚ {domain}à°²à±‹ à°ªà±à°°à°¤à°¿ à°’à°•à±à°•à°°à°¿ à°¨à±à°‚à°¡à°¿ à°ªà°¬à±à°²à°¿à°•à± à°ªà±‹à°¸à±à°Ÿà±à°²à°¨à± à°šà±‚à°ªà±à°¤à±à°‚à°¦à°¿. à°¸à°®à°¾à°–à±à°¯ à°•à°¾à°²à°•à±à°°à°®à°‚ {à°¡à±Šà°®à±ˆà°¨à±} à°²à±‹à°¨à°¿ à°µà±à°¯à°•à±à°¤à±à°²à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà±‡ à°ªà±à°°à°¤à°¿ à°’à°•à±à°•à°°à°¿ à°¨à±à°‚à°¡à°¿ à°ªà°¬à±à°²à°¿à°•à± à°ªà±‹à°¸à±à°Ÿà±à°²à°¨à± à°šà±‚à°ªà±à°¤à±à°‚à°¦à°¿. à°ˆ à°ªà°¬à±à°²à°¿à°•à± à°•à°¾à°²à°•à±à°°à°®à°¾à°²à± à°•à±à°°à±Šà°¤à±à°¤ à°µà±à°¯à°•à±à°¤à±à°²à°¨à± à°•à°¨à±à°—à±Šà°¨à°¡à°¾à°¨à°¿à°•à°¿ à°’à°• à°—à±Šà°ªà±à°ª à°®à°¾à°°à±à°—à°‚.",
-  "onboarding.page_four.home": "à°¹à±‹à°®à± à°•à°¾à°²à°•à±à°°à°®à°‚ à°®à±€à°°à± à°…à°¨à±à°¸à°°à°¿à°‚à°šà±‡ à°µà±à°¯à°•à±à°¤à±à°² à°¨à±à°‚à°¡à°¿ à°ªà±‹à°¸à±à°Ÿà±à°²à°¨à± à°šà±‚à°ªà°¿à°¸à±à°¤à±à°‚à°¦à°¿.",
-  "onboarding.page_four.notifications": "à°Žà°µà°°à±ˆà°¨à°¾ à°®à±€à°¤à±‹ à°¸à°‚à°à°¾à°·à°¿à°‚à°šà°¿à°¨à°ªà±à°ªà±à°¡à± à°¨à±‹à°Ÿà°¿à°«à°¿à°•à±‡à°·à°¨à±à°² à°¨à°¿à°²à±à°µà± à°µà°°à±à°¸à°²à±‹ à°•à°¨à°¿à°ªà°¿à°¸à±à°¤à±à°‚à°¦à°¿.",
-  "onboarding.page_one.federation": "à°®à°¾à°¸à±à°Ÿà±Šà°¡à±Šà°¨à± à°…à°¨à±‡à°¦à°¿ à°…à°¨à±‡à°• à°¸à±à°µà°¤à°‚à°¤à±à°° à°¸à±‡à°µà°¿à°•à°² à°¸à°®à°¾à°¹à°¾à°°à°‚ à°µà°²à°¨ à°à°°à±à°ªà°¡à°¿à°¨ à°’à°• à°¸à±‹à°·à°²à± à°¨à±†à°Ÿà±à°µà°°à±à°•à±. à°®à±‡à°®à± à°ˆ à°¸à±‡à°µà°¿à°•à°²à°¨à± à°¦à±à°·à±à°Ÿà°¾à°‚à°¤à°¾à°²à°¨à°¿ à°…à°‚à°Ÿà°¾à°®à±.",
-  "onboarding.page_one.full_handle": "à°®à±€ à°ªà±‚à°°à±à°¤à°¿ à°¹à±à°¯à°¾à°‚à°¡à°¿à°²à±",
-  "onboarding.page_one.handle_hint": "à°®à±€à°°à± à°®à±€ à°¸à±à°¨à±‡à°¹à°¿à°¤à±à°²à°•à± à°¶à±‹à°§à°¿à°‚à°šà°®à°¨à°¿ à°šà±†à°ªà±à°ªà±‡à°¦à°¿ à°‡à°¦à±‡.",
-  "onboarding.page_one.welcome": "à°®à°¾à°¸à±à°¤à±‹à°¡à°¾à°¨à± à°•à± à°¸à±à°µà°¾à°—à°¤à°‚!",
-  "onboarding.page_six.admin": "à°®à±€ à°¦à±ƒà°·à±à°Ÿà°¾à°‚à°¤à°‚ à°¯à±Šà°•à±à°• à°¨à°¿à°°à±à°µà°¾à°¹à°•à±à°²à± {admin}.",
-  "onboarding.page_six.almost_done": "à°¦à°¾à°¦à°¾à°ªà±à°—à°¾ à°…à°¯à°¿à°ªà±‹à°¯à°¿à°‚à°¦à°¿...",
-  "onboarding.page_six.appetoot": "à°¬à°¾à°¨à± à°†à°ªà±à°ªà±†à°Ÿà±‚à°Ÿà±!",
-  "onboarding.page_six.apps_available": "iOS, Android à°®à°°à°¿à°¯à± à°‡à°¤à°° à°ªà±à°²à°¾à°Ÿà±à°«à°¾à°°à°®à±à°²à°•à± {apps} à°…à°‚à°¦à±à°¬à°¾à°Ÿà±à°²à±‹ à°‰à°¨à±à°¨à°¾à°¯à°¿.",
-  "onboarding.page_six.github": "à°®à°¾à°¸à±à°Ÿà±Šà°¡à±Šà°¨à± à°‰à°šà°¿à°¤ à°“à°ªà±†à°¨à± à°¸à±‹à°°à±à°¸à± à°¸à°¾à°«à±à°Ÿà±à°µà±‡à°°à±. à°®à±€à°°à± à°¦à±‹à°·à°¾à°²à°¨à± à°¨à°¿à°µà±‡à°¦à°¿à°‚à°šà°µà°šà±à°šà±, à°«à±€à°šà°°à±à°²à°¨à± à°…à°à±à°¯à°°à±à°¥à°¿à°‚à°šà°µà°šà±à°šà± à°²à±‡à°¦à°¾ {github} à°²à±‹ à°•à±‹à°¡à±à°•à± à°¦à±‹à°¹à°¦à°‚ à°šà±‡à°¯à°µà°šà±à°šà±.",
-  "onboarding.page_six.guidelines": "à°¸à°‚à°˜à°‚ à°®à°¾à°°à±à°—à°¦à°°à±à°¶à°•à°¾à°²à±",
-  "onboarding.page_six.read_guidelines": "à°¦à°¯à°šà±‡à°¸à°¿ {domain} à°¯à±Šà°•à±à°• {guidelines} à°šà°¦à°µà°‚à°¡à°¿!",
-  "onboarding.page_six.various_app": "à°®à±Šà°¬à±ˆà°²à± à°…à°¨à±à°µà°°à±à°¤à°¨à°¾à°²à±",
-  "onboarding.page_three.profile": "à°®à±€ à°…à°µà°¤à°¾à°°à±, à°¬à°¯à±‹, à°ªà±à°°à°¦à°°à±à°¶à°¨ à°ªà±‡à°°à± à°®à°¾à°°à±à°šà°¡à°¾à°¨à°¿à°•à°¿ à°®à±€ à°ªà±à°°à±Šà°«à±ˆà°²à±à°¨à± à°¸à°µà°°à°¿à°‚à°šà°‚à°¡à°¿. à°…à°•à±à°•à°¡, à°®à±€à°°à± à°‡à°¤à°° à°ªà±à°°à°¾à°§à°¾à°¨à±à°¯à°¤à°²à°¨à± à°•à±‚à°¡à°¾ à°•à°¨à±à°—à±Šà°‚à°Ÿà°¾à°°à±.",
-  "onboarding.page_three.search": "à°µà±à°¯à°•à±à°¤à±à°²à°¨à± à°•à°¨à±à°—à±Šà°¨à°¡à°¾à°¨à°¿à°•à°¿ à°²à±‡à°¦à°¾ {illustration} à°®à°°à°¿à°¯à± {introductions} à°µà°‚à°Ÿà°¿ à°¹à±à°¯à°¾à°·à±à°Ÿà±à°¯à°¾à°—à±à°²à°¨à± à°šà±‚à°¡à°Ÿà°¾à°¨à°¿à°•à°¿ à°¶à±‹à°§à°¨ à°ªà°Ÿà±à°Ÿà±€à°¨à°¿ à°‰à°ªà°¯à±‹à°—à°¿à°‚à°šà°‚à°¡à°¿. à°ˆ à°¦à±à°·à±à°Ÿà°¾à°‚à°¤à°‚à°²à±‹ à°²à±‡à°¨à°¿ à°’à°• à°µà±à°¯à°•à±à°¤à°¿ à°•à±‹à°¸à°‚ à°¶à±‹à°§à°¿à°‚à°šà±‡à°‚à°¦à±à°•à±, à°µà°¾à°°à°¿ à°ªà±‚à°°à±à°¤à°¿ à°¹à±à°¯à°¾à°‚à°¡à°¿à°²à±à°¨à± à°‰à°ªà°¯à±‹à°—à°¿à°‚à°šà°‚à°¡à°¿.",
-  "onboarding.page_two.compose": "à°•à°‚à°ªà±‹à°œà± à°¨à°¿à°²à±à°µà± à°µà°°à±à°¸ à°¨à±à°‚à°¡à°¿ à°ªà±‹à°¸à±à°Ÿà±à°²à°¨à± à°µà±à°°à°¾à°¯à°‚à°¡à°¿. à°®à±€à°°à± à°šà°¿à°¤à±à°°à°¾à°²à°¨à± à°…à°ªà±à°²à±‹à°¡à± à°šà±†à°¯à±à°¯à°µà°šà±à°šà±, à°—à±‹à°ªà±à°¯à°¤à°¾ à°¸à±†à°Ÿà±à°Ÿà°¿à°‚à°—à±à°²à°¨à± à°®à°¾à°°à±à°šà°µà°šà±à°šà± à°®à°°à°¿à°¯à± à°¦à°¿à°—à±à°µ à°šà°¿à°¹à±à°¨à°¾à°²à°¤à±‹ à°•à°‚à°Ÿà±†à°‚à°Ÿà± à°¹à±†à°šà±à°šà°°à°¿à°•à°²à°¨à± à°œà±‹à°¡à°¿à°‚à°šà°µà°šà±à°šà±.",
-  "onboarding.skip": "à°¦à°¾à°Ÿà°µà±‡à°¯à°¿",
   "privacy.change": "à°¸à±à°Ÿà±‡à°Ÿà°¸à± à°—à±‹à°ªà±à°¯à°¤à°¨à± à°¸à°°à±à°¦à±à°¬à°¾à°Ÿà± à°šà±‡à°¯à°‚à°¡à°¿",
   "privacy.direct.long": "à°ªà±‡à°°à±à°•à±Šà°¨à±à°¨ à°µà°¿à°¨à°¿à°¯à±‹à°—à°¦à°¾à°°à±à°²à°•à± à°®à°¾à°¤à±à°°à°®à±‡ à°ªà±‹à°¸à±à°Ÿà± à°šà±‡à°¯à°¿",
   "privacy.direct.short": "à°ªà±à°°à°¤à±à°¯à°•à±à°·",
@@ -250,14 +292,17 @@
   "search_results.statuses": "à°Ÿà±‚à°Ÿà±à°²à±",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "à°²à±‹à°ªà°²à°¿à°•à°¿ à°’à°• à°šà±‚à°ªà±...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "@{name} à°¨à± à°¬à±à°²à°¾à°•à± à°šà±‡à°¯à°¿",
   "status.cancel_reblog_private": "à°¬à±‚à°¸à±à°Ÿà±à°¨à± à°¤à±Šà°²à°—à°¿à°‚à°šà±",
   "status.cannot_reblog": "à°ˆ à°ªà±‹à°¸à±à°Ÿà±à°¨à± à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¯à°¡à°‚ à°¸à°¾à°§à±à°¯à°‚ à°•à°¾à°¦à±",
   "status.delete": "à°¤à±Šà°²à°—à°¿à°‚à°šà±",
+  "status.detailed_status": "à°µà°¿à°µà°°à°£à°¾à°¤à±à°®à°• à°¸à°‚à°à°¾à°·à°£ à°µà±€à°•à±à°·à°£",
   "status.direct": "@{name}à°•à± à°¨à±‡à°°à±à°—à°¾ à°¸à°‚à°¦à±‡à°¶à°‚ à°ªà°‚à°ªà±",
   "status.embed": "à°Žà°‚à°¬à±†à°¡à±",
   "status.favourite": "à°‡à°·à±à°Ÿà°ªà°¡à±",
-  "status.filtered": "Filtered",
+  "status.filtered": "à°µà°¡à°•à°Ÿà±à°Ÿà°¬à°¡à°¿à°¨",
   "status.load_more": "à°®à°°à°¿à°¨à±à°¨à°¿ à°²à±‹à°¡à± à°šà±‡à°¯à°¿",
   "status.media_hidden": "à°®à±€à°¡à°¿à°¯à°¾ à°¦à°¾à°šà°¬à°¡à°¿à°‚à°¦à°¿",
   "status.mention": "@{name}à°¨à± à°ªà±à°°à°¸à±à°¤à°¾à°µà°¿à°‚à°šà±",
@@ -267,9 +312,11 @@
   "status.open": "à°ˆ à°¸à±à°Ÿà±‡à°Ÿà°¸à± à°¨à± à°µà°¿à°¸à±à°¤à°°à°¿à°‚à°šà±",
   "status.pin": "à°ªà±à°°à±Šà°«à±ˆà°²à±à°²à±‹ à°…à°¤à°¿à°•à°¿à°‚à°šà±",
   "status.pinned": "à°…à°¤à°¿à°•à°¿à°‚à°šà°¿à°¨ à°Ÿà±‚à°Ÿà±",
+  "status.read_more": "à°‡à°‚à°•à°¾ à°šà°¦à°µà°‚à°¡à°¿",
   "status.reblog": "à°¬à±‚à°¸à±à°Ÿà±",
   "status.reblog_private": "à°…à°¸à°²à± à°ªà±à°°à±‡à°•à±à°·à°•à±à°²à°•à± à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¯à°¿",
   "status.reblogged_by": "{name} à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¸à°¾à°°à±",
+  "status.reblogs.empty": "à°ˆ à°Ÿà±‚à°Ÿà±à°¨à± à°‡à°‚à°•à°¾ à°Žà°µà°°à±‚ à°¬à±‚à°¸à±à°Ÿà± à°šà±‡à°¯à°²à±‡à°¦à±. à°Žà°µà°°à±ˆà°¨à°¾ à°šà±‡à°¸à°¿à°¨à°ªà±à°ªà±à°¡à±, à°…à°µà°¿ à°‡à°•à±à°•à°¡ à°•à°¨à°¬à°¡à°¤à°¾à°¯à°¿.",
   "status.redraft": "à°¤à±Šà°²à°—à°¿à°‚à°šà± & à°¤à°¿à°°à°—à°°à°¾à°¯à±",
   "status.reply": "à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°‚",
   "status.replyAll": "à°¸à°‚à°à°¾à°·à°£à°•à± à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°‚ à°‡à°µà±à°µà°‚à°¡à°¿",
@@ -281,8 +328,11 @@
   "status.show_less_all": "à°…à°¨à±à°¨à°¿à°Ÿà°¿à°•à±€ à°¤à°•à±à°•à±à°µ à°šà±‚à°ªà°¿à°‚à°šà±",
   "status.show_more": "à°‡à°‚à°•à°¾ à°šà±‚à°ªà°¿à°‚à°šà±",
   "status.show_more_all": "à°…à°¨à±à°¨à°¿à°Ÿà°¿à°•à±€ à°‡à°‚à°•à°¾ à°šà±‚à°ªà°¿à°‚à°šà±",
+  "status.show_thread": "à°—à±Šà°²à±à°¸à±à°¨à± à°šà±‚à°ªà°¿à°‚à°šà±",
   "status.unmute_conversation": "à°¸à°‚à°à°¾à°·à°£à°¨à± à°…à°¨à±à°®à±à°¯à±‚à°Ÿà± à°šà±‡à°¯à°¿",
   "status.unpin": "à°ªà±à°°à±Šà°«à±ˆà°²à± à°¨à±à°‚à°¡à°¿ à°ªà±€à°•à°¿à°µà±‡à°¯à±",
+  "suggestions.dismiss": "à°¸à±‚à°šà°¨à°¨à± à°°à°¦à±à°¦à± à°šà±‡à°¯à°¿",
+  "suggestions.header": "à°®à±€à°•à± à°µà±€à°Ÿà°¿ à°®à±€à°¦ à°†à°¸à°•à±à°¤à°¿ à°‰à°‚à°¡à°µà°šà±à°šà±â€¦",
   "tabs_bar.federated_timeline": "à°¸à°®à°¾à°–à±à°¯",
   "tabs_bar.home": "à°¹à±‹à°®à±",
   "tabs_bar.local_timeline": "à°¸à±à°¥à°¾à°¨à°¿à°•",
@@ -291,9 +341,9 @@
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} à°®à°¾à°Ÿà±à°²à°¾à°¡à±à°¤à±à°¨à±à°¨à°¾à°°à±",
   "ui.beforeunload": "à°®à±€à°°à± à°®à°¾à°¸à±à°Ÿà±Šà°¡à±Šà°¨à±à°¨à± à°µà°¦à°¿à°²à°¿à°µà±‡à°¸à±à°¤à±‡ à°®à±€ à°¡à±à°°à°¾à°«à±à°Ÿà±à°²à± à°ªà±‹à°¤à°¾à°¯à°¿.",
   "upload_area.title": "à°…à°ªà±à°²à±‹à°¡à± à°šà±‡à°¯à°¡à°¾à°¨à°¿à°•à°¿ à°¡à±à°°à°¾à°—à± & à°¡à±à°°à°¾à°ªà± à°šà±‡à°¯à°‚à°¡à°¿",
-  "upload_button.label": "à°®à±€à°¡à°¿à°¯à°¾à°¨à± à°œà±‹à°¡à°¿à°‚à°šà°‚à°¡à°¿",
+  "upload_button.label": "à°®à±€à°¡à°¿à°¯à°¾à°¨à± à°œà±‹à°¡à°¿à°‚à°šà°‚à°¡à°¿ (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "à°¦à±ƒà°·à±à°Ÿà°¿ à°²à±‹à°ªà°®à±à°¨à±à°¨ à°µà°¾à°°à°¿ à°•à±‹à°¸à°‚ à°µà°¿à°µà°°à°¿à°‚à°šà°‚à°¡à°¿",
-  "upload_form.focus": "à°•à°¤à±à°¤à°¿à°°à°¿à°‚à°šà±",
+  "upload_form.focus": "à°ªà±à°°à°¿à°µà±à°¯à±‚à°¨à± à°®à°¾à°°à±à°šà±",
   "upload_form.undo": "à°¤à±Šà°²à°—à°¿à°‚à°šà±",
   "upload_progress.label": "à°…à°ªà±à°²à±‹à°¡à± à°…à°µà±à°¤à±‹à°‚à°¦à°¿...",
   "video.close": "à°µà±€à°¡à°¿à°¯à±‹à°¨à°¿ à°®à±‚à°¸à°¿à°µà±‡à°¯à°¿",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 1d76735a236396be22b82cfc0b505a8a50010d45..2683284f4229ffd58a0c9517fd3ee8c0bbaa5eb1 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Edit profile",
+  "account.endorse": "Feature on profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Follows",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Follows you",
   "account.hide_reblogs": "Hide boosts from @{name}",
+  "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:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Show boosts from @{name}",
   "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}",
@@ -86,6 +93,8 @@
   "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? 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}?",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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_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.public_timeline": "the public timeline",
   "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.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 instances to fill it up",
   "follow_request.authorize": "Authorize",
   "follow_request.reject": "Reject",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "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.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",
   "home.column_settings.basic": "Basic",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "Not found",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Blocked users",
   "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",
@@ -186,35 +242,21 @@
   "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.filter_bar.category": "Quick filter bar",
+  "notifications.column_settings.filter_bar.show": "Show",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
   "privacy.change": "Adjust status privacy",
   "privacy.direct.long": "Post to mentioned users only",
   "privacy.direct.short": "Direct",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favourite",
@@ -267,9 +312,11 @@
   "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 to original audience",
   "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.reply": "Reply",
   "status.replyAll": "Reply to thread",
@@ -281,8 +328,11 @@
   "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.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",
   "tabs_bar.home": "Home",
   "tabs_bar.local_timeline": "Local",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 03a09019f89b7570bd8052f464bb7eb791fbce8b..5d8fc229e6d01755ad892d76597bb443c1b26a64 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "Bot",
   "account.block": "Engelle @{name}",
   "account.block_domain": "Hide everything from {domain}",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.domain_blocked": "Domain hidden",
   "account.edit_profile": "Profili dÃ¼zenle",
+  "account.endorse": "Feature on profile",
   "account.follow": "Takip et",
   "account.followers": "TakipÃ§iler",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "Takip ettikleri",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "Seni takip ediyor",
   "account.hide_reblogs": "Hide boosts from @{name}",
+  "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": "Bahset @{name}",
   "account.moved_to": "{name} has moved to:",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "Show boosts from @{name}",
   "account.unblock": "Engeli kaldÄ±r @{name}",
   "account.unblock_domain": "Unhide {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Takipten vazgeÃ§",
   "account.unmute": "Sesi aÃ§ @{name}",
   "account.unmute_notifications": "Unmute notifications from @{name}",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "{name} kullanÄ±cÄ±sÄ±nÄ± sessize almak istiyor musunuz?",
   "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": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "embed.instructions": "Embed this status on your website by copying the code below.",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Semboller",
   "emoji_button.travel": "Seyahat ve Yerler",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "Yerel zaman tÃ¼neliniz boÅŸ. Daha fazla eÄŸlence iÃ§in herkese aÃ§Ä±k bir gÃ¶nderi paylaÅŸÄ±n.",
   "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "HenÃ¼z bu hashtagâ€™e sahip hiÃ§bir gÃ¶nderi yok.",
   "empty_column.home": "HenÃ¼z kimseyi takip etmiyorsunuz. {public} ziyaret edebilir veya arama kÄ±smÄ±nÄ± kullanarak diÄŸer kullanÄ±cÄ±larla iletiÅŸime geÃ§ebilirsiniz.",
   "empty_column.home.public_timeline": "herkese aÃ§Ä±k zaman tÃ¼neli",
   "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.notifications": "HenÃ¼z hiÃ§bir bildiriminiz yok. DiÄŸer insanlarla sobhet edebilmek iÃ§in etkileÅŸime geÃ§ebilirsiniz.",
   "empty_column.public": "Burada hiÃ§bir gÃ¶nderi yok! Herkese aÃ§Ä±k bir ÅŸeyler yazÄ±n, veya diÄŸer sunucudaki insanlarÄ± takip ederek bu alanÄ±n dolmasÄ±nÄ± saÄŸlayÄ±n",
   "follow_request.authorize": "Yetkilendir",
   "follow_request.reject": "Reddet",
   "getting_started.developers": "Developers",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
   "getting_started.heading": "BaÅŸlangÄ±Ã§",
   "getting_started.invite": "Invite people",
   "getting_started.open_source_notice": "Mastodon aÃ§Ä±k kaynaklÄ± bir yazÄ±lÄ±mdÄ±r. Github {github}. {apps} Ã¼zerinden katkÄ±da bulunabilir, hata raporlayabilirsiniz.",
   "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.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",
   "home.column_settings.basic": "Temel",
   "home.column_settings.show_reblogs": "Boost edilenleri gÃ¶ster",
   "home.column_settings.show_replies": "CevaplarÄ± gÃ¶ster",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "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.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.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toot": "to start a brand new toot",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "BulunamadÄ±",
   "missing_indicator.sublabel": "This resource could not be found",
   "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Engellenen kullanÄ±cÄ±lar",
   "navigation_bar.community_timeline": "Yerel zaman tÃ¼neli",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "Direct messages",
   "navigation_bar.discover": "Discover",
   "navigation_bar.domain_blocks": "Hidden domains",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "TÃ¼m bildirimlerinizi kalÄ±cÄ± olarak temizlemek ister misiniz?",
   "notifications.column_settings.alert": "MasaÃ¼stÃ¼ bildirimleri",
   "notifications.column_settings.favourite": "Favoriler:",
+  "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.follow": "Yeni takipÃ§iler:",
   "notifications.column_settings.mention": "Bahsedilenler:",
   "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boostâ€™lar:",
   "notifications.column_settings.show": "Bildirimlerde gÃ¶ster",
   "notifications.column_settings.sound": "Ses Ã§al",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} notifications",
-  "onboarding.done": "Tamam",
-  "onboarding.next": "SÄ±radaki",
-  "onboarding.page_five.public_timelines": "Yerel zaman tÃ¼neli, bu sunucudaki herkesten gelen gÃ¶nderileri gÃ¶sterir.Federe zaman tÃ¼neli, kullanÄ±cÄ±larÄ±n diÄŸer sunuculardan takip ettiÄŸi kiÅŸilerin herkese aÃ§Ä±k gÃ¶nderilerini gÃ¶sterir. Bunlar herkese aÃ§Ä±k zaman tÃ¼nelleridir ve yeni insanlarla tanÄ±ÅŸmak  iÃ§in harika yerlerdir. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new ",
-  "onboarding.page_four.home": "Takip ettiÄŸiniz insanlardan gelen gÃ¶nderileri gosteren zaman tÃ¼nelidir",
-  "onboarding.page_four.notifications": "Herkimse sizinle iletiÅŸime geÃ§tiÄŸinde gelen bildirimleri gÃ¶sterir.",
-  "onboarding.page_one.federation": "Mastodon, geniÅŸ bir sosyal aÄŸ kurmak iÃ§in birleÅŸen baÄŸÄ±msÄ±z sunuculardan oluÅŸan bir aÄŸdÄ±r.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Mastodon'a hoÅŸ geldiniz.",
-  "onboarding.page_six.admin": "{admin}, ÅŸu anda bulunduÄŸunuz sunucunun yÃ¶neticisidir.",
-  "onboarding.page_six.almost_done": "Neredeyse tamam...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "iOS, Android ve diÄŸer platformlar iÃ§in {apps} mevcuttur",
-  "onboarding.page_six.github": "Mastodon aÃ§Ä±k kaynaklÄ± bir yazÄ±lÄ±mdÄ±r. Github {github} Ã¼zerinden katkÄ±da bulunabilir, Ã¶zellik baÅŸvurusunda bulunabilir,hata raporlayabilirsiniz.",
-  "onboarding.page_six.guidelines": "topluluk kÄ±lavuzlarÄ±",
-  "onboarding.page_six.read_guidelines": "LÃ¼tfen {domain}'in {guidelines} kÄ±lavuzlarÄ±nÄ± okuyunuz.",
-  "onboarding.page_six.various_app": "mobil uygulamalar",
-  "onboarding.page_three.profile": "Profil resminizi, kiÅŸisel bilgilerinizi ve gÃ¶rÃ¼nen isminizi deÄŸiÅŸtirmek iÃ§in profilinizi dÃ¼zenleyebilirsiniz. AyrÄ±ca diÄŸer tercihlerinizi de dÃ¼zenleyebilirsiniz.",
-  "onboarding.page_three.search": "Arama Ã§ubuÄŸunu kullanarak kiÅŸileri bulabilir, ve {illustration} ve {introductions} gibi hashtag'leri arayabilirsiniz. EÄŸer bu sunucuda olmayan birini aramak istiyorsanÄ±z, kullanÄ±cÄ± adÄ±nÄ±n tamamÄ±nÄ± yazarak arayabilirsiniz.",
-  "onboarding.page_two.compose": "Toot oluÅŸturma alanÄ±nÄ± kullanarak gÃ¶nderiler yazabilirsiniz. AÅŸaÄŸÄ±daki ikonlarÄ± kullanarak gÃ¶rseller ekleyebilir, gizlilik ayarlarÄ±nÄ± deÄŸiÅŸtirebilir ve iÃ§erik uyarÄ±sÄ± ekleyebilirsiniz.",
-  "onboarding.skip": "GeÃ§",
   "privacy.change": "GÃ¶nderi gizliliÄŸini ayarla",
   "privacy.direct.long": "Sadece bahsedilen kiÅŸilere gÃ¶nder",
   "privacy.direct.short": "Direkt",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {sonuÃ§} other {sonuÃ§lar}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Bu gÃ¶nderi boost edilemez",
   "status.delete": "Sil",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "Favorilere ekle",
@@ -267,9 +312,11 @@
   "status.open": "Bu gÃ¶nderiyi geniÅŸlet",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "Boost'la",
   "status.reblog_private": "Boost to original audience",
   "status.reblogged_by": "{name} boost etti",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.reply": "Cevapla",
   "status.replyAll": "KonuÅŸmayÄ± cevapla",
@@ -281,8 +328,11 @@
   "status.show_less_all": "Show less for all",
   "status.show_more": "Daha fazlasÄ±",
   "status.show_more_all": "Show more for all",
+  "status.show_thread": "Show thread",
   "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": "Federe",
   "tabs_bar.home": "Ana sayfa",
   "tabs_bar.local_timeline": "Yerel",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 7bb2476d02af28d0a9abd4d36471faa5ac1fdaa3..606dda89fc61577baade109276566c5980d76e9e 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -1,220 +1,262 @@
 {
-  "account.badges.bot": "Bot",
-  "account.block": "Ð—Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸",
+  "account.add_or_remove_from_list": "Add or Remove from lists",
+  "account.badges.bot": "Ð‘Ð¾Ñ‚",
+  "account.block": "Ð—Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ @{name}",
   "account.block_domain": "Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ {domain}",
-  "account.blocked": "Blocked",
-  "account.direct": "Direct Message @{name}",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
-  "account.domain_blocked": "Domain hidden",
-  "account.edit_profile": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ",
+  "account.blocked": "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ–",
+  "account.direct": "ÐŸÑ€ÑÐ¼Ðµ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ @{name}",
+  "account.disclaimer_full": "Ð†Ð½Ñ„Ð¾Ð¼Ð°Ñ†Ñ–Ñ Ð·Ð½Ð¸Ð·Ñƒ Ð¼Ð¾Ð¶Ðµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð½ÐµÐ¿Ð¾Ð²Ð½Ñ–ÑÑ‚ÑŽ.",
+  "account.domain_blocked": "Ð”Ð¾Ð¼ÐµÐ½ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¾",
+  "account.edit_profile": "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ",
+  "account.endorse": "Feature on profile",
   "account.follow": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ",
   "account.followers": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹(-Ð°) Ð½Ð° Ð’Ð°Ñ",
-  "account.hide_reblogs": "Hide boosts from @{name}",
-  "account.media": "ÐœÐµÐ´Ñ–Ñ",
-  "account.mention": "Ð—Ð³Ð°Ð´Ð°Ñ‚Ð¸",
-  "account.moved_to": "{name} has moved to:",
-  "account.mute": "Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸",
-  "account.mute_notifications": "Mute notifications from @{name}",
-  "account.muted": "Muted",
-  "account.posts": "ÐŸÐ¾ÑÑ‚Ð¸",
-  "account.posts_with_replies": "Toots with replies",
-  "account.report": "ÐŸÐ¾ÑÐºÐ°Ñ€Ð¶Ð¸Ñ‚Ð¸ÑÑ",
-  "account.requested": "ÐžÑ‡Ñ–ÐºÑƒÑ” Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ",
-  "account.share": "Share @{name}'s profile",
-  "account.show_reblogs": "Show boosts from @{name}",
+  "account.hide_reblogs": "Ð¡Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸ Ð²Ñ–Ð´ @{name}",
+  "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.mute": "Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ @{name}",
+  "account.mute_notifications": "ÐÐµ Ð¿Ð¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ @{name}",
+  "account.muted": "Ð—Ð°Ð³Ð»ÑƒÑˆÐµÐ½Ð¸Ð¹",
+  "account.posts": "Ð”Ð¼ÑƒÑ…Ð¸",
+  "account.posts_with_replies": "Ð”Ð¼ÑƒÑ…Ð¸ Ð¹ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–",
+  "account.report": "ÐŸÐ¾ÑÐºÐ°Ñ€Ð¶Ð¸Ñ‚Ð¸ÑÑ Ð½Ð° @{name}",
+  "account.requested": "ÐžÑ‡Ñ–ÐºÑƒÑ” Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ. ÐÐ°Ñ‚Ð¸ÑÐ½Ñ–Ñ‚ÑŒ Ñ‰Ð¾Ð± Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚",
+  "account.share": "ÐŸÐ¾ÑˆÐ¸Ñ€Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ @{name}",
+  "account.show_reblogs": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸ Ð²Ñ–Ð´ @{name}",
   "account.unblock": "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸",
   "account.unblock_domain": "Ð Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "Ð’Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ",
-  "account.unmute": "Ð—Ð½ÑÑ‚Ð¸ Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ",
-  "account.unmute_notifications": "Unmute notifications from @{name}",
-  "account.view_full_profile": "View full profile",
-  "alert.unexpected.message": "An unexpected error occurred.",
-  "alert.unexpected.title": "Oops!",
+  "account.unmute": "Ð—Ð½ÑÑ‚Ð¸ Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ @{name}",
+  "account.unmute_notifications": "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ @{name}",
+  "account.view_full_profile": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ Ð¿Ð¾Ð²Ð½Ñ–ÑÑ‚ÑŽ",
+  "alert.unexpected.message": "Ð¢Ñ€Ð°Ð¿Ð¸Ð»Ð°ÑÑŒ Ð½ÐµÐ¾Ñ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°.",
+  "alert.unexpected.title": "ÐžÐ¹!",
   "boost_modal.combo": "Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ñ‚Ð¸ÑÐ½ÑƒÑ‚Ð¸ {combo}, Ñ‰Ð¾Ð± Ð¿Ñ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ð¸ Ñ†Ðµ Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¾Ð³Ð¾ Ñ€Ð°Ð·Ñƒ",
-  "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.body": "Ð©Ð¾ÑÑŒ Ð¿Ñ–ÑˆÐ»Ð¾ Ð½Ðµ Ñ‚Ð°Ðº Ð¿Ñ€Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ– ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñƒ.",
+  "bundle_column_error.retry": "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ñ‰Ðµ",
+  "bundle_column_error.title": "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¼ÐµÑ€ÐµÐ¶Ñ–",
+  "bundle_modal_error.close": "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸",
+  "bundle_modal_error.message": "Ð©Ð¾ÑÑŒ Ð¿Ñ–ÑˆÐ»Ð¾ Ð½Ðµ Ñ‚Ð°Ðº Ð¿Ñ€Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ– ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ‚Ñƒ.",
+  "bundle_modal_error.retry": "Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‰Ðµ",
   "column.blocks": "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–",
   "column.community": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°",
-  "column.direct": "Direct messages",
-  "column.domain_blocks": "Hidden domains",
+  "column.direct": "ÐŸÑ€ÑÐ¼Ñ– Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ",
+  "column.domain_blocks": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ñ– Ð´Ð¾Ð¼ÐµÐ½Ð¸",
   "column.favourites": "Ð’Ð¿Ð¾Ð´Ð¾Ð±Ð°Ð½Ðµ",
   "column.follow_requests": "Ð—Ð°Ð¿Ð¸Ñ‚Ð¸ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ",
   "column.home": "Ð“Ð¾Ð»Ð¾Ð²Ð½Ð°",
-  "column.lists": "Lists",
+  "column.lists": "Ð¡Ð¿Ð¸ÑÐºÐ¸",
   "column.mutes": "Ð—Ð°Ð³Ð»ÑƒÑˆÐµÐ½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–",
   "column.notifications": "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ",
-  "column.pins": "Pinned toot",
+  "column.pins": "Ð—Ð°ÐºÑ€Ñ–Ð¿Ð»ÐµÐ½Ñ– Ð´Ð¼ÑƒÑ…Ð¸",
   "column.public": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð° ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°",
   "column_back_button.label": "ÐÐ°Ð·Ð°Ð´",
-  "column_header.hide_settings": "Hide settings",
+  "column_header.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_header.moveRight_settings": "Ð—Ð¼Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐ¾Ð»Ð¾Ð½ÐºÑƒ Ð²Ð¿Ñ€Ð°Ð²Ð¾",
+  "column_header.pin": "Ð—Ð°ÐºÑ€Ñ–Ð¿Ð¸Ñ‚Ð¸",
+  "column_header.show_settings": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
+  "column_header.unpin": "Ð’Ñ–Ð´ÐºÑ€Ñ–Ð¿Ð¸Ñ‚Ð¸",
   "column_subheading.settings": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
-  "community.column_settings.media_only": "Media 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.",
+  "community.column_settings.media_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.publish": "Ð”Ð¼ÑƒÑ…Ð½ÑƒÑ‚Ð¸",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive.marked": "Media is marked as sensitive",
-  "compose_form.sensitive.unmarked": "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.sensitive.marked": "ÐœÐµÐ´Ñ–Ð° Ð²Ñ–Ð´Ð¼Ñ–Ñ‡ÐµÐ½Ðµ <b>Ð½ÐµÑÐ¿Ñ€Ð¸Ð¹Ð½ÑÑ‚Ð»Ð¸Ð²Ð¸Ð¼</b>",
+  "compose_form.sensitive.unmarked": "ÐœÐµÐ´Ñ–Ð° Ð²Ñ–Ð´Ð¼Ñ–Ñ‡ÐµÐ½Ðµ ÑÐ¿Ñ€Ð¸Ð¹Ð½ÑÑ‚Ð»Ð¸Ð²Ð¸Ð¼",
+  "compose_form.spoiler.marked": "Ð¢ÐµÐºÑÑ‚ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¾ Ð·Ð° Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½ÑÐ¼",
+  "compose_form.spoiler.unmarked": "Ð¢ÐµÐºÑÑ‚ Ð²Ð¸Ð´Ð¸Ð¼Ð¸Ð¹",
   "compose_form.spoiler_placeholder": "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ñ‰Ð¾Ð´Ð¾ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ Ñ‚ÐµÐºÑÑ‚Ñƒ",
   "confirmation_modal.cancel": "Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸",
   "confirmations.block.confirm": "Ð—Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸",
   "confirmations.block.message": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ {name}?",
   "confirmations.delete.confirm": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸",
   "confirmations.delete.message": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ†ÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ?",
-  "confirmations.delete_list.confirm": "Delete",
-  "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
+  "confirmations.delete_list.confirm": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸",
+  "confirmations.delete_list.message": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ†ÐµÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸?",
   "confirmations.domain_block.confirm": "Ð¡Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ Ð²ÐµÑÑŒ Ð´Ð¾Ð¼ÐµÐ½",
-  "confirmations.domain_block.message": "Ð’Ð¸ Ñ‚Ð¾Ñ‡Ð½Ð¾, Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÐµÑÑŒ Ð´Ð¾Ð¼ÐµÐ½ {domain}? Ð£ Ð±Ñ–Ð»ÑŒÑˆÐ¾ÑÑ‚Ñ– Ð²Ð¸Ð¿Ð°Ð´ÐºÑ–Ð² Ð´Ð»Ñ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ñ— Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ ÐºÑ€Ð°Ñ‰Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸/Ð·Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð´ÐµÑÐºÐ¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð².",
+  "confirmations.domain_block.message": "Ð’Ð¸ Ñ‚Ð¾Ñ‡Ð½Ð¾, Ñ‚Ð¾Ñ‡Ð½Ð¾ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÐµÑÑŒ Ð´Ð¾Ð¼ÐµÐ½ {domain}? Ð£ Ð±Ñ–Ð»ÑŒÑˆÐ¾ÑÑ‚Ñ– Ð²Ð¸Ð¿Ð°Ð´ÐºÑ–Ð² Ð´Ð»Ñ Ð½Ð¾Ñ€Ð¼Ð°Ð»ÑŒÐ½Ð¾Ñ— Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ ÐºÑ€Ð°Ñ‰Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸/Ð·Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ Ð»Ð¸ÑˆÐµ Ð´ÐµÑÐºÐ¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð². Ð’Ð¸ Ð½Ðµ Ð·Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð±Ð°Ñ‡Ð¸Ñ‚Ð¸ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð· Ñ†ÑŒÐ¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ñƒ Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¸Ñ… ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°Ñ… Ð°Ð±Ð¾ Ð²Ð°ÑˆÐ¸Ñ… ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½ÑÑ…. Ð’Ð°ÑˆÑ– Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸ Ð· Ñ†ÑŒÐ¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð²Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– Ð²Ñ–Ð´ Ð²Ð°Ñ.",
   "confirmations.mute.confirm": "Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸",
   "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.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "embed.instructions": "Embed this status on your website by copying the code below.",
-  "embed.preview": "Here is what it will look like:",
+  "confirmations.redraft.confirm": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñ– Ð¿ÐµÑ€ÐµÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸",
+  "confirmations.redraft.message": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ Ñ– Ð¿ÐµÑ€ÐµÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾? Ð’Ð¸ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð²ÑÑ– Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–, Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸ Ñ‚Ð° Ð²Ð¿Ð¾Ð´Ð¾Ð±Ð°Ð¹ÐºÐ¸ Ð´Ð¾Ð¿Ð¸ÑÑƒ.",
+  "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.unfollow.message": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð²Ñ–Ð´ {name}?",
+  "embed.instructions": "Ð†Ð½Ñ‚ÐµÐ³Ñ€ÑƒÐ¹Ñ‚Ðµ Ñ†ÐµÐ¹ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Ð²Ð°ÑˆÐ¾Ð¼Ñƒ Ð²ÐµÐ±ÑÐ°Ð¹Ñ‚Ñ–, ÑÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð²ÑˆÐ¸ ÐºÐ¾Ð´ Ð½Ð¸Ð¶Ñ‡Ðµ.",
+  "embed.preview": "ÐžÑÑŒ ÑÐº Ð²Ñ–Ð½ Ð²Ð¸Ð³Ð»ÑÐ´Ð°Ñ‚Ð¸Ð¼Ðµ:",
   "emoji_button.activity": "Ð—Ð°Ð½ÑÑ‚Ñ‚Ñ",
-  "emoji_button.custom": "Custom",
+  "emoji_button.custom": "ÐžÑÐ¾Ð±Ð»Ð¸Ð²Ñ–",
   "emoji_button.flags": "ÐŸÑ€Ð°Ð¿Ð¾Ñ€Ð¸",
   "emoji_button.food": "Ð‡Ð¶Ð° Ñ‚Ð° Ð½Ð°Ð¿Ð¾Ñ—",
   "emoji_button.label": "Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚Ð¸ ÐµÐ¼Ð¾Ð´Ð·Ñ–",
   "emoji_button.nature": "ÐŸÑ€Ð¸Ñ€Ð¾Ð´Ð°",
-  "emoji_button.not_found": "No emojos!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
+  "emoji_button.not_found": "ÐÐµÐ¼Ð°Ñ” ÐµÐ¼Ð¾Ð´Ð·Ñ–!! (â•¯Â°â–¡Â°ï¼‰â•¯ï¸µ â”»â”â”»",
   "emoji_button.objects": "ÐŸÑ€ÐµÐ´Ð¼ÐµÑ‚Ð¸",
   "emoji_button.people": "Ð›ÑŽÐ´Ð¸",
-  "emoji_button.recent": "Frequently used",
+  "emoji_button.recent": "Ð§Ð°ÑÑ‚Ð¾ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ð½Ñ–",
   "emoji_button.search": "Ð—Ð½Ð°Ð¹Ñ‚Ð¸...",
-  "emoji_button.search_results": "Search results",
+  "emoji_button.search_results": "Ð ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ",
   "emoji_button.symbols": "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð¸",
   "emoji_button.travel": "ÐŸÐ¾Ð´Ð¾Ñ€Ð¾Ð¶Ñ–",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "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.direct": "Ð£ Ð²Ð°Ñ Ñ‰Ðµ Ð½ÐµÐ¼Ð°Ñ” Ð¿Ñ€ÑÐ¼Ð¸Ñ… Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½ÑŒ. ÐšÐ¾Ð»Ð¸ Ð²Ð¸ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ Ñ‡Ð¸ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ”Ñ‚Ðµ ÑÐºÐµÑÑŒ, Ð²Ð¾Ð½Ð¾ Ð·'ÑÐ²Ð¸Ñ‚ÑŒÑÑ Ñ‚ÑƒÑ‚.",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "Ð”Ð¾Ð¿Ð¸ÑÑ–Ð² Ð· Ñ†Ð¸Ð¼ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð¼ Ð¿Ð¾ÐºÐ¸ Ð½Ðµ Ñ–ÑÐ½ÑƒÑ”.",
   "empty_column.home": "Ð’Ð¸ Ð¿Ð¾ÐºÐ¸ Ð½Ñ– Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ–. ÐŸÐ¾Ð³Ð¾Ñ€Ñ‚Ð°Ð¹Ñ‚Ðµ {public}, Ð°Ð±Ð¾ ÑÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ¹Ñ‚ÐµÑÑŒ Ð¿Ð¾ÑˆÑƒÐºÐ¾Ð¼, Ñ‰Ð¾Ð± Ð¾ÑÐ²Ð¾Ñ—Ñ‚Ð¸ÑÑ Ñ‚Ð° Ð¿Ð¾Ð·Ð½Ð°Ð¹Ð¾Ð¼Ð¸Ñ‚Ð¸ÑÑ Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼Ð¸.",
   "empty_column.home.public_timeline": "Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ñ– ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ¸",
-  "empty_column.list": "There is nothing in this list yet.",
+  "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.notifications": "Ð£ Ð²Ð°Ñ Ñ‰Ðµ Ð½ÐµÐ¼Ð°Ñ” ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ. ÐŸÐµÑ€ÐµÐ¿Ð¸ÑÑƒÐ¹Ñ‚ÐµÑÑŒ Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼Ð¸, Ñ‰Ð¾Ð± Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ Ñ€Ð¾Ð·Ð¼Ð¾Ð²Ñƒ.",
-  "empty_column.public": "Ð¢ÑƒÑ‚ Ð¿Ð¾ÐºÐ¸ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”! ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ¹Ñ‚Ðµ Ñ‰Ð¾ÑÑŒ, Ð°Ð±Ð¾ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ Ð¿Ñ–Ð´Ð¿Ð¸ÑˆÑ–Ñ‚ÑŒÑÑ Ð½Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ–Ð½ÑˆÐ¸Ñ… Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ð¹, Ñ‰Ð¾Ð± Ð·Ð°Ð¿Ð¾Ð²Ð½Ð¸Ñ‚Ð¸ ÑÑ‚Ñ€Ñ–Ñ‡ÐºÑƒ.",
+  "empty_column.public": "Ð¢ÑƒÑ‚ Ð¿Ð¾ÐºÐ¸ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”! ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ¹Ñ‚Ðµ Ñ‰Ð¾ÑÑŒ, Ð°Ð±Ð¾ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ Ð¿Ñ–Ð´Ð¿Ð¸ÑˆÑ–Ñ‚ÑŒÑÑ Ð½Ð° ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ–Ð½ÑˆÐ¸Ñ… Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ð¹, Ñ‰Ð¾Ð± Ð·Ð°Ð¿Ð¾Ð²Ð½Ð¸Ñ‚Ð¸ ÑÑ‚Ñ€Ñ–Ñ‡ÐºÑƒ",
   "follow_request.authorize": "ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·ÑƒÐ²Ð°Ñ‚Ð¸",
   "follow_request.reject": "Ð’Ñ–Ð´Ð¼Ð¾Ð²Ð¸Ñ‚Ð¸",
-  "getting_started.developers": "Developers",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "Find friends from Twitter",
+  "getting_started.developers": "Ð Ð¾Ð·Ñ€Ð¾Ð±Ð½Ð¸ÐºÐ°Ð¼",
+  "getting_started.directory": "Profile directory",
+  "getting_started.documentation": "Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ",
   "getting_started.heading": "Ð›Ð°ÑÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾ÑÐ¸Ð¼Ð¾",
-  "getting_started.invite": "Invite people",
+  "getting_started.invite": "Ð—Ð°Ð¿Ñ€Ð¾ÑÑ–Ñ‚ÑŒ Ð»ÑŽÐ´ÐµÐ¹",
   "getting_started.open_source_notice": "Mastodon - Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð· Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸Ð¼ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ‚Ð¸ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ñƒ, Ð°Ð±Ð¾ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð½Ð° GitHub Ð·Ð° Ð°Ð´Ñ€ÐµÑÐ¾ÑŽ {github}.",
-  "getting_started.security": "Security",
-  "getting_started.terms": "Terms of service",
+  "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}",
+  "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",
   "home.column_settings.basic": "ÐžÑÐ½Ð¾Ð²Ð½Ñ–",
   "home.column_settings.show_reblogs": "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸",
   "home.column_settings.show_replies": "ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–",
-  "keyboard_shortcuts.back": "to navigate back",
-  "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.down": "to move down in the list",
-  "keyboard_shortcuts.enter": "to open status",
-  "keyboard_shortcuts.favourite": "to favourite",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
-  "keyboard_shortcuts.hotkey": "Hotkey",
-  "keyboard_shortcuts.legend": "to display this legend",
-  "keyboard_shortcuts.mention": "to mention author",
-  "keyboard_shortcuts.reply": "to reply",
-  "keyboard_shortcuts.search": "to focus search",
-  "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
-  "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",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
+  "keyboard_shortcuts.back": "Ð¿ÐµÑ€ÐµÑ…Ð¾Ð´Ð¸Ñ‚Ð¸ Ð½Ð°Ð·Ð°Ð´",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
+  "keyboard_shortcuts.boost": "Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…ÑƒÐ²Ð°Ñ‚Ð¸",
+  "keyboard_shortcuts.column": "Ñ„Ð¾ÐºÑƒÑÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð½Ð° Ð¾Ð´Ð½Ñ–Ð¹ Ð· ÐºÐ¾Ð»Ð¾Ð½Ð¾Ðº",
+  "keyboard_shortcuts.compose": "Ñ„Ð¾ÐºÑƒÑÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð½Ð° Ð¿Ð¾Ð»Ñ– Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ",
+  "keyboard_shortcuts.description": "ÐžÐ¿Ð¸Ñ",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "Ñ€ÑƒÑ…Ð°Ñ‚Ð¸ÑÑ Ð²Ð½Ð¸Ð· ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ¾ÑŽ",
+  "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.home": "to open home timeline",
+  "keyboard_shortcuts.hotkey": "Ð“Ð°Ñ€ÑÑ‡Ð° ÐºÐ»Ð°Ð²Ñ–ÑˆÐ°",
+  "keyboard_shortcuts.legend": "Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿Ñ–Ð´ÐºÐ°Ð·ÐºÑƒ",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "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.pinned": "to open pinned toots list",
+  "keyboard_shortcuts.profile": "Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ Ð°Ð²Ñ‚Ð¾Ñ€Ð°",
+  "keyboard_shortcuts.reply": "Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–ÑÑ‚Ð¸",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "ÑÑ„Ð¾ÐºÑƒÑÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð½Ð° Ð¿Ð¾ÑˆÑƒÐºÑƒ",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
+  "keyboard_shortcuts.toggle_hidden": "Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚Ð¸/Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ñ‚ÐµÐºÑÑ‚",
+  "keyboard_shortcuts.toot": "Ð¿Ð¾Ñ‡Ð°Ñ‚Ð¸ Ð¿Ð¸ÑÐ°Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð´Ð¼ÑƒÑ…",
+  "keyboard_shortcuts.unfocus": "Ñ€Ð¾Ð·Ñ„Ð¾ÐºÑƒÑÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð· Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð´Ð¾Ð¿Ð¸ÑÑƒ Ñ‡Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ",
+  "keyboard_shortcuts.up": "Ñ€ÑƒÑ…Ð°Ñ‚Ð¸ÑÑ Ð²Ð²ÐµÑ€Ñ… ÑÐ¿Ð¸ÑÐºÐ¾Ð¼",
   "lightbox.close": "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸",
-  "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.new.create": "Add list",
-  "lists.new.title_placeholder": "New list title",
-  "lists.search": "Search among people you follow",
-  "lists.subheading": "Your lists",
+  "lightbox.next": "Ð”Ð°Ð»Ñ–",
+  "lightbox.previous": "ÐÐ°Ð·Ð°Ð´",
+  "lists.account.add": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð´Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ",
+  "lists.account.remove": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð·Ñ– ÑÐ¿Ð¸ÑÐºÑƒ",
+  "lists.delete": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº",
+  "lists.edit": "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº",
+  "lists.new.create": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº",
+  "lists.new.title_placeholder": "ÐÐ¾Ð²Ð° Ð½Ð°Ð·Ð²Ð° ÑÐ¿Ð¸ÑÐºÑƒ",
+  "lists.search": "Ð¨ÑƒÐºÐ°Ñ‚Ð¸ ÑÐµÑ€ÐµÐ´ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÑÐºÐ¸Ñ… Ð²Ð¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ–",
+  "lists.subheading": "Ð’Ð°ÑˆÑ– ÑÐ¿Ð¸ÑÐºÐ¸",
   "loading_indicator.label": "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ...",
   "media_gallery.toggle_visible": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸/Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ñ‚Ð¸",
   "missing_indicator.label": "ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾",
-  "missing_indicator.sublabel": "This resource could not be found",
-  "mute_modal.hide_notifications": "Hide notifications from this user?",
+  "missing_indicator.sublabel": "Ð ÐµÑÑƒÑ€Ñ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¸Ð¹",
+  "mute_modal.hide_notifications": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²Ñ–Ð´ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°?",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "Ð—Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–",
   "navigation_bar.community_timeline": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°",
-  "navigation_bar.direct": "Direct messages",
-  "navigation_bar.discover": "Discover",
-  "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.compose": "Compose new toot",
+  "navigation_bar.direct": "ÐŸÑ€ÑÐ¼Ñ– Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ",
+  "navigation_bar.discover": "Ð—Ð½Ð°Ð¹Ñ‚Ð¸",
+  "navigation_bar.domain_blocks": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ñ– Ð´Ð¾Ð¼ÐµÐ½Ð¸",
   "navigation_bar.edit_profile": "Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ",
   "navigation_bar.favourites": "Ð’Ð¿Ð¾Ð´Ð¾Ð±Ð°Ð½Ðµ",
-  "navigation_bar.filters": "Muted words",
+  "navigation_bar.filters": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ñ– ÑÐ»Ð¾Ð²Ð°",
   "navigation_bar.follow_requests": "Ð—Ð°Ð¿Ð¸Ñ‚Ð¸ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ",
-  "navigation_bar.info": "ÐŸÑ€Ð¾ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–ÑŽ",
-  "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts",
-  "navigation_bar.lists": "Lists",
+  "navigation_bar.info": "ÐŸÑ€Ð¾ ÑÐ°Ð¹Ñ‚",
+  "navigation_bar.keyboard_shortcuts": "Ð“Ð°Ñ€ÑÑ‡Ñ– ÐºÐ»Ð°Ð²Ñ–ÑˆÐ¸",
+  "navigation_bar.lists": "Ð¡Ð¿Ð¸ÑÐºÐ¸",
   "navigation_bar.logout": "Ð’Ð¸Ð¹Ñ‚Ð¸",
   "navigation_bar.mutes": "Ð—Ð°Ð³Ð»ÑƒÑˆÐµÐ½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–",
-  "navigation_bar.personal": "Personal",
-  "navigation_bar.pins": "Pinned toots",
+  "navigation_bar.personal": "ÐžÑÐ¾Ð±Ð¸ÑÑ‚Ðµ",
+  "navigation_bar.pins": "Ð—Ð°ÐºÑ€Ñ–Ð¿Ð»ÐµÐ½Ñ– Ð´Ð¼ÑƒÑ…Ð¸",
   "navigation_bar.preferences": "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
   "navigation_bar.public_timeline": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð° ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°",
-  "navigation_bar.security": "Security",
-  "notification.favourite": "{name} ÑÐ¿Ð¾Ð´Ð¾Ð±Ð°Ð²ÑÑ Ð²Ð°Ñˆ Ð´Ð¾Ð¿Ð¸Ñ",
+  "navigation_bar.security": "Ð‘ÐµÐ·Ð¿ÐµÐºÐ°",
+  "notification.favourite": "{name} Ð²Ð¿Ð¾Ð´Ð¾Ð±Ð°Ð²(-Ð»Ð°) Ð²Ð°Ñˆ Ð´Ð¾Ð¿Ð¸Ñ",
   "notification.follow": "{name} Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð²ÑÑ(-Ð»Ð°ÑÑŒ) Ð½Ð° Ð’Ð°Ñ",
   "notification.mention": "{name} Ð·Ð³Ð°Ð´Ð°Ð²(-Ð»Ð°) Ð’Ð°Ñ",
   "notification.reblog": "{name} Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÐ²(-Ð»Ð°) Ð’Ð°Ñˆ Ð´Ð¾Ð¿Ð¸Ñ",
   "notifications.clear": "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ",
-  "notifications.clear_confirmation": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð²ÑÑ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ñ?",
-  "notifications.column_settings.alert": "Ð”ÐµÑÐºÑ‚Ð¾Ð¿Ð½Ñ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ",
+  "notifications.clear_confirmation": "Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–, Ñ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð²ÑÑ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ñ?",
+  "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.follow": "ÐÐ¾Ð²Ñ– Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸:",
-  "notifications.column_settings.mention": "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
+  "notifications.column_settings.mention": "Ð—Ð³Ð°Ð´ÐºÐ¸:",
+  "notifications.column_settings.push": "Push-ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ",
   "notifications.column_settings.reblog": "ÐŸÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð¸:",
   "notifications.column_settings.show": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð² ÐºÐ¾Ð»Ð¾Ð½Ñ†Ñ–",
-  "notifications.column_settings.sound": "Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ñ‚Ð¸ Ð·Ð²ÑƒÐº",
-  "notifications.group": "{count} notifications",
-  "onboarding.done": "Ð“Ð¾Ñ‚Ð¾Ð²Ð¾",
-  "onboarding.next": "Ð”Ð°Ð»Ñ–",
-  "onboarding.page_five.public_timelines": "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ° Ð¿Ð¾ÐºÐ°Ð·ÑƒÑ” Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ñ– Ð¿Ð¾ÑÑ‚Ð¸ ÑƒÑÑ–Ñ… ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² {domain}. Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð° ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ° Ð¿Ð¾ÐºÐ°Ð·ÑƒÑ” Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ñ– Ð¿Ð¾ÑÑ‚Ð¸ ÑƒÑÑ–Ñ… Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÑÐºÐ¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ– {domain}. Ð¦Ðµ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ– ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ¸, Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð½Ð¸Ð¹ ÑÐ¿Ð¾ÑÑ–Ð± Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ñ… Ð»ÑŽÐ´ÐµÐ¹.",
-  "onboarding.page_four.home": "Ð”Ð¾Ð¼Ð°ÑˆÐ½Ñ ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ° Ð¿Ð¾ÐºÐ°Ð·ÑƒÑ” Ð¿Ð¾ÑÑ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð², Ð½Ð° ÑÐºÐ¸Ñ… Ð’Ð¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ–.",
-  "onboarding.page_four.notifications": "ÐšÐ¾Ð»Ð¾Ð½ÐºÐ° ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ Ð¿Ð¾ÐºÐ°Ð·ÑƒÑ” Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð¸, ÐºÐ¾Ð»Ð¸ Ñ…Ñ‚Ð¾ÑÑŒ Ð·Ð²ÐµÑ€Ñ‚Ð°Ñ”Ñ‚ÑŒÑÑ Ð´Ð¾ Ð’Ð°Ñ.",
-  "onboarding.page_one.federation": "Mastodon - Ñ†Ðµ Ð¼ÐµÑ€ÐµÐ¶Ð° Ð½ÐµÐ·Ð°Ð»ÐµÐ¶Ð½Ð¸Ñ… ÑÐµÑ€Ð²ÐµÑ€Ñ–Ð², ÑÐºÑ– Ñ€Ð°Ð·Ð¾Ð¼ Ð¾Ð±Ñ€Ð°Ð·Ð¾Ð²ÑƒÑŽÑ‚ÑŒ Ñ”Ð´Ð¸Ð½Ñƒ ÑÐ¾Ñ†Ñ–Ð°Ð»ÑŒÐ½Ñƒ Ð¼ÐµÑ€ÐµÐ¶Ñƒ. ÐœÐ¸ Ð½Ð°Ð·Ñ‹Ð²Ð°Ñ”Ð¼Ð¾ Ñ†Ñ– ÑÐµÑ€Ð²ÐµÑ€Ð¸ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–ÑÐ¼Ð¸.",
-  "onboarding.page_one.full_handle": "Your full handle",
-  "onboarding.page_one.handle_hint": "This is what you would tell your friends to search for.",
-  "onboarding.page_one.welcome": "Ð›Ð°ÑÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾ÑÐ¸Ð¼Ð¾ Ð´Ð¾ Mastodon!",
-  "onboarding.page_six.admin": "ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ Ð’Ð°ÑˆÐ¾Ñ— Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ— Ñ” {admin}.",
-  "onboarding.page_six.almost_done": "ÐœÐ°Ð¹Ð¶Ðµ Ð³Ð¾Ñ‚Ð¾Ð²Ð¾...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "Ð”Ð»Ñ Mastodon Ñ–ÑÐ½ÑƒÑŽÑ‚ÑŒ {apps}, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ– Ð´Ð»Ñ iOS, Android Ñ‚Ð° Ñ–Ð½ÑˆÐ¸Ñ… Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼.",
-  "onboarding.page_six.github": "Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñ‚Ð¸ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð¾Ð²Ñ– Ñ‡Ð¸ ÑÐ¿Ð¾Ð²Ñ–ÑÑ‚Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð½Ð° GitHub Ð·Ð° Ð°Ð´Ñ€ÐµÑÐ¾ÑŽ {github}.",
-  "onboarding.page_six.guidelines": "Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð°",
-  "onboarding.page_six.read_guidelines": "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ {guidelines} Ð´Ð¾Ð¼ÐµÐ½Ñƒ {domain}!",
-  "onboarding.page_six.various_app": "Ð¼Ð¾Ð±Ñ–Ð»ÑŒÐ½Ñ– Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¸",
-  "onboarding.page_three.profile": "Ð’Ñ–Ð´Ñ€ÐµÐ´Ð°Ð³ÑƒÐ¹Ñ‚Ðµ Ð’Ð°Ñˆ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ, Ñ‰Ð¾Ð± Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð’Ð°ÑˆÐ¸ Ð°Ð²Ð°Ñ‚Ð°Ñ€ÐºÑƒ, Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–ÑŽ Ñ‚Ð° Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÑƒÐ²Ð°Ð½Ðµ Ñ–Ð¼'Ñ. Ð¢Ð°Ð¼ Ð’Ð¸ Ð·Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ– Ñ–Ð½ÑˆÑ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ.",
-  "onboarding.page_three.search": "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ñ€ÑÐ´Ð¾Ðº Ð¿Ð¾ÑˆÑƒÐºÑƒ, Ñ‰Ð¾Ð± Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ–Ð½ÑˆÐ¸Ñ… Ð»ÑŽÐ´ÐµÐ¹ Ñ‚Ð° Ð¿Ð¾Ð´Ð¸Ð²Ð¸Ñ‚Ð¸ÑÑ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¸ Ð½Ð°ÐºÑˆÑ‚Ð°Ð»Ñ‚ {illustration} Ñ‚Ð° {introductions}. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ð»ÑŽÐ´Ð¸Ð½Ñƒ Ð· Ñ–Ð½ÑˆÐ¾Ñ— Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—, Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ñ—Ñ…Ð½Ñ–Ð¹ Ð¿Ð¾Ð²Ð½Ð¸Ð¹ Ð½Ñ–ÐºÐ½ÐµÐ¹Ð¼.",
-  "onboarding.page_two.compose": "ÐŸÐ¸ÑˆÑ–Ñ‚ÑŒ Ð¿Ð¾ÑÑ‚Ð¸ Ñƒ ÐºÐ¾Ð»Ð¾Ð½Ñ†Ñ– 'ÐÐ°Ð¿Ð¸ÑÐ°Ñ‚Ð¸'. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ, Ð¼Ñ–Ð½ÑÑ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ– Ñ‚Ð° Ð´Ð¾Ð´Ð°Ð²Ð°Ñ‚Ð¸ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ Ð¿Ñ–ÐºÑ‚Ð¾Ð³Ñ€Ð°Ð¼ Ð·Ð½Ð¸Ð·Ñƒ.",
-  "onboarding.skip": "ÐŸÑ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ð¸",
+  "notifications.column_settings.sound": "Ð’Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ñ‚Ð¸ Ð·Ð²ÑƒÐºÐ¸",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
+  "notifications.group": "{count} ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ",
   "privacy.change": "Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð²Ð¸Ð´Ð¸Ð¼Ñ–ÑÑ‚ÑŒ Ð´Ð¾Ð¿Ð¸ÑÑƒ",
   "privacy.direct.long": "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð·Ð³Ð°Ð´Ð°Ð½Ð¸Ð¼ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°Ð¼",
   "privacy.direct.short": "ÐÐ°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ð¹",
@@ -224,17 +266,17 @@
   "privacy.public.short": "ÐŸÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¹",
   "privacy.unlisted.long": "ÐÐµ Ð¿Ð¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ñƒ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ñ… ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°Ñ…",
   "privacy.unlisted.short": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¸Ð¹",
-  "regeneration_indicator.label": "Loadingâ€¦",
-  "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.seconds": "{number}s",
+  "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}Ñ",
   "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.forward": "ÐÐ°Ð´Ñ–ÑÐ»Ð°Ñ‚Ð¸ Ð´Ð¾ {target}",
+  "report.forward_hint": "Ð¦Ðµ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð· Ñ–Ð½ÑˆÐ¾Ð³Ð¾ ÑÐµÑ€Ð²ÐµÑ€Ñƒ. Ð’Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ð°Ð½Ð¾Ð½Ñ–Ð¼Ñ–Ð·Ð¾Ð²Ð°Ð½Ñƒ ÐºÐ¾Ð¿Ñ–ÑŽ ÑÐºÐ°Ñ€Ð³Ð¸ Ñ– Ñ‚ÑƒÐ´Ð¸?",
+  "report.hint": "Ð¡ÐºÐ°Ñ€Ð³Ñƒ Ð±ÑƒÐ´Ðµ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¾ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð°Ð¼ Ð’Ð°ÑˆÐ¾Ð³Ð¾ ÑÐ°Ð¹Ñ‚Ñƒ. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ð´Ð°Ñ‚Ð¸ Ñ—Ð¼ Ð¿Ð¾ÑÑÐ½ÐµÐ½Ð½Ñ, Ñ‡Ð¾Ð¼Ñƒ Ð²Ð¸ ÑÐºÐ°Ñ€Ð¶Ð¸Ñ‚ÐµÑÑŒ Ð½Ð° Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð¸Ð¶Ñ‡Ðµ:",
   "report.placeholder": "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ñ– ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ–",
   "report.submit": "Ð’Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸",
   "report.target": "Ð¡ÐºÐ°Ñ€Ð¶Ð¸Ð¼Ð¾ÑÑ Ð½Ð°",
@@ -250,10 +292,13 @@
   "search_results.statuses": "Toots",
   "search_results.total": "{count, number} {count, plural, one {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚} few {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¸} many {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ–Ð²} other {Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ñ–Ð²}}",
   "standalone.public_title": "A look inside...",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Block @{name}",
   "status.cancel_reblog_private": "Unboost",
   "status.cannot_reblog": "Ð¦ÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÑ‚Ð¸Ð¹",
   "status.delete": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "Direct message @{name}",
   "status.embed": "Embed",
   "status.favourite": "ÐŸÐ¾Ð´Ð¾Ð±Ð°Ñ”Ñ‚ÑŒÑÑ",
@@ -267,9 +312,11 @@
   "status.open": "Ð Ð¾Ð·Ð³Ð¾Ñ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾Ð¿Ð¸Ñ",
   "status.pin": "Pin on profile",
   "status.pinned": "Pinned toot",
+  "status.read_more": "Read more",
   "status.reblog": "ÐŸÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÑ‚Ð¸",
   "status.reblog_private": "Boost to original audience",
   "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.reply": "Ð’Ñ–Ð´Ð¿Ð¾Ð²Ñ–ÑÑ‚Ð¸",
   "status.replyAll": "Ð’Ñ–Ð´Ð¿Ð¾Ð²Ñ–ÑÑ‚Ð¸ Ð½Ð° Ñ‚Ñ€ÐµÐ´",
@@ -281,28 +328,31 @@
   "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.unmute_conversation": "Ð—Ð½ÑÑ‚Ð¸ Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ Ð· Ð´Ñ–Ð°Ð»Ð¾Ð³Ñƒ",
   "status.unpin": "Unpin from profile",
+  "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": "Search",
+  "tabs_bar.search": "ÐŸÐ¾ÑˆÑƒÐº",
   "trends.count_by_accounts": "{count} {rawCount, plural, one {person} other {people}} talking",
-  "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
+  "ui.beforeunload": "Ð’Ð°ÑˆÑƒ Ñ‡ÐµÑ€Ð½ÐµÑ‚ÐºÑƒ Ð±ÑƒÐ´Ðµ Ð²Ñ‚Ñ€Ð°Ñ‡ÐµÐ½Ð¾, ÑÐºÑ‰Ð¾ Ð²Ð¸ Ð¿Ð¾ÐºÐ¸Ð½ÐµÑ‚Ðµ Mastodon.",
   "upload_area.title": "ÐŸÐµÑ€ÐµÑ‚ÑÐ³Ð½Ñ–Ñ‚ÑŒ ÑÑŽÐ´Ð¸, Ñ‰Ð¾Ð± Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸",
   "upload_button.label": "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¼ÐµÐ´Ñ–Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚",
-  "upload_form.description": "Describe for the visually impaired",
-  "upload_form.focus": "Crop",
-  "upload_form.undo": "Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸",
+  "upload_form.description": "ÐžÐ¿Ð¸ÑˆÑ–Ñ‚ÑŒ Ð´Ð»Ñ Ð»ÑŽÐ´ÐµÐ¹ Ð· Ð²Ð°Ð´Ð°Ð¼Ð¸ Ð·Ð¾Ñ€Ñƒ",
+  "upload_form.focus": "ÐžÐ±Ñ€Ñ–Ð·Ð°Ñ‚Ð¸",
+  "upload_form.undo": "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸",
   "upload_progress.label": "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ...",
-  "video.close": "Close video",
-  "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.close": "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð²Ñ–Ð´ÐµÐ¾",
+  "video.exit_fullscreen": "Ð’Ð¸Ð¹Ñ‚Ð¸ Ð· Ð¿Ð¾Ð²Ð½Ð¾Ð³Ð¾ ÐµÐºÑ€Ð°Ð½Ñƒ",
+  "video.expand": "Ð Ð¾Ð·ÑˆÐ¸Ñ€Ð¸Ñ‚Ð¸ Ð²Ñ–Ð´ÐµÐ¾",
+  "video.fullscreen": "ÐÐ° Ð²ÐµÑÑŒ ÐµÐºÑ€Ð°Ð½",
+  "video.hide": "ÐŸÑ€Ð¸Ñ…Ð¾Ð²Ð°Ñ‚Ð¸ Ð²Ñ–Ð´ÐµÐ¾",
+  "video.mute": "Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð·Ð²ÑƒÐº",
+  "video.pause": "ÐŸÑ€Ð¸Ð·ÑƒÐ¿Ð¸Ð½Ð¸Ñ‚Ð¸",
+  "video.play": "ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ñ‚Ð¸",
+  "video.unmute": "Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð·Ð²ÑƒÐº"
 }
diff --git a/app/javascript/mastodon/locales/whitelist_ast.json b/app/javascript/mastodon/locales/whitelist_ast.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ast.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_cy.json b/app/javascript/mastodon/locales/whitelist_cy.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_cy.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_ka.json b/app/javascript/mastodon/locales/whitelist_ka.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ka.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_lv.json b/app/javascript/mastodon/locales/whitelist_lv.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_lv.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_ms.json b/app/javascript/mastodon/locales/whitelist_ms.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ms.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_ro.json b/app/javascript/mastodon/locales/whitelist_ro.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ro.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/whitelist_ta.json b/app/javascript/mastodon/locales/whitelist_ta.json
new file mode 100644
index 0000000000000000000000000000000000000000..0d4f101c7a37a4c875e6999bee1a287fdb733380
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ta.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 8b73bb8f99ce9c4aca94038f232d5c265812c36c..dfa261d6e4da3d9632988f3e2d422b8bc6c97dd9 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "æœºå™¨äºº",
   "account.block": "å±è”½ @{name}",
   "account.block_domain": "éšè—æ¥è‡ª {domain} çš„å†…å®¹",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "æ¤å¤„æ˜¾ç¤ºçš„ä¿¡æ¯å¯èƒ½ä¸æ˜¯å…¨éƒ¨å†…å®¹ã€‚",
   "account.domain_blocked": "ç½‘ç«™å·²å±è”½",
   "account.edit_profile": "ä¿®æ”¹ä¸ªäººèµ„æ–™",
+  "account.endorse": "Feature on profile",
   "account.follow": "å…³æ³¨",
   "account.followers": "å…³æ³¨è€…",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "æ£åœ¨å…³æ³¨",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "å…³æ³¨äº†ä½ ",
   "account.hide_reblogs": "éšè—æ¥è‡ª @{name} çš„è½¬å˜Ÿ",
+  "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} å·²ç»è¿ç§»åˆ°ï¼š",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "æ˜¾ç¤ºæ¥è‡ª @{name} çš„è½¬å˜Ÿ",
   "account.unblock": "ä¸å†å±è”½ @{name}",
   "account.unblock_domain": "ä¸å†éšè—æ¥è‡ª {domain} çš„å†…å®¹",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "å–æ¶ˆå…³æ³¨",
   "account.unmute": "ä¸å†éšè— @{name}",
   "account.unmute_notifications": "ä¸å†éšè—æ¥è‡ª @{name} çš„é€šçŸ¥",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "ä½ ç¡®å®šè¦éšè— {name} å—ï¼Ÿ",
   "confirmations.redraft.confirm": "åˆ é™¤å¹¶é‡æ–°ç¼–è¾‘",
   "confirmations.redraft.message": "ä½ ç¡®å®šè¦åˆ é™¤è¿™æ¡å˜Ÿæ–‡å¹¶é‡æ–°ç¼–è¾‘å®ƒå—ï¼Ÿæ‰€æœ‰ç›¸å…³çš„å›žå¤ã€è½¬å˜Ÿå’Œæ”¶è—éƒ½ä¼šè¢«æ¸…é™¤ã€‚",
+  "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.unfollow.message": "ä½ ç¡®å®šè¦å–æ¶ˆå…³æ³¨ {name} å—ï¼Ÿ",
   "embed.instructions": "è¦åœ¨ä½ çš„ç½‘ç«™ä¸ŠåµŒå…¥è¿™æ¡å˜Ÿæ–‡ï¼Œè¯·å¤åˆ¶ä»¥ä¸‹ä»£ç ã€‚",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "æœç´¢ç»“æžœ",
   "emoji_button.symbols": "ç¬¦å·",
   "emoji_button.travel": "æ—…è¡Œå’Œåœ°ç‚¹",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "æœ¬ç«™æ—¶é—´è½´æš‚æ—¶æ²¡æœ‰å†…å®¹ï¼Œå¿«å˜Ÿå‡ ä¸ªæ¥æŠ¢å¤´é¦™å•Šï¼",
   "empty_column.direct": "ä½ è¿˜æ²¡æœ‰ä½¿ç”¨è¿‡ç§ä¿¡ã€‚å½“ä½ å‘å‡ºæˆ–è€…æ”¶åˆ°ç§ä¿¡æ—¶ï¼Œå®ƒä¼šåœ¨è¿™é‡Œæ˜¾ç¤ºã€‚",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "è¿™ä¸ªè¯é¢˜æ ‡ç¾ä¸‹æš‚æ—¶æ²¡æœ‰å†…å®¹ã€‚",
   "empty_column.home": "ä½ è¿˜æ²¡æœ‰å…³æ³¨ä»»ä½•ç”¨æˆ·ã€‚å¿«çœ‹çœ‹{public}ï¼Œå‘å…¶ä»–ç”¨æˆ·æè®ªå§ã€‚",
   "empty_column.home.public_timeline": "å…¬å…±æ—¶é—´è½´",
   "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.notifications": "ä½ è¿˜æ²¡æœ‰æ”¶åˆ°è¿‡ä»»ä½•é€šçŸ¥ï¼Œå¿«å‘å…¶ä»–ç”¨æˆ·æè®ªå§ã€‚",
   "empty_column.public": "è¿™é‡Œç¥žé©¬éƒ½æ²¡æœ‰ï¼å†™ä¸€äº›å…¬å¼€çš„å˜Ÿæ–‡ï¼Œæˆ–è€…å…³æ³¨å…¶ä»–å®žä¾‹çš„ç”¨æˆ·åŽï¼Œè¿™é‡Œå°±ä¼šæœ‰å˜Ÿæ–‡å‡ºçŽ°äº†å“¦ï¼",
   "follow_request.authorize": "åŒæ„",
   "follow_request.reject": "æ‹’ç»",
   "getting_started.developers": "å¼€å‘",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "æ–‡æ¡£",
-  "getting_started.find_friends": "å¯»æ‰¾ Twitter å¥½å‹",
   "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": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "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",
   "home.column_settings.basic": "åŸºæœ¬è®¾ç½®",
   "home.column_settings.show_reblogs": "æ˜¾ç¤ºè½¬å˜Ÿ",
   "home.column_settings.show_replies": "æ˜¾ç¤ºå›žå¤",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "è¿”å›žä¸Šä¸€é¡µ",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "è½¬å˜Ÿ",
   "keyboard_shortcuts.column": "é€‰æ‹©ç¬¬ X æ ä¸çš„å˜Ÿæ–‡",
   "keyboard_shortcuts.compose": "é€‰æ‹©å˜Ÿæ–‡æ’°å†™æ¡†",
   "keyboard_shortcuts.description": "è¯´æ˜Ž",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "åœ¨åˆ—è¡¨ä¸è®©å…‰æ ‡ä¸‹ç§»",
   "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.home": "to open home timeline",
   "keyboard_shortcuts.hotkey": "å¿«æ·é”®",
   "keyboard_shortcuts.legend": "æ˜¾ç¤ºæ¤åˆ—è¡¨",
+  "keyboard_shortcuts.local": "to open local timeline",
   "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.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.search": "é€‰æ‹©æœç´¢æ¡†",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "æ˜¾ç¤ºæˆ–éšè—è¢«æŠ˜å çš„æ£æ–‡",
   "keyboard_shortcuts.toot": "å‘é€æ–°å˜Ÿæ–‡",
   "keyboard_shortcuts.unfocus": "å–æ¶ˆè¾“å…¥",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "æ‰¾ä¸åˆ°å†…å®¹",
   "missing_indicator.sublabel": "æ— æ³•æ‰¾åˆ°æ¤èµ„æº",
   "mute_modal.hide_notifications": "åŒæ—¶éšè—æ¥è‡ªè¿™ä¸ªç”¨æˆ·çš„é€šçŸ¥",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "å·²å±è”½çš„ç”¨æˆ·",
   "navigation_bar.community_timeline": "æœ¬ç«™æ—¶é—´è½´",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "ç§ä¿¡",
   "navigation_bar.discover": "å‘çŽ°",
   "navigation_bar.domain_blocks": "å·²å±è”½çš„ç½‘ç«™",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "ä½ ç¡®å®šè¦æ°¸ä¹…æ¸…ç©ºé€šçŸ¥åˆ—è¡¨å—ï¼Ÿ",
   "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.follow": "å½“æœ‰äººå…³æ³¨ä½ æ—¶ï¼š",
   "notifications.column_settings.mention": "å½“æœ‰äººåœ¨å˜Ÿæ–‡ä¸æåŠä½ æ—¶ï¼š",
   "notifications.column_settings.push": "æŽ¨é€é€šçŸ¥",
-  "notifications.column_settings.push_meta": "æ¤è®¾å¤‡",
   "notifications.column_settings.reblog": "å½“æœ‰äººè½¬å˜Ÿäº†ä½ çš„å˜Ÿæ–‡æ—¶ï¼š",
   "notifications.column_settings.show": "åœ¨é€šçŸ¥æ æ˜¾ç¤º",
   "notifications.column_settings.sound": "æ’æ”¾éŸ³æ•ˆ",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} æ¡é€šçŸ¥",
-  "onboarding.done": "å‡ºå‘ï¼",
-  "onboarding.next": "ä¸‹ä¸€æ¥",
-  "onboarding.page_five.public_timelines": "â€œæœ¬ç«™æ—¶é—´è½´â€æ˜¾ç¤ºçš„æ˜¯ç”±æœ¬ç«™ï¼ˆ{domain}ï¼‰ç”¨æˆ·å‘å¸ƒçš„æ‰€æœ‰å…¬å¼€å˜Ÿæ–‡ã€‚â€œè·¨ç«™å…¬å…±æ—¶é—´è½´â€æ˜¾ç¤ºçš„çš„æ˜¯ç”±æœ¬ç«™ç”¨æˆ·å…³æ³¨å¯¹è±¡æ‰€å‘å¸ƒçš„æ‰€æœ‰å…¬å¼€å˜Ÿæ–‡ã€‚è¿™äº›å°±æ˜¯å¯»äººå¥½åŽ»å¤„çš„å…¬å…±æ—¶é—´è½´å•¦ã€‚",
-  "onboarding.page_four.home": "ä½ çš„â€œä¸»é¡µâ€æ—¶é—´è½´ä¸Šæ˜¾ç¤ºçš„æ˜¯ä½ çš„å…³æ³¨å¯¹è±¡æ‰€å‘å¸ƒçš„å˜Ÿæ–‡ã€‚",
-  "onboarding.page_four.notifications": "å¦‚æžœæœ‰äººä¸Žä½ äº’åŠ¨äº†ï¼Œä»–ä»¬å°±ä¼šå‡ºçŽ°åœ¨â€œé€šçŸ¥â€æ ä¸å“¦ï½ž",
-  "onboarding.page_one.federation": "Mastodon æ˜¯ç”±ä¸€ç³»åˆ—ç‹¬ç«‹çš„æœåŠ¡å™¨å…±åŒæ‰“é€ çš„å¼ºå¤§çš„ç¤¾äº¤ç½‘ç»œï¼Œæˆ‘ä»¬å°†è¿™äº›å„è‡ªç‹¬ç«‹è€Œåˆç›¸äº’è¿žæŽ¥çš„æœåŠ¡å™¨å«åšâ€œå®žä¾‹â€ã€‚",
-  "onboarding.page_one.full_handle": "ä½ çš„å®Œæ•´ç”¨æˆ·åœ°å€",
-  "onboarding.page_one.handle_hint": "ä½ çš„æœ‹å‹ä»¬éœ€è¦è¿™ä¸ªæ‰èƒ½é€šè¿‡æœç´¢åŠŸèƒ½æ‰¾åˆ°ä½ ã€‚",
-  "onboarding.page_one.welcome": "æ¬¢è¿Žæ¥åˆ° Mastodonï¼",
-  "onboarding.page_six.admin": "{admin} æ˜¯ä½ æ‰€åœ¨æœåŠ¡å™¨å®žä¾‹çš„ç®¡ç†å‘˜ã€‚",
-  "onboarding.page_six.almost_done": "å·®ä¸å¤šäº†â€¦â€¦",
-  "onboarding.page_six.appetoot": "å—·å‘œï½ž",
-  "onboarding.page_six.apps_available": "æˆ‘ä»¬è¿˜æœ‰é€‚ç”¨äºŽ iOSã€Android å’Œå…¶å®ƒå¹³å°çš„{apps}å“¦ï½ž",
-  "onboarding.page_six.github": "Mastodon æ˜¯è‡ªç”±çš„å¼€æºè½¯ä»¶ã€‚æ¬¢è¿Žå‰å¾€ {github} åé¦ˆé—®é¢˜ã€æå‡ºå¯¹æ–°åŠŸèƒ½çš„å»ºè®®æˆ–è´¡çŒ®ä»£ç  :-)",
-  "onboarding.page_six.guidelines": "ç¤¾åŒºæŒ‡å—",
-  "onboarding.page_six.read_guidelines": "åˆ«å¿˜äº†çœ‹çœ‹ {domain} çš„{guidelines}ï¼",
-  "onboarding.page_six.various_app": "ç§»åŠ¨è®¾å¤‡åº”ç”¨",
-  "onboarding.page_three.profile": "ä½ è¿˜å¯ä»¥ä¿®æ”¹ä½ çš„ä¸ªäººèµ„æ–™ï¼Œæ¯”å¦‚å¤´åƒã€ç®€ä»‹å’Œæ˜µç§°ç‰åå¥½è®¾ç½®ã€‚",
-  "onboarding.page_three.search": "ä½ å¯ä»¥é€šè¿‡æœç´¢åŠŸèƒ½å¯»æ‰¾ç”¨æˆ·å’Œè¯é¢˜æ ‡ç¾ï¼Œæ¯”å¦‚â€œ{illustration}â€ï¼Œæˆ–æ˜¯â€œ{introductions}â€ã€‚å¦‚æžœä½ æƒ³æœç´¢å…¶ä»–å®žä¾‹ä¸Šçš„ç”¨æˆ·ï¼Œå°±éœ€è¦è¾“å…¥å®Œæ•´ç”¨æˆ·åœ°å€ï¼ˆ@ç”¨æˆ·å@åŸŸåï¼‰å“¦ã€‚",
-  "onboarding.page_two.compose": "åœ¨æ’°å†™æ ä¸å¼€å§‹å˜Ÿå˜Ÿå§ï¼ä¸‹æ–¹çš„æŒ‰é’®åˆ†åˆ«å¯ä»¥ç”¨æ¥ä¸Šä¼ å›¾ç‰‡ã€ä¿®æ”¹å˜Ÿæ–‡å¯è§èŒƒå›´ï¼Œä»¥åŠæ·»åŠ è¦å‘Šä¿¡æ¯ã€‚",
-  "onboarding.skip": "è·³è¿‡",
   "privacy.change": "è®¾ç½®å˜Ÿæ–‡å¯è§èŒƒå›´",
   "privacy.direct.long": "åªæœ‰è¢«æåŠçš„ç”¨æˆ·èƒ½çœ‹åˆ°",
   "privacy.direct.short": "ç§ä¿¡",
@@ -250,10 +292,13 @@
   "search_results.statuses": "å˜Ÿæ–‡",
   "search_results.total": "å…± {count, number} ä¸ªç»“æžœ",
   "standalone.public_title": "å¤§å®¶éƒ½åœ¨å¹²å•¥ï¼Ÿ",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "å±è”½ @{name}",
   "status.cancel_reblog_private": "å–æ¶ˆè½¬å˜Ÿ",
   "status.cannot_reblog": "æ— æ³•è½¬å˜Ÿè¿™æ¡å˜Ÿæ–‡",
   "status.delete": "åˆ é™¤",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "å‘é€ç§ä¿¡ç»™ @{name}",
   "status.embed": "åµŒå…¥",
   "status.favourite": "æ”¶è—",
@@ -267,9 +312,11 @@
   "status.open": "å±•å¼€å˜Ÿæ–‡",
   "status.pin": "åœ¨ä¸ªäººèµ„æ–™é¡µé¢ç½®é¡¶",
   "status.pinned": "ç½®é¡¶å˜Ÿæ–‡",
+  "status.read_more": "Read more",
   "status.reblog": "è½¬å˜Ÿ",
   "status.reblog_private": "è½¬å˜Ÿç»™åŽŸæœ‰å…³æ³¨è€…",
   "status.reblogged_by": "{name} è½¬å˜Ÿäº†",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "åˆ é™¤å¹¶é‡æ–°ç¼–è¾‘",
   "status.reply": "å›žå¤",
   "status.replyAll": "å›žå¤æ‰€æœ‰äºº",
@@ -281,8 +328,11 @@
   "status.show_less_all": "éšè—æ‰€æœ‰å†…å®¹",
   "status.show_more": "æ˜¾ç¤ºå†…å®¹",
   "status.show_more_all": "æ˜¾ç¤ºæ‰€æœ‰å†…å®¹",
+  "status.show_thread": "Show thread",
   "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": "æœ¬ç«™",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 21c3e61544b466da6460653fccb04fdac128252b..e57aa6d96dd2270829fdd8a85ca0f31d94899ed0 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,4 +1,5 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "æ©Ÿæ¢°äºº",
   "account.block": "å°éŽ– @{name}",
   "account.block_domain": "éš±è—ä¾†è‡ª {domain} çš„ä¸€åˆ‡æ–‡ç« ",
@@ -7,11 +8,16 @@
   "account.disclaimer_full": "ä¸‹åˆ—è³‡æ–™ä¸ä¸€å®šå®Œæ•´ã€‚",
   "account.domain_blocked": "æœå‹™ç«™è¢«éš±è—",
   "account.edit_profile": "ä¿®æ”¹å€‹äººè³‡æ–™",
+  "account.endorse": "Feature on profile",
   "account.follow": "é—œæ³¨",
   "account.followers": "é—œæ³¨çš„äºº",
+  "account.followers.empty": "No one follows this user yet.",
   "account.follows": "æ£é—œæ³¨",
+  "account.follows.empty": "This user doesn't follow anyone yet.",
   "account.follows_you": "é—œæ³¨ä½ ",
   "account.hide_reblogs": "éš±è— @{name} çš„è½‰æŽ¨",
+  "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} å·²ç¶“é·ç§»åˆ°ï¼š",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "é¡¯ç¤º @{name} çš„æŽ¨æ–‡",
   "account.unblock": "è§£é™¤å° @{name} çš„å°éŽ–",
   "account.unblock_domain": "ä¸å†éš±è— {domain}",
+  "account.unendorse": "Don't feature on profile",
   "account.unfollow": "å–æ¶ˆé—œæ³¨",
   "account.unmute": "å–æ¶ˆ @{name} çš„éœéŸ³",
   "account.unmute_notifications": "å–æ¶ˆä¾†è‡ª @{name} é€šçŸ¥çš„éœéŸ³",
@@ -86,6 +93,8 @@
   "confirmations.mute.message": "ä½ ç¢ºå®šè¦å°‡{name}éœéŸ³å—Žï¼Ÿ",
   "confirmations.redraft.confirm": "åˆªé™¤ä¸¦ç·¨è¼¯",
   "confirmations.redraft.message": "ä½ ç¢ºå®šè¦åˆªé™¤ä¸¦é‡æ–°ç·¨è¼¯å—Žï¼Ÿæ‰€æœ‰ç›¸é—œçš„å›žè¦†ã€è½‰æŽ¨èˆ‡æœ€æ„›éƒ½æœƒè¢«åˆªé™¤ã€‚",
+  "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.unfollow.message": "çœŸçš„ä¸è¦ç¹¼çºŒé—œæ³¨ {name} äº†å—Žï¼Ÿ",
   "embed.instructions": "è¦å…§åµŒæ¤æ–‡ç« ï¼Œè«‹å°‡ä»¥ä¸‹ä»£ç¢¼è²¼é€²ä½ çš„ç¶²ç«™ã€‚",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "æœå°‹çµæžœ",
   "emoji_button.symbols": "ç¬¦è™Ÿ",
   "emoji_button.travel": "æ—…éŠæ™¯ç‰©",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.community": "æœ¬ç«™æ™‚é–“è»¸æš«æ™‚æœªæœ‰å…§å®¹ï¼Œå¿«å¯«ä¸€é»žæ±è¥¿ä¾†æ¶é é¦™å•Šï¼",
   "empty_column.direct": "ä½ æ²’æœ‰å€‹äººè¨Šæ¯ã€‚ç•¶ä½ ç™¼å‡ºæˆ–æŽ¥æ”¶å€‹äººè¨Šæ¯ï¼Œå°±æœƒåœ¨é€™è£¡å‡ºç¾ã€‚",
+  "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_requests": "You don't have any follow requests yet. When you receive one, it will show up here.",
   "empty_column.hashtag": "é€™å€‹æ¨™ç±¤æš«æ™‚æœªæœ‰å…§å®¹ã€‚",
   "empty_column.home": "ä½ é‚„æ²’æœ‰é—œæ³¨ä»»ä½•ç”¨æˆ¶ã€‚å¿«çœ‹çœ‹{public}ï¼Œå‘å…¶ä»–ç”¨æˆ¶æè¨•å§ã€‚",
   "empty_column.home.public_timeline": "å…¬å…±æ™‚é–“è»¸",
   "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.notifications": "ä½ æ²’æœ‰ä»»ä½•é€šçŸ¥ç´€éŒ„ï¼Œå¿«å‘å…¶ä»–ç”¨æˆ¶æè¨•å§ã€‚",
   "empty_column.public": "è·¨ç«™æ™‚é–“è»¸æš«æ™‚æ²’æœ‰å…§å®¹ï¼å¿«å¯«ä¸€äº›å…¬å…±çš„æ–‡ç« ï¼Œæˆ–è€…é—œæ³¨å¦ä¸€äº›æœå‹™ç«™çš„ç”¨æˆ¶å§ï¼ä½ å’Œæœ¬ç«™ã€å‹ç«™çš„äº¤æµï¼Œå°‡æ±ºå®šé€™è£å‡ºç¾çš„å…§å®¹ã€‚",
   "follow_request.authorize": "æ‰¹å‡†",
   "follow_request.reject": "æ‹’çµ•",
   "getting_started.developers": "é–‹ç™¼è€…",
+  "getting_started.directory": "Profile directory",
   "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "å°‹æ‰¾ Twitter å¥½å‹",
   "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": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "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",
   "home.column_settings.basic": "åŸºæœ¬",
   "home.column_settings.show_reblogs": "é¡¯ç¤ºè¢«è½‰æŽ¨çš„æ–‡ç« ",
   "home.column_settings.show_replies": "é¡¯ç¤ºå›žæ‡‰æ–‡ç« ",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "å¾Œé€€",
+  "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "è½‰æŽ¨",
   "keyboard_shortcuts.column": "æŠŠæ¨™ç¤ºç§»å‹•åˆ°å…¶ä¸ä¸€åˆ—",
   "keyboard_shortcuts.compose": "æŠŠæ¨™ç¤ºç§»å‹•åˆ°æ–‡å—è¼¸å…¥å€",
   "keyboard_shortcuts.description": "æè¿°",
+  "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "åœ¨åˆ—è¡¨å¾€ä¸‹ç§»å‹•",
   "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.home": "to open home timeline",
   "keyboard_shortcuts.hotkey": "å¿«é€Ÿéµ",
   "keyboard_shortcuts.legend": "é¡¯ç¤ºé€™å€‹èªªæ˜Ž",
+  "keyboard_shortcuts.local": "to open local timeline",
   "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.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.search": "æŠŠæ¨™ç¤ºç§»å‹•åˆ°æœç´¢",
+  "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "é¡¯ç¤ºæˆ–éš±è—è¢«æ¨™ç‚ºæ•æ„Ÿçš„æ–‡å—",
   "keyboard_shortcuts.toot": "æ–°çš„æŽ¨æ–‡",
   "keyboard_shortcuts.unfocus": "æŠŠæ¨™ç¤ºç§»é›¢æ–‡å—è¼¸å…¥å’Œæœç´¢",
@@ -159,8 +213,10 @@
   "missing_indicator.label": "æ‰¾ä¸åˆ°å…§å®¹",
   "missing_indicator.sublabel": "ç„¡æ³•æ‰¾åˆ°å…§å®¹",
   "mute_modal.hide_notifications": "éš±è—ä¾†è‡ªé€™ç”¨æˆ¶çš„é€šçŸ¥å—Žï¼Ÿ",
+  "navigation_bar.apps": "Mobile apps",
   "navigation_bar.blocks": "è¢«ä½ å°éŽ–çš„ç”¨æˆ¶",
   "navigation_bar.community_timeline": "æœ¬ç«™æ™‚é–“è»¸",
+  "navigation_bar.compose": "Compose new toot",
   "navigation_bar.direct": "å€‹äººè¨Šæ¯",
   "navigation_bar.discover": "æŽ¢ç´¢",
   "navigation_bar.domain_blocks": "éš±è—çš„æœå‹™ç«™",
@@ -186,35 +242,21 @@
   "notifications.clear_confirmation": "ä½ ç¢ºå®šè¦æ¸…ç©ºé€šçŸ¥ç´€éŒ„å—Žï¼Ÿ",
   "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.follow": "é—œæ³¨ä½ ï¼š",
   "notifications.column_settings.mention": "æåŠä½ ï¼š",
   "notifications.column_settings.push": "æŽ¨é€é€šçŸ¥",
-  "notifications.column_settings.push_meta": "é€™è‡ºè¨å‚™",
   "notifications.column_settings.reblog": "è½‰æŽ¨ä½ çš„æ–‡ç« ï¼š",
   "notifications.column_settings.show": "åœ¨é€šçŸ¥æ¬„é¡¯ç¤º",
   "notifications.column_settings.sound": "æ’æ”¾éŸ³æ•ˆ",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} æ¢é€šçŸ¥",
-  "onboarding.done": "é–‹å§‹ä½¿ç”¨",
-  "onboarding.next": "ç¹¼çºŒ",
-  "onboarding.page_five.public_timelines": "ã€Œæœ¬ç«™æ™‚é–“è»¸ã€é¡¯ç¤ºåœ¨ {domain} å„ç”¨æˆ¶çš„å…¬é–‹æ–‡ç« ã€‚ã€Œè·¨ç«™æ™‚é–“è»¸ã€é¡¯ç¤ºåœ¨ {domain} å„äººé—œæ³¨çš„æ‰€æœ‰ç”¨æˆ¶ï¼ˆåŒ…æ‹¬å…¶ä»–æœå‹™ç«™ï¼‰çš„å…¬é–‹æ–‡ç« ã€‚é€™äº›éƒ½æ˜¯ã€Œå…¬å…±æ™‚é–“è»¸ã€ï¼Œæ˜¯èªè˜æ–°æœ‹å‹çš„å¥½åœ°æ–¹ã€‚",
-  "onboarding.page_four.home": "ã€Œä¸»é ã€é¡¯ç¤ºä½ æ‰€é—œæ³¨ç”¨æˆ¶çš„æ–‡ç« ã€‚",
-  "onboarding.page_four.notifications": "ã€Œé€šçŸ¥ã€æ¬„é¡¯ç¤ºä½ å’Œå…¶ä»–äººçš„äº’å‹•ã€‚",
-  "onboarding.page_one.federation": "Mastodonï¼ˆè¬è±¡ç¤¾äº¤ï¼‰æ˜¯ç”±ä¸€æ‰¹ç¨ç«‹ç¶²ç«™çµ„æˆçš„é¾å¤§ç¶²çµ¡ï¼Œæˆ‘å€‘å°‡é€™äº›ç¨ç«‹åˆäº’é€£ç¶²ç«™ç¨±ç‚ºã€Œæœå‹™ç«™ã€(instance) ã€‚",
-  "onboarding.page_one.full_handle": "ä½ çš„å¸³è™Ÿå…¨å",
-  "onboarding.page_one.handle_hint": "æœ‹å‹å¯ä»¥å¾žé€™å€‹å¸³è™Ÿå…¨åæ‰¾åˆ°ä½ ã€‚",
-  "onboarding.page_one.welcome": "æ¡è¿Žä½¿ç”¨ Mastodonï¼ˆè¬è±¡ç¤¾äº¤ï¼‰ï¼",
-  "onboarding.page_six.admin": "ä½ æœå‹™ç«™çš„ç®¡ç†å“¡æ˜¯{admin}ã€‚",
-  "onboarding.page_six.almost_done": "å·®ä¸å¤šäº†â€¦â€¦",
-  "onboarding.page_six.appetoot": "æ‰‹æ©Ÿï¼Œä½ å¥½ï¼",
-  "onboarding.page_six.apps_available": "ç›®å‰æ”¯æ´ Mastodon çš„{apps}å·²ç¶“æ”¯æ´ iOSã€Android å’Œå…¶ä»–ç³»çµ±å¹³å°ã€‚",
-  "onboarding.page_six.github": "Mastodon ï¼ˆè¬è±¡ï¼‰æ˜¯ä¸€å€‹é–‹æºçš„ç¨‹å¼ï¼Œä½ å¯ä»¥åœ¨ {github} ä¸Šå›žå ±å•é¡Œã€æè°æ–°åŠŸèƒ½ã€æˆ–è€…åƒèˆ‡é–‹ç™¼è²¢ç»ã€‚",
-  "onboarding.page_six.guidelines": "ç¤¾ç¾¤å®ˆå‰‡",
-  "onboarding.page_six.read_guidelines": "è«‹ç•™æ„é–±è®€ {domain} çš„ {guidelines}ï¼",
-  "onboarding.page_six.various_app": "å„æ‰‹æ©Ÿæ‡‰ç”¨ç¨‹å¼",
-  "onboarding.page_three.profile": "ä¿®æ”¹ä½ å€‹äººé åƒã€ç°¡ä»‹å’Œé¡¯ç¤ºåç¨±ï¼Œä¸¦å¯æ‰¾åˆ°å…¶ä»–è¨å®šçš„é é¢ã€‚",
-  "onboarding.page_three.search": "ç”¨ã€Œæœå°‹ã€æ¡†åŽ»æ‰¾ç”¨æˆ¶æˆ–æ¨™ç±¤åƒã€Œ{illustration}ã€å’Œã€Œ{introductions}ã€ã€‚è‹¥ä½ æƒ³æ‰¾çš„äººåœ¨åˆ¥çš„æœå‹™ç«™ï¼Œè«‹ç”¨å®Œæ•´çš„ã€Œ@ç”¨æˆ¶å@ç¶²åŸŸã€æ ¼å¼æœå°‹ã€‚",
-  "onboarding.page_two.compose": "åœ¨ç·¨å¯«æ¬„å¯«ä½ çš„æ–‡ç« ã€‚ä½ å¯ä»¥åœ¨æ¤ä¸Šè¼‰åœ–ç‰‡ã€ä¿®æ”¹æ–‡ç« çš„ç§éš±åº¦ã€åŠåŠ å…¥é©ç•¶çš„å…§å®¹è¦å‘Šã€‚",
-  "onboarding.skip": "ç•¥éŽ",
   "privacy.change": "èª¿æ•´ç§éš±è¨å®š",
   "privacy.direct.long": "åªæœ‰æåŠçš„ç”¨æˆ¶èƒ½çœ‹åˆ°",
   "privacy.direct.short": "ç§äººè¨Šæ¯",
@@ -250,10 +292,13 @@
   "search_results.statuses": "æ–‡ç« ",
   "search_results.total": "{count, number} é …çµæžœ",
   "standalone.public_title": "ç«™é»žä¸€çž¥â€¦",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "å°éŽ– @{name}",
   "status.cancel_reblog_private": "å–æ¶ˆè½‰æŽ¨",
   "status.cannot_reblog": "é€™ç¯‡æ–‡ç« ç„¡æ³•è¢«è½‰æŽ¨",
   "status.delete": "åˆªé™¤",
+  "status.detailed_status": "Detailed conversation view",
   "status.direct": "ç§è¨Š @{name}",
   "status.embed": "é‘²åµŒ",
   "status.favourite": "æ”¶è—",
@@ -267,9 +312,11 @@
   "status.open": "å±•é–‹æ–‡ç« ",
   "status.pin": "ç½®é ‚åˆ°è³‡æ–™é ",
   "status.pinned": "ç½®é ‚æ–‡ç« ",
+  "status.read_more": "Read more",
   "status.reblog": "è½‰æŽ¨",
   "status.reblog_private": "è½‰æŽ¨åˆ°åŽŸè®€è€…",
   "status.reblogged_by": "{name} è½‰æŽ¨",
+  "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "åˆªé™¤ä¸¦ç·¨è¼¯",
   "status.reply": "å›žæ‡‰",
   "status.replyAll": "å›žæ‡‰æ‰€æœ‰äºº",
@@ -281,8 +328,11 @@
   "status.show_less_all": "æ¸›å°‘é¡¯ç¤ºé€™é¡žæ–‡ç« ",
   "status.show_more": "é¡¯ç¤ºæ›´å¤š",
   "status.show_more_all": "é¡¯ç¤ºæ›´å¤šé€™é¡žæ–‡ç« ",
+  "status.show_thread": "Show thread",
   "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": "æœ¬ç«™",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index b4a70ef70af8aba992bd414be4cfe03970ed10ad..0cbe5da5aac1e143e2082a898a083b2ac5a2f058 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,17 +1,23 @@
 {
+  "account.add_or_remove_from_list": "Add or Remove from lists",
   "account.badges.bot": "æ©Ÿå™¨äºº",
   "account.block": "å°éŽ– @{name}",
-  "account.block_domain": "éš±è—ä¾†è‡ª {domain} çš„ä¸€åˆ‡è²¼æ–‡",
+  "account.block_domain": "éš±è—ä¾†è‡ª {domain} çš„ä¸€åˆ‡å˜Ÿæ–‡",
   "account.blocked": "å·²è¢«å°éŽ–çš„",
   "account.direct": "ç™¼é€ç§è¨Šçµ¦ @{name}",
   "account.disclaimer_full": "ä¸‹åˆ—è³‡æ–™ä¸ä¸€å®šå®Œæ•´ã€‚",
   "account.domain_blocked": "ç«™é»žè¢«éš±è—",
   "account.edit_profile": "ç·¨è¼¯ä½¿ç”¨è€…è³‡è¨Š",
+  "account.endorse": "åœ¨å€‹äººè³‡è¨Šé é¢ä¸ŠæŽ¨è–¦å°æ–¹",
   "account.follow": "é—œæ³¨",
   "account.followers": "é—œæ³¨è€…",
+  "account.followers.empty": "é‚„æ²’æœ‰äººé—œæ³¨é€™å€‹ä½¿ç”¨è€…ã€‚",
   "account.follows": "æ£åœ¨é—œæ³¨",
+  "account.follows.empty": "é€™å€‹ä½¿ç”¨è€…é‚„æ²’æœ‰é—œæ³¨ä»»ä½•äººã€‚",
   "account.follows_you": "é—œæ³¨ä½ ",
   "account.hide_reblogs": "éš±è—ä¾†è‡ª @{name} çš„è½‰æŽ¨",
+  "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} å·²ç¶“ç§»è‡³ï¼š",
@@ -26,6 +32,7 @@
   "account.show_reblogs": "é¡¯ç¤ºä¾†è‡ª @{name} çš„å˜Ÿæ–‡",
   "account.unblock": "å–æ¶ˆå°éŽ– @{name}",
   "account.unblock_domain": "ä¸å†éš±è— {domain}",
+  "account.unendorse": "ä¸å†æ–¼å€‹äººè³‡è¨Šé é¢ä¸ŠæŽ¨è–¦å°æ–¹",
   "account.unfollow": "å–æ¶ˆé—œæ³¨",
   "account.unmute": "ä¸å†éœéŸ³ @{name}",
   "account.unmute_notifications": "ä¸å†å°ä¾†è‡ª @{name} çš„é€šçŸ¥éœéŸ³",
@@ -63,10 +70,10 @@
   "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": "ä½ çš„å¸³è™Ÿæ²’æœ‰{locked}ã€‚ä»»ä½•äººéƒ½å¯ä»¥é—œæ³¨ä½ ï¼Œçœ‹åˆ°ç™¼çµ¦é—œæ³¨è€…çš„å˜Ÿæ–‡ã€‚",
   "compose_form.lock_disclaimer.lock": "ä¸ŠéŽ–",
   "compose_form.placeholder": "åœ¨æƒ³äº›ä»€éº¼ï¼Ÿ",
-  "compose_form.publish": "è²¼æŽ‰",
+  "compose_form.publish": "å˜ŸæŽ‰",
   "compose_form.publish_loud": "{publish}ï¼",
   "compose_form.sensitive.marked": "æ¤åª’é«”å·²è¢«æ¨™è¨»ç‚ºæ•æ„Ÿçš„",
   "compose_form.sensitive.unmarked": "æ¤åª’é«”æœªè¢«æ¨™è¨»ç‚ºæ•æ„Ÿçš„",
@@ -85,10 +92,12 @@
   "confirmations.mute.confirm": "æ¶ˆéŸ³",
   "confirmations.mute.message": "ä½ ç¢ºå®šè¦æ¶ˆéŸ³ {name} ï¼Ÿ",
   "confirmations.redraft.confirm": "åˆªé™¤ & ç·¨è¼¯",
-  "confirmations.redraft.message": "ä½ ç¢ºå®šè¦åˆªé™¤é€™æ¢å˜Ÿæ–‡ä¸¦é‡æ–°ç·¨è¼¯å®ƒå—Ž? æ‰€æœ‰ç›¸é—œçš„å›žè¦†ã€è½‰å˜Ÿèˆ‡æœ€æ„›éƒ½æœƒè¢«åˆªé™¤ã€‚",
+  "confirmations.redraft.message": "ä½ ç¢ºå®šè¦åˆªé™¤é€™æ¢å˜Ÿæ–‡ä¸¦é‡æ–°ç·¨è¼¯å®ƒå—Žï¼Ÿæ‰€æœ‰ç›¸é—œçš„è½‰å˜Ÿèˆ‡æœ€æ„›éƒ½æœƒè¢«åˆªé™¤ï¼Œè€Œå°åŽŸå§‹å˜Ÿæ–‡çš„å›žè¦†å°‡æœƒè®Šæˆå¤å…’ã€‚",
+  "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.unfollow.message": "çœŸçš„ä¸è¦ç¹¼çºŒé—œæ³¨ {name} äº†å—Žï¼Ÿ",
-  "embed.instructions": "è¦å…§åµŒæ¤è²¼æ–‡ï¼Œè«‹å°‡ä»¥ä¸‹ä»£ç¢¼è²¼é€²ä½ çš„ç¶²ç«™ã€‚",
+  "embed.instructions": "è¦å…§åµŒæ¤å˜Ÿæ–‡ï¼Œè«‹å°‡ä»¥ä¸‹ä»£ç¢¼è²¼é€²ä½ çš„ç¶²ç«™ã€‚",
   "embed.preview": "çœ‹ä¸ŠåŽ»æœƒè®Šæˆé€™æ¨£ï¼š",
   "emoji_button.activity": "æ´»å‹•",
   "emoji_button.custom": "è‡ªè¨‚",
@@ -104,41 +113,86 @@
   "emoji_button.search_results": "æœå°‹çµæžœ",
   "emoji_button.symbols": "ç¬¦è™Ÿ",
   "emoji_button.travel": "æ—…éŠèˆ‡åœ°é»ž",
+  "empty_column.account_timeline": "No toots here!",
+  "empty_column.blocks": "ä½ é‚„æ²’æœ‰å°éŽ–ä»»ä½•ä½¿ç”¨è€…ã€‚",
   "empty_column.community": "æœ¬åœ°æ™‚é–“è»¸æ˜¯ç©ºçš„ã€‚å…¬é–‹å¯«é»žä»€éº¼å§ï¼",
   "empty_column.direct": "ä½ é‚„æ²’æœ‰ä½¿ç”¨éŽç§è¨Šã€‚ç•¶ä½ ç™¼å‡ºæˆ–è‘—æ”¶åˆ°ç§è¨Šæ™‚ï¼Œå®ƒæœƒåœ¨é€™è£¡é¡¯ç¤ºã€‚",
+  "empty_column.domain_blocks": "é‚„æ²’æœ‰éš±è—ä»»ä½•ç¶²åŸŸã€‚",
+  "empty_column.favourited_statuses": "ä½ é‚„æ²’æœ‰æ”¶è—ä»»ä½•å˜Ÿæ–‡ã€‚æ”¶è—å¾Œçš„å˜Ÿæ–‡æœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
+  "empty_column.favourites": "é‚„æ²’æœ‰äººæ”¶è—æ¤å˜Ÿæ–‡ã€‚å¦‚æžœæœ‰äººæ”¶è—ï¼Œæœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
+  "empty_column.follow_requests": "é‚„æ²’æœ‰äººè«‹æ±‚é—œæ³¨ä½ ã€‚å¦‚æžœæ”¶åˆ°é—œæ³¨è«‹æ±‚ï¼Œæœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
   "empty_column.hashtag": "é€™å€‹ä¸»é¡Œæ¨™ç±¤ä¸‹ä»€éº¼éƒ½æ²’æœ‰ã€‚",
   "empty_column.home": "ä½ é‚„æ²’é—œæ³¨ä»»ä½•äººã€‚é€ è¨ª{public}æˆ–åˆ©ç”¨æœå°‹åŠŸèƒ½æ‰¾åˆ°å…¶ä»–ç”¨è€…ã€‚",
   "empty_column.home.public_timeline": "å…¬é–‹æ™‚é–“è»¸",
-  "empty_column.list": "æ¤ä»½æ¸…å–®å°šæœªæœ‰æ±è¥¿ã€‚ç•¶æ¤æ¸…å–®çš„æˆå“¡è²¼å‡ºäº†æ–°çš„ç‹€æ…‹æ™‚ï¼Œå®ƒå€‘å°±æœƒå‡ºç¾åœ¨é€™è£¡ã€‚",
+  "empty_column.list": "æ¤ä»½åå–®å°šæœªæœ‰æ±è¥¿ã€‚ç•¶æ¤åå–®çš„æˆå“¡å˜Ÿå‡ºäº†æ–°çš„ç‹€æ…‹æ™‚ï¼Œå®ƒå€‘å°±æœƒå‡ºç¾åœ¨é€™è£¡ã€‚",
+  "empty_column.lists": "ä½ é‚„æ²’æœ‰å»ºç«‹ä»»ä½•åå–®ã€‚ä½ å»ºç«‹çš„åå–®å°‡æœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
+  "empty_column.mutes": "ä½ é‚„æ²’æœ‰éœéŸ³ä»»ä½•ä½¿ç”¨è€…ã€‚",
   "empty_column.notifications": "é‚„æ²’æœ‰ä»»ä½•é€šçŸ¥ã€‚å’Œåˆ¥çš„ä½¿ç”¨è€…äº’å‹•ä¾†é–‹å§‹å°è©±ã€‚",
   "empty_column.public": "é€™è£¡ä»€éº¼éƒ½æ²’æœ‰! å¯«ä¸€äº›å…¬é–‹çš„å˜Ÿæ–‡ï¼Œæˆ–è‘—é—œæ³¨å…¶ä»–ç«™é»žçš„ä½¿ç”¨è€…å¾Œï¼Œé€™è£¡å°±æœƒæœ‰å˜Ÿæ–‡å‡ºç¾äº†",
   "follow_request.authorize": "æŽˆæ¬Š",
   "follow_request.reject": "æ‹’çµ•",
   "getting_started.developers": "é–‹ç™¼",
-  "getting_started.documentation": "Documentation",
-  "getting_started.find_friends": "å°‹æ‰¾ Twitter å¥½å‹",
+  "getting_started.directory": "Profile 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": "and {additional}",
+  "hashtag.column_header.tag_mode.any": "or {additional}",
+  "hashtag.column_header.tag_mode.none": "without {additional}",
+  "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",
   "home.column_settings.basic": "åŸºæœ¬",
   "home.column_settings.show_reblogs": "é¡¯ç¤ºè½‰æŽ¨",
   "home.column_settings.show_replies": "é¡¯ç¤ºå›žæ‡‰",
+  "introduction.federation.action": "Next",
+  "introduction.federation.federated.headline": "Federated",
+  "introduction.federation.federated.text": "Public posts from other servers of the fediverse will appear in the federated timeline.",
+  "introduction.federation.home.headline": "Home",
+  "introduction.federation.home.text": "Posts from people you follow will appear in your home feed. You can follow anyone on any server!",
+  "introduction.federation.local.headline": "Local",
+  "introduction.federation.local.text": "Public posts from people on the same server as you will appear in the local timeline.",
+  "introduction.interactions.action": "Finish tutorial!",
+  "introduction.interactions.favourite.headline": "Favourite",
+  "introduction.interactions.favourite.text": "You can save a toot for later, and let the author know that you liked it, by favouriting it.",
+  "introduction.interactions.reblog.headline": "Boost",
+  "introduction.interactions.reblog.text": "You can share other people's toots with your followers by boosting them.",
+  "introduction.interactions.reply.headline": "Reply",
+  "introduction.interactions.reply.text": "You can reply to other people's and your own toots, which will chain them together in a conversation.",
+  "introduction.welcome.action": "Let's go!",
+  "introduction.welcome.headline": "First steps",
+  "introduction.welcome.text": "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.",
   "keyboard_shortcuts.back": "å›žåˆ°ä¸Šä¸€å€‹",
+  "keyboard_shortcuts.blocked": "åˆ°å°éŽ–çš„ä½¿ç”¨è€…åå–®",
   "keyboard_shortcuts.boost": "åˆ°è½‰æŽ¨",
   "keyboard_shortcuts.column": "é¸æ“‡ç¬¬ X æ¬„ä¸çš„å˜Ÿæ–‡",
   "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": "åˆ°æ”¶è—åå–®",
+  "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.pinned": "åˆ°æ”¶è—çš„å˜Ÿæ–‡åå–®",
+  "keyboard_shortcuts.profile": "åˆ°å˜Ÿæ–‡ä½œè€…çš„å€‹äººè³‡è¨Šé ",
   "keyboard_shortcuts.reply": "åˆ°å›žæ‡‰",
+  "keyboard_shortcuts.requests": "æ‰“é–‹é—œæ³¨è«‹æ±‚åå–®",
   "keyboard_shortcuts.search": "æŠŠæ»‘é¼ ç§»å‹•åˆ°æœå°‹",
+  "keyboard_shortcuts.start": "åˆ°ã€Œé¦¬ä¸Šé–‹å§‹ã€",
   "keyboard_shortcuts.toggle_hidden": "é¡¯ç¤ºæˆ–éš±è—è¢«æ¨™ç‚ºæ•æ„Ÿçš„å˜Ÿæ–‡",
   "keyboard_shortcuts.toot": "æ–°çš„å˜Ÿæ–‡",
   "keyboard_shortcuts.unfocus": "å–æ¶ˆè¼¸å…¥",
@@ -159,14 +213,16 @@
   "missing_indicator.label": "æ‰¾ä¸åˆ°",
   "missing_indicator.sublabel": "æ‰¾ä¸åˆ°æ¤è³‡æº",
   "mute_modal.hide_notifications": "éš±è—ä¾†è‡ªé€™å€‹ä½¿ç”¨è€…çš„é€šçŸ¥ï¼Ÿ",
+  "navigation_bar.apps": "è¡Œå‹•æ‡‰ç”¨ç¨‹å¼",
   "navigation_bar.blocks": "å°éŽ–çš„ä½¿ç”¨è€…",
   "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": "Muted words",
+  "navigation_bar.filters": "æ¶ˆéŸ³çš„è©ž",
   "navigation_bar.follow_requests": "é—œæ³¨è«‹æ±‚",
   "navigation_bar.info": "é—œæ–¼æœ¬ç«™",
   "navigation_bar.keyboard_shortcuts": "å¿«æ·éµ",
@@ -186,41 +242,27 @@
   "notifications.clear_confirmation": "ç¢ºå®šè¦æ°¸ä¹…æ¸…é™¤ä½ çš„é€šçŸ¥å—Žï¼Ÿ",
   "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.follow": "æ–°çš„é—œæ³¨è€…ï¼š",
   "notifications.column_settings.mention": "æåˆ°ï¼š",
   "notifications.column_settings.push": "æŽ¨é€é€šçŸ¥",
-  "notifications.column_settings.push_meta": "é€™è‡ºè¨å‚™",
   "notifications.column_settings.reblog": "è½‰å˜Ÿï¼š",
   "notifications.column_settings.show": "é¡¯ç¤ºåœ¨æ¬„ä½ä¸",
   "notifications.column_settings.sound": "æ’æ”¾éŸ³æ•ˆ",
+  "notifications.filter.all": "All",
+  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.favourites": "Favourites",
+  "notifications.filter.follows": "Follows",
+  "notifications.filter.mentions": "Mentions",
   "notifications.group": "{count} æ¢é€šçŸ¥",
-  "onboarding.done": "å®Œæˆ",
-  "onboarding.next": "ä¸‹ä¸€æ¥",
-  "onboarding.page_five.public_timelines": "æœ¬ç«™æ™‚é–“è»¸é¡¯ç¤º {domain} ä¸Šæ‰€æœ‰çš„å…¬é–‹å˜Ÿæ–‡ã€‚å…¶ä»–ç«™é»žæ™‚é–“è»¸é¡¯ç¤º {domain} ä¸Šæ‰€æœ‰äººé—œæ³¨çš„å…¬é–‹å˜Ÿæ–‡ã€‚é€™å°±æ˜¯å…¬é–‹æ™‚é–“è»¸ï¼Œç™¼ç¾æ–°æœ‹å‹çš„å¥½åœ°æ–¹ã€‚",
-  "onboarding.page_four.home": "ä¸»é æ™‚é–“è»¸é¡¯ç¤ºæ‰€æœ‰ä½ é—œæ³¨çš„äººçš„å˜Ÿæ–‡ã€‚",
-  "onboarding.page_four.notifications": "é€šçŸ¥æ¬„é¡¯ç¤ºåˆ¥äººå’Œä½ çš„äº’å‹•ã€‚",
-  "onboarding.page_one.federation": "Mastodon æ˜¯ç”±ç¨ç«‹çš„ä¼ºæœå™¨é€£çµèµ·ä¾†ï¼Œå½¢æˆçš„å¤§ç¤¾ç¾¤ç¶²è·¯ã€‚æˆ‘å€‘æŠŠé€™äº›ä¼ºæœå™¨ç¨±ç‚ºç«™é»žã€‚",
-  "onboarding.page_one.full_handle": "ä½ çš„å®Œæ•´å¸³æˆ¶åç¨±",
-  "onboarding.page_one.handle_hint": "ä½ çš„æœ‹å‹å€‘å¯ä»¥å¾žé€™å€‹å¸³æˆ¶å…¨åæ‰¾åˆ°ä½ ã€‚",
-  "onboarding.page_one.welcome": "æ¡è¿Žä¾†åˆ° Mastodon ï¼",
-  "onboarding.page_six.admin": "ä½ çš„ç«™é»žçš„ç®¡ç†å“¡æ˜¯ {admin} ã€‚",
-  "onboarding.page_six.almost_done": "å¿«å¥½äº†â€¦",
-  "onboarding.page_six.appetoot": "å—·å—š~!",
-  "onboarding.page_six.apps_available": "åœ¨ iOS ã€ Android å’Œå…¶ä»–å¹³å°ä¸Šæœ‰é€™äº› {apps} å¯ä»¥ç”¨ã€‚",
-  "onboarding.page_six.github": "Mastodon æ˜¯è‡ªç”±çš„é–‹æºè»Ÿé«”ã€‚ä½ å¯ä»¥åœ¨ {github} ä¸Šå›žå ±å•é¡Œã€è«‹æ±‚æ–°åŠŸèƒ½æˆ–æ˜¯åšå‡ºè²¢ç»ã€‚",
-  "onboarding.page_six.guidelines": "ç¤¾ç¾¤æŒ‡å—",
-  "onboarding.page_six.read_guidelines": "è«‹é–±è®€ {domain} çš„ {guidelines} ï¼",
-  "onboarding.page_six.various_app": "è¡Œå‹•ç‰ˆæ‡‰ç”¨ç¨‹å¼",
-  "onboarding.page_three.profile": "ç·¨è¼¯ä½ çš„é è²¼ã€ç°¡ä»‹èˆ‡é¡¯ç¤ºåç¨±ã€‚ä½ ä¹Ÿå¯ä»¥åœ¨é€™é‚Šæ‰¾åˆ°å…¶ä»–è¨å®šã€‚",
-  "onboarding.page_three.search": "åˆ©ç”¨æœå°‹åˆ—ä¾†æ‰¾åˆ°å…¶ä»–äººæˆ–æ˜¯ä¸»é¡Œæ¨™ç±¤ï¼Œåƒæ˜¯ {illustration} æˆ– {introductions} ã€‚ç”¨å®Œæ•´çš„å¸³æˆ¶åç¨±ä¾†æ‰¾å…¶ä»–ç«™é»žä¸Šçš„ä½¿ç”¨è€…ã€‚",
-  "onboarding.page_two.compose": "åœ¨ç·¨è¼¯æ¬„å¯«äº›ä»€éº¼ã€‚å¯ä»¥ä¸Šå‚³åœ–ç‰‡ã€æ”¹è®Šéš±ç§è¨å®šæˆ–æ˜¯ç”¨ä¸‹é¢çš„åœ–ç¤ºåŠ ä¸Šå…§å®¹è¦å‘Šã€‚",
-  "onboarding.skip": "è·³éŽ",
   "privacy.change": "èª¿æ•´éš±ç§ç‹€æ…‹",
   "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": "ä¸å…¬é–‹",
@@ -250,14 +292,17 @@
   "search_results.statuses": "å˜Ÿæ–‡",
   "search_results.total": "{count, number} é …çµæžœ",
   "standalone.public_title": "ç«™é»žä¸€çž¥â€¦",
+  "status.admin_account": "Open moderation interface for @{name}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "å°éŽ– @{name}",
   "status.cancel_reblog_private": "å–æ¶ˆè½‰å˜Ÿ",
   "status.cannot_reblog": "é€™ç¯‡å˜Ÿæ–‡ç„¡æ³•è¢«è½‰å˜Ÿ",
   "status.delete": "åˆªé™¤",
+  "status.detailed_status": "å°è©±çš„è©³ç´°å…§å®¹",
   "status.direct": "ç™¼é€ç§è¨Šçµ¦ @{name}",
   "status.embed": "åµŒå…¥",
   "status.favourite": "æœ€æ„›",
-  "status.filtered": "Filtered",
+  "status.filtered": "å·²éŽæ¿¾",
   "status.load_more": "è¼‰å…¥æ›´å¤š",
   "status.media_hidden": "éš±è—åª’é«”å…§å®¹",
   "status.mention": "æåˆ° @{name}",
@@ -267,9 +312,11 @@
   "status.open": "å±•é–‹å˜Ÿæ–‡",
   "status.pin": "ç½®é ‚åˆ°å€‹äººè³‡è¨Šé ",
   "status.pinned": "ç½®é ‚å˜Ÿæ–‡",
+  "status.read_more": "Read more",
   "status.reblog": "è½‰å˜Ÿ",
   "status.reblog_private": "è½‰å˜Ÿçµ¦åŽŸæœ‰é—œæ³¨è€…",
   "status.reblogged_by": "{name} è½‰å˜Ÿäº†",
+  "status.reblogs.empty": "é‚„æ²’æœ‰äººè½‰å˜Ÿã€‚å¦‚æžœæœ‰ï¼Œæœƒé¡¯ç¤ºåœ¨é€™è£¡ã€‚",
   "status.redraft": "åˆªé™¤ & ç·¨è¼¯",
   "status.reply": "å›žè¦†",
   "status.replyAll": "å›žè¦†æ‰€æœ‰äºº",
@@ -281,8 +328,11 @@
   "status.show_less_all": "æ¸›å°‘é¡¯ç¤ºé€™é¡žå˜Ÿæ–‡",
   "status.show_more": "é¡¯ç¤ºæ›´å¤š",
   "status.show_more_all": "é¡¯ç¤ºæ›´å¤šé€™é¡žå˜Ÿæ–‡",
+  "status.show_thread": "Show thread",
   "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": "æœ¬ç«™",
@@ -291,7 +341,7 @@
   "trends.count_by_accounts": "{count} ä½ä½¿ç”¨è€…åœ¨è¨Žè«–",
   "ui.beforeunload": "å¦‚æžœé›¢é–‹ Mastodonï¼Œä½ çš„è‰ç¨¿å°‡æœƒä¸è¦‹ã€‚",
   "upload_area.title": "æ‹–æ”¾ä¾†ä¸Šå‚³",
-  "upload_button.label": "ä¸Šå‚³åª’é«”æª”æ¡ˆ",
+  "upload_button.label": "ä¸Šå‚³åª’é«”æª”æ¡ˆ (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_form.description": "ç‚ºè¦–éšœäººå£«å¢žåŠ æ–‡å—èªªæ˜Ž",
   "upload_form.focus": "è£åˆ‡",
   "upload_form.undo": "åˆªé™¤",
diff --git a/app/javascript/mastodon/reducers/cards.js b/app/javascript/mastodon/reducers/cards.js
deleted file mode 100644
index 4d86b0d7e7a0821ee336ee2405d44717c167440d..0000000000000000000000000000000000000000
--- a/app/javascript/mastodon/reducers/cards.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { STATUS_CARD_FETCH_SUCCESS } from '../actions/cards';
-
-import { Map as ImmutableMap, fromJS } from 'immutable';
-
-const initialState = ImmutableMap();
-
-export default function cards(state = initialState, action) {
-  switch(action.type) {
-  case STATUS_CARD_FETCH_SUCCESS:
-    return state.set(action.id, fromJS(action.card));
-  default:
-    return state;
-  }
-};
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 552f659c9276e7714ca60a78b8146313b1ef7e1f..1622871b8fff5c9d1765065af187119b59295733 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -51,6 +51,7 @@ const initialState = ImmutableMap({
   in_reply_to: null,
   is_composing: false,
   is_submitting: false,
+  is_changing_upload: false,
   is_uploading: false,
   progress: 0,
   media_attachments: ImmutableList(),
@@ -79,6 +80,7 @@ function clearAll(state) {
     map.set('spoiler', false);
     map.set('spoiler_text', '');
     map.set('is_submitting', false);
+    map.set('is_changing_upload', false);
     map.set('in_reply_to', null);
     map.set('privacy', state.get('default_privacy'));
     map.set('sensitive', false);
@@ -131,7 +133,7 @@ const updateSuggestionTags = (state, token) => {
 
   return state.merge({
     suggestions: state.get('tagHistory')
-      .filter(tag => tag.startsWith(prefix))
+      .filter(tag => tag.toLowerCase().startsWith(prefix.toLowerCase()))
       .slice(0, 4)
       .map(tag => '#' + tag),
     suggestion_token: token,
@@ -248,13 +250,15 @@ export default function compose(state = initialState, action) {
       map.set('idempotencyKey', uuid());
     });
   case COMPOSE_SUBMIT_REQUEST:
-  case COMPOSE_UPLOAD_CHANGE_REQUEST:
     return state.set('is_submitting', true);
+  case COMPOSE_UPLOAD_CHANGE_REQUEST:
+    return state.set('is_changing_upload', true);
   case COMPOSE_SUBMIT_SUCCESS:
     return clearAll(state);
   case COMPOSE_SUBMIT_FAIL:
-  case COMPOSE_UPLOAD_CHANGE_FAIL:
     return state.set('is_submitting', false);
+  case COMPOSE_UPLOAD_CHANGE_FAIL:
+    return state.set('is_changing_upload', false);
   case COMPOSE_UPLOAD_REQUEST:
     return state.set('is_uploading', true);
   case COMPOSE_UPLOAD_SUCCESS:
@@ -300,7 +304,7 @@ export default function compose(state = initialState, action) {
     return insertEmoji(state, action.position, action.emoji, action.needsSpace);
   case COMPOSE_UPLOAD_CHANGE_SUCCESS:
     return state
-      .set('is_submitting', false)
+      .set('is_changing_upload', false)
       .update('media_attachments', list => list.map(item => {
         if (item.get('id') === action.media.id) {
           return fromJS(action.media);
diff --git a/app/javascript/mastodon/reducers/conversations.js b/app/javascript/mastodon/reducers/conversations.js
new file mode 100644
index 0000000000000000000000000000000000000000..955a07754de087d0b1a74aaa1931f486ed2ee9a2
--- /dev/null
+++ b/app/javascript/mastodon/reducers/conversations.js
@@ -0,0 +1,102 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import {
+  CONVERSATIONS_MOUNT,
+  CONVERSATIONS_UNMOUNT,
+  CONVERSATIONS_FETCH_REQUEST,
+  CONVERSATIONS_FETCH_SUCCESS,
+  CONVERSATIONS_FETCH_FAIL,
+  CONVERSATIONS_UPDATE,
+  CONVERSATIONS_READ,
+} from '../actions/conversations';
+import compareId from '../compare_id';
+
+const initialState = ImmutableMap({
+  items: ImmutableList(),
+  isLoading: false,
+  hasMore: true,
+  mounted: false,
+});
+
+const conversationToMap = item => ImmutableMap({
+  id: item.id,
+  unread: item.unread,
+  accounts: ImmutableList(item.accounts.map(a => a.id)),
+  last_status: item.last_status ? item.last_status.id : null,
+});
+
+const updateConversation = (state, item) => state.update('items', list => {
+  const index   = list.findIndex(x => x.get('id') === item.id);
+  const newItem = conversationToMap(item);
+
+  if (index === -1) {
+    return list.unshift(newItem);
+  } else {
+    return list.set(index, newItem);
+  }
+});
+
+const expandNormalizedConversations = (state, conversations, next) => {
+  let items = ImmutableList(conversations.map(conversationToMap));
+
+  return state.withMutations(mutable => {
+    if (!items.isEmpty()) {
+      mutable.update('items', list => {
+        list = list.map(oldItem => {
+          const newItemIndex = items.findIndex(x => x.get('id') === oldItem.get('id'));
+
+          if (newItemIndex === -1) {
+            return oldItem;
+          }
+
+          const newItem = items.get(newItemIndex);
+          items = items.delete(newItemIndex);
+
+          return newItem;
+        });
+
+        list = list.concat(items);
+
+        return list.sortBy(x => x.get('last_status'), (a, b) => {
+          if(a === null || b === null) {
+            return -1;
+          }
+
+          return compareId(a, b) * -1;
+        });
+      });
+    }
+
+    if (!next) {
+      mutable.set('hasMore', false);
+    }
+
+    mutable.set('isLoading', false);
+  });
+};
+
+export default function conversations(state = initialState, action) {
+  switch (action.type) {
+  case CONVERSATIONS_FETCH_REQUEST:
+    return state.set('isLoading', true);
+  case CONVERSATIONS_FETCH_FAIL:
+    return state.set('isLoading', false);
+  case CONVERSATIONS_FETCH_SUCCESS:
+    return expandNormalizedConversations(state, action.conversations, action.next);
+  case CONVERSATIONS_UPDATE:
+    return updateConversation(state, action.conversation);
+  case CONVERSATIONS_MOUNT:
+    return state.update('mounted', count => count + 1);
+  case CONVERSATIONS_UNMOUNT:
+    return state.update('mounted', count => count - 1);
+  case CONVERSATIONS_READ:
+    return state.update('items', list => list.map(item => {
+      if (item.get('id') === action.id) {
+        return item.set('unread', false);
+      }
+
+      return item;
+    }));
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/dropdown_menu.js b/app/javascript/mastodon/reducers/dropdown_menu.js
index 5449884cc5834beb052d3954a1f3b920d0e0da44..36fd4f13217522000bab317a98a94cbcfc1aeed6 100644
--- a/app/javascript/mastodon/reducers/dropdown_menu.js
+++ b/app/javascript/mastodon/reducers/dropdown_menu.js
@@ -4,12 +4,12 @@ import {
   DROPDOWN_MENU_CLOSE,
 } from '../actions/dropdown_menu';
 
-const initialState = Immutable.Map({ openId: null, placement: null });
+const initialState = Immutable.Map({ openId: null, placement: null, keyboard: false });
 
 export default function dropdownMenu(state = initialState, action) {
   switch (action.type) {
   case DROPDOWN_MENU_OPEN:
-    return state.merge({ openId: action.id, placement: action.placement });
+    return state.merge({ openId: action.id, placement: action.placement, keyboard: action.keyboard });
   case DROPDOWN_MENU_CLOSE:
     return state.get('openId') === action.id ? state.set('openId', null) : state;
   default:
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 4a981fada9dfab7a295ab5f31394223381560ea7..0f0de849f789a0d1657768761bbbb43ba0b65d15 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -14,7 +14,6 @@ import relationships from './relationships';
 import settings from './settings';
 import push_notifications from './push_notifications';
 import status_lists from './status_lists';
-import cards from './cards';
 import mutes from './mutes';
 import reports from './reports';
 import contexts from './contexts';
@@ -26,7 +25,10 @@ import height_cache from './height_cache';
 import custom_emojis from './custom_emojis';
 import lists from './lists';
 import listEditor from './list_editor';
+import listAdder from './list_adder';
 import filters from './filters';
+import conversations from './conversations';
+import suggestions from './suggestions';
 
 const reducers = {
   dropdown_menu,
@@ -44,7 +46,6 @@ const reducers = {
   relationships,
   settings,
   push_notifications,
-  cards,
   mutes,
   reports,
   contexts,
@@ -56,7 +57,10 @@ const reducers = {
   custom_emojis,
   lists,
   listEditor,
+  listAdder,
   filters,
+  conversations,
+  suggestions,
 };
 
 export default combineReducers(reducers);
diff --git a/app/javascript/mastodon/reducers/list_adder.js b/app/javascript/mastodon/reducers/list_adder.js
new file mode 100644
index 0000000000000000000000000000000000000000..b8c1b0e26954b51b16cbf66d09a2a833d2a375a6
--- /dev/null
+++ b/app/javascript/mastodon/reducers/list_adder.js
@@ -0,0 +1,47 @@
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import {
+  LIST_ADDER_RESET,
+  LIST_ADDER_SETUP,
+  LIST_ADDER_LISTS_FETCH_REQUEST,
+  LIST_ADDER_LISTS_FETCH_SUCCESS,
+  LIST_ADDER_LISTS_FETCH_FAIL,
+  LIST_EDITOR_ADD_SUCCESS,
+  LIST_EDITOR_REMOVE_SUCCESS,
+} from '../actions/lists';
+
+const initialState = ImmutableMap({
+  accountId: null,
+
+  lists: ImmutableMap({
+    items: ImmutableList(),
+    loaded: false,
+    isLoading: false,
+  }),
+});
+
+export default function listAdderReducer(state = initialState, action) {
+  switch(action.type) {
+  case LIST_ADDER_RESET:
+    return initialState;
+  case LIST_ADDER_SETUP:
+    return state.withMutations(map => {
+      map.set('accountId', action.account.get('id'));
+    });
+  case LIST_ADDER_LISTS_FETCH_REQUEST:
+    return state.setIn(['lists', 'isLoading'], true);
+  case LIST_ADDER_LISTS_FETCH_FAIL:
+    return state.setIn(['lists', 'isLoading'], false);
+  case LIST_ADDER_LISTS_FETCH_SUCCESS:
+    return state.update('lists', lists => lists.withMutations(map => {
+      map.set('isLoading', false);
+      map.set('loaded', true);
+      map.set('items', ImmutableList(action.lists.map(item => item.id)));
+    }));
+  case LIST_EDITOR_ADD_SUCCESS:
+    return state.updateIn(['lists', 'items'], list => list.unshift(action.listId));
+  case LIST_EDITOR_REMOVE_SUCCESS:
+    return state.updateIn(['lists', 'items'], list => list.filterNot(item => item === action.listId));
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 84d4fc69888f05f91dda66bed3ee3d67f69231fc..19a02f5b1546bde84e802d8ab854f5f3f2295a03 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -3,6 +3,7 @@ import {
   NOTIFICATIONS_EXPAND_SUCCESS,
   NOTIFICATIONS_EXPAND_REQUEST,
   NOTIFICATIONS_EXPAND_FAIL,
+  NOTIFICATIONS_FILTER_SET,
   NOTIFICATIONS_CLEAR,
   NOTIFICATIONS_SCROLL_TOP,
 } from '../actions/notifications';
@@ -26,6 +27,7 @@ const notificationToMap = notification => ImmutableMap({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
+  created_at: notification.created_at,
   status: notification.status ? notification.status.id : null,
 });
 
@@ -68,7 +70,7 @@ const expandNormalizedNotifications = (state, notifications, next) => {
     }
 
     if (!next) {
-      mutable.set('hasMore', true);
+      mutable.set('hasMore', false);
     }
 
     mutable.set('isLoading', false);
@@ -97,6 +99,8 @@ export default function notifications(state = initialState, action) {
     return state.set('isLoading', true);
   case NOTIFICATIONS_EXPAND_FAIL:
     return state.set('isLoading', false);
+  case NOTIFICATIONS_FILTER_SET:
+    return state.set('items', ImmutableList()).set('hasMore', true);
   case NOTIFICATIONS_SCROLL_TOP:
     return updateTop(state, action.top);
   case NOTIFICATIONS_UPDATE:
diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index d1caabc1c702cd88d08a9f4654b3836a5223b3aa..8322780de569d68c26f88dcac12b90d716d4d61e 100644
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -1,10 +1,16 @@
 import {
   ACCOUNT_FOLLOW_SUCCESS,
+  ACCOUNT_FOLLOW_REQUEST,
+  ACCOUNT_FOLLOW_FAIL,
   ACCOUNT_UNFOLLOW_SUCCESS,
+  ACCOUNT_UNFOLLOW_REQUEST,
+  ACCOUNT_UNFOLLOW_FAIL,
   ACCOUNT_BLOCK_SUCCESS,
   ACCOUNT_UNBLOCK_SUCCESS,
   ACCOUNT_MUTE_SUCCESS,
   ACCOUNT_UNMUTE_SUCCESS,
+  ACCOUNT_PIN_SUCCESS,
+  ACCOUNT_UNPIN_SUCCESS,
   RELATIONSHIPS_FETCH_SUCCESS,
 } from '../actions/accounts';
 import {
@@ -35,12 +41,22 @@ const initialState = ImmutableMap();
 
 export default function relationships(state = initialState, action) {
   switch(action.type) {
+  case ACCOUNT_FOLLOW_REQUEST:
+    return state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
+  case ACCOUNT_FOLLOW_FAIL:
+    return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
+  case ACCOUNT_UNFOLLOW_REQUEST:
+    return state.setIn([action.id, 'following'], false);
+  case ACCOUNT_UNFOLLOW_FAIL:
+    return state.setIn([action.id, 'following'], true);
   case ACCOUNT_FOLLOW_SUCCESS:
   case ACCOUNT_UNFOLLOW_SUCCESS:
   case ACCOUNT_BLOCK_SUCCESS:
   case ACCOUNT_UNBLOCK_SUCCESS:
   case ACCOUNT_MUTE_SUCCESS:
   case ACCOUNT_UNMUTE_SUCCESS:
+  case ACCOUNT_PIN_SUCCESS:
+  case ACCOUNT_UNPIN_SUCCESS:
     return normalizeRelationship(state, action.relationship);
   case RELATIONSHIPS_FETCH_SUCCESS:
     return normalizeRelationships(state, action.relationships);
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 12bcc2583faaf3188f72b77dc8f91d0d76259913..2e1878cf782e526c54fa1d9916eb397a7fb187ce 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -1,4 +1,5 @@
 import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
+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';
@@ -32,6 +33,12 @@ const initialState = ImmutableMap({
       mention: true,
     }),
 
+    quickFilter: ImmutableMap({
+      active: 'all',
+      show: true,
+      advanced: false,
+    }),
+
     shows: ImmutableMap({
       follow: true,
       favourite: true,
@@ -112,6 +119,7 @@ export default function settings(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
     return hydrate(state, action.state.get('settings'));
+  case NOTIFICATIONS_FILTER_SET:
   case SETTING_CHANGE:
     return state
       .setIn(action.path, action.value)
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 3abe69bcead081e514cf65874f18c1a22fc922b4..885cc221cd4d29ddb5dabffa4c207f276efa5e90 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -38,22 +38,30 @@ export default function statuses(state = initialState, action) {
   case FAVOURITE_REQUEST:
     return state.setIn([action.status.get('id'), 'favourited'], true);
   case FAVOURITE_FAIL:
-    return state.setIn([action.status.get('id'), 'favourited'], false);
+    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
   case REBLOG_REQUEST:
     return state.setIn([action.status.get('id'), 'reblogged'], true);
   case REBLOG_FAIL:
-    return state.setIn([action.status.get('id'), 'reblogged'], false);
+    return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'reblogged'], false);
   case STATUS_MUTE_SUCCESS:
     return state.setIn([action.id, 'muted'], true);
   case STATUS_UNMUTE_SUCCESS:
     return state.setIn([action.id, 'muted'], false);
   case STATUS_REVEAL:
     return state.withMutations(map => {
-      action.ids.forEach(id => map.setIn([id, 'hidden'], false));
+      action.ids.forEach(id => {
+        if (!(state.get(id) === undefined)) {
+          map.setIn([id, 'hidden'], false);
+        }
+      });
     });
   case STATUS_HIDE:
     return state.withMutations(map => {
-      action.ids.forEach(id => map.setIn([id, 'hidden'], true));
+      action.ids.forEach(id => {
+        if (!(state.get(id) === undefined)) {
+          map.setIn([id, 'hidden'], true);
+        }
+      });
     });
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.references);
diff --git a/app/javascript/mastodon/reducers/suggestions.js b/app/javascript/mastodon/reducers/suggestions.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f4b89d58659714dd370557ff1736124dc07b91a
--- /dev/null
+++ b/app/javascript/mastodon/reducers/suggestions.js
@@ -0,0 +1,30 @@
+import {
+  SUGGESTIONS_FETCH_REQUEST,
+  SUGGESTIONS_FETCH_SUCCESS,
+  SUGGESTIONS_FETCH_FAIL,
+  SUGGESTIONS_DISMISS,
+} from '../actions/suggestions';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+
+const initialState = ImmutableMap({
+  items: ImmutableList(),
+  isLoading: false,
+});
+
+export default function suggestionsReducer(state = initialState, action) {
+  switch(action.type) {
+  case SUGGESTIONS_FETCH_REQUEST:
+    return state.set('isLoading', true);
+  case SUGGESTIONS_FETCH_SUCCESS:
+    return state.withMutations(map => {
+      map.set('items', fromJS(action.accounts.map(x => x.id)));
+      map.set('isLoading', false);
+    });
+  case SUGGESTIONS_FETCH_FAIL:
+    return state.set('isLoading', false);
+  case SUGGESTIONS_DISMISS:
+    return state.update('items', list => list.filterNot(id => id === action.id));
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 916a091eb9bc69075de2402ce0a99e1ce810e4aa..1f7ece8122f2e3f74c935c11ee117232d42f9f18 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -1,6 +1,7 @@
 import {
   TIMELINE_UPDATE,
   TIMELINE_DELETE,
+  TIMELINE_CLEAR,
   TIMELINE_EXPAND_SUCCESS,
   TIMELINE_EXPAND_REQUEST,
   TIMELINE_EXPAND_FAIL,
@@ -25,10 +26,10 @@ const initialTimeline = ImmutableMap({
   items: ImmutableList(),
 });
 
-const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial) => {
+const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, isLoadingRecent) => {
   return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
     mMap.set('isLoading', false);
-    if (!next) mMap.set('hasMore', false);
+    if (!next && !isLoadingRecent) mMap.set('hasMore', false);
 
     if (!statuses.isEmpty()) {
       mMap.update('items', ImmutableList(), oldIds => {
@@ -86,6 +87,10 @@ const deleteStatus = (state, id, accountId, references) => {
   return state;
 };
 
+const clearTimeline = (state, timeline) => {
+  return state.set(timeline, initialTimeline);
+};
+
 const filterTimelines = (state, relationship, statuses) => {
   let references;
 
@@ -121,11 +126,13 @@ export default function timelines(state = initialState, action) {
   case TIMELINE_EXPAND_FAIL:
     return state.update(action.timeline, initialTimeline, map => map.set('isLoading', false));
   case TIMELINE_EXPAND_SUCCESS:
-    return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial);
+    return expandNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next, action.partial, action.isLoadingRecent);
   case TIMELINE_UPDATE:
     return updateTimeline(state, action.timeline, fromJS(action.status));
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
+  case TIMELINE_CLEAR:
+    return clearTimeline(state, action.timeline);
   case ACCOUNT_BLOCK_SUCCESS:
   case ACCOUNT_MUTE_SUCCESS:
     return filterTimelines(state, action.relationship, action.statuses);
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 106198f7449cc31192b557582c1f743bbfdb92f2..70f08a8eb5e0dd610cbc54bb69a07d781b216872 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 } from 'immutable';
+import { me } from '../initial_state';
 
 const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
 const getAccountCounters     = (state, id) => state.getIn(['accounts_counters', id], null);
@@ -83,7 +84,7 @@ export const makeGetStatus = () => {
         statusReblog = null;
       }
 
-      const regex    = regexFromFilters(filters);
+      const regex    = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters);
       const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
 
       return statusBase.withMutations(map => {
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
index 3318bbadccf0b71d1c7bce6e79b963df93ab29af..1ab0dc0faacd7dd4df013f366d1fd70366944e18 100644
--- a/app/javascript/mastodon/service_worker/web_push_notifications.js
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -80,15 +80,7 @@ const handlePush = (event) => {
 
   // Placeholder until more information can be loaded
   event.waitUntil(
-    notify({
-      title,
-      body,
-      icon,
-      tag: notification_id,
-      timestamp: new Date(),
-      badge: '/badge.png',
-      data: { access_token, preferred_locale, url: '/web/notifications' },
-    }).then(() => fetchFromApi(`/api/v1/notifications/${notification_id}`, 'get', access_token)).then(notification => {
+    fetchFromApi(`/api/v1/notifications/${notification_id}`, 'get', access_token).then(notification => {
       const options = {};
 
       options.title     = formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
@@ -100,11 +92,14 @@ const handlePush = (event) => {
       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/statuses/${notification.status.id}` : `/web/accounts/${notification.account.id}` };
 
-      if (notification.status && notification.status.sensitive) {
+      if (notification.status && notification.status.spoiler_text || notification.status.sensitive) {
         options.data.hiddenBody  = htmlToPlainText(notification.status.content);
         options.data.hiddenImage = notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url;
 
-        options.body    = notification.status.spoiler_text;
+        if (notification.status.spoiler_text) {
+          options.body    = notification.status.spoiler_text;
+        }
+
         options.image   = undefined;
         options.actions = [actionExpand(preferred_locale)];
       } else if (notification.type === 'mention') {
@@ -112,6 +107,16 @@ const handlePush = (event) => {
       }
 
       return notify(options);
+    }).catch(() => {
+      return notify({
+        title,
+        body,
+        icon,
+        tag: notification_id,
+        timestamp: new Date(),
+        badge: '/badge.png',
+        data: { access_token, preferred_locale, url: '/web/notifications' },
+      });
     })
   );
 };
@@ -166,7 +171,7 @@ const openUrl = url =>
 
       if (webClients.length !== 0) {
         const client       = findBestClient(webClients);
-        const { pathname } = new URL(url);
+        const { pathname } = new URL(url, self.location);
 
         if (pathname.startsWith('/web/')) {
           return client.focus().then(client => client.postMessage({
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index 1376d4cbaf566e37d957281ea390dac8f386616d..7e7472841aa74676e2ca6b6c62f556f4f2292af2 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -11,5 +11,5 @@ export default function configureStore() {
     loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }),
     errorsMiddleware(),
     soundsMiddleware()
-  ), window.devToolsExtension ? window.devToolsExtension() : f => f));
+  ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f));
 };
diff --git a/app/javascript/mastodon/utils/resize_image.js b/app/javascript/mastodon/utils/resize_image.js
index 279a858cad314ee40be3468b007adb695fb8ffae..d1608094f7f379592ac43820fd8014c5b4a53e97 100644
--- a/app/javascript/mastodon/utils/resize_image.js
+++ b/app/javascript/mastodon/utils/resize_image.js
@@ -1,6 +1,6 @@
 import EXIF from 'exif-js';
 
-const MAX_IMAGE_DIMENSION = 1280;
+const MAX_IMAGE_PIXELS = 1638400; // 1280x1280px
 
 const getImageUrl = inputFile => new Promise((resolve, reject) => {
   if (window.URL && URL.createObjectURL) {
@@ -73,18 +73,8 @@ const processImage = (img, { width, height, orientation, type = 'image/png' }) =
 const resizeImage = (img, type = 'image/png') => new Promise((resolve, reject) => {
   const { width, height } = img;
 
-  let newWidth, newHeight;
-
-  if (width > height) {
-    newHeight = height * MAX_IMAGE_DIMENSION / width;
-    newWidth  = MAX_IMAGE_DIMENSION;
-  } else if (height > width) {
-    newWidth  = width * MAX_IMAGE_DIMENSION / height;
-    newHeight = MAX_IMAGE_DIMENSION;
-  } else {
-    newWidth  = MAX_IMAGE_DIMENSION;
-    newHeight = MAX_IMAGE_DIMENSION;
-  }
+  const newWidth  = Math.round(Math.sqrt(MAX_IMAGE_PIXELS * (width / height)));
+  const newHeight = Math.round(Math.sqrt(MAX_IMAGE_PIXELS * (height / width)));
 
   getOrientation(img, type)
     .then(orientation => processImage(img, {
@@ -104,7 +94,7 @@ export default inputFile => new Promise((resolve, reject) => {
   }
 
   loadImage(inputFile).then(img => {
-    if (img.width < MAX_IMAGE_DIMENSION && img.height < MAX_IMAGE_DIMENSION) {
+    if (img.width * img.height < MAX_IMAGE_PIXELS) {
       resolve(inputFile);
       return;
     }
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js
index 63e12da42ccfe3ec029bfb4c1fd9c65d9f32d810..843cb2c87d43860242a16b32852452f597080f78 100644
--- a/app/javascript/packs/about.js
+++ b/app/javascript/packs/about.js
@@ -1,4 +1,7 @@
 import loadPolyfills from '../mastodon/load_polyfills';
+import { start } from '../mastodon/common';
+
+start();
 
 function loaded() {
   const TimelineContainer = require('../mastodon/containers/timeline_container').default;
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
index 5dbcc03d3941d08dfe171f2f201753acd3fcf4d8..f0c0ee0b74eb10ccf67a8ed65c703ba89ae3893b 100644
--- a/app/javascript/packs/admin.js
+++ b/app/javascript/packs/admin.js
@@ -1,17 +1,5 @@
 import { delegate } from 'rails-ujs';
 
-function handleDeleteStatus(event) {
-  const [data] = event.detail;
-  const element = document.querySelector(`[data-id="${data.id}"]`);
-  if (element) {
-    element.parentNode.removeChild(element);
-  }
-}
-
-[].forEach.call(document.querySelectorAll('.trash-button'), (content) => {
-  content.addEventListener('ajax:success', handleDeleteStatus);
-});
-
 const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
 
 delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
@@ -22,6 +10,7 @@ delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
 
 delegate(document, batchCheckboxClassName, 'change', () => {
   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);
@@ -39,3 +28,16 @@ delegate(document, '.media-spoiler-hide-button', 'click', () => {
     element.click();
   });
 });
+
+delegate(document, '#domain_block_severity', 'change', ({ target }) => {
+  const rejectMediaDiv   = document.querySelector('.input.with_label.domain_block_reject_media');
+  const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
+
+  if (rejectMediaDiv) {
+    rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
+  }
+
+  if (rejectReportsDiv) {
+    rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
+  }
+});
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 116632dea704a860b7c3881e203f189f5f4612ac..c65ebed74f8b94abf31111d7aa395e2a33a42ba4 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -1,4 +1,7 @@
 import loadPolyfills from '../mastodon/load_polyfills';
+import { start } from '../mastodon/common';
+
+start();
 
 loadPolyfills().then(() => {
   require('../mastodon/main').default();
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
deleted file mode 100644
index 96e6f4b16f496f96dc0f45bd682af1ac6f2eee30..0000000000000000000000000000000000000000
--- a/app/javascript/packs/common.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { start } from 'rails-ujs';
-import 'font-awesome/css/font-awesome.css';
-
-require.context('../images/', true);
-
-start();
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 5b9c1967255d6dbf57bbd58cce251730faa5c5ce..4ab27c769281e433b38a1e9427a82371186b8286 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -1,5 +1,9 @@
+import escapeTextContentForBrowser from 'escape-html';
 import loadPolyfills from '../mastodon/load_polyfills';
 import ready from '../mastodon/ready';
+import { start } from '../mastodon/common';
+
+start();
 
 window.addEventListener('message', e => {
   const data = e.data || {};
@@ -18,16 +22,27 @@ window.addEventListener('message', e => {
 });
 
 function main() {
-  const { length } = require('stringz');
-  const IntlRelativeFormat = require('intl-relativeformat').default;
+  const IntlMessageFormat = require('intl-messageformat').default;
+  const { timeAgoString } = require('../mastodon/components/relative_timestamp');
   const { delegate } = require('rails-ujs');
   const emojify = require('../mastodon/features/emoji/emoji').default;
   const { getLocale } = require('../mastodon/locales');
-  const { localeData } = getLocale();
+  const { messages } = getLocale();
   const React = require('react');
   const ReactDOM = require('react-dom');
+  const Rellax = require('rellax');
+  const createHistory = require('history').createBrowserHistory;
+
+  const scrollToDetailedStatus = () => {
+    const history = createHistory();
+    const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status');
+    const location = history.location;
 
-  localeData.forEach(IntlRelativeFormat.__addLocaleData);
+    if (detailedStatuses.length === 1 && (!location.state || !location.state.scrolledToDetailedStatus)) {
+      detailedStatuses[0].scrollIntoView();
+      history.replace(location.pathname, { ...location.state, scrolledToDetailedStatus: true });
+    }
+  };
 
   ready(() => {
     const locale = document.documentElement.lang;
@@ -40,8 +55,6 @@ function main() {
       minute: 'numeric',
     });
 
-    const relativeFormat = new IntlRelativeFormat(locale);
-
     [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
       content.innerHTML = emojify(content.innerHTML);
     });
@@ -56,28 +69,52 @@ function main() {
 
     [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
       const datetime = new Date(content.getAttribute('datetime'));
+      const now      = new Date();
 
       content.title = dateTimeFormat.format(datetime);
-      content.textContent = relativeFormat.format(datetime);
-    });
-
-    [].forEach.call(document.querySelectorAll('.logo-button'), (content) => {
-      content.addEventListener('click', (e) => {
-        e.preventDefault();
-        window.open(e.target.href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
-      });
+      content.textContent = timeAgoString({
+        formatMessage: ({ id, defaultMessage }, values) => (new IntlMessageFormat(messages[id] || defaultMessage, locale)).format(values),
+        formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
+      }, datetime, now, now.getFullYear());
     });
 
     const reactComponents = document.querySelectorAll('[data-component]');
+
     if (reactComponents.length > 0) {
       import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
         .then(({ default: MediaContainer }) => {
+          [].forEach.call(reactComponents, (component) => {
+            [].forEach.call(component.children, (child) => {
+              component.removeChild(child);
+            });
+          });
+
           const content = document.createElement('div');
 
           ReactDOM.render(<MediaContainer locale={locale} components={reactComponents} />, content);
           document.body.appendChild(content);
+          scrollToDetailedStatus();
         })
-        .catch(error => console.error(error));
+        .catch(error => {
+          console.error(error);
+          scrollToDetailedStatus();
+        });
+    } else {
+      scrollToDetailedStatus();
+    }
+
+    const parallaxComponents = document.querySelectorAll('.parallax');
+
+    if (parallaxComponents.length > 0 ) {
+      new Rellax('.parallax', { speed: -1 });
+    }
+
+    if (document.body.classList.contains('with-modals')) {
+      const scrollbarWidth = window.innerWidth - document.documentElement.clientWidth;
+      const scrollbarWidthStyle = document.createElement('style');
+      scrollbarWidthStyle.id = 'scrollbar-width';
+      document.head.appendChild(scrollbarWidthStyle);
+      scrollbarWidthStyle.sheet.insertRule(`body.with-modals--active { margin-right: ${scrollbarWidth}px; }`, 0);
     }
   });
 
@@ -103,24 +140,33 @@ function main() {
     return false;
   });
 
-  delegate(document, '.account_display_name', 'input', ({ target }) => {
-    const nameCounter = document.querySelector('.name-counter');
+  delegate(document, '.modal-button', 'click', e => {
+    e.preventDefault();
 
-    if (nameCounter) {
-      nameCounter.textContent = 30 - length(target.value);
+    let href;
+
+    if (e.target.nodeName !== 'A') {
+      href = e.target.parentNode.href;
+    } else {
+      href = e.target.href;
     }
-  });
 
-  delegate(document, '.account_note', 'input', ({ target }) => {
-    const noteCounter = document.querySelector('.note-counter');
+    window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
+  });
 
-    if (noteCounter) {
-      noteCounter.textContent = 65535 - length(target.value);
+  delegate(document, '#account_display_name', 'input', ({ target }) => {
+    const name = document.querySelector('.card .display-name strong');
+    if (name) {
+      if (target.value) {
+        name.innerHTML = emojify(escapeTextContentForBrowser(target.value));
+      } else {
+        name.textContent = document.querySelector('#default_account_display_name').textContent;
+      }
     }
   });
 
   delegate(document, '#account_avatar', 'change', ({ target }) => {
-    const avatar = document.querySelector('.card.compact .avatar img');
+    const avatar = document.querySelector('.card .avatar img');
     const [file] = target.files || [];
     const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
 
@@ -128,11 +174,45 @@ function main() {
   });
 
   delegate(document, '#account_header', 'change', ({ target }) => {
-    const header = document.querySelector('.card.compact');
+    const header = document.querySelector('.card .card__img img');
     const [file] = target.files || [];
     const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
 
-    header.style.backgroundImage = `url(${url})`;
+    header.src = url;
+  });
+
+  delegate(document, '#account_locked', 'change', ({ target }) => {
+    const lock = document.querySelector('.card .display-name i');
+
+    if (target.checked) {
+      lock.style.display = 'inline';
+    } else {
+      lock.style.display = 'none';
+    }
+  });
+
+  delegate(document, '.input-copy input', 'click', ({ target }) => {
+    target.select();
+  });
+
+  delegate(document, '.input-copy button', 'click', ({ target }) => {
+    const input = target.parentNode.querySelector('.input-copy__wrapper input');
+
+    input.focus();
+    input.select();
+
+    try {
+      if (document.execCommand('copy')) {
+        input.blur();
+        target.parentNode.classList.add('copied');
+
+        setTimeout(() => {
+          target.parentNode.classList.remove('copied');
+        }, 700);
+      }
+    } catch (err) {
+      console.error(err);
+    }
   });
 }
 
diff --git a/app/javascript/packs/share.js b/app/javascript/packs/share.js
index e9580f648bf0df4b5719ab4d1352c46f4cffdf64..4ef23e1b2e9b8ef705ff07a4d9e468df39d89801 100644
--- a/app/javascript/packs/share.js
+++ b/app/javascript/packs/share.js
@@ -1,4 +1,7 @@
 import loadPolyfills from '../mastodon/load_polyfills';
+import { start } from '../mastodon/common';
+
+start();
 
 function loaded() {
   const ComposeContainer = require('../mastodon/containers/compose_container').default;
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 268d7c11d07ec6a678e8121a0b1b10416b62a118..0eae63247c16ea9893c60bb4e8914064fded710b 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -10,17 +10,19 @@
 @import 'mastodon/lists';
 @import 'mastodon/footer';
 @import 'mastodon/compact_header';
-@import 'mastodon/landing_strip';
+@import 'mastodon/widgets';
 @import 'mastodon/forms';
 @import 'mastodon/accounts';
 @import 'mastodon/stream_entries';
 @import 'mastodon/boost';
 @import 'mastodon/components';
+@import 'mastodon/introduction';
 @import 'mastodon/modal';
 @import 'mastodon/emoji_picker';
 @import 'mastodon/about';
 @import 'mastodon/tables';
 @import 'mastodon/admin';
+@import 'mastodon/dashboard';
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
 
diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss
index dbe070f9a3c22fa5c9d6e6605a2c5bc9d7d6c63f..74d1df8ed3edd9318352aa5bfa1d3baf6a2f7800 100644
--- a/app/javascript/styles/mailer.scss
+++ b/app/javascript/styles/mailer.scss
@@ -169,7 +169,7 @@ p {
   font-family: Helvetica, Arial, sans-serif;
 
   @media only screen {
-    font-family: 'mastodon-font-sans-serif', sans-serif !important;
+    font-family: $font-sans-serif, sans-serif !important;
   }
 }
 
@@ -426,6 +426,10 @@ h5 {
     background: $success-green;
   }
 
+  &.alert-icon td {
+    background: $error-red;
+  }
+
   img {
     max-width: 32px;
     width: 32px;
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 84ccd326ec8b8ec35df3253f58203ed804548b6b..78bc2dbb6d50e0ab8371f7d28676492feb95c48e 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -169,6 +169,10 @@
   color: $white;
 }
 
+.dropdown-menu__separator {
+  border-bottom-color: lighten($ui-base-color, 12%);
+}
+
 // Change the background colors of modals
 .actions-modal,
 .boost-modal,
@@ -281,3 +285,73 @@
     }
   }
 }
+
+.simple_form,
+.table-form {
+  .warning {
+    box-shadow: none;
+    background: rgba($error-red, 0.5);
+    text-shadow: none;
+  }
+}
+
+.status__content,
+.reply-indicator__content {
+  a {
+    color: $highlight-text-color;
+  }
+}
+
+.button.logo-button {
+  color: $white;
+
+  svg path:first-child {
+    fill: $white;
+  }
+}
+
+.public-layout {
+  .header,
+  .public-account-header,
+  .public-account-bio {
+    box-shadow: none;
+  }
+
+  .header {
+    background: lighten($ui-base-color, 12%);
+  }
+
+  .public-account-header {
+    &__image {
+      background: lighten($ui-base-color, 12%);
+
+      &::after {
+        box-shadow: none;
+      }
+    }
+
+    &__tabs {
+      &__name {
+        h1,
+        h1 small {
+          color: $white;
+        }
+      }
+    }
+  }
+}
+
+.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,
+.nothing-here {
+  box-shadow: none;
+}
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index 67d768a6c6e34413babf9a12a61ec0d8ea6dd209..d5bafe6b6a2e7a6b13371d8d9b4a87ea634f384d 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -10,3 +10,34 @@
   height: $size;
   background-size: $size $size;
 }
+
+@mixin search-input() {
+  outline: 0;
+  box-sizing: border-box;
+  width: 100%;
+  border: none;
+  box-shadow: none;
+  font-family: inherit;
+  background: $ui-base-color;
+  color: $darker-text-color;
+  font-size: 14px;
+  margin: 0;
+
+  &::-moz-focus-inner {
+    border: 0;
+  }
+
+  &::-moz-focus-inner,
+  &:focus,
+  &:active {
+    outline: 0 !important;
+  }
+
+  &:focus {
+    background: lighten($ui-base-color, 4%);
+  }
+
+  @media screen and (max-width: 600px) {
+    font-size: 16px;
+  }
+}
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index 19e14fe95284d095176e6ada2bd0ca41290dc65b..c6f249fabdf5257b7477627a981f904865e63ea3 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -15,6 +15,276 @@ $small-breakpoint: 960px;
   }
 }
 
+.rich-formatting {
+  font-family: $font-sans-serif, sans-serif;
+  font-size: 16px;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 30px;
+  color: $darker-text-color;
+  padding-right: 10px;
+
+  a {
+    color: $highlight-text-color;
+    text-decoration: underline;
+  }
+
+  p,
+  li {
+    font-family: $font-sans-serif, sans-serif;
+    font-size: 16px;
+    font-weight: 400;
+    font-size: 16px;
+    line-height: 30px;
+    margin-bottom: 12px;
+    color: $darker-text-color;
+
+    a {
+      color: $highlight-text-color;
+      text-decoration: underline;
+    }
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  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-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-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 {
   .grid {
     display: grid;
@@ -94,7 +364,7 @@ $small-breakpoint: 960px;
 
   @media screen and (max-width: $column-breakpoint) {
     .grid {
-      grid-template-columns: auto;
+      grid-template-columns: 100%;
 
       .column-0 {
         display: block;
@@ -180,7 +450,7 @@ $small-breakpoint: 960px;
 
   p,
   li {
-    font-family: 'mastodon-font-sans-serif', sans-serif;
+    font-family: $font-sans-serif, sans-serif;
     font-size: 16px;
     font-weight: 400;
     font-size: 16px;
@@ -229,7 +499,7 @@ $small-breakpoint: 960px;
   }
 
   h1 {
-    font-family: 'mastodon-font-display', sans-serif;
+    font-family: $font-display, sans-serif;
     font-size: 26px;
     line-height: 30px;
     font-weight: 500;
@@ -237,7 +507,7 @@ $small-breakpoint: 960px;
     color: $secondary-text-color;
 
     small {
-      font-family: 'mastodon-font-sans-serif', sans-serif;
+      font-family: $font-sans-serif, sans-serif;
       display: block;
       font-size: 18px;
       font-weight: 400;
@@ -246,7 +516,7 @@ $small-breakpoint: 960px;
   }
 
   h2 {
-    font-family: 'mastodon-font-display', sans-serif;
+    font-family: $font-display, sans-serif;
     font-size: 22px;
     line-height: 26px;
     font-weight: 500;
@@ -255,7 +525,7 @@ $small-breakpoint: 960px;
   }
 
   h3 {
-    font-family: 'mastodon-font-display', sans-serif;
+    font-family: $font-display, sans-serif;
     font-size: 18px;
     line-height: 24px;
     font-weight: 500;
@@ -264,7 +534,7 @@ $small-breakpoint: 960px;
   }
 
   h4 {
-    font-family: 'mastodon-font-display', sans-serif;
+    font-family: $font-display, sans-serif;
     font-size: 16px;
     line-height: 24px;
     font-weight: 500;
@@ -273,7 +543,7 @@ $small-breakpoint: 960px;
   }
 
   h5 {
-    font-family: 'mastodon-font-display', sans-serif;
+    font-family: $font-display, sans-serif;
     font-size: 14px;
     line-height: 24px;
     font-weight: 500;
@@ -282,7 +552,7 @@ $small-breakpoint: 960px;
   }
 
   h6 {
-    font-family: 'mastodon-font-display', sans-serif;
+    font-family: $font-display, sans-serif;
     font-size: 12px;
     line-height: 24px;
     font-weight: 500;
@@ -349,7 +619,7 @@ $small-breakpoint: 960px;
 
       .hero .heading {
         padding-bottom: 20px;
-        font-family: 'mastodon-font-sans-serif', sans-serif;
+        font-family: $font-sans-serif, sans-serif;
         font-size: 16px;
         font-weight: 400;
         font-size: 16px;
@@ -400,7 +670,7 @@ $small-breakpoint: 960px;
         text-decoration: none;
         padding: 12px 16px;
         line-height: 32px;
-        font-family: 'mastodon-font-display', sans-serif;
+        font-family: $font-display, sans-serif;
         font-weight: 500;
         font-size: 14px;
 
@@ -473,7 +743,7 @@ $small-breakpoint: 960px;
   .about-short {
     background: darken($ui-base-color, 4%);
     padding: 50px 0 30px;
-    font-family: 'mastodon-font-sans-serif', sans-serif;
+    font-family: $font-sans-serif, sans-serif;
     font-size: 16px;
     font-weight: 400;
     font-size: 16px;
@@ -486,128 +756,6 @@ $small-breakpoint: 960px;
     }
   }
 
-  .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: 'mastodon-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-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: 'mastodon-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;
-        }
-      }
-    }
-  }
-
   &.alternative {
     padding: 10px 0;
 
@@ -642,8 +790,10 @@ $small-breakpoint: 960px;
     border-radius: 4px;
     padding: 25px 40px;
     overflow: hidden;
+    box-sizing: border-box;
 
     .row {
+      width: 100%;
       display: flex;
       flex-direction: row-reverse;
       flex-wrap: wrap;
@@ -660,11 +810,20 @@ $small-breakpoint: 960px;
         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;
+      }
     }
   }
 
@@ -853,7 +1012,7 @@ $small-breakpoint: 960px;
     display: flex;
     -webkit-overflow-scrolling: touch;
     -ms-overflow-style: -ms-autohiding-scrollbar;
-    font-family: 'mastodon-font-sans-serif', sans-serif;
+    font-family: $font-sans-serif, sans-serif;
     font-size: 13px;
     line-height: 18px;
     font-weight: 400;
@@ -923,7 +1082,7 @@ $small-breakpoint: 960px;
     }
 
     @media screen and (max-width: $column-breakpoint) {
-      height: 90vh;
+      display: none;
     }
   }
 
@@ -983,21 +1142,6 @@ $small-breakpoint: 960px;
     }
   }
 
-  .extended-description {
-    padding: 50px 0;
-    font-family: 'mastodon-font-sans-serif', sans-serif;
-    font-size: 16px;
-    font-weight: 400;
-    font-size: 16px;
-    line-height: 30px;
-    color: $darker-text-color;
-
-    a {
-      color: $highlight-text-color;
-      text-decoration: underline;
-    }
-  }
-
   .footer-links {
     padding-bottom: 50px;
     text-align: right;
@@ -1115,6 +1259,20 @@ $small-breakpoint: 960px;
   }
 
   &.tag-page {
+    @media screen and (max-width: $column-breakpoint) {
+      padding: 0;
+
+      .container {
+        padding: 0;
+      }
+
+      #mastodon-timeline {
+        display: flex;
+        height: 100vh;
+        border-radius: 0;
+      }
+    }
+
     .grid {
       @media screen and (min-width: $small-breakpoint) {
         grid-template-columns: 33% 67%;
@@ -1146,24 +1304,17 @@ $small-breakpoint: 960px;
 
     @media screen and (max-width: $column-breakpoint) {
       .grid {
+        grid-gap: 0;
+
         .column-1 {
           grid-column: 1;
-          grid-row: 2;
+          grid-row: 1;
         }
 
         .column-2 {
-          grid-column: 1;
-          grid-row: 1;
+          display: none;
         }
       }
-
-      .brand {
-        margin: 0;
-      }
-
-      .landing-page__features {
-        display: none;
-      }
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/accessibility.scss b/app/javascript/styles/mastodon/accessibility.scss
index 373bcd4ac91e4c20c7d49d2c0a649e9fd6b6b3eb..d33806c8487f5adfaf47d20a9ea3554d5a95ae6b 100644
--- a/app/javascript/styles/mastodon/accessibility.scss
+++ b/app/javascript/styles/mastodon/accessibility.scss
@@ -1,4 +1,4 @@
-$black-emojis: '8ball' 'ant' 'back' 'black_circle' 'black_large_square' 'black_medium_small_square' 'black_medium_square' 'black_nib' 'black_small_square' 'bomb' 'bust_in_silhouette' 'camera' 'camera_with_flash' 'clubs' 'copyright' 'curly_loop' 'currency_exchange' 'end' 'heavy_check_mark' 'heavy_division_sign' 'heavy_dollar_sign' 'heavy_minus_sign' 'heavy_multiplication_x' 'heavy_plus_sign' 'lower_left_fountain_pen' 'on' 'registered' 'soon' 'spades' 'spider' 'tm' 'top' 'waving_black_flag' 'wavy_dash' 'video_game';
+$black-emojis: '8ball' 'ant' 'back' 'black_circle' 'black_heart' 'black_large_square' 'black_medium_small_square' 'black_medium_square' 'black_nib' 'black_small_square' 'bomb' 'bowling' 'bust_in_silhouette' 'busts_in_silhouette' 'camera' 'camera_with_flash' 'clubs' 'copyright' 'curly_loop' 'currency_exchange' 'dark_sunglasses' 'eight_pointed_black_star' 'electric_plug' 'end' 'female-guard' 'film_projector' 'fried_egg' 'gorilla' 'guardsman' 'heavy_check_mark' 'heavy_division_sign' 'heavy_dollar_sign' 'heavy_minus_sign' 'heavy_multiplication_x' 'heavy_plus_sign' 'hocho' 'hole' 'joystick' 'kaaba' 'lower_left_ballpoint_pen' 'lower_left_fountain_pen' 'male-guard' 'microphone' 'mortar_board' 'movie_camera' 'musical_score' 'on' 'registered' 'soon' 'spades' 'speaking_head_in_silhouette' 'spider' 'telephone_receiver' 'tm' 'top' 'tophat' 'turkey' 'vhs' 'video_camera' 'video_game' 'water_buffalo' 'waving_black_flag' 'wavy_dash';
 
 %white-emoji-outline {
   filter: drop-shadow(1px 1px 0 $white) drop-shadow(-1px 1px 0 $white) drop-shadow(1px -1px 0 $white) drop-shadow(-1px -1px 0 $white);
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index b4612b063cd5befb7138c77633862bbfa29ef78b..63a5c61b8bfcd919d1cdf0d060b8039d10dc25cd 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -1,243 +1,100 @@
 .card {
-  background-color: $base-shadow-color;
-  background-size: cover;
-  background-position: center;
-  border-radius: 4px 4px 0 0;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  overflow: hidden;
-  position: relative;
-  display: flex;
-
-  &::after {
-    background: rgba(darken($ui-base-color, 8%), 0.5);
+  & > a {
     display: block;
-    content: "";
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 1;
-  }
-
-  @media screen and (max-width: 740px) {
-    border-radius: 0;
-    box-shadow: none;
-  }
-
-  .card__illustration {
-    padding: 60px 0;
-    position: relative;
-    flex: 1 1 auto;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .card__bio {
-    max-width: 260px;
-    flex: 1 1 auto;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    background: rgba(darken($ui-base-color, 8%), 0.8);
-    position: relative;
-    z-index: 2;
-  }
-
-  &.compact {
-    padding: 30px 0;
-    border-radius: 4px;
-
-    .avatar {
-      margin-bottom: 0;
+    text-decoration: none;
+    color: inherit;
+    box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
 
-      img {
-        object-fit: cover;
-      }
+    @media screen and (max-width: $no-gap-breakpoint) {
+      box-shadow: none;
     }
-  }
-
-  .name {
-    display: block;
-    font-size: 20px;
-    line-height: 18px * 1.5;
-    color: $primary-text-color;
-    padding: 10px 15px;
-    padding-bottom: 0;
-    font-weight: 500;
-    position: relative;
-    z-index: 2;
-    margin-bottom: 30px;
-    overflow: hidden;
-    text-overflow: ellipsis;
 
-    small {
-      display: block;
-      font-size: 14px;
-      color: $highlight-text-color;
-      font-weight: 400;
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      .fa {
-        margin-left: 3px;
+    &:hover,
+    &:active,
+    &:focus {
+      .card__bar {
+        background: lighten($ui-base-color, 8%);
       }
     }
   }
 
-  .avatar {
-    width: 120px;
-    margin: 0 auto;
+  &__img {
+    height: 130px;
     position: relative;
-    z-index: 2;
+    background: darken($ui-base-color, 12%);
+    border-radius: 4px 4px 0 0;
 
     img {
-      width: 120px;
-      height: 120px;
-      display: block;
-      border-radius: 120px;
-      box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-    }
-  }
-
-  .roles {
-    margin-bottom: 30px;
-    padding: 0 15px;
-  }
-
-  .details-counters {
-    margin-top: 30px;
-    display: flex;
-    flex-direction: row;
-    width: 100%;
-  }
-
-  .counter {
-    width: 33.3%;
-    box-sizing: border-box;
-    flex: 0 0 auto;
-    color: $darker-text-color;
-    padding: 5px 10px 0;
-    margin-bottom: 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: -10px;
-      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;
-      }
-    }
-
-    &:hover {
-      &::after {
-        opacity: 1;
-        transition-duration: 100ms;
-      }
-    }
-
-    a {
-      text-decoration: none;
-      color: inherit;
+      height: 100%;
+      margin: 0;
+      object-fit: cover;
+      border-radius: 4px 4px 0 0;
     }
 
-    .counter-label {
-      font-size: 12px;
-      display: block;
-      margin-bottom: 5px;
+    @media screen and (max-width: 600px) {
+      height: 200px;
     }
 
-    .counter-number {
-      font-weight: 500;
-      font-size: 18px;
-      color: $primary-text-color;
-      font-family: 'mastodon-font-display', sans-serif;
+    @media screen and (max-width: $no-gap-breakpoint) {
+      display: none;
     }
   }
 
-  .bio {
-    font-size: 14px;
-    line-height: 18px;
-    padding: 0 15px;
-    color: $secondary-text-color;
-  }
-
-  @media screen and (max-width: 480px) {
-    display: block;
+  &__bar {
+    position: relative;
+    padding: 15px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    background: lighten($ui-base-color, 4%);
+    border-radius: 0 0 4px 4px;
 
-    .card__bio {
-      max-width: none;
+    @media screen and (max-width: $no-gap-breakpoint) {
+      border-radius: 0;
     }
 
-    .name,
-    .roles {
-      text-align: center;
-      margin-bottom: 15px;
-    }
+    .avatar {
+      flex: 0 0 auto;
+      width: 48px;
+      height: 48px;
+      padding-top: 2px;
 
-    .bio {
-      margin-bottom: 15px;
+      img {
+        width: 100%;
+        height: 100%;
+        display: block;
+        margin: 0;
+        border-radius: 4px;
+        background: darken($ui-base-color, 8%);
+      }
     }
-  }
-}
 
-.card,
-.account-grid-card {
-  .controls {
-    position: absolute;
-    top: 15px;
-    left: 15px;
-    z-index: 2;
-
-    .icon-button {
-      color: rgba($white, 0.8);
-      text-decoration: none;
-      font-size: 13px;
-      line-height: 13px;
-      font-weight: 500;
+    .display-name {
+      margin-left: 15px;
+      text-align: left;
 
-      .fa {
-        font-weight: 400;
-        margin-right: 5px;
+      strong {
+        font-size: 15px;
+        color: $primary-text-color;
+        font-weight: 500;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
-      &:hover,
-      &:active,
-      &:focus {
-        color: $white;
+      span {
+        display: block;
+        font-size: 14px;
+        color: $darker-text-color;
+        font-weight: 400;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
   }
 }
 
-.account-grid-card .controls {
-  left: auto;
-  right: 15px;
-}
-
 .pagination {
   padding: 30px 0;
   text-align: center;
@@ -314,289 +171,28 @@
   }
 }
 
-.accounts-grid {
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  background: darken($simple-background-color, 8%);
-  border-radius: 0 0 4px 4px;
-  padding: 20px 5px;
-  padding-bottom: 10px;
-  overflow: hidden;
-  display: flex;
-  flex-wrap: wrap;
-  z-index: 2;
-  position: relative;
-
-  &.empty img {
-    position: absolute;
-    opacity: 0.2;
-    height: 200px;
-    left: 0;
-    bottom: 0;
-    pointer-events: none;
-  }
-
-  @media screen and (max-width: 740px) {
-    border-radius: 0;
-    box-shadow: none;
-  }
-
-  .account-grid-card {
-    box-sizing: border-box;
-    width: 335px;
-    background: $simple-background-color;
-    border-radius: 4px;
-    color: $inverted-text-color;
-    margin: 0 5px 10px;
-    position: relative;
-
-    @media screen and (max-width: 740px) {
-      width: calc(100% - 10px);
-    }
-
-    .account-grid-card__header {
-      overflow: hidden;
-      height: 100px;
-      border-radius: 4px 4px 0 0;
-      background-color: lighten($inverted-text-color, 4%);
-      background-size: cover;
-      background-position: center;
-      position: relative;
-
-      &::after {
-        background: rgba(darken($ui-base-color, 8%), 0.5);
-        display: block;
-        content: "";
-        position: absolute;
-        left: 0;
-        top: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 1;
-      }
-    }
-
-    .account-grid-card__avatar {
-      box-sizing: border-box;
-      padding: 15px;
-      position: absolute;
-      z-index: 2;
-      top: 100px - (40px + 2px);
-      left: -2px;
-    }
-
-    .avatar {
-      width: 80px;
-      height: 80px;
-
-      img {
-        display: block;
-        width: 80px;
-        height: 80px;
-        border-radius: 80px;
-        border: 2px solid $simple-background-color;
-        background: $simple-background-color;
-      }
-    }
-
-    .name {
-      padding: 15px;
-      padding-top: 10px;
-      padding-left: 15px + 80px + 15px;
-
-      a {
-        display: block;
-        color: $inverted-text-color;
-        text-decoration: none;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        font-weight: 500;
-
-        &:hover {
-          .display_name {
-            text-decoration: underline;
-          }
-        }
-      }
-    }
-
-    .display_name {
-      font-size: 16px;
-      display: block;
-      text-overflow: ellipsis;
-      overflow: hidden;
-    }
-
-    .username {
-      color: $lighter-text-color;
-      font-size: 14px;
-      font-weight: 400;
-    }
-
-    .account__header__content {
-      padding: 10px 15px;
-      padding-top: 15px;
-      color: $lighter-text-color;
-      word-wrap: break-word;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      height: 5.5em;
-      position: relative;
-
-      &::after {
-        display: block;
-        content: "";
-        width: 100%;
-        height: 100px;
-        position: absolute;
-        bottom: 0;
-        background: linear-gradient(to bottom, rgba($simple-background-color, 0.01) 0%, rgba($simple-background-color, 1) 100%);
-        left: 0;
-        border-radius: 0 0 4px 4px;
-        pointer-events: none;
-      }
-    }
-  }
-}
-
 .nothing-here {
-  width: 100%;
-  display: block;
+  background: $ui-base-color;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
   color: $light-text-color;
   font-size: 14px;
   font-weight: 500;
   text-align: center;
-  padding: 130px 0;
-  padding-top: 125px;
-  margin: 0 auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   cursor: default;
-}
-
-.account-card {
   border-radius: 4px;
-  text-align: left;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
-  background: $simple-background-color;
-
-  &__header {
-    background: $base-shadow-color;
-    background-size: cover;
-    background-position: center center;
-    height: 90px;
-    border-radius: 4px 4px 0 0;
-  }
-
-  & > .detailed-status__display-name {
-    display: block;
-    overflow: hidden;
-    display: flex;
-    align-items: center;
-    padding: 10px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    & > div:first-child {
-      flex: 0 0 auto;
-      margin-right: 10px;
-      width: 48px;
-      height: 48px;
-    }
-
-    .avatar {
-      display: block;
-      border-radius: 4px;
-      margin: 0;
-    }
-
-    .display-name {
-      flex: 1 0 auto;
-      display: block;
-      max-width: 100%;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      cursor: default;
-
-      & > .detailed-status__display-name {
-        margin-bottom: 0;
-      }
-
-      strong {
-        font-weight: 500;
-        color: $ui-base-color;
+  padding: 20px;
+  min-height: 30vh;
 
-        @each $lang in $cjk-langs {
-          &:lang(#{$lang}) {
-            font-weight: 700;
-          }
-        }
-      }
-
-      span {
-        font-size: 14px;
-        color: $light-text-color;
-      }
-    }
-
-    &:hover {
-      .display-name {
-        strong {
-          text-decoration: none;
-        }
-      }
-    }
+  &--under-tabs {
+    border-radius: 0 0 4px 4px;
   }
 
-  .counter {
+  &--flexible {
     box-sizing: border-box;
-    flex: 0 0 auto;
-    color: $light-text-color;
-    padding: 0 10px;
-    cursor: default;
-    text-align: center;
-    position: relative;
-    line-height: 24px;
-
-    .counter-label {
-      font-size: 12px;
-      display: block;
-      text-transform: uppercase;
-    }
-
-    .counter-number {
-      font-weight: 500;
-      font-size: 16px;
-      color: $inverted-text-color;
-      font-family: 'mastodon-font-display', sans-serif;
-    }
-  }
-}
-
-.activity-stream-tabs {
-  background: $simple-background-color;
-  border-bottom: 1px solid $ui-secondary-color;
-  position: relative;
-  z-index: 2;
-
-  a {
-    display: inline-block;
-    padding: 15px;
-    text-decoration: none;
-    color: $highlight-text-color;
-    text-transform: uppercase;
-    font-weight: 500;
-
-    &:hover,
-    &:active,
-    &:focus {
-      color: lighten($highlight-text-color, 8%);
-    }
-
-    &.active {
-      color: $inverted-text-color;
-      cursor: default;
-    }
+    min-height: 100%;
   }
 }
 
@@ -629,14 +225,14 @@
   padding: 0;
   margin: 15px -15px -15px;
   border: 0 none;
-  border-top: 1px solid lighten($ui-base-color, 4%);
-  border-bottom: 1px solid lighten($ui-base-color, 4%);
+  border-top: 1px solid lighten($ui-base-color, 12%);
+  border-bottom: 1px solid lighten($ui-base-color, 12%);
   font-size: 14px;
   line-height: 20px;
 
   dl {
     display: flex;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
+    border-bottom: 1px solid lighten($ui-base-color, 12%);
   }
 
   dt,
@@ -674,6 +270,20 @@
     }
   }
 
+  .verified {
+    border: 1px solid rgba($valid-value-color, 0.5);
+    background: rgba($valid-value-color, 0.25);
+
+    a {
+      color: $valid-value-color;
+      font-weight: 500;
+    }
+
+    &__mark {
+      color: $valid-value-color;
+    }
+  }
+
   dl:last-child {
     border-bottom: 0;
   }
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 560b11ddf4eb2132cf423c6a88b163ccbf0e11a0..177f8145fa86dfce7324cfee6096edf0b1c639b7 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1,10 +1,14 @@
+$no-columns-breakpoint: 600px;
+$sidebar-width: 240px;
+$content-width: 840px;
+
 .admin-wrapper {
   display: flex;
   justify-content: center;
   height: 100%;
 
   .sidebar-wrapper {
-    flex: 1;
+    flex: 1 1 $sidebar-width;
     height: 100%;
     background: $ui-base-color;
     display: flex;
@@ -12,7 +16,7 @@
   }
 
   .sidebar {
-    width: 240px;
+    width: $sidebar-width;
     height: 100%;
     padding: 0;
     overflow-y: auto;
@@ -24,12 +28,22 @@
       height: 100px;
     }
 
+    @media screen and (max-width: $no-columns-breakpoint) {
+      & > a:first-child {
+        display: none;
+      }
+    }
+
     ul {
       list-style: none;
       border-radius: 4px 0 0 4px;
       overflow: hidden;
       margin-bottom: 20px;
 
+      @media screen and (max-width: $no-columns-breakpoint) {
+        margin-bottom: 0;
+      }
+
       a {
         display: block;
         padding: 15px;
@@ -62,38 +76,50 @@
         a {
           border: 0;
           padding: 15px 35px;
+        }
+      }
 
-          &.selected {
-            color: $primary-text-color;
-            background-color: $ui-highlight-color;
-            border-bottom: 0;
-            border-radius: 0;
+      .simple-navigation-active-leaf a {
+        color: $primary-text-color;
+        background-color: $ui-highlight-color;
+        border-bottom: 0;
+        border-radius: 0;
 
-            &:hover {
-              background-color: lighten($ui-highlight-color, 5%);
-            }
-          }
+        &:hover {
+          background-color: lighten($ui-highlight-color, 5%);
         }
       }
     }
+
+    & > ul > .simple-navigation-active-leaf a {
+      border-radius: 4px 0 0 4px;
+    }
   }
 
   .content-wrapper {
-    flex: 2;
+    flex: 2 1 $content-width;
     overflow: auto;
   }
 
   .content {
-    max-width: 700px;
+    max-width: $content-width;
     padding: 20px 15px;
     padding-top: 60px;
     padding-left: 25px;
 
+    @media screen and (max-width: $no-columns-breakpoint) {
+      max-width: none;
+      padding: 15px;
+      padding-top: 30px;
+    }
+
     h2 {
       color: $secondary-text-color;
       font-size: 24px;
       line-height: 28px;
       font-weight: 400;
+      padding-bottom: 40px;
+      border-bottom: 1px solid lighten($ui-base-color, 8%);
       margin-bottom: 40px;
     }
 
@@ -108,7 +134,7 @@
     h4 {
       text-transform: uppercase;
       font-size: 13px;
-      font-weight: 500;
+      font-weight: 700;
       color: $darker-text-color;
       padding-bottom: 8px;
       margin-bottom: 8px;
@@ -122,6 +148,25 @@
       font-weight: 400;
     }
 
+    .fields-group h6 {
+      color: $primary-text-color;
+      font-weight: 500;
+    }
+
+    .directory__tag a {
+      box-shadow: none;
+    }
+
+    .directory__tag h4 {
+      font-size: 18px;
+      font-weight: 700;
+      color: $primary-text-color;
+      text-transform: none;
+      padding-bottom: 0;
+      margin-bottom: 0;
+      border-bottom: none;
+    }
+
     & > p {
       font-size: 14px;
       line-height: 18px;
@@ -165,32 +210,14 @@
       color: $valid-value-color;
       font-weight: 500;
     }
-  }
-
-  .simple_form {
-    max-width: 400px;
 
-    &.edit_user,
-    &.new_form_admin_settings,
-    &.new_form_two_factor_confirmation,
-    &.new_form_delete_confirmation,
-    &.new_import,
-    &.new_domain_block,
-    &.edit_domain_block {
-      max-width: none;
-    }
-
-    .form_two_factor_confirmation_code,
-    .form_delete_confirmation_password {
-      max-width: 400px;
-    }
-
-    .actions {
-      max-width: 400px;
+    .negative-hint {
+      color: $error-value-color;
+      font-weight: 500;
     }
   }
 
-  @media screen and (max-width: 600px) {
+  @media screen and (max-width: $no-columns-breakpoint) {
     display: block;
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
@@ -204,16 +231,8 @@
 
     .sidebar {
       width: 100%;
-      padding: 10px 0;
+      padding: 0;
       height: auto;
-
-      .logo {
-        margin: 20px auto;
-      }
-    }
-
-    .content {
-      padding-top: 20px;
     }
   }
 }
@@ -429,7 +448,7 @@
     border-radius: 0 0 4px 4px;
     padding: 10px;
     color: $darker-text-color;
-    font-family: 'mastodon-font-monospace', monospace;
+    font-family: $font-monospace, monospace;
     font-size: 12px;
     word-wrap: break-word;
     min-height: 20px;
@@ -539,6 +558,10 @@ a.name-tag,
     border-left-color: lighten($error-red, 12%);
   }
 
+  &.warning {
+    border-left-color: $gold-star;
+  }
+
   &__bubble {
     padding: 16px;
     padding-left: 14px;
@@ -562,3 +585,102 @@ a.name-tag,
     color: $dark-text-color;
   }
 }
+
+.report-card {
+  background: $ui-base-color;
+  border-radius: 4px;
+  margin-bottom: 20px;
+
+  &__profile {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15px;
+
+    .account {
+      padding: 0;
+      border: 0;
+
+      &__avatar-wrapper {
+        margin-left: 0;
+      }
+    }
+
+    &__stats {
+      flex: 0 0 auto;
+      font-weight: 500;
+      color: $darker-text-color;
+      text-transform: uppercase;
+      text-align: right;
+
+      a {
+        color: inherit;
+        text-decoration: none;
+
+        &:focus,
+        &:hover,
+        &:active {
+          color: lighten($darker-text-color, 8%);
+        }
+      }
+
+      .red {
+        color: $error-value-color;
+      }
+    }
+  }
+
+  &__summary {
+    &__item {
+      display: flex;
+      justify-content: flex-start;
+      border-top: 1px solid darken($ui-base-color, 4%);
+
+      &:hover {
+        background: lighten($ui-base-color, 2%);
+      }
+
+      &__reported-by,
+      &__assigned {
+        padding: 15px;
+        flex: 0 0 auto;
+        box-sizing: border-box;
+        width: 150px;
+        color: $darker-text-color;
+
+        &,
+        .username {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+
+      &__content {
+        flex: 1 1 auto;
+        max-width: calc(100% - 300px);
+
+        &__icon {
+          color: $dark-text-color;
+          margin-right: 4px;
+          font-weight: 500;
+        }
+      }
+
+      &__content a {
+        display: block;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 15px;
+        text-decoration: none;
+        color: $darker-text-color;
+      }
+    }
+  }
+}
+
+.one-line {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index c52e069be6720347882f35f5dc2c5189e7f1104b..746def6251c14349b6b5227c38ceb4f1ec7c6fc2 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -1,13 +1,17 @@
+@function hex-color($color) {
+  @if type-of($color) == 'color' {
+    $color: str-slice(ie-hex-str($color), 4);
+  }
+  @return '%23' + unquote($color)
+}
+
 body {
-  font-family: 'mastodon-font-sans-serif', sans-serif;
-  background: $ui-base-color;
-  background-size: cover;
-  background-attachment: fixed;
+  font-family: $font-sans-serif, sans-serif;
+  background: darken($ui-base-color, 8%);
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
   color: $primary-text-color;
-  padding-bottom: 20px;
   text-rendering: optimizelegibility;
   font-feature-settings: "kern";
   text-size-adjust: none;
@@ -25,8 +29,8 @@ body {
     // Fira Sans => Firefox OS
     // Droid Sans => Older Androids (<4.0)
     // Helvetica Neue => Older macOS <10.11
-    // mastodon-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", mastodon-font-sans-serif, sans-serif;
+    // $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;
   }
 
   &.app-body {
@@ -35,16 +39,24 @@ body {
     height: 100%;
     padding: 0;
     background: $ui-base-color;
+
+    &.with-modals--active {
+      overflow-y: hidden;
+    }
   }
 
-  &.about-body {
-    background: darken($ui-base-color, 8%);
-    padding-bottom: 0;
+  &.lighter {
+    background: $ui-base-color;
   }
 
-  &.tag-body {
-    background: darken($ui-base-color, 8%);
-    padding-bottom: 0;
+  &.with-modals {
+    overflow-x: hidden;
+    overflow-y: scroll;
+
+    &--active {
+      overflow-y: hidden;
+      margin-right: 13px;
+    }
   }
 
   &.player {
@@ -52,7 +64,7 @@ body {
   }
 
   &.embed {
-    background: transparent;
+    background: lighten($ui-base-color, 4%);
     margin: 0;
     padding-bottom: 0;
 
diff --git a/app/javascript/styles/mastodon/boost.scss b/app/javascript/styles/mastodon/boost.scss
index 8e11cb5960caed491e3fa83de9a1e762a69ff367..5a6d6ae406c4610faf56bd1bcbba343f7c67b23a 100644
--- a/app/javascript/styles/mastodon/boost.scss
+++ b/app/javascript/styles/mastodon/boost.scss
@@ -1,10 +1,3 @@
-@function hex-color($color) {
-  @if type-of($color) == 'color' {
-    $color: str-slice(ie-hex-str($color), 4);
-  }
-  @return '%23' + unquote($color)
-}
-
 button.icon-button i.fa-retweet {
   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($action-button-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($highlight-text-color)}' stroke-width='0'/></svg>");
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 5fa73d58a207d54485432c075c2c0a03956ed0da..10e094648197e6ef05b9483934d717e439ef729e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -35,6 +35,17 @@
     transition: all 200ms ease-out;
   }
 
+  &--destructive {
+    transition: none;
+
+    &:active,
+    &:focus,
+    &:hover {
+      background-color: $error-red;
+      transition: none;
+    }
+  }
+
   &:disabled {
     background-color: $ui-primary-color;
     cursor: default;
@@ -219,7 +230,6 @@
 
 .dropdown-menu {
   position: absolute;
-  transform-origin: 50% 0;
 }
 
 .invisible {
@@ -542,7 +552,7 @@
 
       .character-counter {
         cursor: default;
-        font-family: 'mastodon-font-sans-serif', sans-serif;
+        font-family: $font-sans-serif, sans-serif;
         font-size: 14px;
         font-weight: 600;
         color: $lighter-text-color;
@@ -621,13 +631,16 @@
 
 .status__content,
 .reply-indicator__content {
+  position: relative;
   font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
   font-weight: 400;
   overflow: hidden;
+  text-overflow: ellipsis;
   white-space: pre-wrap;
   padding-top: 2px;
+  color: $primary-text-color;
 
   &:focus {
     outline: 0;
@@ -710,6 +723,26 @@
   }
 }
 
+.status__content.status__content--collapsed {
+  max-height: 20px * 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%);
+  border: 0;
+  background: transparent;
+  padding: 0;
+  padding-top: 8px;
+
+  &:hover,
+  &:active {
+    text-decoration: underline;
+  }
+}
+
 .status__content__spoiler-link {
   display: inline-block;
   border-radius: 2px;
@@ -768,7 +801,7 @@
   padding: 8px 10px;
   padding-left: 68px;
   position: relative;
-  min-height: 48px;
+  min-height: 54px;
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: default;
 
@@ -790,8 +823,9 @@
     margin-top: 8px;
   }
 
-  &.status-direct {
+  &.status-direct:not(.read) {
     background: lighten($ui-base-color, 8%);
+    border-bottom-color: lighten($ui-base-color, 12%);
   }
 
   &.light {
@@ -842,7 +876,8 @@
   }
 }
 
-.status__relative-time {
+.status__relative-time,
+.notification__relative_time {
   color: $dark-text-color;
   float: right;
   font-size: 14px;
@@ -921,15 +956,31 @@
   align-items: center;
   display: flex;
   margin-top: 8px;
+
+  &__counter {
+    display: inline-flex;
+    margin-right: 11px;
+    align-items: center;
+
+    .status__action-bar-button {
+      margin-right: 4px;
+    }
+
+    &__label {
+      display: inline-block;
+      width: 14px;
+      font-size: 12px;
+      font-weight: 500;
+      color: $action-button-color;
+    }
+  }
 }
 
 .status__action-bar-button {
-  float: left;
   margin-right: 18px;
 }
 
 .status__action-bar-dropdown {
-  float: left;
   height: 23.15px;
   width: 23.15px;
 }
@@ -946,6 +997,18 @@
   background: lighten($ui-base-color, 4%);
   padding: 14px 10px;
 
+  &--flex {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: flex-start;
+
+    .status__content,
+    .detailed-status__meta {
+      flex: 100%;
+    }
+  }
+
   .status__content {
     font-size: 19px;
     line-height: 24px;
@@ -1071,6 +1134,18 @@
     vertical-align: middle;
     margin-right: 5px;
   }
+
+  &-composite {
+    @include avatar-radius();
+    overflow: hidden;
+
+    & > div {
+      @include avatar-radius();
+      float: left;
+      position: relative;
+      box-sizing: border-box;
+    }
+  }
 }
 
 a .account__avatar {
@@ -1224,7 +1299,6 @@ a .account__avatar {
 }
 
 .account__action-bar-dropdown {
-  flex: 0 1 calc(50% - 140px);
   padding: 10px;
 
   .icon-button {
@@ -1256,9 +1330,14 @@ a .account__avatar {
 .account__action-bar__tab {
   text-decoration: none;
   overflow: hidden;
-  flex: 0 1 80px;
+  flex: 0 1 100%;
   border-right: 1px solid lighten($ui-base-color, 8%);
-  padding: 10px 5px;
+  padding: 10px 0;
+  border-bottom: 4px solid transparent;
+
+  &.active {
+    border-bottom: 4px solid $ui-highlight-color;
+  }
 
   & > span {
     display: block;
@@ -1411,6 +1490,7 @@ a.account__display-name {
   cursor: default;
   color: $darker-text-color;
   font-size: 15px;
+  line-height: 22px;
   position: relative;
 
   .fa {
@@ -1418,7 +1498,7 @@ a.account__display-name {
   }
 
   > span {
-    display: block;
+    display: inline;
     overflow: hidden;
     text-overflow: ellipsis;
   }
@@ -1448,6 +1528,10 @@ a.account__display-name {
   }
 }
 
+.notification__relative_time {
+  float: right;
+}
+
 .display-name {
   display: block;
   max-width: 100%;
@@ -1478,6 +1562,7 @@ a.account__display-name {
   display: flex;
   align-items: center;
   justify-content: center;
+  flex-direction: column;
 
   .image-loader__preview-canvas {
     max-width: $media-modal-media-max-width;
@@ -1486,8 +1571,8 @@ a.account__display-name {
     object-fit: contain;
   }
 
-  &.image-loader--loading .image-loader__preview-canvas {
-    filter: blur(2px);
+  .loading-bar {
+    position: relative;
   }
 
   &.image-loader--amorphous .image-loader__preview-canvas {
@@ -1590,10 +1675,27 @@ a.account__display-name {
   padding: 4px 0;
   border-radius: 4px;
   box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+  z-index: 9999;
 
   ul {
     list-style: none;
   }
+
+  &.left {
+    transform-origin: 100% 50%;
+  }
+
+  &.top {
+    transform-origin: 50% 100%;
+  }
+
+  &.bottom {
+    transform-origin: 50% 0;
+  }
+
+  &.right {
+    transform-origin: 0 50%;
+  }
 }
 
 .dropdown-menu__arrow {
@@ -1611,14 +1713,14 @@ a.account__display-name {
 
   &.top {
     bottom: -5px;
-    margin-left: -13px;
+    margin-left: -7px;
     border-width: 5px 7px 0;
     border-top-color: $ui-secondary-color;
   }
 
   &.bottom {
     top: -5px;
-    margin-left: -13px;
+    margin-left: -7px;
     border-width: 0 7px 5px;
     border-bottom-color: $ui-secondary-color;
   }
@@ -1751,7 +1853,7 @@ a.account__display-name {
 }
 
 .column {
-  width: 330px;
+  width: 350px;
   position: relative;
   box-sizing: border-box;
   display: flex;
@@ -1996,6 +2098,17 @@ a.account__display-name {
   @supports(display: grid) { // hack to fix Chrome <57
     contain: strict;
   }
+
+  &--flex {
+    display: flex;
+    flex-direction: column;
+  }
+
+  &__append {
+    flex: 1 1 auto;
+    position: relative;
+    min-height: 120px;
+  }
 }
 
 .scrollable.fullscreen {
@@ -2010,6 +2123,7 @@ a.account__display-name {
   cursor: pointer;
   flex: 0 0 auto;
   font-size: 16px;
+  line-height: inherit;
   border: 0;
   text-align: unset;
   padding: 15px;
@@ -2223,28 +2337,6 @@ a.account__display-name {
 .getting-started {
   color: $dark-text-color;
 
-  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;
-    }
-  }
-
   &__footer {
     flex: 0 0 auto;
     padding: 10px;
@@ -2257,6 +2349,28 @@ a.account__display-name {
     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 {
@@ -2464,12 +2578,24 @@ a.status-card {
   display: block;
   margin-top: 5px;
   font-size: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .status-card__image {
   flex: 0 0 100px;
   background: lighten($ui-base-color, 8%);
   position: relative;
+
+  & > .fa {
+    font-size: 21px;
+    position: absolute;
+    transform-origin: 50% 50%;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+  }
 }
 
 .status-card.horizontal {
@@ -2488,6 +2614,31 @@ a.status-card {
   }
 }
 
+.status-card.compact {
+  border-color: lighten($ui-base-color, 4%);
+
+  &.interactive {
+    border: 0;
+  }
+
+  .status-card__content {
+    padding: 8px;
+    padding-top: 10px;
+  }
+
+  .status-card__title {
+    white-space: nowrap;
+  }
+
+  .status-card__image {
+    flex: 0 0 60px;
+  }
+}
+
+a.status-card.compact:hover {
+  background-color: lighten($ui-base-color, 4%);
+}
+
 .status-card__image-image {
   border-radius: 4px 0 0 4px;
   display: block;
@@ -2759,7 +2910,6 @@ a.status-card {
     transform: translateX(-50%);
     margin: 82px 0 0 50%;
     white-space: nowrap;
-    animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
   }
 }
 
@@ -2768,11 +2918,20 @@ a.status-card {
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
-  width: 0;
-  height: 0;
+  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%;
+}
+
+.no-reduce-motion .loading-indicator span {
+  animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
+}
+
+.no-reduce-motion .loading-indicator__figure {
   animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
 }
 
@@ -2897,6 +3056,26 @@ a.status-card {
   display: block;
   font-weight: 500;
   margin-bottom: 10px;
+
+  .column-settings__hashtag-select {
+    &__control {
+      @include search-input();
+    }
+
+    &__multi-value {
+      background: lighten($ui-base-color, 8%);
+    }
+
+    &__multi-value__label,
+    &__input {
+      color: $darker-text-color;
+    }
+
+    &__indicator-separator,
+    &__dropdown-indicator {
+      display: none;
+    }
+  }
 }
 
 .column-settings__row {
@@ -2948,8 +3127,7 @@ a.status-card {
   line-height: 24px;
 }
 
-.setting-toggle__label,
-.setting-meta__label {
+.setting-toggle__label {
   color: $darker-text-color;
   display: inline-block;
   margin-bottom: 14px;
@@ -2957,10 +3135,6 @@ a.status-card {
   vertical-align: middle;
 }
 
-.setting-meta__label {
-  float: right;
-}
-
 .empty-column-indicator,
 .error-column {
   color: $dark-text-color;
@@ -3259,7 +3433,14 @@ a.status-card {
   border-radius: 4px;
   margin-left: 40px;
   overflow: hidden;
-  transform-origin: 50% 0;
+
+  &.top {
+    transform-origin: 50% 100%;
+  }
+
+  &.bottom {
+    transform-origin: 50% 0;
+  }
 }
 
 .privacy-dropdown__option {
@@ -3331,6 +3512,10 @@ a.status-card {
     }
   }
 
+  &.top .privacy-dropdown__value {
+    border-radius: 0 0 4px 4px;
+  }
+
   .privacy-dropdown__dropdown {
     display: block;
     box-shadow: 2px 4px 6px rgba($base-shadow-color, 0.1);
@@ -3342,36 +3527,10 @@ a.status-card {
 }
 
 .search__input {
-  outline: 0;
-  box-sizing: border-box;
   display: block;
-  width: 100%;
-  border: none;
   padding: 10px;
   padding-right: 30px;
-  font-family: inherit;
-  background: $ui-base-color;
-  color: $darker-text-color;
-  font-size: 14px;
-  margin: 0;
-
-  &::-moz-focus-inner {
-    border: 0;
-  }
-
-  &::-moz-focus-inner,
-  &:focus,
-  &:active {
-    outline: 0 !important;
-  }
-
-  &:focus {
-    background: lighten($ui-base-color, 4%);
-  }
-
-  @media screen and (max-width: 600px) {
-    font-size: 16px;
-  }
+  @include search-input();
 }
 
 .search__icon {
@@ -3648,25 +3807,6 @@ a.status-card {
   flex-direction: column;
 }
 
-.onboarding-modal__pager {
-  height: 80vh;
-  width: 80vw;
-  max-width: 520px;
-  max-height: 470px;
-
-  .react-swipeable-view-container > div {
-    width: 100%;
-    height: 100%;
-    box-sizing: border-box;
-    display: none;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    display: flex;
-    user-select: text;
-  }
-}
-
 .error-modal__body {
   height: 80vh;
   width: 80vw;
@@ -3700,22 +3840,6 @@ a.status-card {
   text-align: center;
 }
 
-@media screen and (max-width: 550px) {
-  .onboarding-modal {
-    width: 100%;
-    height: 100%;
-    border-radius: 0;
-  }
-
-  .onboarding-modal__pager {
-    width: 100%;
-    height: auto;
-    max-width: none;
-    max-height: none;
-    flex: 1 1 auto;
-  }
-}
-
 .onboarding-modal__paginator,
 .error-modal__footer {
   flex: 0 0 auto;
@@ -3764,124 +3888,6 @@ a.status-card {
   justify-content: center;
 }
 
-.onboarding-modal__dots {
-  flex: 1 1 auto;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.onboarding-modal__dot {
-  width: 14px;
-  height: 14px;
-  border-radius: 14px;
-  background: darken($ui-secondary-color, 16%);
-  margin: 0 3px;
-  cursor: pointer;
-
-  &:hover {
-    background: darken($ui-secondary-color, 18%);
-  }
-
-  &.active {
-    cursor: default;
-    background: darken($ui-secondary-color, 24%);
-  }
-}
-
-.onboarding-modal__page__wrapper {
-  pointer-events: none;
-  padding: 25px;
-  padding-bottom: 0;
-
-  &.onboarding-modal__page__wrapper--active {
-    pointer-events: auto;
-  }
-}
-
-.onboarding-modal__page {
-  cursor: default;
-  line-height: 21px;
-
-  h1 {
-    font-size: 18px;
-    font-weight: 500;
-    color: $inverted-text-color;
-    margin-bottom: 20px;
-  }
-
-  a {
-    color: $highlight-text-color;
-
-    &:hover,
-    &:focus,
-    &:active {
-      color: lighten($highlight-text-color, 4%);
-    }
-  }
-
-  .navigation-bar a {
-    color: inherit;
-  }
-
-  p {
-    font-size: 16px;
-    color: $lighter-text-color;
-    margin-top: 10px;
-    margin-bottom: 10px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-
-    strong {
-      font-weight: 500;
-      background: $ui-base-color;
-      color: $secondary-text-color;
-      border-radius: 4px;
-      font-size: 14px;
-      padding: 3px 6px;
-
-      @each $lang in $cjk-langs {
-        &:lang(#{$lang}) {
-          font-weight: 700;
-        }
-      }
-    }
-  }
-}
-
-.onboarding-modal__page__wrapper-0 {
-  background: url('../images/elephant_ui_greeting.svg') no-repeat left bottom / auto 250px;
-  height: 100%;
-  padding: 0;
-}
-
-.onboarding-modal__page-one {
-  &__lead {
-    padding: 65px;
-    padding-top: 45px;
-    padding-bottom: 0;
-    margin-bottom: 10px;
-
-    h1 {
-      font-size: 26px;
-      line-height: 36px;
-      margin-bottom: 8px;
-    }
-
-    p {
-      margin-bottom: 0;
-    }
-  }
-
-  &__extra {
-    padding-right: 65px;
-    padding-left: 185px;
-    text-align: center;
-  }
-}
-
 .display-case {
   text-align: center;
   font-size: 15px;
@@ -3904,92 +3910,6 @@ a.status-card {
   }
 }
 
-.onboarding-modal__page-two,
-.onboarding-modal__page-three,
-.onboarding-modal__page-four,
-.onboarding-modal__page-five {
-  p {
-    text-align: left;
-  }
-
-  .figure {
-    background: darken($ui-base-color, 8%);
-    color: $secondary-text-color;
-    margin-bottom: 20px;
-    border-radius: 4px;
-    padding: 10px;
-    text-align: center;
-    font-size: 14px;
-    box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.3);
-
-    .onboarding-modal__image {
-      border-radius: 4px;
-      margin-bottom: 10px;
-    }
-
-    &.non-interactive {
-      pointer-events: none;
-      text-align: left;
-    }
-  }
-}
-
-.onboarding-modal__page-four__columns {
-  .row {
-    display: flex;
-    margin-bottom: 20px;
-
-    & > div {
-      flex: 1 1 0;
-      margin: 0 10px;
-
-      &:first-child {
-        margin-left: 0;
-      }
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      p {
-        text-align: center;
-      }
-    }
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .column-header {
-    color: $primary-text-color;
-  }
-}
-
-@media screen and (max-width: 320px) and (max-height: 600px) {
-  .onboarding-modal__page p {
-    font-size: 14px;
-    line-height: 20px;
-  }
-
-  .onboarding-modal__page-two .figure,
-  .onboarding-modal__page-three .figure,
-  .onboarding-modal__page-four .figure,
-  .onboarding-modal__page-five .figure {
-    font-size: 12px;
-    margin-bottom: 10px;
-  }
-
-  .onboarding-modal__page-four__columns .row {
-    margin-bottom: 10px;
-  }
-
-  .onboarding-modal__page-four__columns .column-header {
-    padding: 5px;
-    font-size: 12px;
-  }
-}
-
 .onboard-sliders {
   display: inline-block;
   max-width: 30px;
@@ -4135,6 +4055,11 @@ a.status-card {
     color: $highlight-text-color;
   }
 
+  .status__content,
+  .status__content p {
+    color: $inverted-text-color;
+  }
+
   @media screen and (max-width: 480px) {
     max-height: 10vh;
   }
@@ -4519,6 +4444,19 @@ a.status-card {
   z-index: 5;
 }
 
+.detailed,
+.fullscreen {
+  .video-player__volume__current,
+  .video-player__volume::before {
+    bottom: 27px;
+  }
+
+  .video-player__volume__handle {
+    bottom: 23px;
+  }
+
+}
+
 .video-player {
   overflow: hidden;
   position: relative;
@@ -4667,7 +4605,7 @@ a.status-card {
 
   &__time-current {
     color: $white;
-    margin-left: 10px;
+    margin-left: 60px;
   }
 
   &__time-sep {
@@ -4680,6 +4618,48 @@ a.status-card {
     color: $white;
   }
 
+  &__volume {
+    cursor: pointer;
+    height: 24px;
+    display: inline;
+
+    &::before {
+      content: "";
+      width: 50px;
+      background: rgba($white, 0.35);
+      border-radius: 4px;
+      display: block;
+      position: absolute;
+      height: 4px;
+      left: 70px;
+      bottom: 20px;
+    }
+
+    &__current {
+      display: block;
+      position: absolute;
+      height: 4px;
+      border-radius: 4px;
+      left: 70px;
+      bottom: 20px;
+      background: lighten($ui-highlight-color, 8%);
+    }
+
+    &__handle {
+      position: absolute;
+      z-index: 3;
+      border-radius: 50%;
+      width: 12px;
+      height: 12px;
+      bottom: 16px;
+      left: 70px;
+      transition: opacity .1s ease;
+      background: lighten($ui-highlight-color, 8%);
+      box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+      pointer-events: none;
+    }
+  }
+
   &__seek {
     cursor: pointer;
     height: 24px;
@@ -4830,12 +4810,21 @@ a.status-card {
   }
 }
 
+.notification__filter-bar,
 .account__section-headline {
   background: darken($ui-base-color, 4%);
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: default;
   display: flex;
+  flex-shrink: 0;
 
+  button {
+    background: darken($ui-base-color, 4%);
+    border: 0;
+    margin: 0;
+  }
+
+  button,
   a {
     display: block;
     flex: 1 1 auto;
@@ -5046,7 +5035,7 @@ noscript {
       width: 100%;
       border: none;
       padding: 10px;
-      font-family: 'mastodon-font-monospace', monospace;
+      font-family: $font-monospace, monospace;
       background: $ui-base-color;
       color: $primary-text-color;
       font-size: 14px;
@@ -5209,6 +5198,47 @@ noscript {
   }
 }
 
+.list-adder {
+  background: $ui-base-color;
+  flex-direction: column;
+  border-radius: 8px;
+  box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+  width: 380px;
+  overflow: hidden;
+
+  @media screen and (max-width: 420px) {
+    width: 90%;
+  }
+
+  &__account {
+    background: lighten($ui-base-color, 13%);
+  }
+
+  &__lists {
+    background: lighten($ui-base-color, 13%);
+    height: 50vh;
+    border-radius: 0 0 8px 8px;
+    overflow-y: auto;
+  }
+
+  .list {
+    padding: 10px;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+  }
+
+  .list__wrapper {
+    display: flex;
+  }
+
+  .list__display-name {
+    flex: 1 1 auto;
+    overflow: hidden;
+    text-decoration: none;
+    font-size: 16px;
+    padding: 10px;
+  }
+}
+
 .focal-point-modal {
   max-width: 80vw;
   max-height: 80vh;
@@ -5287,16 +5317,18 @@ noscript {
   overflow: hidden;
   margin: 20px -10px -20px;
   border-bottom: 0;
+  border-top: 0;
 
   dl {
-    border-top: 1px solid lighten($ui-base-color, 8%);
+    border-top: 1px solid lighten($ui-base-color, 4%);
+    border-bottom: 0;
     display: flex;
   }
 
   dt,
   dd {
     box-sizing: border-box;
-    padding: 14px 20px;
+    padding: 14px 5px;
     text-align: center;
     max-height: 48px;
     overflow: hidden;
@@ -5316,6 +5348,11 @@ noscript {
     flex: 1 1 auto;
     color: $primary-text-color;
     background: $ui-base-color;
+
+    &.verified {
+      border: 1px solid rgba($valid-value-color, 0.5);
+      background: rgba($valid-value-color, 0.25);
+    }
   }
 }
 
diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss
index ac648c8680eb6152759ef103de88ea87085bb94d..a98fa52c47bb2b45b6f1c6fa8c9de4cf9cc5f8d3 100644
--- a/app/javascript/styles/mastodon/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
@@ -37,7 +37,7 @@
       outline: 0;
       padding: 12px 16px;
       line-height: 32px;
-      font-family: 'mastodon-font-display', sans-serif;
+      font-family: $font-display, sans-serif;
       font-weight: 500;
       font-size: 14px;
     }
@@ -60,10 +60,6 @@
   }
 }
 
-.media-standalone__body {
-  overflow: hidden;
-}
-
 .account-header {
   width: 400px;
   margin: 0 auto;
@@ -118,3 +114,701 @@
     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;
+  }
+
+  .landing-page__call-to-action {
+    min-height: 100%;
+  }
+
+  @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: 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;
+
+      img {
+        display: block;
+        height: 18px;
+        width: auto;
+        position: relative;
+        bottom: -2px;
+
+        @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;
+      }
+    }
+  }
+
+  .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;
+
+        svg path:last-child {
+          fill: $secondary-text-color;
+        }
+      }
+    }
+
+    &__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 {
+          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;
+
+          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;
+    }
+  }
+
+  .static-icon-button {
+    color: $action-button-color;
+    font-size: 18px;
+
+    & > span {
+      font-size: 14px;
+      font-weight: 500;
+    }
+  }
+
+  .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%);
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss
new file mode 100644
index 0000000000000000000000000000000000000000..e4564f062cd7bbb97028507eab9083c49c012cbc
--- /dev/null
+++ b/app/javascript/styles/mastodon/dashboard.scss
@@ -0,0 +1,76 @@
+.dashboard__counters {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -5px;
+  margin-bottom: 20px;
+
+  & > div {
+    box-sizing: border-box;
+    flex: 0 0 33.333%;
+    padding: 0 5px;
+    margin-bottom: 10px;
+
+    & > div,
+    & > a {
+      padding: 20px;
+      background: lighten($ui-base-color, 4%);
+      border-radius: 4px;
+    }
+
+    & > a {
+      text-decoration: none;
+      color: inherit;
+      display: block;
+
+      &:hover,
+      &:focus,
+      &:active {
+        background: lighten($ui-base-color, 8%);
+      }
+    }
+  }
+
+  &__num,
+  &__text {
+    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;
+  }
+
+  &__text {
+    font-size: 18px;
+  }
+
+  &__label {
+    font-size: 14px;
+    color: $darker-text-color;
+    text-align: center;
+    font-weight: 500;
+  }
+}
+
+.dashboard__widgets {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -5px;
+
+  & > div {
+    flex: 0 0 33.333%;
+    margin-bottom: 20px;
+
+    & > div {
+      padding: 0 5px;
+    }
+  }
+
+  a:not(.name-tag) {
+    color: $ui-secondary-color;
+    font-weight: 500;
+    text-decoration: none;
+  }
+}
diff --git a/app/javascript/styles/mastodon/footer.scss b/app/javascript/styles/mastodon/footer.scss
index 81eb1ce2d31e2003c36e261dddb66c24a9cce753..4d75477e09b8786de6899deaa556d4e869a58938 100644
--- a/app/javascript/styles/mastodon/footer.scss
+++ b/app/javascript/styles/mastodon/footer.scss
@@ -1,39 +1,140 @@
-.footer {
-  text-align: center;
-  margin-top: 30px;
-  padding-bottom: 60px;
-  font-size: 12px;
-  color: $darker-text-color;
-
-  .footer__domain {
-    font-weight: 500;
-
-    a {
-      color: inherit;
-      text-decoration: none;
+.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;
     }
-  }
 
-  .powered-by,
-  .single-user-login {
-    font-weight: 400;
+    .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;
+        }
 
-    a {
-      color: inherit;
-      text-decoration: underline;
-      font-weight: 500;
+        .column-3,
+        .column-4 {
+          grid-column: 3;
+        }
 
-      &:hover {
+        .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;
       }
     }
 
-    img {
-      margin: 0 4px;
-      position: relative;
-      bottom: -1px;
-      height: 18px;
-      vertical-align: top;
+    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;
+
+        path {
+          fill: lighten($ui-base-color, 34%);
+        }
+      }
+
+      &:hover,
+      &:focus,
+      &:active {
+        svg path {
+          fill: lighten($ui-base-color, 38%);
+        }
+      }
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 375c7b64bb443fe581a3cda27ff3a17f56e7cb70..bab982706fd5c53bd9469bf2e9f70663492e682c 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -1,5 +1,7 @@
+$no-columns-breakpoint: 600px;
+
 code {
-  font-family: 'mastodon-font-monospace', monospace;
+  font-family: $font-monospace, monospace;
   font-weight: 400;
 }
 
@@ -13,6 +15,60 @@ code {
   .input {
     margin-bottom: 15px;
     overflow: hidden;
+
+    &.hidden {
+      margin: 0;
+    }
+
+    &.radio_buttons {
+      .radio {
+        margin-bottom: 15px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      .radio > label {
+        position: relative;
+        padding-left: 28px;
+
+        input {
+          position: absolute;
+          top: -2px;
+          left: 0;
+        }
+      }
+    }
+
+    &.boolean {
+      position: relative;
+      margin-bottom: 0;
+
+      .label_input > label {
+        font-family: inherit;
+        font-size: 14px;
+        padding-top: 5px;
+        color: $primary-text-color;
+        display: block;
+        width: auto;
+      }
+
+      .label_input,
+      .hint {
+        padding-left: 28px;
+      }
+
+      .label_input__wrapper {
+        position: static;
+      }
+
+      label.checkbox {
+        position: absolute;
+        top: 2px;
+        left: 0;
+      }
+    }
   }
 
   .row {
@@ -27,9 +83,22 @@ code {
     }
   }
 
+  .hint {
+    color: $darker-text-color;
+
+    a {
+      color: $highlight-text-color;
+    }
+
+    code {
+      border-radius: 3px;
+      padding: 0.2em 0.4em;
+      background: darken($ui-base-color, 12%);
+    }
+  }
+
   span.hint {
     display: block;
-    color: $darker-text-color;
     font-size: 12px;
     margin-top: 4px;
   }
@@ -44,11 +113,6 @@ code {
       line-height: 18px;
       margin-top: 15px;
       margin-bottom: 0;
-      color: $darker-text-color;
-
-      a {
-        color: $highlight-text-color;
-      }
     }
   }
 
@@ -66,87 +130,60 @@ code {
     }
   }
 
-  .label_input {
-    display: flex;
+  .input.with_floating_label {
+    .label_input {
+      display: flex;
 
-    label {
-      flex: 0 0 auto;
+      & > label {
+        font-family: inherit;
+        font-size: 14px;
+        color: $primary-text-color;
+        font-weight: 500;
+        min-width: 150px;
+        flex: 0 0 auto;
+      }
+
+      input,
+      select {
+        flex: 1 1 auto;
+      }
     }
 
-    input {
-      flex: 1 1 auto;
+    &.select .hint {
+      margin-top: 6px;
+      margin-left: 150px;
     }
   }
 
   .input.with_label {
-    padding: 15px 0;
-    margin-bottom: 0;
-
-    .label_input {
-      flex-wrap: wrap;
-      align-items: flex-start;
-    }
-
-    &.file .label_input {
-      flex-wrap: nowrap;
-    }
-
-    &.select .label_input {
-      align-items: initial;
-    }
-
     .label_input > label {
       font-family: inherit;
-      font-size: 16px;
+      font-size: 14px;
       color: $primary-text-color;
       display: block;
-      padding-top: 5px;
-      margin-bottom: 5px;
-      flex: 1;
-      min-width: 150px;
+      margin-bottom: 8px;
       word-wrap: break-word;
+      font-weight: 500;
+    }
 
-      &.select {
-        flex: 0;
-      }
-
-      & ~ * {
-        margin-left: 10px;
-      }
+    .hint {
+      margin-top: 6px;
     }
 
     ul {
       flex: 390px;
     }
-
-    &.boolean {
-      padding: initial;
-      margin-bottom: initial;
-
-      .label_input > label {
-        font-family: inherit;
-        font-size: 14px;
-        color: $primary-text-color;
-        display: block;
-        width: auto;
-      }
-
-      label.checkbox {
-        position: relative;
-        padding-left: 25px;
-        flex: 1 1 auto;
-      }
-    }
   }
 
   .input.with_block_label {
-    padding-top: 15px;
+    max-width: none;
 
     & > label {
       font-family: inherit;
       font-size: 16px;
       color: $primary-text-color;
       display: block;
+      font-weight: 500;
       padding-top: 5px;
     }
 
@@ -154,62 +191,82 @@ code {
       margin-bottom: 15px;
     }
 
-    li {
-      float: left;
-      width: 50%;
+    ul {
+      columns: 2;
     }
   }
 
+  .required abbr {
+    text-decoration: none;
+    color: lighten($error-value-color, 12%);
+  }
+
   .fields-group {
     margin-bottom: 25px;
-  }
 
-  .input.radio_buttons .radio label {
-    margin-bottom: 5px;
-    font-family: inherit;
-    font-size: 14px;
-    color: $primary-text-color;
-    display: block;
-    width: auto;
+    .input:last-child {
+      margin-bottom: 0;
+    }
   }
 
-  .input.boolean {
-    margin-bottom: 5px;
+  .fields-row {
+    display: flex;
+    margin: 0 -10px;
+    padding-top: 5px;
+    margin-bottom: 25px;
 
-    label {
-      font-family: inherit;
-      font-size: 14px;
-      color: $primary-text-color;
-      display: block;
-      width: auto;
+    .input {
+      max-width: none;
     }
 
-    label.checkbox {
-      position: relative;
-      padding-left: 25px;
+    &__column {
+      box-sizing: border-box;
+      padding: 0 10px;
       flex: 1 1 auto;
+      min-height: 1px;
+
+      &-6 {
+        max-width: 50%;
+      }
     }
 
-    input[type=checkbox] {
-      position: absolute;
-      left: 0;
-      top: 5px;
-      margin: 0;
+    .fields-group:last-child,
+    .fields-row__column.fields-group {
+      margin-bottom: 0;
     }
 
-    .hint {
-      padding-left: 25px;
-      margin-left: 0;
+    @media screen and (max-width: $no-columns-breakpoint) {
+      display: block;
+      margin-bottom: 0;
+
+      &__column {
+        max-width: none;
+      }
+
+      .fields-group:last-child,
+      .fields-row__column.fields-group,
+      .fields-row__column {
+        margin-bottom: 25px;
+      }
     }
   }
 
+  .input.radio_buttons .radio label {
+    margin-bottom: 5px;
+    font-family: inherit;
+    font-size: 14px;
+    color: $primary-text-color;
+    display: block;
+    width: auto;
+  }
+
   .check_boxes {
     .checkbox {
       label {
         font-family: inherit;
         font-size: 14px;
         color: $primary-text-color;
-        display: block;
+        display: inline-block;
         width: auto;
         position: relative;
         padding-top: 5px;
@@ -231,12 +288,7 @@ code {
   input[type=email],
   input[type=password],
   textarea {
-    background: transparent;
     box-sizing: border-box;
-    border: 0;
-    border-bottom: 2px solid $ui-primary-color;
-    border-radius: 2px 2px 0 0;
-    padding: 7px 4px;
     font-size: 16px;
     color: $primary-text-color;
     display: block;
@@ -244,23 +296,31 @@ code {
     outline: 0;
     font-family: inherit;
     resize: vertical;
+    background: darken($ui-base-color, 10%);
+    border: 1px solid darken($ui-base-color, 14%);
+    border-radius: 4px;
+    padding: 10px;
 
     &:invalid {
       box-shadow: none;
     }
 
     &:focus:invalid {
-      border-bottom-color: lighten($error-red, 12%);
+      border-color: lighten($error-red, 12%);
     }
 
     &:required:valid {
-      border-bottom-color: $valid-value-color;
+      border-color: $valid-value-color;
+    }
+
+    &:hover {
+      border-color: darken($ui-base-color, 20%);
     }
 
     &:active,
     &:focus {
-      border-bottom-color: $highlight-text-color;
-      background: rgba($base-overlay-background, 0.1);
+      border-color: $highlight-text-color;
+      background: darken($ui-base-color, 8%);
     }
   }
 
@@ -270,9 +330,12 @@ code {
     }
 
     input[type=text],
+    input[type=number],
     input[type=email],
-    input[type=password] {
-      border-bottom-color: $valid-value-color;
+    input[type=password],
+    textarea,
+    select {
+      border-color: lighten($error-red, 12%);
     }
 
     .error {
@@ -344,22 +407,33 @@ code {
   }
 
   select {
+    appearance: none;
+    box-sizing: border-box;
     font-size: 16px;
-    max-height: 29px;
+    color: $primary-text-color;
+    display: block;
+    width: 100%;
+    outline: 0;
+    font-family: inherit;
+    resize: vertical;
+    background: darken($ui-base-color, 10%) url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>") no-repeat right 8px center / auto 16px;
+    border: 1px solid darken($ui-base-color, 14%);
+    border-radius: 4px;
+    padding-left: 10px;
+    padding-right: 30px;
+    height: 41px;
   }
 
-  .input-with-append {
-    position: relative;
-
-    .input input {
-      padding-right: 142px;
+  .label_input {
+    &__wrapper {
+      position: relative;
     }
 
-    .append {
+    &__append {
       position: absolute;
-      right: 0;
-      top: 0;
-      padding: 7px 4px;
+      right: 3px;
+      top: 1px;
+      padding: 10px;
       padding-bottom: 9px;
       font-size: 16px;
       color: $dark-text-color;
@@ -378,7 +452,7 @@ code {
         right: 0;
         bottom: 1px;
         width: 5px;
-        background-image: linear-gradient(to right, rgba($ui-base-color, 0), $ui-base-color);
+        background-image: linear-gradient(to right, rgba(darken($ui-base-color, 10%), 0), darken($ui-base-color, 10%));
       }
     }
   }
@@ -390,9 +464,20 @@ code {
   border-radius: 4px;
   padding: 15px 10px;
   margin-bottom: 30px;
-  box-shadow: 0 0 5px rgba($base-shadow-color, 0.2);
   text-align: center;
 
+  &.notice {
+    border: 1px solid rgba($valid-value-color, 0.5);
+    background: rgba($valid-value-color, 0.25);
+    color: $valid-value-color;
+  }
+
+  &.alert {
+    border: 1px solid rgba($error-value-color, 0.5);
+    background: rgba($error-value-color, 0.25);
+    color: $error-value-color;
+  }
+
   p {
     margin-bottom: 15px;
   }
@@ -404,7 +489,7 @@ code {
     width: 100%;
     border: none;
     padding: 10px;
-    font-family: 'mastodon-font-monospace', monospace;
+    font-family: $font-monospace, monospace;
     background: $ui-base-color;
     color: $primary-text-color;
     font-size: 14px;
@@ -454,15 +539,39 @@ code {
   }
 }
 
+.quick-nav {
+  list-style: none;
+  margin-bottom: 25px;
+  font-size: 14px;
+
+  li {
+    display: inline-block;
+    margin-right: 10px;
+  }
+
+  a {
+    color: $highlight-text-color;
+    text-transform: uppercase;
+    text-decoration: none;
+    font-weight: 700;
+
+    &:hover,
+    &:focus,
+    &:active {
+      color: lighten($highlight-text-color, 8%);
+    }
+  }
+}
+
 .oauth-prompt,
 .follow-prompt {
   margin-bottom: 30px;
-  text-align: center;
   color: $darker-text-color;
 
   h2 {
     font-size: 16px;
     margin-bottom: 30px;
+    text-align: center;
   }
 
   strong {
@@ -616,3 +725,60 @@ code {
 .scope-danger {
   color: $warning-red;
 }
+
+.form_admin_settings_site_short_description,
+.form_admin_settings_site_description,
+.form_admin_settings_site_extended_description,
+.form_admin_settings_site_terms,
+.form_admin_settings_custom_css,
+.form_admin_settings_closed_registrations_message {
+  textarea {
+    font-family: $font-monospace, monospace;
+  }
+}
+
+.input-copy {
+  background: darken($ui-base-color, 10%);
+  border: 1px solid darken($ui-base-color, 14%);
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  padding-right: 4px;
+  position: relative;
+  top: 1px;
+  transition: border-color 300ms linear;
+
+  &__wrapper {
+    flex: 1 1 auto;
+  }
+
+  input[type=text] {
+    background: transparent;
+    border: 0;
+    padding: 10px;
+    font-size: 14px;
+    font-family: $font-monospace, monospace;
+  }
+
+  button {
+    flex: 0 0 auto;
+    margin: 4px;
+    text-transform: none;
+    font-weight: 400;
+    font-size: 14px;
+    padding: 7px 18px;
+    padding-bottom: 6px;
+    width: auto;
+    transition: background 300ms linear;
+  }
+
+  &.copied {
+    border-color: $valid-value-color;
+    transition: none;
+
+    button {
+      background: $valid-value-color;
+      transition: none;
+    }
+  }
+}
diff --git a/app/javascript/styles/mastodon/introduction.scss b/app/javascript/styles/mastodon/introduction.scss
new file mode 100644
index 0000000000000000000000000000000000000000..222d8f60e863b167b5b76326a317b1ad0792f5b4
--- /dev/null
+++ b/app/javascript/styles/mastodon/introduction.scss
@@ -0,0 +1,153 @@
+.introduction {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+
+  @media screen and (max-width: 920px) {
+    background: darken($ui-base-color, 8%);
+    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/landing_strip.scss b/app/javascript/styles/mastodon/landing_strip.scss
deleted file mode 100644
index 86614b89bc5802fe91ecd41bf4b6d879236dcad8..0000000000000000000000000000000000000000
--- a/app/javascript/styles/mastodon/landing_strip.scss
+++ /dev/null
@@ -1,111 +0,0 @@
-.landing-strip,
-.memoriam-strip {
-  background: rgba(darken($ui-base-color, 7%), 0.8);
-  color: $darker-text-color;
-  font-weight: 400;
-  padding: 14px;
-  border-radius: 4px;
-  margin-bottom: 20px;
-  display: flex;
-  align-items: center;
-
-  strong,
-  a {
-    font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-
-  a {
-    color: inherit;
-    text-decoration: underline;
-  }
-
-  .logo {
-    width: 30px;
-    height: 30px;
-    flex: 0 0 auto;
-    margin-right: 15px;
-  }
-
-  @media screen and (max-width: 740px) {
-    margin-bottom: 0;
-  }
-}
-
-.memoriam-strip {
-  background: rgba($base-shadow-color, 0.7);
-}
-
-.moved-strip {
-  padding: 14px;
-  border-radius: 4px;
-  background: rgba(darken($ui-base-color, 7%), 0.8);
-  color: $secondary-text-color;
-  font-weight: 400;
-  margin-bottom: 20px;
-
-  strong,
-  a {
-    font-weight: 500;
-
-    @each $lang in $cjk-langs {
-      &:lang(#{$lang}) {
-        font-weight: 700;
-      }
-    }
-  }
-
-  a {
-    color: inherit;
-    text-decoration: underline;
-
-    &.mention {
-      text-decoration: none;
-
-      span {
-        text-decoration: none;
-      }
-
-      &:focus,
-      &:hover,
-      &:active {
-        text-decoration: none;
-
-        span {
-          text-decoration: underline;
-        }
-      }
-    }
-  }
-
-  &__message {
-    margin-bottom: 15px;
-
-    .fa {
-      margin-right: 5px;
-      color: $darker-text-color;
-    }
-  }
-
-  &__card {
-    .detailed-status__display-avatar {
-      position: relative;
-      cursor: pointer;
-    }
-
-    .detailed-status__display-name {
-      margin-bottom: 0;
-      text-decoration: none;
-
-      span {
-        color: $highlight-text-color;
-        font-weight: 400;
-      }
-    }
-  }
-}
diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss
index ff3b2c02231490ad50d6bdcedfd6251067cafe1a..e24ba8c1c015dff42f2acfd0f916cc8279b30931 100644
--- a/app/javascript/styles/mastodon/reset.scss
+++ b/app/javascript/styles/mastodon/reset.scss
@@ -53,6 +53,10 @@ table {
   border-spacing: 0;
 }
 
+html {
+  scrollbar-color: lighten($ui-base-color, 4%) transparent;
+}
+
 ::-webkit-scrollbar {
   width: 12px;
   height: 12px;
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index b8c0efad86332435bb87b647571ec2c53565ac20..940dc8af298d529f66f3f420256bc9a1d6b5dba3 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -46,8 +46,8 @@ body.rtl {
   .column-header__buttons {
     left: 0;
     right: auto;
-    margin-left: -15px;
-    margin-right: 0;
+    margin-left: 0;
+    margin-right: -15px;
   }
 
   .column-inline-form .icon-button {
@@ -73,15 +73,11 @@ body.rtl {
     float: left;
   }
 
-  .setting-toggle {
+  .setting-toggle__label {
     margin-left: 0;
     margin-right: 8px;
   }
 
-  .setting-meta__label {
-    float: left;
-  }
-
   .status__avatar {
     left: auto;
     right: 10px;
@@ -134,15 +130,17 @@ body.rtl {
     float: left;
   }
 
-  .activity-stream .detailed-status.light .detailed-status__display-name > div {
-    float: right;
-    margin-right: 0;
-    margin-left: 10px;
-  }
+  .status__action-bar {
 
-  .activity-stream .detailed-status.light .detailed-status__meta span > span {
-    margin-left: 0;
-    margin-right: 6px;
+    &__counter {
+      margin-right: 0;
+      margin-left: 11px;
+
+      .status__action-bar-button {
+        margin-right: 0;
+        margin-left: 4px;
+      }
+    }
   }
 
   .status__action-bar-button {
@@ -165,6 +163,10 @@ body.rtl {
     margin-right: 0;
   }
 
+  .detailed-status__display-name .display-name {
+    text-align: right;
+  }
+
   .detailed-status__display-avatar {
     margin-right: 0;
     margin-left: 10px;
@@ -187,40 +189,73 @@ body.rtl {
     right: -2.14285714em;
   }
 
+  .admin-wrapper {
+    direction: rtl;
+  }
+
   .admin-wrapper .sidebar ul a i.fa,
   a.table-action-link i.fa {
     margin-right: 0;
     margin-left: 5px;
   }
 
-  .simple_form .check_boxes .checkbox label,
-  .simple_form .input.with_label.boolean label.checkbox {
+  .simple_form .check_boxes .checkbox label {
     padding-left: 0;
     padding-right: 25px;
   }
 
+  .simple_form .input.with_label.boolean label.checkbox {
+    padding-left: 25px;
+    padding-right: 0;
+  }
+
   .simple_form .check_boxes .checkbox input[type="checkbox"],
   .simple_form .input.boolean input[type="checkbox"] {
     left: auto;
     right: 0;
   }
 
+  .simple_form .input.radio_buttons .radio {
+    left: auto;
+    right: 0;
+  }
+
+  .simple_form .input.radio_buttons .radio > label {
+    padding-right: 28px;
+    padding-left: 0;
+  }
+
   .simple_form .input-with-append .input input {
     padding-left: 142px;
     padding-right: 0;
   }
 
-  .simple_form .input-with-append .append {
+  .simple_form .input.boolean label.checkbox {
+    left: auto;
+    right: 0;
+  }
+
+  .simple_form .input.boolean .label_input,
+  .simple_form .input.boolean .hint {
+    padding-left: 0;
+    padding-right: 28px;
+  }
+
+  .simple_form .label_input__append {
     right: auto;
-    left: 0;
+    left: 3px;
 
     &::after {
       right: auto;
       left: 0;
-      background-image: linear-gradient(to left, rgba($ui-base-color, 0), $ui-base-color);
+      background-image: linear-gradient(to left, rgba(darken($ui-base-color, 10%), 0), darken($ui-base-color, 10%));
     }
   }
 
+  .simple_form select {
+    background: darken($ui-base-color, 10%) url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 14.933 18.467' height='19.698' width='15.929'><path d='M3.467 14.967l-3.393-3.5H14.86l-3.392 3.5c-1.866 1.925-3.666 3.5-4 3.5-.335 0-2.135-1.575-4-3.5zm.266-11.234L7.467 0 11.2 3.733l3.733 3.734H0l3.733-3.734z' fill='#{hex-color(lighten($ui-base-color, 12%))}'/></svg>") no-repeat left 8px center / auto 16px;
+  }
+
   .table th,
   .table td {
     text-align: right;
@@ -236,6 +271,10 @@ body.rtl {
     left: auto;
   }
 
+  .landing-page__call-to-action .row__information-board {
+    direction: rtl;
+  }
+
   .landing-page .header .hero .floats .float-1 {
     left: -120px;
     right: auto;
@@ -285,4 +324,59 @@ body.rtl {
       }
     }
   }
+
+  .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;
+    text-align: right;
+  }
+
+  .fa-chevron-left::before {
+    content: "\F054";
+  }
+
+  .fa-chevron-right::before {
+    content: "\F053";
+  }
+
+  .column-back-button__icon {
+    margin-right: 0;
+    margin-left: 5px;
+  }
+
+  .column-header__setting-arrows .column-header__setting-btn:last-child {
+    padding-left: 0;
+    padding-right: 10px;
+  }
+
+  .simple_form .input.radio_buttons .radio > label input {
+    left: auto;
+    right: 0;
+  }
 }
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index 9188c22064e69cad315f8f7e1b26856438aa7d7c..d8bd30377286e1af43766e17eaccf0c8a6da55c4 100644
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -1,363 +1,165 @@
 .activity-stream {
-  clear: both;
   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) {
+    margin-bottom: 0;
+    border-radius: 0;
+    box-shadow: none;
+  }
+
+  &--headless {
+    border-radius: 0;
+    margin: 0;
+    box-shadow: none;
+
+    .detailed-status,
+    .status {
+      border-radius: 0 !important;
+    }
+  }
+
+  div[data-component] {
+    width: 100%;
+  }
 
   .entry {
-    background: $simple-background-color;
+    background: $ui-base-color;
 
-    .detailed-status.light,
-    .status.light,
-    .more.light {
-      border-bottom: 1px solid $ui-secondary-color;
+    .detailed-status,
+    .status,
+    .load-more {
       animation: none;
     }
 
     &:last-child {
-      &,
-      .detailed-status.light,
-      .status.light {
+      .detailed-status,
+      .status,
+      .load-more {
         border-bottom: 0;
         border-radius: 0 0 4px 4px;
       }
     }
 
     &:first-child {
-      &,
-      .detailed-status.light,
-      .status.light {
+      .detailed-status,
+      .status,
+      .load-more {
         border-radius: 4px 4px 0 0;
       }
 
       &:last-child {
-        &,
-        .detailed-status.light,
-        .status.light {
+        .detailed-status,
+        .status,
+        .load-more {
           border-radius: 4px;
         }
       }
     }
 
     @media screen and (max-width: 740px) {
-      &,
-      .detailed-status.light,
-      .status.light {
+      .detailed-status,
+      .status,
+      .load-more {
         border-radius: 0 !important;
       }
     }
   }
 
-  &.with-header {
-    .entry {
-      &:first-child {
-        &,
-        .detailed-status.light,
-        .status.light {
-          border-radius: 0;
-        }
-
-        &:last-child {
-          &,
-          .detailed-status.light,
-          .status.light {
-            border-radius: 0 0 4px 4px;
-          }
-        }
-      }
-    }
-  }
-
-  .media-gallery__gifv__label {
-    bottom: 9px;
-  }
-
-  .status.light {
-    padding: 14px 14px 14px (48px + 14px * 2);
-    position: relative;
-    min-height: 48px;
-    cursor: default;
-
-    .status__header {
-      font-size: 15px;
-
-      .status__meta {
-        float: right;
-        font-size: 14px;
-
-        .status__relative-time {
-          color: $lighter-text-color;
-        }
-      }
-    }
-
-    .status__display-name {
-      display: block;
-      max-width: 100%;
-      padding-right: 25px;
-      color: $inverted-text-color;
-    }
-
-    .status__avatar {
-      position: absolute;
-      left: 14px;
-      top: 14px;
-      width: 48px;
-      height: 48px;
-
-      & > div {
-        width: 48px;
-        height: 48px;
-      }
-
-      img {
-        display: block;
-        border-radius: 4px;
-      }
-    }
-
-    .display-name {
-      display: block;
-      max-width: 100%;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-
-      strong {
-        font-weight: 500;
-        color: $inverted-text-color;
-
-        @each $lang in $cjk-langs {
-          &:lang(#{$lang}) {
-            font-weight: 700;
-          }
-        }
-      }
-
-      span {
-        font-size: 14px;
-        color: $light-text-color;
-      }
-    }
-
-    .status__content {
-      color: $inverted-text-color;
-
-      a {
-        color: $highlight-text-color;
-      }
-
-      a.status__content__spoiler-link {
-        color: $primary-text-color;
-        background: $ui-base-color;
-
-        &:hover {
-          background: lighten($ui-base-color, 8%);
-        }
-      }
-    }
+  &--highlighted .entry {
+    background: lighten($ui-base-color, 8%);
   }
+}
 
-  .detailed-status.light {
-    padding: 14px;
-    background: $simple-background-color;
-    cursor: default;
-
-    .detailed-status__display-name {
-      display: block;
-      overflow: hidden;
-      margin-bottom: 15px;
-
-      & > div {
-        float: left;
-        margin-right: 10px;
-      }
-
-      .display-name {
-        display: block;
-        max-width: 100%;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-
-        strong {
-          font-weight: 500;
-          color: $inverted-text-color;
-
-          @each $lang in $cjk-langs {
-            &:lang(#{$lang}) {
-              font-weight: 700;
-            }
-          }
-        }
-
-        span {
-          font-size: 14px;
-          color: $light-text-color;
-        }
-      }
-    }
-
-    .avatar {
-      width: 48px;
-      height: 48px;
-
-      img {
-        display: block;
-        border-radius: 4px;
-      }
-    }
-
-    .status__content {
-      color: $inverted-text-color;
-
-      a {
-        color: $highlight-text-color;
-      }
-
-      a.status__content__spoiler-link {
-        color: $primary-text-color;
-        background: $ui-base-color;
-
-        &:hover {
-          background: lighten($ui-base-color, 8%);
-        }
-      }
-    }
-
-    .detailed-status__meta {
-      margin-top: 15px;
-      color: $light-text-color;
-      font-size: 14px;
-      line-height: 18px;
-
-      a {
-        color: inherit;
-      }
-
-      span > span {
-        font-weight: 500;
-        font-size: 12px;
-        margin-left: 6px;
-        display: inline-block;
-      }
-    }
-
-    .status-card {
-      border-color: lighten($ui-secondary-color, 4%);
-      color: $lighter-text-color;
+.button.logo-button {
+  flex: 0 auto;
+  font-size: 14px;
+  background: $ui-highlight-color;
+  color: $primary-text-color;
+  text-transform: none;
+  line-height: 36px;
+  height: auto;
+  padding: 3px 15px;
+  border: 0;
 
-      &:hover {
-        background: lighten($ui-secondary-color, 4%);
-      }
-    }
+  svg {
+    width: 20px;
+    height: auto;
+    vertical-align: middle;
+    margin-right: 5px;
 
-    .status-card__title,
-    .status-card__description {
-      color: $inverted-text-color;
+    path:first-child {
+      fill: $primary-text-color;
     }
 
-    .status-card__image {
-      background: $ui-secondary-color;
+    path:last-child {
+      fill: $ui-highlight-color;
     }
   }
 
-  .media-spoiler {
-    background: $ui-base-color;
-    color: $darker-text-color;
-  }
+  &:active,
+  &:focus,
+  &:hover {
+    background: lighten($ui-highlight-color, 10%);
 
-  .pre-header {
-    padding: 14px 0;
-    padding-left: (48px + 14px * 2);
-    padding-bottom: 0;
-    margin-bottom: -4px;
-    color: $light-text-color;
-    font-size: 14px;
-    position: relative;
-
-    .pre-header__icon {
-      position: absolute;
-      left: (48px + 14px * 2 - 30px);
-    }
-
-    .status__display-name.muted strong {
-      color: $light-text-color;
+    svg path:last-child {
+      fill: lighten($ui-highlight-color, 10%);
     }
   }
 
-  .open-in-web-link {
-    text-decoration: none;
-
+  &.button--destructive {
+    &:active,
+    &:focus,
     &:hover {
-      text-decoration: underline;
+      background: $error-red;
+
+      svg path:last-child {
+        fill: $error-red;
+      }
     }
   }
 
-  .more {
-    color: $darker-text-color;
-    display: block;
-    padding: 14px;
-    text-align: center;
-
-    &:not(:hover) {
-      text-decoration: none;
+  @media screen and (max-width: $no-gap-breakpoint) {
+    svg {
+      display: none;
     }
   }
 }
 
-.embed {
-  .activity-stream {
-    box-shadow: none;
+.embed,
+.public-layout {
+  .detailed-status {
+    padding: 15px;
   }
-}
 
-.entry {
-  .detailed-status.light {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-    align-items: flex-start;
+  .status {
+    padding: 15px 15px 15px (48px + 15px * 2);
+    min-height: 48px + 2px;
 
-    .detailed-status__display-name {
-      flex: 1;
-      margin: 0 5px 15px 0;
+    &__avatar {
+      left: 15px;
+      top: 17px;
     }
 
-    .button.button-secondary.logo-button {
-      flex: 0 auto;
-      font-size: 14px;
-      background: $ui-highlight-color;
-      color: $primary-text-color;
-      border: 0;
-
-      svg {
-        width: 20px;
-        height: auto;
-        vertical-align: middle;
-        margin-right: 5px;
-
-        path:first-child {
-          fill: $primary-text-color;
-        }
-
-        path:last-child {
-          fill: $ui-highlight-color;
-        }
-      }
+    &__content {
+      padding-top: 5px;
+    }
 
-      &:active,
-      &:focus,
-      &:hover {
-        background: lighten($ui-highlight-color, 10%);
+    &__prepend {
+      margin-left: 48px + 15px * 2;
+      padding-top: 15px;
+    }
 
-        svg path:last-child {
-          fill: lighten($ui-highlight-color, 10%);
-        }
-      }
+    &__prepend-icon-wrapper {
+      left: -32px;
     }
 
-    .status__content,
-    .detailed-status__meta {
-      flex: 100%;
+    .media-gallery,
+    &__action-bar,
+    .video-player {
+      margin-top: 10px;
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index e54c55947e63b3ea0810a20497c503fedcaf4f7d..adb75afe5bdf3f361e8a5a14ce4542f084fd5844 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -1,9 +1,3 @@
-@keyframes Swag {
-  0% { background-position: 0% 0%; }
-  50% { background-position: 100% 0%; }
-  100% { background-position: 200% 0%; }
-}
-
 .table {
   width: 100%;
   max-width: 100%;
@@ -96,7 +90,7 @@
 }
 
 samp {
-  font-family: 'mastodon-font-monospace', monospace;
+  font-family: $font-monospace, monospace;
 }
 
 button.table-action-link {
@@ -191,14 +185,12 @@ a.table-action-link {
   .status__content {
     padding-top: 0;
 
+    summary {
+      display: list-item;
+    }
+
     strong {
       font-weight: 700;
-      background: linear-gradient(to right, orange , yellow, green, cyan, blue, violet,orange , yellow, green, cyan, blue, violet);
-      background-size: 200% 100%;
-      -webkit-background-clip: text;
-      background-clip: text;
-      color: transparent;
-      animation: Swag 2s linear 0s infinite;
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 40aeb4afcfe2cd41654ef82403300ad243ee0bea..a82c44229639dac104e53e8f11452f094a1c8e96 100644
--- a/app/javascript/styles/mastodon/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss
@@ -46,3 +46,9 @@ $cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW;
 $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;
+
+$font-sans-serif: 'mastodon-font-sans-serif' !default;
+$font-display: 'mastodon-font-display' !default;
+$font-monospace: 'mastodon-font-monospace' !default;
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
new file mode 100644
index 0000000000000000000000000000000000000000..c97337e4e3f77c837dd15b7a1f77df44133b92f6
--- /dev/null
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -0,0 +1,517 @@
+.hero-widget {
+  margin-bottom: 10px;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+
+  &__img {
+    width: 100%;
+    height: 167px;
+    position: relative;
+    overflow: hidden;
+    border-radius: 4px 4px 0 0;
+    background: $base-shadow-color;
+
+    img {
+      object-fit: cover;
+      display: block;
+      width: 100%;
+      height: 100%;
+      margin: 0;
+      border-radius: 4px 4px 0 0;
+    }
+  }
+
+  &__text {
+    background: $ui-base-color;
+    padding: 20px;
+    border-radius: 0 0 4px 4px;
+    font-size: 15px;
+    color: $darker-text-color;
+    line-height: 20px;
+    word-wrap: break-word;
+    font-weight: 400;
+
+    .emojione {
+      width: 20px;
+      height: 20px;
+      margin: -3px 0 0;
+    }
+
+    p {
+      margin-bottom: 20px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    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%);
+    }
+
+    a {
+      color: $secondary-text-color;
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    display: none;
+  }
+}
+
+.endorsements-widget {
+  margin-bottom: 10px;
+  padding-bottom: 10px;
+
+  h4 {
+    padding: 10px;
+    text-transform: uppercase;
+    font-weight: 700;
+    font-size: 13px;
+    color: $darker-text-color;
+  }
+
+  .account {
+    padding: 10px 0;
+
+    &:last-child {
+      border-bottom: 0;
+    }
+
+    .account__display-name {
+      display: flex;
+      align-items: center;
+    }
+
+    .account__avatar {
+      width: 44px;
+      height: 44px;
+      background-size: 44px 44px;
+    }
+  }
+}
+
+.box-widget {
+  padding: 20px;
+  border-radius: 4px;
+  background: $ui-base-color;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+}
+
+.contact-widget,
+.landing-page__information.contact-widget {
+  box-sizing: border-box;
+  padding: 20px;
+  min-height: 100%;
+  border-radius: 4px;
+  background: $ui-base-color;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+}
+
+.contact-widget {
+  font-size: 15px;
+  color: $darker-text-color;
+  line-height: 20px;
+  word-wrap: break-word;
+  font-weight: 400;
+
+  strong {
+    font-weight: 500;
+  }
+
+  p {
+    margin-bottom: 10px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  &__mail {
+    margin-top: 10px;
+
+    a {
+      color: $primary-text-color;
+      text-decoration: none;
+    }
+  }
+}
+
+.moved-account-widget {
+  padding: 15px;
+  padding-bottom: 20px;
+  border-radius: 4px;
+  background: $ui-base-color;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+  color: $secondary-text-color;
+  font-weight: 400;
+  margin-bottom: 10px;
+
+  strong,
+  a {
+    font-weight: 500;
+
+    @each $lang in $cjk-langs {
+      &:lang(#{$lang}) {
+        font-weight: 700;
+      }
+    }
+  }
+
+  a {
+    color: inherit;
+    text-decoration: underline;
+
+    &.mention {
+      text-decoration: none;
+
+      span {
+        text-decoration: none;
+      }
+
+      &:focus,
+      &:hover,
+      &:active {
+        text-decoration: none;
+
+        span {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+
+  &__message {
+    margin-bottom: 15px;
+
+    .fa {
+      margin-right: 5px;
+      color: $darker-text-color;
+    }
+  }
+
+  &__card {
+    .detailed-status__display-avatar {
+      position: relative;
+      cursor: pointer;
+    }
+
+    .detailed-status__display-name {
+      margin-bottom: 0;
+      text-decoration: none;
+
+      span {
+        font-weight: 400;
+      }
+    }
+  }
+}
+
+.memoriam-widget {
+  padding: 20px;
+  border-radius: 4px;
+  background: $base-shadow-color;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+  font-size: 14px;
+  color: $darker-text-color;
+  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;
+  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+
+  &__tag {
+    box-sizing: border-box;
+    margin-bottom: 10px;
+
+    a {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background: $ui-base-color;
+      border-radius: 4px;
+      padding: 15px;
+      text-decoration: none;
+      color: inherit;
+      box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+
+      &:hover,
+      &:active,
+      &:focus {
+        background: lighten($ui-base-color, 8%);
+      }
+    }
+
+    &.active a {
+      background: $ui-highlight-color;
+      cursor: default;
+    }
+
+    h4 {
+      flex: 1 1 auto;
+      font-size: 18px;
+      font-weight: 700;
+      color: $primary-text-color;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+
+      .fa {
+        color: $darker-text-color;
+      }
+
+      small {
+        display: block;
+        font-weight: 400;
+        font-size: 15px;
+        margin-top: 8px;
+        color: $darker-text-color;
+      }
+    }
+
+    &.active h4 {
+      &,
+      .fa,
+      small {
+        color: $primary-text-color;
+      }
+    }
+
+    .avatar-stack {
+      flex: 0 0 auto;
+      width: (36px + 4px) * 3;
+    }
+
+    &.active .avatar-stack .account__avatar {
+      border-color: $ui-highlight-color;
+    }
+  }
+}
+
+.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;
+    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%;
+
+  .account {
+    padding: 0;
+    border: 0;
+  }
+
+  thead th {
+    text-align: center;
+    text-transform: uppercase;
+    color: $darker-text-color;
+    font-weight: 700;
+    padding: 10px;
+
+    &:first-child {
+      text-align: left;
+    }
+  }
+
+  tbody td {
+    padding: 15px 0;
+    vertical-align: middle;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+  }
+
+  tbody tr:last-child td {
+    border-bottom: 0;
+  }
+
+  &__count {
+    width: 120px;
+    text-align: center;
+    font-size: 15px;
+    font-weight: 500;
+    color: $primary-text-color;
+
+    small {
+      display: block;
+      color: $darker-text-color;
+      font-weight: 400;
+      font-size: 14px;
+    }
+  }
+
+  @media screen and (max-width: $no-gap-breakpoint) {
+    tbody td.optional {
+      display: none;
+    }
+  }
+}
+
+.moved-account-widget,
+.memoriam-widget,
+.box-widget,
+.contact-widget,
+.landing-page__information.contact-widget,
+.directory,
+.page-header {
+  @media screen and (max-width: $no-gap-breakpoint) {
+    margin-bottom: 0;
+    box-shadow: none;
+    border-radius: 0;
+  }
+}
+
+$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: (960px - 20px) / 3;
+
+    @media screen and (max-width: $fluid-breakpoint) {
+      width: (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;
+    text-decoration: none;
+    font-weight: 500;
+    color: $ui-highlight-color;
+
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: underline;
+    }
+  }
+}
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 03476920b265adac918cd91254c3506e9192cceb..87318fb1c5c33b9fb977e285b4cac5f9a082e7bf 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -50,6 +50,8 @@ class ActivityPub::Activity
         ActivityPub::Activity::Add
       when 'Remove'
         ActivityPub::Activity::Remove
+      when 'Move'
+        ActivityPub::Activity::Move
       end
     end
   end
@@ -96,7 +98,7 @@ class ActivityPub::Activity
   end
 
   def notify_about_mentions(status)
-    status.mentions.includes(:account).each do |mention|
+    status.active_mentions.includes(:account).each do |mention|
       next unless mention.account.local? && audience_includes?(mention.account)
       NotifyService.new.call(mention.account, mention)
     end
@@ -104,7 +106,9 @@ class ActivityPub::Activity
 
   def crawl_links(status)
     return if status.spoiler_text?
-    LinkCrawlWorker.perform_async(status.id)
+
+    # Spread out crawling randomly to avoid DDoSing the link
+    LinkCrawlWorker.perform_in(rand(1..59).seconds, status.id)
   end
 
   def distribute_to_followers(status)
@@ -127,4 +131,10 @@ class ActivityPub::Activity
       ::FetchRemoteStatusService.new.call(@object['url'])
     end
   end
+
+  def lock_or_return(key, expire_after = 7.days.seconds)
+    yield if redis.set(key, true, nx: true, ex: expire_after)
+  ensure
+    redis.del(key)
+  end
 end
diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb
index bd90c901944f08ed3ff4ce46b9578d20cc98d13a..348ee0d1cb3ef27ea9ccc559c18fc2ac8dadb3a7 100644
--- a/app/lib/activitypub/activity/accept.rb
+++ b/app/lib/activitypub/activity/accept.rb
@@ -11,6 +11,8 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
   private
 
   def accept_follow
+    return accept_follow_for_relay if relay_follow?
+
     target_account = account_from_uri(target_uri)
 
     return if target_account.nil? || !target_account.local?
@@ -19,6 +21,18 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
     follow_request&.authorize!
   end
 
+  def accept_follow_for_relay
+    relay.update!(state: :accepted)
+  end
+
+  def relay
+    @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
+  end
+
+  def relay_follow?
+    relay.present?
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['actor'])
   end
diff --git a/app/lib/activitypub/activity/announce.rb b/app/lib/activitypub/activity/announce.rb
index 1147a4481fd02466ae01d7322ed79bfbba434224..34d1b7cbd0fe1f04f1a5fda453f1f95056e9a6a2 100644
--- a/app/lib/activitypub/activity/announce.rb
+++ b/app/lib/activitypub/activity/announce.rb
@@ -17,7 +17,7 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
       uri: @json['id'],
       created_at: @json['published'],
       override_timestamps: @options[:override_timestamps],
-      visibility: original_status.visibility
+      visibility: visibility_from_audience
     )
 
     distribute(status)
@@ -26,6 +26,18 @@ class ActivityPub::Activity::Announce < ActivityPub::Activity
 
   private
 
+  def visibility_from_audience
+    if equals_or_includes?(@json['to'], ActivityPub::TagManager::COLLECTIONS[:public])
+      :public
+    elsif equals_or_includes?(@json['cc'], ActivityPub::TagManager::COLLECTIONS[:public])
+      :unlisted
+    elsif equals_or_includes?(@json['to'], @account.followers_url)
+      :private
+    else
+      :direct
+    end
+  end
+
   def announceable?(status)
     status.account_id == @account.id || status.public_visibility? || status.unlisted_visibility?
   end
diff --git a/app/lib/activitypub/activity/block.rb b/app/lib/activitypub/activity/block.rb
index 26da8bdf5c46edf16b53b2946d19b137d3cd90fe..a17a2d50a6af0a738b2c36f41bae3afa5dcf309a 100644
--- a/app/lib/activitypub/activity/block.rb
+++ b/app/lib/activitypub/activity/block.rb
@@ -4,9 +4,10 @@ class ActivityPub::Activity::Block < ActivityPub::Activity
   def perform
     target_account = account_from_uri(object_uri)
 
-    return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.blocking?(target_account)
+    return if target_account.nil? || !target_account.local? || @account.blocking?(target_account)
 
     UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
-    @account.block!(target_account, uri: @json['id'])
+
+    @account.block!(target_account, uri: @json['id']) unless delete_arrived_first?(@json['id'])
   end
 end
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 00479fd9a5ddff1b5f8e587c3fee858aa09b34cc..b49657d4b14625238630ae3b2c07956f90a6225e 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -2,15 +2,23 @@
 
 class ActivityPub::Activity::Create < ActivityPub::Activity
   SUPPORTED_TYPES = %w(Note).freeze
-  CONVERTED_TYPES = %w(Image Video Article).freeze
+  CONVERTED_TYPES = %w(Image Video Article Page).freeze
 
   def perform
-    return if delete_arrived_first?(object_uri) || unsupported_object_type? || invalid_origin?(@object['id'])
+    return if unsupported_object_type? || invalid_origin?(@object['id'])
+    return if Tombstone.exists?(uri: @object['id'])
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
+        return if delete_arrived_first?(object_uri)
+
         @status = find_existing_status
-        process_status if @status.nil?
+
+        if @status.nil?
+          process_status
+        elsif @options[:delivered_to_account_id].present?
+          postprocess_audience_and_deliver
+        end
       else
         raise Mastodon::RaceConditionError
       end
@@ -22,12 +30,17 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   private
 
   def process_status
-    status_params = process_status_params
+    @tags     = []
+    @mentions = []
+    @params   = {}
 
-    ApplicationRecord.transaction do
-      @status = Status.create!(status_params)
+    process_status_params
+    process_tags
+    process_audience
 
-      process_tags(@status)
+    ApplicationRecord.transaction do
+      @status = Status.create!(@params)
+      attach_tags(@status)
     end
 
     resolve_thread(@status)
@@ -42,62 +55,122 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_status_params
-    {
-      uri: @object['id'],
-      url: object_url || @object['id'],
-      account: @account,
-      text: text_from_content || '',
-      language: detected_language,
-      spoiler_text: @object['summary'] || '',
-      created_at: @object['published'],
-      override_timestamps: @options[:override_timestamps],
-      reply: @object['inReplyTo'].present?,
-      sensitive: @object['sensitive'] || false,
-      visibility: visibility_from_audience,
-      thread: replied_to_status,
-      conversation: conversation_from_uri(@object['conversation']),
-      media_attachment_ids: process_attachments.take(4).map(&:id),
-    }
-  end
-
-  def process_tags(status)
+    @params = begin
+      {
+        uri: @object['id'],
+        url: object_url || @object['id'],
+        account: @account,
+        text: text_from_content || '',
+        language: detected_language,
+        spoiler_text: converted_object_type? ? '' : (text_from_summary || ''),
+        created_at: @object['published'],
+        override_timestamps: @options[:override_timestamps],
+        reply: @object['inReplyTo'].present?,
+        sensitive: @object['sensitive'] || false,
+        visibility: visibility_from_audience,
+        thread: replied_to_status,
+        conversation: conversation_from_uri(@object['conversation']),
+        media_attachment_ids: process_attachments.take(4).map(&:id),
+      }
+    end
+  end
+
+  def process_audience
+    (as_array(@object['to']) + as_array(@object['cc'])).uniq.each do |audience|
+      next if audience == ActivityPub::TagManager::COLLECTIONS[:public]
+
+      # 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)
+
+      next if account.nil? || @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
+    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
+  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)
+  end
+
+  def attach_tags(status)
+    @tags.each do |tag|
+      status.tags << tag
+      TrendingTags.record_use!(tag, status.account, status.created_at) if status.public_visibility?
+    end
+
+    @mentions.each do |mention|
+      mention.status = status
+      mention.save
+    end
+  end
+
+  def process_tags
     return if @object['tag'].nil?
 
     as_array(@object['tag']).each do |tag|
       if equals_or_includes?(tag['type'], 'Hashtag')
-        process_hashtag tag, status
+        process_hashtag tag
       elsif equals_or_includes?(tag['type'], 'Mention')
-        process_mention tag, status
+        process_mention tag
       elsif equals_or_includes?(tag['type'], 'Emoji')
-        process_emoji tag, status
+        process_emoji tag
       end
     end
   end
 
-  def process_hashtag(tag, status)
+  def process_hashtag(tag)
     return if tag['name'].blank?
 
     hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase
-    hashtag = Tag.where(name: hashtag).first_or_create(name: hashtag)
+    hashtag = Tag.where(name: hashtag).first_or_create!(name: hashtag)
 
-    return if status.tags.include?(hashtag)
+    return if @tags.include?(hashtag)
 
-    status.tags << hashtag
-    TrendingTags.record_use!(hashtag, status.account, status.created_at) if status.public_visibility?
+    @tags << hashtag
   rescue ActiveRecord::RecordInvalid
     nil
   end
 
-  def process_mention(tag, status)
+  def process_mention(tag)
     return if tag['href'].blank?
 
     account = account_from_uri(tag['href'])
-    account = FetchRemoteAccountService.new.call(tag['href'], id: false) if account.nil?
+    account = ::FetchRemoteAccountService.new.call(tag['href'], id: false) if account.nil?
+
     return if account.nil?
-    account.mentions.create(status: status)
+
+    @mentions << Mention.new(account: account, silent: false)
   end
 
-  def process_emoji(tag, _status)
+  def process_emoji(tag)
     return if skip_download?
     return if tag['name'].blank? || tag['icon'].blank? || tag['icon']['url'].blank?
 
@@ -107,7 +180,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     updated   = tag['updated']
     emoji     = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
 
-    return unless emoji.nil? || emoji.updated_at >= updated
+    return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
 
     emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
     emoji.image_remote_url = image_url
@@ -140,7 +213,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def resolve_thread(status)
-    return unless status.reply? && status.thread.nil?
+    return unless status.reply? && status.thread.nil? && Request.valid_url?(in_reply_to_uri)
     ThreadResolveWorker.perform_async(status.id, in_reply_to_uri)
   end
 
@@ -184,7 +257,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def text_from_content
-    return Formatter.instance.linkify([text_from_name, object_url || @object['id']].join(' ')) if converted_object_type?
+    return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || @object['id']].join(' ')) if converted_object_type?
 
     if @object['content'].present?
       @object['content']
@@ -193,6 +266,14 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     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']
@@ -206,6 +287,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       @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
@@ -223,6 +306,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     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
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 3474d55d94735f161059f72a8390fba3a56ba3cf..dc76dd3e222ca3e8fd07816d4df4c8530f038121 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -12,16 +12,23 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   private
 
   def delete_person
-    SuspendAccountService.new.call(@account)
-    @account.destroy!
+    lock_or_return("delete_in_progress:#{@account.id}") do
+      SuspendAccountService.new.call(@account)
+      @account.destroy!
+    end
   end
 
   def delete_note
+    return if object_uri.nil?
+
+    unless invalid_origin?(object_uri)
+      RedisLock.acquire(lock_options) { |_lock| delete_later!(object_uri) }
+      Tombstone.find_or_create_by(uri: object_uri, account: @account)
+    end
+
     @status   = Status.find_by(uri: object_uri, account: @account)
     @status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
 
-    delete_later!(object_uri)
-
     return if @status.nil?
 
     if @status.public_visibility? || @status.unlisted_visibility?
@@ -64,4 +71,17 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
   def payload
     @payload ||= Oj.dump(@json)
   end
+
+  def lock_options
+    { redis: Redis.current, key: "create:#{object_uri}" }
+  end
+
+  def invalid_origin?(url)
+    return true if unsupported_uri_scheme?(url)
+
+    needle   = Addressable::URI.parse(url).host
+    haystack = Addressable::URI.parse(@account.uri).host
+
+    !haystack.casecmp(needle).zero?
+  end
 end
diff --git a/app/lib/activitypub/activity/flag.rb b/app/lib/activitypub/activity/flag.rb
index 36d3c57300c945f51b3da6a7cb48d721e37dab9d..0d10d6c3c93557fcab03cf387975c346eae4a750 100644
--- a/app/lib/activitypub/activity/flag.rb
+++ b/app/lib/activitypub/activity/flag.rb
@@ -2,12 +2,12 @@
 
 class ActivityPub::Activity::Flag < ActivityPub::Activity
   def perform
+    return if skip_reports?
+
     target_accounts            = object_uris.map { |uri| account_from_uri(uri) }.compact.select(&:local?)
     target_statuses_by_account = object_uris.map { |uri| status_from_uri(uri) }.compact.select(&:local?).group_by(&:account_id)
 
     target_accounts.each do |target_account|
-      next if Report.where(account: @account, target_account: target_account).exists?
-
       target_statuses = target_statuses_by_account[target_account.id]
 
       ReportService.new.call(
@@ -19,6 +19,12 @@ class ActivityPub::Activity::Flag < ActivityPub::Activity
     end
   end
 
+  private
+
+  def skip_reports?
+    DomainBlock.find_by(domain: @account.domain)&.reject_reports?
+  end
+
   def object_uris
     @object_uris ||= Array(@object.is_a?(Array) ? @object.map { |item| value_or_id(item) } : value_or_id(@object))
   end
diff --git a/app/lib/activitypub/activity/follow.rb b/app/lib/activitypub/activity/follow.rb
index 826dcf18ef27d76f3ff71304f04fff4c3db17259..1e805c0d1758fa4349ff89de051b2cc3f66a0afe 100644
--- a/app/lib/activitypub/activity/follow.rb
+++ b/app/lib/activitypub/activity/follow.rb
@@ -6,14 +6,14 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
 
     return if target_account.nil? || !target_account.local? || delete_arrived_first?(@json['id']) || @account.requested?(target_account)
 
-    if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain)
+    if target_account.blocking?(@account) || target_account.domain_blocking?(@account.domain) || target_account.moved?
       reject_follow_request!(target_account)
       return
     end
 
     # Fast-forward repeat follow requests
     if @account.following?(target_account)
-      AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true)
+      AuthorizeFollowService.new.call(@account, target_account, skip_follow_request: true, follow_request_uri: @json['id'])
       return
     end
 
@@ -28,7 +28,7 @@ class ActivityPub::Activity::Follow < ActivityPub::Activity
   end
 
   def reject_follow_request!(target_account)
-    json = Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).as_json).sign!(target_account))
+    json = ActiveModelSerializers::SerializableResource.new(FollowRequest.new(account: @account, target_account: target_account, uri: @json['id']), serializer: ActivityPub::RejectFollowSerializer, adapter: ActivityPub::Adapter).to_json
     ActivityPub::DeliveryWorker.perform_async(json, target_account.id, @account.inbox_url)
   end
 end
diff --git a/app/lib/activitypub/activity/move.rb b/app/lib/activitypub/activity/move.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d7a5f595cc1c6707ce247fb6f5dafa1a924f6dd6
--- /dev/null
+++ b/app/lib/activitypub/activity/move.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class ActivityPub::Activity::Move < ActivityPub::Activity
+  PROCESSING_COOLDOWN = 7.days.seconds
+
+  def perform
+    return if origin_account.uri != object_uri || processed?
+
+    mark_as_processing!
+
+    target_account = ActivityPub::FetchRemoteAccountService.new.call(target_uri)
+
+    return if target_account.nil? || !target_account.also_known_as.include?(origin_account.uri)
+
+    # In case for some reason we didn't have a redirect for the profile already, set it
+    origin_account.update(moved_to_account: target_account) if origin_account.moved_to_account_id.nil?
+
+    # Initiate a re-follow for each follower
+    origin_account.followers.local.select(:id).find_in_batches do |follower_accounts|
+      UnfollowFollowWorker.push_bulk(follower_accounts.map(&:id)) do |follower_account_id|
+        [follower_account_id, origin_account.id, target_account.id]
+      end
+    end
+  end
+
+  private
+
+  def origin_account
+    @account
+  end
+
+  def target_uri
+    value_or_id(@json['target'])
+  end
+
+  def processed?
+    redis.exists("move_in_progress:#{@account.id}")
+  end
+
+  def mark_as_processing!
+    redis.setex("move_in_progress:#{@account.id}", PROCESSING_COOLDOWN, true)
+  end
+end
diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
index 28d472883f2748be37385033f1106e9d4c6ea79c..dba21fb9a7d896c23a7a385f935b72f34fb31b40 100644
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@@ -11,6 +11,8 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
   private
 
   def reject_follow
+    return reject_follow_for_relay if relay_follow?
+
     target_account = account_from_uri(target_uri)
 
     return if target_account.nil? || !target_account.local?
@@ -21,6 +23,18 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
     UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
   end
 
+  def reject_follow_for_relay
+    relay.update!(state: :rejected)
+  end
+
+  def relay
+    @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
+  end
+
+  def relay_follow?
+    relay.present?
+  end
+
   def target_uri
     @target_uri ||= value_or_id(@object['actor'])
   end
diff --git a/app/lib/activitypub/activity/undo.rb b/app/lib/activitypub/activity/undo.rb
index cbed417c4e850ec97ab7b5c07fea2d166d297e00..599823c6e25db8ffac3ed5c1a513e92ef40bf7a8 100644
--- a/app/lib/activitypub/activity/undo.rb
+++ b/app/lib/activitypub/activity/undo.rb
@@ -5,6 +5,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
     case @object['type']
     when 'Announce'
       undo_announce
+    when 'Accept'
+      undo_accept
     when 'Follow'
       undo_follow
     when 'Like'
@@ -17,6 +19,8 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
   private
 
   def undo_announce
+    return if object_uri.nil?
+
     status   = Status.find_by(uri: object_uri, account: @account)
     status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
 
@@ -27,6 +31,10 @@ class ActivityPub::Activity::Undo < ActivityPub::Activity
     end
   end
 
+  def undo_accept
+    ::Follow.find_by(target_account: @account, uri: target_uri)&.revoke_request!
+  end
+
   def undo_follow
     target_account = account_from_uri(target_uri)
 
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index aa5907f033d5951fdee091af9137a28c3f8dc25e..67dae3f81388a87c6ebfee0d54c6a4334ecfaa21 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -11,6 +11,7 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
 
   def update_account
     return if @account.uri != object_uri
-    ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object)
+
+    ActivityPub::ProcessAccountService.new.call(@account.username, @account.domain, @object, signed_with_known_key: true)
   end
 end
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index e880499f1a621284784c0434dd81536ce43b74c9..99f4d93055403d39b8ebfb7e1b9d7eea861c08e5 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -9,7 +9,8 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
       {
         'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
         'sensitive'                 => 'as:sensitive',
-        'movedTo'                   => 'as:movedTo',
+        'movedTo'                   => { '@id' => 'as:movedTo', '@type' => '@id' },
+        'alsoKnownAs'               => { '@id' => 'as:alsoKnownAs', '@type' => '@id' },
         'Hashtag'                   => 'as:Hashtag',
         'ostatus'                   => 'http://ostatus.org#',
         'atomUri'                   => 'ostatus:atomUri',
@@ -18,7 +19,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
         'toot'                      => 'http://joinmastodon.org/ns#',
         'Emoji'                     => 'toot:Emoji',
         'focalPoint'                => { '@container' => '@list', '@id' => 'toot:focalPoint' },
-        'featured'                  => 'toot:featured',
+        'featured'                  => { '@id' => 'toot:featured', '@type' => '@id' },
         'schema'                    => 'http://schema.org#',
         'PropertyValue'             => 'schema:PropertyValue',
         'value'                     => 'schema:value',
diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb
index 16142a6ff474811c9ee62508f4c62df725fb6e42..f52a8f406fde3dfd07d7830fe32c929418222346 100644
--- a/app/lib/activitypub/linked_data_signature.rb
+++ b/app/lib/activitypub/linked_data_signature.rb
@@ -32,7 +32,7 @@ class ActivityPub::LinkedDataSignature
     end
   end
 
-  def sign!(creator)
+  def sign!(creator, sign_with: nil)
     options = {
       'type'    => 'RsaSignature2017',
       'creator' => [ActivityPub::TagManager.instance.uri_for(creator), '#main-key'].join,
@@ -42,8 +42,9 @@ class ActivityPub::LinkedDataSignature
     options_hash  = hash(options.without('type', 'id', 'signatureValue').merge('@context' => CONTEXT))
     document_hash = hash(@json.without('signature'))
     to_be_signed  = options_hash + document_hash
+    keypair       = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : creator.keypair
 
-    signature = Base64.strict_encode64(creator.keypair.sign(OpenSSL::Digest::SHA256.new, to_be_signed))
+    signature = Base64.strict_encode64(keypair.sign(OpenSSL::Digest::SHA256.new, to_be_signed))
 
     @json.merge('signature' => options.merge('signatureValue' => signature))
   end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 95d1cf9f35326d7ea64016fcdce55b1a1e784d26..be3a562d00cdf46ec9b758f42389016673cddcc7 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -58,8 +58,8 @@ class ActivityPub::TagManager
       [COLLECTIONS[:public]]
     when 'unlisted', 'private'
       [account_followers_url(status.account)]
-    when 'direct'
-      status.mentions.map { |mention| uri_for(mention.account) }
+    when 'direct', 'limited'
+      status.active_mentions.map { |mention| uri_for(mention.account) }
     end
   end
 
@@ -80,7 +80,7 @@ class ActivityPub::TagManager
       cc << COLLECTIONS[:public]
     end
 
-    cc.concat(status.mentions.map { |mention| uri_for(mention.account) }) unless status.direct_visibility?
+    cc.concat(status.active_mentions.map { |mention| uri_for(mention.account) }) unless status.direct_visibility? || status.limited_visibility?
 
     cc
   end
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb
index 2aa37389ca627eac780758a07c3813ce26cd476a..8fff544a054a35743d69b774926f0843f4af2ef0 100644
--- a/app/lib/entity_cache.rb
+++ b/app/lib/entity_cache.rb
@@ -21,7 +21,7 @@ class EntityCache
     end
 
     unless uncached_ids.empty?
-      uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).map { |item| [item.shortcode, item] }.to_h
+      uncached = CustomEmoji.where(shortcode: shortcodes, domain: domain, disabled: false).each_with_object({}) { |item, h| h[item.shortcode] = item }
       uncached.each_value { |item| Rails.cache.write(to_key(:emoji, item.shortcode, domain), item, expires_in: MAX_EXPIRATION) }
     end
 
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 14cba70dcf3d74df68a523200172a3e47c25a846..f99df33e54f0d2d61104a8bbc1029008eb3f5b0d 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -27,7 +27,7 @@ class FeedManager
   end
 
   def push_to_home(account, status)
-    return false unless add_to_feed(:home, account.id, status)
+    return false unless add_to_feed(:home, account.id, status, 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}")
     true
@@ -40,7 +40,12 @@ class FeedManager
   end
 
   def push_to_list(list, status)
-    return false unless add_to_feed(:list, list.id, status)
+    if status.reply? && status.in_reply_to_account_id != status.account_id
+      should_filter = status.in_reply_to_account_id != list.account_id
+      should_filter &&= !ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?
+      return false if should_filter
+    end
+    return false unless add_to_feed(:list, list.id, status, 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}")
     true
@@ -87,8 +92,8 @@ class FeedManager
     end
 
     query.each do |status|
-      next if status.direct_visibility? || filter?(:home, status, into_account)
-      add_to_feed(:home, into_account.id, status)
+      next if status.direct_visibility? || status.limited_visibility? || filter?(:home, status, into_account)
+      add_to_feed(:home, into_account.id, status, into_account.user&.aggregates_reblogs?)
     end
 
     trim(:home, into_account.id)
@@ -126,7 +131,7 @@ class FeedManager
 
       statuses.each do |status|
         next if filter_from_home?(status, account)
-        added += 1 if add_to_feed(:home, account.id, status)
+        added += 1 if add_to_feed(:home, account.id, status, account.user&.aggregates_reblogs?)
       end
 
       break unless added.zero?
@@ -155,12 +160,12 @@ class FeedManager
     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)
 
-    check_for_blocks = status.mentions.pluck(:account_id)
+    check_for_blocks = status.active_mentions.pluck(:account_id)
     check_for_blocks.concat([status.account_id])
 
     if status.reblog?
       check_for_blocks.concat([status.reblog.account_id])
-      check_for_blocks.concat(status.reblog.mentions.pluck(:account_id))
+      check_for_blocks.concat(status.reblog.active_mentions.pluck(:account_id))
     end
 
     return true if blocks_or_mutes?(receiver_id, check_for_blocks, :home)
@@ -187,7 +192,7 @@ class FeedManager
     # This filter is called from NotifyService, but already after the sender of
     # the notification has been checked for mute/block. Therefore, it's not
     # necessary to check the author of the toot for mute/block again
-    check_for_blocks = status.mentions.pluck(:account_id)
+    check_for_blocks = status.active_mentions.pluck(:account_id)
     check_for_blocks.concat([status.in_reply_to_account]) if status.reply? && !status.in_reply_to_account_id.nil?
 
     should_filter   = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions)                                                         # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
@@ -225,11 +230,11 @@ class FeedManager
   # added, and false if it was not added to the feed. Note that this is
   # an internal helper: callers must call trim or push updates if
   # either action is appropriate.
-  def add_to_feed(timeline_type, account_id, status)
+  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')
 
-    if status.reblog?
+    if status.reblog? && (aggregate_reblogs.nil? || aggregate_reblogs)
       # If the original status or a reblog of it is within
       # REBLOG_FALLOFF statuses from the top, do not re-insert it into
       # the feed
@@ -288,7 +293,7 @@ class FeedManager
       # remains in the set. We could pick a random element, but this
       # set should generally be small, and it seems ideal to show the
       # oldest potential such reblog.
-      other_reblog = redis.smembers(reblog_set_key).map(&:to_i).sort.first
+      other_reblog = redis.smembers(reblog_set_key).map(&:to_i).min
 
       redis.zadd(timeline_key, other_reblog, other_reblog) if other_reblog
 
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index e1ab05cc0bf769241b050c54a3ac96a92fcfb93b..05fd9eeb1261abeeb9bcbb1dbc046c5a385f9cfd 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -23,17 +23,17 @@ class Formatter
 
     unless status.local?
       html = reformat(raw_content)
-      html = encode_custom_emojis(html, status.emojis) if options[:custom_emojify]
+      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.mentions.map(&:account)
+    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) if options[:custom_emojify]
+    html = encode_custom_emojis(html, status.emojis, options[:autoplay]) if options[:custom_emojify]
     html = simple_format(html, {}, sanitize: false)
     html = html.delete("\n")
 
@@ -53,7 +53,7 @@ class Formatter
 
   def simplified_format(account, **options)
     html = account.local? ? linkify(account.note) : reformat(account.note)
-    html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify]
+    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
@@ -61,22 +61,22 @@ class Formatter
     Sanitize.fragment(html, config)
   end
 
-  def format_spoiler(status)
+  def format_spoiler(status, **options)
     html = encode(status.spoiler_text)
-    html = encode_custom_emojis(html, status.emojis)
+    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) if options[:custom_emojify]
+    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)
     return reformat(str).html_safe unless account.local? # rubocop:disable Rails/OutputSafety
     html = encode_and_link_urls(str, me: true)
-    html = encode_custom_emojis(html, account.emojis) if options[:custom_emojify]
+    html = encode_custom_emojis(html, account.emojis, options[:autoplay]) if options[:custom_emojify]
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
 
@@ -90,8 +90,12 @@ class Formatter
 
   private
 
+  def html_entities
+    @html_entities ||= HTMLEntities.new
+  end
+
   def encode(html)
-    HTMLEntities.new.encode(html)
+    html_entities.encode(html)
   end
 
   def encode_and_link_urls(html, accounts = nil, options = {})
@@ -120,10 +124,14 @@ class Formatter
     end
   end
 
-  def encode_custom_emojis(html, emojis)
+  def encode_custom_emojis(html, emojis, animate = false)
     return html if emojis.empty?
 
-    emoji_map = emojis.map { |e| [e.shortcode, full_asset_url(e.image.url(:static))] }.to_h
+    emoji_map = if animate
+                  emojis.each_with_object({}) { |e, h| h[e.shortcode] = full_asset_url(e.image.url) }
+                else
+                  emojis.each_with_object({}) { |e, h| h[e.shortcode] = full_asset_url(e.image.url(:static)) }
+                end
 
     i                     = -1
     tag_open_index        = nil
@@ -139,7 +147,7 @@ class Formatter
         emoji     = emoji_map[shortcode]
 
         if emoji
-          replacement = "<img draggable=\"false\" class=\"emojione\" alt=\":#{shortcode}:\" title=\":#{shortcode}:\" src=\"#{emoji}\" />"
+          replacement = "<img draggable=\"false\" class=\"emojione\" alt=\":#{encode(shortcode)}:\" title=\":#{encode(shortcode)}:\" src=\"#{encode(emoji)}\" />"
           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
@@ -208,7 +216,7 @@ class Formatter
     return link_to_account(acct) unless linkable_accounts
 
     account = linkable_accounts.find { |item| TagManager.instance.same_acct?(item.acct, acct) }
-    account ? mention_html(account) : "@#{acct}"
+    account ? mention_html(account) : "@#{encode(acct)}"
   end
 
   def link_to_account(acct)
@@ -217,7 +225,7 @@ class Formatter
     domain  = nil if TagManager.instance.local_domain?(domain)
     account = EntityCache.instance.mention(username, domain)
 
-    account ? mention_html(account) : "@#{acct}"
+    account ? mention_html(account) : "@#{encode(acct)}"
   end
 
   def link_to_hashtag(entity)
@@ -235,10 +243,10 @@ class Formatter
   end
 
   def hashtag_html(tag)
-    "<a href=\"#{tag_url(tag.downcase)}\" class=\"mention hashtag\" rel=\"tag\">#<span>#{tag}</span></a>"
+    "<a href=\"#{encode(tag_url(tag.downcase))}\" class=\"mention hashtag\" rel=\"tag\">#<span>#{encode(tag)}</span></a>"
   end
 
   def mention_html(account)
-    "<span class=\"h-card\"><a href=\"#{TagManager.instance.url_for(account)}\" class=\"u-url mention\">@<span>#{account.username}</span></a></span>"
+    "<span class=\"h-card\"><a href=\"#{encode(TagManager.instance.url_for(account))}\" class=\"u-url mention\">@<span>#{encode(account.username)}</span></a></span>"
   end
 end
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index 7cd9758ece561b114135a2c9d3c9387f77a9dd78..761a8822dfb9df720271c6803416bba2f8a6c739 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -13,6 +13,8 @@ class InlineRenderer
       serializer = REST::StatusSerializer
     when :notification
       serializer = REST::NotificationSerializer
+    when :conversation
+      serializer = REST::ConversationSerializer
     else
       return
     end
diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb
index c6f52f0c7eadb807d08f76d0010fcdb971c13601..58c8e206940ab3c3bd584be0ae84dd903fa45ffb 100644
--- a/app/lib/language_detector.rb
+++ b/app/lib/language_detector.rb
@@ -3,12 +3,17 @@
 class LanguageDetector
   include Singleton
 
+  CHARACTER_THRESHOLD = 140
+
   def initialize
     @identifier = CLD3::NNetLanguageIdentifier.new(1, 2048)
   end
 
   def detect(text, account)
-    detect_language_code(text) || default_locale(account)
+    input_text = prepare_text(text)
+    return if input_text.blank?
+
+    detect_language_code(input_text) || default_locale(account)
   end
 
   def language_names
@@ -23,8 +28,14 @@ class LanguageDetector
     simplify_text(text).strip
   end
 
+  def unreliable_input?(text)
+    text.size < CHARACTER_THRESHOLD
+  end
+
   def detect_language_code(text)
-    result = @identifier.find_language(prepare_text(text))
+    return if unreliable_input?(text)
+
+    result = @identifier.find_language(text)
     iso6391(result.language.to_s).to_sym if result.reliable?
   end
 
@@ -66,6 +77,6 @@ class LanguageDetector
   end
 
   def default_locale(account)
-    account.user_locale&.to_sym
+    return account.user_locale&.to_sym || I18n.default_locale if account.local?
   end
 end
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index d3a303a0c4896f23edeaf68db9a7ab77f622c4a0..3840c8fbfed5b6507419ca5d8d4f07ae902ad66f 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -7,7 +7,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
       return [nil, false]
     end
 
-    return [nil, false] if @account.suspended?
+    return [nil, false] if @account.suspended? || invalid_origin?
 
     RedisLock.acquire(lock_options) do |lock|
       if lock.acquired?
@@ -57,7 +57,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
       save_emojis(status)
     end
 
-    if thread? && status.thread.nil?
+    if thread? && status.thread.nil? && Request.valid_url?(thread.second)
       Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"
       ThreadResolveWorker.perform_async(status.id, thread.second)
     end
@@ -204,6 +204,15 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
     end
   end
 
+  def invalid_origin?
+    return false unless id.start_with?('http') # Legacy IDs cannot be checked
+
+    needle = Addressable::URI.parse(id).normalized_host
+
+    !(needle.casecmp(@account.domain).zero? ||
+      needle.casecmp(Addressable::URI.parse(@account.remote_url.presence || @account.uri).normalized_host).zero?)
+  end
+
   def lock_options
     { redis: Redis.current, key: "create:#{id}" }
   end
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 5c6ff4f9b9fd04b5d4bf42e30b79a3de3ea9d013..7a181fb404563e0fa845b3138611b253b2b3fde4 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -352,9 +352,9 @@ class OStatus::AtomSerializer
     append_element(entry, 'link', nil, rel: :alternate, type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(status)) if status.account.local?
 
     append_element(entry, 'summary', status.spoiler_text, 'xml:lang': status.language) if status.spoiler_text?
-    append_element(entry, 'content', Formatter.instance.format(status).to_str, type: 'html', 'xml:lang': status.language)
+    append_element(entry, 'content', Formatter.instance.format(status).to_str || '.', type: 'html', 'xml:lang': status.language)
 
-    status.mentions.sort_by(&:id).each do |mentioned|
+    status.active_mentions.sort_by(&:id).each do |mentioned|
       append_element(entry, 'link', nil, rel: :mentioned, 'ostatus:object-type': OStatus::TagManager::TYPES[:person], href: OStatus::TagManager.instance.uri_for(mentioned.account))
     end
 
diff --git a/app/lib/potential_friendship_tracker.rb b/app/lib/potential_friendship_tracker.rb
index 362482669eb79b15af2c903f73f8d3108c01dc12..017a9748d5f979caa16712c3a2fabe4d185be702 100644
--- a/app/lib/potential_friendship_tracker.rb
+++ b/app/lib/potential_friendship_tracker.rb
@@ -12,6 +12,8 @@ class PotentialFriendshipTracker
 
   class << self
     def record(account_id, target_account_id, action)
+      return if account_id == target_account_id
+
       key    = "interactions:#{account_id}"
       weight = WEIGHTS[action]
 
diff --git a/app/lib/request.rb b/app/lib/request.rb
index 576ed23ca0c21561c81147f642523e74dba1805b..ef4aeaf29018ebfab1797f8ee33a2a37b1826e19 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -2,6 +2,17 @@
 
 require 'ipaddr'
 require 'socket'
+require 'resolv'
+
+# Monkey-patch the HTTP.rb timeout class to avoid using a timeout block
+# around the Socket#open method, since we use our own timeout blocks inside
+# that method
+class HTTP::Timeout::PerOperation
+  def connect(socket_class, host, port, nodelay = false)
+    @socket = socket_class.open(host, port)
+    @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1) if nodelay
+  end
+end
 
 class Request
   REQUEST_TARGET = '(request-target)'
@@ -22,10 +33,11 @@ class Request
     set_digest! if options.key?(:body)
   end
 
-  def on_behalf_of(account, key_id_format = :acct)
+  def on_behalf_of(account, key_id_format = :acct, sign_with: nil)
     raise ArgumentError unless account.local?
 
     @account       = account
+    @keypair       = sign_with.present? ? OpenSSL::PKey::RSA.new(sign_with) : @account.keypair
     @key_id_format = key_id_format
 
     self
@@ -44,7 +56,7 @@ class Request
     end
 
     begin
-      yield response.extend(ClientLimit)
+      yield response.extend(ClientLimit) if block_given?
     ensure
       http_client.close
     end
@@ -54,6 +66,18 @@ class Request
     (@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
   end
 
+  class << self
+    def valid_url?(url)
+      begin
+        parsed_url = Addressable::URI.parse(url)
+      rescue Addressable::URI::InvalidURIError
+        return false
+      end
+
+      %w(http https).include?(parsed_url.scheme) && parsed_url.host.present?
+    end
+  end
+
   private
 
   def set_common_headers!
@@ -70,17 +94,17 @@ class Request
 
   def signature
     algorithm = 'rsa-sha256'
-    signature = Base64.strict_encode64(@account.keypair.sign(OpenSSL::Digest::SHA256.new, signed_string))
+    signature = Base64.strict_encode64(@keypair.sign(OpenSSL::Digest::SHA256.new, signed_string))
 
-    "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers}\",signature=\"#{signature}\""
+    "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers.keys.join(' ').downcase}\",signature=\"#{signature}\""
   end
 
   def signed_string
-    @headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
+    signed_headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
   end
 
   def signed_headers
-    @headers.keys.join(' ').downcase
+    @headers.without('User-Agent', 'Accept-Encoding')
   end
 
   def key_id
@@ -93,7 +117,11 @@ class Request
   end
 
   def timeout
-    { write: 10, connect: 10, read: 10 }
+    # We enforce a 1s timeout on DNS resolving, 10s timeout on socket opening
+    # and 5s timeout on the TLS handshake, meaning the worst case should take
+    # about 16s in total
+
+    { connect: 5, read: 10, write: 10 }
   end
 
   def http_client
@@ -138,17 +166,34 @@ class Request
   class Socket < TCPSocket
     class << self
       def open(host, *args)
-        return super host, *args if thru_hidden_service? host
+        return super(host, *args) if thru_hidden_service?(host)
+
         outer_e = nil
-        Addrinfo.foreach(host, nil, nil, :SOCK_STREAM) do |address|
-          begin
-            raise Mastodon::HostValidationError if PrivateAddressCheck.private_address? IPAddr.new(address.ip_address)
-            return super address.ip_address, *args
-          rescue => e
-            outer_e = e
+
+        Resolv::DNS.open do |dns|
+          dns.timeouts = 1
+
+          addresses = dns.getaddresses(host).take(2)
+          time_slot = 10.0 / addresses.size
+
+          addresses.each do |address|
+            begin
+              raise Mastodon::HostValidationError if PrivateAddressCheck.private_address?(IPAddr.new(address.to_s))
+
+              ::Timeout.timeout(time_slot, HTTP::TimeoutError) do
+                return super(address.to_s, *args)
+              end
+            rescue => e
+              outer_e = e
+            end
           end
         end
-        raise outer_e if outer_e
+
+        if outer_e
+          raise outer_e
+        else
+          raise SocketError, "No address for #{host}"
+        end
       end
 
       alias new open
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index c2b4669245af232242ad3cc8fda1b21952adf151..1bba4a5a6eb3c90379699d705b3b76e584134f0b 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -2,7 +2,7 @@
 
 class Sanitize
   module Config
-    HTTP_PROTOCOLS ||= ['http', 'https', :relative].freeze
+    HTTP_PROTOCOLS ||= ['http', 'https', 'dat', 'dweb', 'ipfs', 'ipns', 'ssb', 'gopher', :relative].freeze
 
     CLASS_WHITELIST_TRANSFORMER = lambda do |env|
       node = env[:node]
diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb
index de4af3009751956a95398d6948ca63c52a17c439..3653ab1149d5432c53cb709f0b6e3ba4e5e022c9 100644
--- a/app/lib/settings/scoped_settings.rb
+++ b/app/lib/settings/scoped_settings.rb
@@ -2,6 +2,10 @@
 
 module Settings
   class ScopedSettings
+    DEFAULTING_TO_UNSCOPED = %w(
+      theme
+    ).freeze
+
     def initialize(object)
       @object = object
     end
@@ -27,7 +31,7 @@ module Settings
 
     def all_as_records
       vars = thing_scoped
-      records = vars.map { |r| [r.var, r] }.to_h
+      records = vars.each_with_object({}) { |r, h| h[r.var] = r }
 
       Setting.default_settings.each do |key, default_value|
         next if records.key?(key) || default_value.is_a?(Hash)
@@ -50,15 +54,22 @@ module Settings
       Rails.cache.fetch(Setting.cache_key(key, @object)) do
         db_val = thing_scoped.find_by(var: key.to_s)
         if db_val
-          default_value = Setting.default_settings[key]
+          default_value = ScopedSettings.default_settings[key]
           return default_value.with_indifferent_access.merge!(db_val.value) if default_value.is_a?(Hash)
           db_val.value
         else
-          Setting.default_settings[key]
+          ScopedSettings.default_settings[key]
         end
       end
     end
 
+    class << self
+      def default_settings
+        defaulting = DEFAULTING_TO_UNSCOPED.each_with_object({}) { |k, h| h[k] = Setting[k] }
+        Setting.default_settings.merge!(defaulting)
+      end
+    end
+
     protected
 
     def thing_scoped
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index 8339593978be0d5fec757e5b8a28f39db20f840b..19b8544103ed99836e870160a735f4bc18f7a0ba 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -15,21 +15,23 @@ class UserSettingsDecorator
   private
 
   def process_update
-    user.settings['notification_emails']     = merged_notification_emails if change?('notification_emails')
-    user.settings['interactions']            = merged_interactions if change?('interactions')
-    user.settings['default_privacy']         = default_privacy_preference if change?('setting_default_privacy')
-    user.settings['default_sensitive']       = default_sensitive_preference if change?('setting_default_sensitive')
-    user.settings['default_language']        = default_language_preference if change?('setting_default_language')
-    user.settings['unfollow_modal']          = unfollow_modal_preference if change?('setting_unfollow_modal')
-    user.settings['boost_modal']             = boost_modal_preference if change?('setting_boost_modal')
-    user.settings['delete_modal']            = delete_modal_preference if change?('setting_delete_modal')
-    user.settings['auto_play_gif']           = auto_play_gif_preference if change?('setting_auto_play_gif')
-    user.settings['display_sensitive_media'] = display_sensitive_media_preference if change?('setting_display_sensitive_media')
-    user.settings['reduce_motion']           = reduce_motion_preference if change?('setting_reduce_motion')
-    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['notification_emails'] = merged_notification_emails if change?('notification_emails')
+    user.settings['interactions']        = merged_interactions if change?('interactions')
+    user.settings['default_privacy']     = default_privacy_preference if change?('setting_default_privacy')
+    user.settings['default_sensitive']   = default_sensitive_preference if change?('setting_default_sensitive')
+    user.settings['default_language']    = default_language_preference if change?('setting_default_language')
+    user.settings['unfollow_modal']      = unfollow_modal_preference if change?('setting_unfollow_modal')
+    user.settings['boost_modal']         = boost_modal_preference if change?('setting_boost_modal')
+    user.settings['delete_modal']        = delete_modal_preference if change?('setting_delete_modal')
+    user.settings['auto_play_gif']       = auto_play_gif_preference if change?('setting_auto_play_gif')
+    user.settings['display_media']       = display_media_preference if change?('setting_display_media')
+    user.settings['expand_spoilers']     = expand_spoilers_preference if change?('setting_expand_spoilers')
+    user.settings['reduce_motion']       = reduce_motion_preference if change?('setting_reduce_motion')
+    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')
   end
 
   def merged_notification_emails
@@ -68,8 +70,12 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_auto_play_gif'
   end
 
-  def display_sensitive_media_preference
-    boolean_cast_setting 'setting_display_sensitive_media'
+  def display_media_preference
+    settings['setting_display_media']
+  end
+
+  def expand_spoilers_preference
+    boolean_cast_setting 'setting_expand_spoilers'
   end
 
   def reduce_motion_preference
@@ -92,6 +98,10 @@ class UserSettingsDecorator
     settings['setting_default_language']
   end
 
+  def aggregate_reblogs_preference
+    boolean_cast_setting 'setting_aggregate_reblogs'
+  end
+
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index bf161b9be040d542b0e4974985d6c60513a64b60..cc585c3b76a8ee2f227cad67b34583e3a9cb8373 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -5,7 +5,6 @@ class ApplicationMailer < ActionMailer::Base
 
   helper :application
   helper :instance
-  helper :mailer
 
   protected
 
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index b4584429628ce2eab5d806b2a7205663a4e9f625..66fa337c1f277a6c276fbee0e92cfc44c1c16998 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -66,16 +66,20 @@ class NotificationMailer < ApplicationMailer
   end
 
   def digest(recipient, **opts)
-    @me            = recipient
-    @since         = opts[:since] || @me.user.last_emailed_at || @me.user.current_sign_in_at
-    @notifications = Notification.where(account: @me, activity_type: 'Mention').where('created_at > ?', @since)
-    @follows_since = Notification.where(account: @me, activity_type: 'Follow').where('created_at > ?', @since).count
+    return if recipient.user.disabled?
+
+    @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 @me.user.disabled? || @notifications.empty?
+    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.size)
+           subject: I18n.t(:subject, scope: [:notification_mailer, :digest], count: @notifications_count)
     end
   end
 
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 9848c34a25e84ba46a631b006c8dc042b33ffc25..8f3a4ab3aa269f32857fe58ffa8bfd881a2aa945 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -16,7 +16,7 @@ class UserMailer < Devise::Mailer
     return if @resource.disabled?
 
     I18n.with_locale(@resource.locale || I18n.default_locale) do
-      mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email,
+      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
@@ -78,4 +78,16 @@ class UserMailer < Devise::Mailer
       mail to: @resource.email, subject: I18n.t('user_mailer.backup_ready.subject')
     end
   end
+
+  def warning(user, warning)
+    @resource = user
+    @warning  = warning
+    @instance = Rails.configuration.x.local_domain
+
+    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
+    end
+  end
 end
diff --git a/app/models/account.rb b/app/models/account.rb
index 51b3c2c7ab110c4a833b8316a3147b43c07d3dd9..963c8b8449c7837690579423c2bff8fe0c244a00 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -32,9 +32,6 @@
 #  suspended               :boolean          default(FALSE), not null
 #  locked                  :boolean          default(FALSE), not null
 #  header_remote_url       :string           default(""), not null
-#  statuses_count          :integer          default(0), not null
-#  followers_count         :integer          default(0), not null
-#  following_count         :integer          default(0), not null
 #  last_webfingered_at     :datetime
 #  inbox_url               :string           default(""), not null
 #  outbox_url              :string           default(""), not null
@@ -46,88 +43,61 @@
 #  featured_collection_url :string
 #  fields                  :jsonb
 #  actor_type              :string
+#  discoverable            :boolean
+#  also_known_as           :string           is an Array
 #
 
 class Account < ApplicationRecord
-  USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.]+[a-z0-9_]+)?/i
+  USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
   MENTION_RE  = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i
+  MIN_FOLLOWERS_DISCOVERY = 10
 
+  include AccountAssociations
   include AccountAvatar
   include AccountFinderConcern
   include AccountHeader
   include AccountInteractions
   include Attachmentable
   include Paginable
+  include AccountCounters
+  include DomainNormalizable
 
   enum protocol: [:ostatus, :activitypub]
 
-  # Local users
-  has_one :user, inverse_of: :account
-
   validates :username, presence: true
 
   # Remote user validations
   validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? }
+  validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, 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? }
   validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
   validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
   validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? }
-  validates :note, length: { maximum: 65535 }, if: -> { local? && will_save_change_to_note? }
+  validates :note, note_length: { maximum: 65535 }, if: -> { local? && will_save_change_to_note? }
   validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? }
 
-  # Timelines
-  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
-
-  # Pinned statuses
-  has_many :status_pins, inverse_of: :account, dependent: :destroy
-  has_many :pinned_statuses, -> { reorder('status_pins.created_at DESC') }, through: :status_pins, class_name: 'Status', source: :status
-
-  # Media
-  has_many :media_attachments, dependent: :destroy
-
-  # PuSH subscriptions
-  has_many :subscriptions, dependent: :destroy
-
-  # Report relationships
-  has_many :reports
-  has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id
-
-  has_many :report_notes, dependent: :destroy
-  has_many :custom_filters, inverse_of: :account, dependent: :destroy
-
-  # Moderation notes
-  has_many :account_moderation_notes, dependent: :destroy
-  has_many :targeted_moderation_notes, class_name: 'AccountModerationNote', foreign_key: :target_account_id, dependent: :destroy
-
-  # Lists
-  has_many :list_accounts, inverse_of: :account, dependent: :destroy
-  has_many :lists, through: :list_accounts
-
-  # Account migrations
-  belongs_to :moved_to_account, class_name: 'Account', optional: true
-
   scope :remote, -> { where.not(domain: nil) }
   scope :local, -> { where(domain: nil) }
-  scope :without_followers, -> { where(followers_count: 0) }
-  scope :with_followers, -> { where('followers_count > 0') }
   scope :expiring, ->(time) { remote.where.not(subscription_expires_at: nil).where('subscription_expires_at < ?', time) }
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
   scope :silenced, -> { where(silenced: true) }
   scope :suspended, -> { where(suspended: true) }
   scope :without_suspended, -> { where(suspended: false) }
+  scope :without_silenced, -> { where(silenced: false) }
   scope :recent, -> { reorder(id: :desc) }
+  scope :bots, -> { where(actor_type: %w(Application Service)) }
   scope :alphabetic, -> { order(domain: :asc, username: :asc) }
   scope :by_domain_accounts, -> { group(:domain).select(:domain, 'COUNT(*) AS accounts_count').order('accounts_count desc') }
   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, -> { where(suspended: false).where(moved_to_account_id: nil) }
+  scope :searchable, -> { without_suspended.where(moved_to_account_id: nil) }
+  scope :discoverable, -> { searchable.without_silenced.where(discoverable: true).joins(:account_stat).where(AccountStat.arel_table[:followers_count].gteq(MIN_FOLLOWERS_DISCOVERY)).by_recent_status }
+  scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) }
+  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')) }
+  scope :popular, -> { order('account_stats.followers_count desc') }
 
   delegate :email,
            :unconfirmed_email,
@@ -171,6 +141,10 @@ class Account < ApplicationRecord
     "#{username}@#{Rails.configuration.x.local_domain}"
   end
 
+  def local_followers_count
+    Follow.where(target_account_id: id).count
+  end
+
   def to_webfinger_s
     "acct:#{local_username_and_domain}"
   end
@@ -188,6 +162,21 @@ class Account < ApplicationRecord
     ResolveAccountService.new.call(acct)
   end
 
+  def silence!
+    update!(silenced: true)
+  end
+
+  def unsilence!
+    update!(silenced: false)
+  end
+
+  def suspend!
+    transaction do
+      user&.disable! if local?
+      update!(suspended: true)
+    end
+  end
+
   def unsuspend!
     transaction do
       user&.enable! if local?
@@ -206,16 +195,62 @@ class Account < ApplicationRecord
     @keypair ||= OpenSSL::PKey::RSA.new(private_key || public_key)
   end
 
+  def tags_as_strings=(tag_names)
+    tag_names.map! { |name| name.mb_chars.downcase.to_s }
+    tag_names.uniq!
+
+    # Existing hashtags
+    hashtags_map = Tag.where(name: tag_names).each_with_object({}) { |tag, h| h[tag.name] = tag }
+
+    # Initialize not yet existing hashtags
+    tag_names.each do |name|
+      next if hashtags_map.key?(name)
+      hashtags_map[name] = Tag.new(name: name)
+    end
+
+    # Remove hashtags that are to be deleted
+    tags.each do |tag|
+      if hashtags_map.key?(tag.name)
+        hashtags_map.delete(tag.name)
+      else
+        transaction do
+          tags.delete(tag)
+          tag.decrement_count!(:accounts_count)
+        end
+      end
+    end
+
+    # Add hashtags that were so far missing
+    hashtags_map.each_value do |tag|
+      transaction do
+        tags << tag
+        tag.increment_count!(:accounts_count)
+      end
+    end
+  end
+
+  def also_known_as
+    self[:also_known_as] || []
+  end
+
   def fields
     (self[:fields] || []).map { |f| Field.new(self, f) }
   end
 
   def fields_attributes=(attributes)
-    fields = []
+    fields     = []
+    old_fields = self[:fields] || []
 
     if attributes.is_a?(Hash)
       attributes.each_value do |attr|
         next if attr[:name].blank?
+
+        previous = old_fields.find { |item| item['value'] == attr[:value] }
+
+        if previous && previous['verified_at'].present?
+          attr[:verified_at] = previous['verified_at']
+        end
+
         fields << attr
       end
     end
@@ -223,13 +258,18 @@ class Account < ApplicationRecord
     self[:fields] = fields
   end
 
+  DEFAULT_FIELDS_SIZE = 4
+
   def build_fields
-    return if fields.size >= 4
+    return if fields.size >= DEFAULT_FIELDS_SIZE
+
+    tmp = self[:fields] || []
 
-    raw_fields = self[:fields] || []
-    add_fields = 4 - raw_fields.size
-    add_fields.times { raw_fields << { name: '', value: '' } }
-    self.fields = raw_fields
+    (DEFAULT_FIELDS_SIZE - tmp.size).times do
+      tmp << { name: '', value: '' }
+    end
+
+    self.fields = tmp
   end
 
   def magic_key
@@ -282,17 +322,52 @@ class Account < ApplicationRecord
   end
 
   class Field < ActiveModelSerializers::Model
-    attributes :name, :value, :account, :errors
+    attributes :name, :value, :verified_at, :account, :errors
+
+    def initialize(account, attributes)
+      @account     = account
+      @attributes  = attributes
+      @name        = attributes['name'].strip[0, string_limit]
+      @value       = attributes['value'].strip[0, string_limit]
+      @verified_at = attributes['verified_at']&.to_datetime
+      @errors      = {}
+    end
+
+    def verified?
+      verified_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 initialize(account, attr)
-      @account = account
-      @name    = attr['name'].strip[0, 255]
-      @value   = attr['value'].strip[0, 255]
-      @errors  = {}
+    def verifiable?
+      value_for_verification.present? && value_for_verification.start_with?('http://', 'https://')
+    end
+
+    def mark_verified!
+      @verified_at = Time.now.utc
+      @attributes['verified_at'] = @verified_at
     end
 
     def to_h
-      { name: @name, value: @value }
+      { name: @name, value: @value, verified_at: @verified_at }
+    end
+
+    private
+
+    def string_limit
+      if account.local?
+        255
+      else
+        2047
+      end
     end
   end
 
@@ -325,7 +400,9 @@ class Account < ApplicationRecord
         LIMIT ?
       SQL
 
-      find_by_sql([sql, limit])
+      records = find_by_sql([sql, limit])
+      ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
+      records
     end
 
     def advanced_search_for(terms, account, limit = 10, following = false)
@@ -352,7 +429,7 @@ class Account < ApplicationRecord
           LIMIT ?
         SQL
 
-        find_by_sql([sql, account.id, account.id, account.id, limit])
+        records = find_by_sql([sql, account.id, account.id, account.id, limit])
       else
         sql = <<-SQL.squish
           SELECT
@@ -368,8 +445,11 @@ class Account < ApplicationRecord
           LIMIT ?
         SQL
 
-        find_by_sql([sql, account.id, account.id, limit])
+        records = find_by_sql([sql, account.id, account.id, limit])
       end
+
+      ActiveRecord::Associations::Preloader.new.preload(records, :account_stat)
+      records
     end
 
     private
@@ -388,8 +468,8 @@ class Account < ApplicationRecord
   end
 
   before_create :generate_keys
-  before_validation :normalize_domain
   before_validation :prepare_contents, if: :local?
+  before_destroy :clean_feed_manager
 
   private
 
@@ -409,10 +489,25 @@ class Account < ApplicationRecord
   def normalize_domain
     return if local?
 
-    self.domain = TagManager.instance.normalize_domain(domain)
+    super
   end
 
   def emojifiable_text
     [note, display_name, fields.map(&:value)].join(' ')
   end
+
+  def clean_feed_manager
+    reblog_key       = FeedManager.instance.key(:home, id, 'reblogs')
+    reblogged_id_set = Redis.current.zrange(reblog_key, 0, -1)
+
+    Redis.current.pipelined do
+      Redis.current.del(FeedManager.instance.key(:home, id))
+      Redis.current.del(reblog_key)
+
+      reblogged_id_set.each do |reblogged_id|
+        reblog_set_key = FeedManager.instance.key(:home, id, "reblogs:#{reblogged_id}")
+        Redis.current.del(reblog_set_key)
+      end
+    end
+  end
 end
diff --git a/app/models/account_conversation.rb b/app/models/account_conversation.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cc6b39279866bceb1c01a7d8e25d2fb394bdd146
--- /dev/null
+++ b/app/models/account_conversation.rb
@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: account_conversations
+#
+#  id                      :bigint(8)        not null, primary key
+#  account_id              :bigint(8)
+#  conversation_id         :bigint(8)
+#  participant_account_ids :bigint(8)        default([]), not null, is an Array
+#  status_ids              :bigint(8)        default([]), not null, is an Array
+#  last_status_id          :bigint(8)
+#  lock_version            :integer          default(0), not null
+#  unread                  :boolean          default(FALSE), not null
+#
+
+class AccountConversation < ApplicationRecord
+  after_commit :push_to_streaming_api
+
+  belongs_to :account
+  belongs_to :conversation
+  belongs_to :last_status, class_name: 'Status'
+
+  before_validation :set_last_status
+
+  def participant_account_ids=(arr)
+    self[:participant_account_ids] = arr.sort
+  end
+
+  def participant_accounts
+    if participant_account_ids.empty?
+      [account]
+    else
+      Account.where(id: participant_account_ids)
+    end
+  end
+
+  class << self
+    def paginate_by_id(limit, options = {})
+      if options[:min_id]
+        paginate_by_min_id(limit, options[:min_id]).reverse
+      else
+        paginate_by_max_id(limit, options[:max_id], options[:since_id])
+      end
+    end
+
+    def paginate_by_min_id(limit, min_id = nil)
+      query = order(arel_table[:last_status_id].asc).limit(limit)
+      query = query.where(arel_table[:last_status_id].gt(min_id)) if min_id.present?
+      query
+    end
+
+    def paginate_by_max_id(limit, max_id = nil, since_id = nil)
+      query = order(arel_table[:last_status_id].desc).limit(limit)
+      query = query.where(arel_table[:last_status_id].lt(max_id)) if max_id.present?
+      query = query.where(arel_table[:last_status_id].gt(since_id)) if since_id.present?
+      query
+    end
+
+    def add_status(recipient, status)
+      conversation = find_or_initialize_by(account: recipient, conversation_id: status.conversation_id, participant_account_ids: participants_from_status(recipient, status))
+
+      return conversation if conversation.status_ids.include?(status.id)
+
+      conversation.status_ids << status.id
+      conversation.unread = status.account_id != recipient.id
+      conversation.save
+      conversation
+    rescue ActiveRecord::StaleObjectError
+      retry
+    end
+
+    def remove_status(recipient, status)
+      conversation = find_by(account: recipient, conversation_id: status.conversation_id, participant_account_ids: participants_from_status(recipient, status))
+
+      return if conversation.nil?
+
+      conversation.status_ids.delete(status.id)
+
+      if conversation.status_ids.empty?
+        conversation.destroy
+      else
+        conversation.save
+      end
+
+      conversation
+    rescue ActiveRecord::StaleObjectError
+      retry
+    end
+
+    private
+
+    def participants_from_status(recipient, status)
+      ((status.active_mentions.pluck(:account_id) + [status.account_id]).uniq - [recipient.id]).sort
+    end
+  end
+
+  private
+
+  def set_last_status
+    self.status_ids     = status_ids.sort
+    self.last_status_id = status_ids.last
+  end
+
+  def push_to_streaming_api
+    return if destroyed? || !subscribed_to_timeline?
+    PushConversationWorker.perform_async(id)
+  end
+
+  def subscribed_to_timeline?
+    Redis.current.exists("subscribed:#{streaming_channel}")
+  end
+
+  def streaming_channel
+    "timeline:direct:#{account_id}"
+  end
+end
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb
index dc7a03039fe4f6ddc8de9ecea64328f4aee95382..b10f50db778b100e1aa477dcd6ac8ad01c7b4a7e 100644
--- a/app/models/account_filter.rb
+++ b/app/models/account_filter.rb
@@ -5,13 +5,14 @@ class AccountFilter
 
   def initialize(params)
     @params = params
+    set_defaults!
   end
 
   def results
-    scope = Account.alphabetic
+    scope = Account.recent.includes(:user)
 
     params.each do |key, value|
-      scope.merge!(scope_for(key, value)) if value.present?
+      scope.merge!(scope_for(key, value.to_s.strip)) if value.present?
     end
 
     scope
@@ -19,6 +20,11 @@ class AccountFilter
 
   private
 
+  def set_defaults!
+    params['local']  = '1' if params['remote'].blank?
+    params['active'] = '1' if params['suspended'].blank? && params['silenced'].blank?
+  end
+
   def scope_for(key, value)
     case key.to_s
     when 'local'
@@ -27,10 +33,10 @@ class AccountFilter
       Account.remote
     when 'by_domain'
       Account.where(domain: value)
+    when 'active'
+      Account.without_suspended
     when 'silenced'
       Account.silenced
-    when 'recent'
-      Account.recent
     when 'suspended'
       Account.suspended
     when 'username'
@@ -40,11 +46,7 @@ class AccountFilter
     when 'email'
       accounts_with_users.merge User.matches_email(value)
     when 'ip'
-      if valid_ip?(value)
-        accounts_with_users.merge User.with_recent_ip_address(value)
-      else
-        Account.default_scoped
-      end
+      valid_ip?(value) ? accounts_with_users.where('users.current_sign_in_ip <<= ?', value) : Account.none
     when 'staff'
       accounts_with_users.merge User.staff
     else
@@ -57,8 +59,7 @@ class AccountFilter
   end
 
   def valid_ip?(value)
-    IPAddr.new(value)
-    true
+    IPAddr.new(value) && true
   rescue IPAddr::InvalidAddressError
     false
   end
diff --git a/app/models/account_pin.rb b/app/models/account_pin.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b51d3d4cd4e2ae07fd31d3de2397137ed2fdd1e6
--- /dev/null
+++ b/app/models/account_pin.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: account_pins
+#
+#  id                :bigint(8)        not null, primary key
+#  account_id        :bigint(8)
+#  target_account_id :bigint(8)
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#
+
+class AccountPin < ApplicationRecord
+  include Paginable
+  include RelationshipCacheable
+
+  belongs_to :account
+  belongs_to :target_account, class_name: 'Account'
+
+  validate :validate_follow_relationship
+
+  private
+
+  def validate_follow_relationship
+    errors.add(:base, I18n.t('accounts.pin_errors.following')) unless account.following?(target_account)
+  end
+end
diff --git a/app/models/account_stat.rb b/app/models/account_stat.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9813aa84ff105420b0629e5a9f501ba78296ff30
--- /dev/null
+++ b/app/models/account_stat.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: account_stats
+#
+#  id              :bigint(8)        not null, primary key
+#  account_id      :bigint(8)        not null
+#  statuses_count  :bigint(8)        default(0), not null
+#  following_count :bigint(8)        default(0), not null
+#  followers_count :bigint(8)        default(0), not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  last_status_at  :datetime
+#
+
+class AccountStat < ApplicationRecord
+  belongs_to :account, inverse_of: :account_stat
+
+  def increment_count!(key)
+    update(attributes_for_increment(key))
+  end
+
+  def decrement_count!(key)
+    update(key => [public_send(key) - 1, 0].max)
+  end
+
+  private
+
+  def attributes_for_increment(key)
+    attrs = { key => public_send(key) + 1 }
+    attrs[:last_status_at] = Time.now.utc if key == :statuses_count
+    attrs
+  end
+end
diff --git a/app/models/account_tag_stat.rb b/app/models/account_tag_stat.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3c36c155abede51974741ec568030d1278344158
--- /dev/null
+++ b/app/models/account_tag_stat.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: account_tag_stats
+#
+#  id             :bigint(8)        not null, primary key
+#  tag_id         :bigint(8)        not null
+#  accounts_count :bigint(8)        default(0), not null
+#  hidden         :boolean          default(FALSE), not null
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#
+
+class AccountTagStat < ApplicationRecord
+  belongs_to :tag, inverse_of: :account_tag_stat
+
+  def increment_count!(key)
+    update(key => public_send(key) + 1)
+  end
+
+  def decrement_count!(key)
+    update(key => [public_send(key) - 1, 0].max)
+  end
+end
diff --git a/app/models/account_warning.rb b/app/models/account_warning.rb
new file mode 100644
index 0000000000000000000000000000000000000000..157e6c04d1eb39d41872f3c07f1054179c6d66af
--- /dev/null
+++ b/app/models/account_warning.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: account_warnings
+#
+#  id                :bigint(8)        not null, primary key
+#  account_id        :bigint(8)
+#  target_account_id :bigint(8)
+#  action            :integer          default("none"), not null
+#  text              :text             default(""), not null
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#
+
+class AccountWarning < ApplicationRecord
+  enum action: %i(none disable silence suspend), _suffix: :action
+
+  belongs_to :account, inverse_of: :account_warnings
+  belongs_to :target_account, class_name: 'Account', inverse_of: :targeted_account_warnings
+
+  scope :latest, -> { order(created_at: :desc) }
+  scope :custom, -> { where.not(text: '') }
+end
diff --git a/app/models/account_warning_preset.rb b/app/models/account_warning_preset.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ba8ceabb353da2081a7c3c747d785bfbbc57dd3c
--- /dev/null
+++ b/app/models/account_warning_preset.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: account_warning_presets
+#
+#  id         :bigint(8)        not null, primary key
+#  text       :text             default(""), not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class AccountWarningPreset < ApplicationRecord
+  validates :text, presence: true
+end
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
new file mode 100644
index 0000000000000000000000000000000000000000..84c3f880d2556efd5005cd59dea1d273f604af6f
--- /dev/null
+++ b/app/models/admin/account_action.rb
@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+class Admin::AccountAction
+  include ActiveModel::Model
+  include AccountableConcern
+  include Authorization
+
+  TYPES = %w(
+    none
+    disable
+    silence
+    suspend
+  ).freeze
+
+  attr_accessor :target_account,
+                :current_account,
+                :type,
+                :text,
+                :report_id,
+                :warning_preset_id,
+                :send_email_notification
+
+  attr_reader :warning
+
+  def save!
+    ApplicationRecord.transaction do
+      process_action!
+      process_warning!
+    end
+
+    queue_email!
+    process_reports!
+  end
+
+  def report
+    @report ||= Report.find(report_id) if report_id.present?
+  end
+
+  def with_report?
+    !report.nil?
+  end
+
+  class << self
+    def types_for_account(account)
+      if account.local?
+        TYPES
+      else
+        TYPES - %w(none disable)
+      end
+    end
+  end
+
+  private
+
+  def process_action!
+    case type
+    when 'disable'
+      handle_disable!
+    when 'silence'
+      handle_silence!
+    when 'suspend'
+      handle_suspend!
+    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)
+
+    # 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?
+  end
+
+  def process_reports!
+    return if report_id.blank?
+
+    authorize(report, :update?)
+
+    if type == 'none'
+      log_action(:resolve, report)
+      report.resolve!(current_account)
+    else
+      Report.where(target_account: target_account).unresolved.update_all(action_taken: true, action_taken_by_account_id: current_account.id)
+    end
+  end
+
+  def handle_disable!
+    authorize(target_account.user, :disable?)
+    log_action(:disable, target_account.user)
+    target_account.user&.disable!
+  end
+
+  def handle_silence!
+    authorize(target_account, :silence?)
+    log_action(:silence, target_account)
+    target_account.silence!
+  end
+
+  def handle_suspend!
+    authorize(target_account, :suspend?)
+    log_action(:suspend, target_account)
+    target_account.suspend!
+    queue_suspension_worker!
+  end
+
+  def text_for_warning
+    [warning_preset&.text, text].compact.join("\n\n")
+  end
+
+  def queue_suspension_worker!
+    Admin::SuspensionWorker.perform_async(target_account.id)
+  end
+
+  def queue_email!
+    return unless warnable?
+
+    UserMailer.warning(target_account.user, warning).deliver_later!
+  end
+
+  def warnable?
+    send_email_notification && target_account.local?
+  end
+
+  def warning_preset
+    @warning_preset ||= AccountWarningPreset.find(warning_preset_id) if warning_preset_id.present?
+  end
+end
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7dafeee34ca67cd69986c2d6cf0c402d0f469e13
--- /dev/null
+++ b/app/models/concerns/account_associations.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module AccountAssociations
+  extend ActiveSupport::Concern
+
+  included do
+    # Local users
+    has_one :user, inverse_of: :account, dependent: :destroy
+
+    # Timelines
+    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
+    has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account
+    has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy
+
+    # Pinned statuses
+    has_many :status_pins, inverse_of: :account, dependent: :destroy
+    has_many :pinned_statuses, -> { reorder('status_pins.created_at DESC') }, through: :status_pins, class_name: 'Status', source: :status
+
+    # Endorsements
+    has_many :account_pins, inverse_of: :account, dependent: :destroy
+    has_many :endorsed_accounts, through: :account_pins, class_name: 'Account', source: :target_account
+
+    # Media
+    has_many :media_attachments, dependent: :destroy
+
+    # PuSH subscriptions
+    has_many :subscriptions, dependent: :destroy
+
+    # Report relationships
+    has_many :reports, dependent: :destroy, inverse_of: :account
+    has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account
+
+    has_many :report_notes, dependent: :destroy
+    has_many :custom_filters, inverse_of: :account, dependent: :destroy
+
+    # Moderation notes
+    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
+
+    # Lists (that the account is on, not owned by the account)
+    has_many :list_accounts, inverse_of: :account, dependent: :destroy
+    has_many :lists, through: :list_accounts
+
+    # Lists (owned by the account)
+    has_many :owned_lists, class_name: 'List', dependent: :destroy, inverse_of: :account
+
+    # Account migrations
+    belongs_to :moved_to_account, class_name: 'Account', optional: true
+
+    # Hashtags
+    has_and_belongs_to_many :tags
+  end
+end
diff --git a/app/models/concerns/account_counters.rb b/app/models/concerns/account_counters.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3581df8dd8b2ac69b6806eb4b0bea7c3651eec06
--- /dev/null
+++ b/app/models/concerns/account_counters.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module AccountCounters
+  extend ActiveSupport::Concern
+
+  included do
+    has_one :account_stat, inverse_of: :account
+    after_save :save_account_stat
+  end
+
+  delegate :statuses_count,
+           :statuses_count=,
+           :following_count,
+           :following_count=,
+           :followers_count,
+           :followers_count=,
+           :increment_count!,
+           :decrement_count!,
+           :last_status_at,
+           to: :account_stat
+
+  def account_stat
+    super || build_account_stat
+  end
+
+  private
+
+  def save_account_stat
+    return unless account_stat&.changed?
+    account_stat.save
+  end
+end
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb
index 6b7237e89d5f32bc8d861d62e08ba07c9b77d81b..7e3bbde097799a711f6921125b629ede25e4b8d2 100644
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -12,6 +12,10 @@ module AccountFinderConcern
       find_remote(username, domain) || raise(ActiveRecord::RecordNotFound)
     end
 
+    def representative
+      find_local(Setting.site_contact_username.gsub(/\A@/, '')) || Account.local.find_by(suspended: false)
+    end
+
     def find_local(username)
       find_remote(username, nil)
     end
diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb
index ef40b8126b5b4b440171e1c1652d21fe89e9527c..067e166eb6ce5e340a86489c1c12d525c2c24dfd 100644
--- a/app/models/concerns/account_header.rb
+++ b/app/models/concerns/account_header.rb
@@ -5,11 +5,12 @@ module AccountHeader
 
   IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
   LIMIT = 2.megabytes
+  MAX_PIXELS = 750_000 # 1500x500px
 
   class_methods do
     def header_styles(file)
-      styles = { original: { geometry: '700x335#', file_geometry_parser: FastGeometryParser } }
-      styles[:static] = { geometry: '700x335#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
+      styles = { original: { pixels: MAX_PIXELS, file_geometry_parser: FastGeometryParser } }
+      styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif'
       styles
     end
 
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index e14e041f614afe70159baedcb738845e303f9beb..ad2909d9183aec8ba03dbc12e8589c462b08ef3d 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -40,10 +40,14 @@ module AccountInteractions
       end
     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
+
     def domain_blocking_map(target_account_ids, account_id)
-      accounts_map    = Account.where(id: target_account_ids).select('id, domain').map { |a| [a.id, a.domain] }.to_h
+      accounts_map    = Account.where(id: target_account_ids).select('id, domain').each_with_object({}) { |a, h| h[a.id] = a.domain }
       blocked_domains = domain_blocking_map_by_domain(accounts_map.values.compact, account_id)
-      accounts_map.map { |id, domain| [id, blocked_domains[domain]] }.to_h
+      accounts_map.reduce({}) { |h, (id, domain)| h.merge(id => blocked_domains[domain]) }
     end
 
     def domain_blocking_map_by_domain(target_domains, account_id)
@@ -190,6 +194,10 @@ module AccountInteractions
     status_pins.where(status: status).exists?
   end
 
+  def endorsed?(account)
+    account_pins.where(target_account: account).exists?
+  end
+
   def followers_for_local_distribution
     followers.local
              .joins(:user)
diff --git a/app/models/concerns/domain_normalizable.rb b/app/models/concerns/domain_normalizable.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dff3e5414f13a995236f1111f33dadbec4ef0cbb
--- /dev/null
+++ b/app/models/concerns/domain_normalizable.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module DomainNormalizable
+  extend ActiveSupport::Concern
+
+  included do
+    before_validation :normalize_domain
+  end
+
+  private
+
+  def normalize_domain
+    self.domain = TagManager.instance.normalize_domain(domain)
+  end
+end
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb
index 444ccdfdbe5748f244d88896edf09e63e8ed3a43..2c06314760cd34df4fff886c0c5489ca86e93aa6 100644
--- a/app/models/concerns/expireable.rb
+++ b/app/models/concerns/expireable.rb
@@ -9,7 +9,7 @@ module Expireable
     attr_reader :expires_in
 
     def expires_in=(interval)
-      self.expires_at = interval.to_i.seconds.from_now unless interval.blank?
+      self.expires_at = interval.to_i.seconds.from_now if interval.present?
       @expires_in     = interval
     end
 
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb
index 50288e70055f484ad2be2b1cbde347197d27c36d..f263fe7af04761de25c995676342442178dda999 100644
--- a/app/models/concerns/omniauthable.rb
+++ b/app/models/concerns/omniauthable.rb
@@ -26,7 +26,7 @@ module Omniauthable
       # to prevent the identity being locked with accidentally created accounts.
       # Note that this may leave zombie accounts (with no associated identity) which
       # can be cleaned up at a later date.
-      user = signed_in_resource ? signed_in_resource : identity.user
+      user = signed_in_resource || identity.user
       user = create_for_oauth(auth) if user.nil?
 
       if identity.user.nil?
@@ -61,7 +61,7 @@ module Omniauthable
       display_name      = auth.info.full_name || [auth.info.first_name, auth.info.last_name].join(' ')
 
       {
-        email: email ? email : "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com",
+        email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com",
         password: Devise.friendly_token[0, 20],
         account_attributes: {
           username: ensure_unique_username(auth.uid),
diff --git a/app/models/concerns/paginable.rb b/app/models/concerns/paginable.rb
index 66695677e9af6990bca0382c2b76d45bc2990a45..8863094f7d467be0ac73ae1279648d9f24b4347d 100644
--- a/app/models/concerns/paginable.rb
+++ b/app/models/concerns/paginable.rb
@@ -19,5 +19,13 @@ module Paginable
       query = query.where(arel_table[:id].gt(min_id)) if min_id.present?
       query
     }
+
+    scope :paginate_by_id, ->(limit, options = {}) {
+      if options[:min_id].present?
+        paginate_by_min_id(limit, options[:min_id]).reverse
+      else
+        paginate_by_max_id(limit, options[:max_id], options[:since_id])
+      end
+    }
   end
 end
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index c17f19a60050bb1a0916b4a9c041aade37692ca0..9372a963bf64eef747b062399d3e05639def5567 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -18,7 +18,7 @@ module Remotable
           return
         end
 
-        return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[attribute_name] == url
+        return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.blank? || self[attribute_name] == url
 
         begin
           Request.new(:get, url).perform do |response|
diff --git a/app/models/concerns/status_threading_concern.rb b/app/models/concerns/status_threading_concern.rb
index fa441469c11c80766bea1baf62313106e8ae2f01..b9c800c2aabdbb3a262dd9839ee6c6ede2f7a2a4 100644
--- a/app/models/concerns/status_threading_concern.rb
+++ b/app/models/concerns/status_threading_concern.rb
@@ -8,7 +8,7 @@ module StatusThreadingConcern
   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)
+    find_statuses_from_tree_path(descendant_ids(limit, max_child_id, since_child_id, depth), account, promote: true)
   end
 
   private
@@ -76,7 +76,7 @@ module StatusThreadingConcern
     descendants_with_self - [self]
   end
 
-  def find_statuses_from_tree_path(ids, account)
+  def find_statuses_from_tree_path(ids, account, promote: false)
     statuses    = statuses_with_accounts(ids).to_a
     account_ids = statuses.map(&:account_id).uniq
     domains     = statuses.map(&:account_domain).compact.uniq
@@ -86,6 +86,28 @@ module StatusThreadingConcern
 
     # Order ancestors/descendants by tree path
     statuses.sort_by! { |status| ids.index(status.id) }
+
+    # Bring self-replies to the top
+    if promote
+      promote_by!(statuses) { |status| status.in_reply_to_account_id == status.account_id }
+    else
+      statuses
+    end
+  end
+
+  def promote_by!(arr)
+    insert_at = arr.find_index { |item| !yield(item) }
+
+    return arr if insert_at.nil?
+
+    arr.each_with_index do |item, index|
+      next if index <= insert_at || !yield(item)
+
+      arr.insert(insert_at, arr.delete_at(index))
+      insert_at += 1
+    end
+
+    arr
   end
 
   def relations_map_for_account(account, account_ids, domains)
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index b99ed01f081cab2303d47d559c1a8a9b7c350958..d3cc7050492ea5523ccde7596eebcfba777d4f3c 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -31,6 +31,8 @@ class CustomEmoji < ApplicationRecord
 
   has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }
 
+  before_validation :downcase_domain
+
   validates_attachment :image, content_type: { content_type: 'image/png' }, presence: true, size: { less_than: LIMIT }
   validates :shortcode, uniqueness: { scope: :domain }, format: { with: /\A#{SHORTCODE_RE_FRAGMENT}\z/ }, length: { minimum: 2 }
 
@@ -73,4 +75,8 @@ class CustomEmoji < ApplicationRecord
   def remove_entity_cache
     Rails.cache.delete(EntityCache.instance.to_key(:emoji, shortcode, domain))
   end
+
+  def downcase_domain
+    self.domain = domain.downcase unless domain.nil?
+  end
 end
diff --git a/app/models/custom_emoji_filter.rb b/app/models/custom_emoji_filter.rb
index c4bc310bb0773d60b5136117a6832edff6435ccb..7649055d2839037ded1cd8eef11f3244c1258a0a 100644
--- a/app/models/custom_emoji_filter.rb
+++ b/app/models/custom_emoji_filter.rb
@@ -26,7 +26,7 @@ class CustomEmojiFilter
     when 'remote'
       CustomEmoji.remote
     when 'by_domain'
-      CustomEmoji.where(domain: value)
+      CustomEmoji.where(domain: value.downcase)
     when 'shortcode'
       CustomEmoji.search(value)
     else
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 93658793bd437e98a0c5eb97f604b4f5ad94e9b9..1064ea7c8f29bbdf3763f365e644a44b0e30860d 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -3,15 +3,18 @@
 #
 # Table name: domain_blocks
 #
-#  id           :bigint(8)        not null, primary key
-#  domain       :string           default(""), not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#  severity     :integer          default("silence")
-#  reject_media :boolean          default(FALSE), not null
+#  id             :bigint(8)        not null, primary key
+#  domain         :string           default(""), not null
+#  created_at     :datetime         not null
+#  updated_at     :datetime         not null
+#  severity       :integer          default("silence")
+#  reject_media   :boolean          default(FALSE), not null
+#  reject_reports :boolean          default(FALSE), not null
 #
 
 class DomainBlock < ApplicationRecord
+  include DomainNormalizable
+
   enum severity: [:silence, :suspend, :noop]
 
   attr_accessor :retroactive
@@ -24,12 +27,4 @@ class DomainBlock < ApplicationRecord
   def self.blocked?(domain)
     where(domain: domain, severity: :suspend).exists?
   end
-
-  before_validation :normalize_domain
-
-  private
-
-  def normalize_domain
-    self.domain = TagManager.instance.normalize_domain(domain)
-  end
 end
diff --git a/app/models/email_domain_block.rb b/app/models/email_domain_block.rb
index 10490375bc224cd39c42260e96332970c2f005c6..0fcd36477b927942e5e02dca35db7dcfdafe8999 100644
--- a/app/models/email_domain_block.rb
+++ b/app/models/email_domain_block.rb
@@ -10,7 +10,7 @@
 #
 
 class EmailDomainBlock < ApplicationRecord
-  before_validation :normalize_domain
+  include DomainNormalizable
 
   validates :domain, presence: true, uniqueness: true
 
@@ -27,10 +27,4 @@ class EmailDomainBlock < ApplicationRecord
 
     where(domain: domain).exists?
   end
-
-  private
-
-  def normalize_domain
-    self.domain = TagManager.instance.normalize_domain(domain)
-  end
 end
diff --git a/app/models/export.rb b/app/models/export.rb
index f0d5dd2557dd8d68959eec21fdbd221273a3ac7d..a2520e9c244f34cf0ef609be5b06a8d4e169672f 100644
--- a/app/models/export.rb
+++ b/app/models/export.rb
@@ -9,23 +9,53 @@ class Export
   end
 
   def to_blocked_accounts_csv
-    to_csv account.blocking
+    to_csv account.blocking.select(:username, :domain)
   end
 
   def to_muted_accounts_csv
-    to_csv account.muting
+    to_csv account.muting.select(:username, :domain)
   end
 
   def to_following_accounts_csv
-    to_csv account.following
+    to_csv account.following.select(:username, :domain)
+  end
+
+  def to_lists_csv
+    CSV.generate do |csv|
+      account.owned_lists.select(:title).each do |list|
+        list.accounts.select(:username, :domain).each do |account|
+          csv << [list.title, acct(account)]
+        end
+      end
+    end
+  end
+
+  def to_blocked_domains_csv
+    CSV.generate do |csv|
+      account.domain_blocks.pluck(:domain).each do |domain|
+        csv << [domain]
+      end
+    end
   end
 
   def total_storage
     account.media_attachments.sum(:file_file_size)
   end
 
+  def total_statuses
+    account.statuses_count
+  end
+
   def total_follows
-    account.following.count
+    account.following_count
+  end
+
+  def total_lists
+    account.owned_lists.count
+  end
+
+  def total_followers
+    account.followers_count
   end
 
   def total_blocks
@@ -36,13 +66,21 @@ class Export
     account.muting.count
   end
 
+  def total_domain_blocks
+    account.domain_blocks.count
+  end
+
   private
 
   def to_csv(accounts)
     CSV.generate do |csv|
       accounts.each do |account|
-        csv << [(account.local? ? account.local_username_and_domain : account.acct)]
+        csv << [acct(account)]
       end
     end
   end
+
+  def acct(account)
+    account.local? ? account.local_username_and_domain : account.acct
+  end
 end
diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index 0fce82f6f92a3fe4891b110e1e213dbd52923c17..17f8c9fa631d2a758512dff8cb458ad2e92e1505 100644
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -32,20 +32,11 @@ class Favourite < ApplicationRecord
   private
 
   def increment_cache_counters
-    if association(:status).loaded?
-      status.update_attribute(:favourites_count, status.favourites_count + 1)
-    else
-      Status.where(id: status_id).update_all('favourites_count = COALESCE(favourites_count, 0) + 1')
-    end
+    status&.increment_count!(:favourites_count)
   end
 
   def decrement_cache_counters
     return if association(:status).loaded? && (status.marked_for_destruction? || status.marked_for_mass_destruction?)
-
-    if association(:status).loaded?
-      status.update_attribute(:favourites_count, [status.favourites_count - 1, 0].max)
-    else
-      Status.where(id: status_id).update_all('favourites_count = GREATEST(COALESCE(favourites_count, 0) - 1, 0)')
-    end
+    status&.decrement_count!(:favourites_count)
   end
 end
diff --git a/app/models/feed.rb b/app/models/feed.rb
index d99f1ffb2c7620025fc0cdaf627d73ddd7a5d3d5..5bce88f25522df0a9797a30672e46195e30c2793 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -6,16 +6,20 @@ class Feed
     @id   = id
   end
 
-  def get(limit, max_id = nil, since_id = nil)
-    from_redis(limit, max_id, since_id)
+  def get(limit, max_id = nil, since_id = nil, min_id = nil)
+    from_redis(limit, max_id, since_id, min_id)
   end
 
   protected
 
-  def from_redis(limit, max_id, since_id)
-    max_id     = '+inf' if max_id.blank?
-    since_id   = '-inf' if since_id.blank?
-    unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+  def from_redis(limit, max_id, since_id, min_id)
+    if min_id.blank?
+      max_id     = '+inf' if max_id.blank?
+      since_id   = '-inf' if since_id.blank?
+      unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+    else
+      unhydrated = redis.zrangebyscore(key, "(#{min_id}", '+inf', limit: [0, limit], with_scores: true).map(&:first).map(&:to_i)
+    end
 
     Status.where(id: unhydrated).cache_ids
   end
diff --git a/app/models/follow.rb b/app/models/follow.rb
index eaf8445f3bfb0c9243c6b1ebb4321e1bfc7bc8a5..87fa114253b4e6b4b454cfd53d9f65c937646e23 100644
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -16,15 +16,13 @@ class Follow < ApplicationRecord
   include Paginable
   include RelationshipCacheable
 
-  belongs_to :account, counter_cache: :following_count
-
-  belongs_to :target_account,
-             class_name: 'Account',
-             counter_cache: :followers_count
+  belongs_to :account
+  belongs_to :target_account, class_name: 'Account'
 
   has_one :notification, as: :activity, dependent: :destroy
 
   validates :account_id, uniqueness: { scope: :target_account_id }
+  validates_with FollowLimitValidator, on: :create
 
   scope :recent, -> { reorder(id: :desc) }
 
@@ -32,11 +30,33 @@ class Follow < ApplicationRecord
     false # Force uri_for to use uri attribute
   end
 
+  def revoke_request!
+    FollowRequest.create!(account: account, target_account: target_account, show_reblogs: show_reblogs, uri: uri)
+    destroy!
+  end
+
   before_validation :set_uri, only: :create
+  after_create :increment_cache_counters
+  after_destroy :remove_endorsements
+  after_destroy :decrement_cache_counters
 
   private
 
   def set_uri
     self.uri = ActivityPub::TagManager.instance.generate_uri_for(self) if uri.nil?
   end
+
+  def remove_endorsements
+    AccountPin.where(target_account_id: target_account_id, account_id: account_id).delete_all
+  end
+
+  def increment_cache_counters
+    account&.increment_count!(:following_count)
+    target_account&.increment_count!(:followers_count)
+  end
+
+  def decrement_cache_counters
+    account&.decrement_count!(:following_count)
+    target_account&.decrement_count!(:followers_count)
+  end
 end
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 9c4875564b29a6d6293d6534b5aa74c2c9e6e8ed..c5451a0507ac58df3894a9796ba13cdcee4b8731 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -22,6 +22,7 @@ class FollowRequest < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
 
   validates :account_id, uniqueness: { scope: :target_account_id }
+  validates_with FollowLimitValidator, on: :create
 
   def authorize!
     account.follow!(target_account, reblogs: show_reblogs, uri: uri)
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 723480bddb4c13bf631e2063c3c1b109876a30de..eca71bf6214f466efb2782c5b12a04fd19a985f0 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -10,6 +10,8 @@ class Form::AdminSettings
     :site_contact_email=,
     :site_title,
     :site_title=,
+    :site_short_description,
+    :site_short_description=,
     :site_description,
     :site_description=,
     :site_extended_description,
@@ -28,6 +30,8 @@ class Form::AdminSettings
     :show_staff_badge=,
     :bootstrap_timeline_accounts,
     :bootstrap_timeline_accounts=,
+    :theme,
+    :theme=,
     :min_invite_role,
     :min_invite_role=,
     :activity_api_enabled,
@@ -38,6 +42,10 @@ class Form::AdminSettings
     :show_known_fediverse_at_about_page=,
     :preview_sensitive_media,
     :preview_sensitive_media=,
+    :custom_css,
+    :custom_css=,
+    :profile_directory,
+    :profile_directory=,
     to: Setting
   )
 end
diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb
index 4f08a3049732168183f9df9d26e20f9c8b3d4c36..89872806754ed9da47289f45dae468a970dce910 100644
--- a/app/models/form/status_batch.rb
+++ b/app/models/form/status_batch.rb
@@ -6,8 +6,6 @@ class Form::StatusBatch
 
   attr_accessor :status_ids, :action, :current_account
 
-  ACTION_TYPE = %w(nsfw_on nsfw_off delete).freeze
-
   def save
     case action
     when 'nsfw_on', 'nsfw_off'
@@ -23,7 +21,7 @@ class Form::StatusBatch
     media_attached_status_ids = MediaAttachment.where(status_id: status_ids).pluck(:status_id)
 
     ApplicationRecord.transaction do
-      Status.where(id: media_attached_status_ids).find_each do |status|
+      Status.where(id: media_attached_status_ids).reorder(nil).find_each do |status|
         status.update!(sensitive: sensitive)
         log_action :update, status
       end
@@ -35,7 +33,7 @@ class Form::StatusBatch
   end
 
   def delete_statuses
-    Status.where(id: status_ids).find_each do |status|
+    Status.where(id: status_ids).reorder(nil).find_each do |status|
       RemovalWorker.perform_async(status.id)
       log_action :destroy, status
     end
diff --git a/app/models/home_feed.rb b/app/models/home_feed.rb
index b943a34ce19ab4889ca13c801cbde91a97efe01a..ba7564983b0f8bc9820759773c7d53b0ec075578 100644
--- a/app/models/home_feed.rb
+++ b/app/models/home_feed.rb
@@ -7,9 +7,9 @@ class HomeFeed < Feed
     @account = account
   end
 
-  def get(limit, max_id = nil, since_id = nil)
+  def get(limit, max_id = nil, since_id = nil, min_id = nil)
     if redis.exists("account:#{@account.id}:regeneration")
-      from_database(limit, max_id, since_id)
+      from_database(limit, max_id, since_id, min_id)
     else
       super
     end
@@ -17,9 +17,9 @@ class HomeFeed < Feed
 
   private
 
-  def from_database(limit, max_id, since_id)
+  def from_database(limit, max_id, since_id, min_id)
     Status.as_home_timeline(@account)
-          .paginate_by_max_id(limit, max_id, since_id)
+          .paginate_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
           .reject { |status| FeedManager.instance.filter?(:home, status, @account.id) }
   end
 end
diff --git a/app/models/identity.rb b/app/models/identity.rb
index a5e0c09ec14d416afdc4b2e1584f0f01890b800c..8cc65aef413d1330a5c338e64d11287a19a2e4c1 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -3,12 +3,12 @@
 #
 # Table name: identities
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer
 #  provider   :string           default(""), not null
 #  uid        :string           default(""), not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  id         :bigint(8)        not null, primary key
+#  user_id    :bigint(8)
 #
 
 class Identity < ApplicationRecord
diff --git a/app/models/instance.rb b/app/models/instance.rb
index 6d5c9c2ab605008da96b0fa50fa2ae4684bc6e40..7448d465c3c4eaf90a48b820d13352fdf3f4f3b8 100644
--- a/app/models/instance.rb
+++ b/app/models/instance.rb
@@ -3,10 +3,23 @@
 class Instance
   include ActiveModel::Model
 
-  attr_accessor :domain, :accounts_count
+  attr_accessor :domain, :accounts_count, :domain_block
 
-  def initialize(account)
-    @domain = account.domain
-    @accounts_count = account.accounts_count
+  def initialize(resource)
+    @domain         = resource.domain
+    @accounts_count = resource.accounts_count
+    @domain_block   = resource.is_a?(DomainBlock) ? resource : DomainBlock.find_by(domain: domain)
+  end
+
+  def cached_sample_accounts
+    Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { Account.where(domain: domain).searchable.joins(:account_stat).popular.limit(3) }
+  end
+
+  def to_param
+    domain
+  end
+
+  def cache_key
+    domain
   end
 end
diff --git a/app/models/instance_filter.rb b/app/models/instance_filter.rb
index 5073cf1faa48a06e95b2dbbb75ef69423a3de465..3483d8cd6e996ec7104909e1d37a7761c56a8372 100644
--- a/app/models/instance_filter.rb
+++ b/app/models/instance_filter.rb
@@ -8,21 +8,10 @@ class InstanceFilter
   end
 
   def results
-    scope = Account.remote.by_domain_accounts
-    params.each do |key, value|
-      scope.merge!(scope_for(key, value)) if value.present?
-    end
-    scope
-  end
-
-  private
-
-  def scope_for(key, value)
-    case key.to_s
-    when 'domain_name'
-      Account.matches_domain(value)
+    if params[:limited].present?
+      DomainBlock.order(id: :desc)
     else
-      raise "Unknown filter: #{key}"
+      Account.remote.by_domain_accounts
     end
   end
 end
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index f9a8f322ead50e48bb20030b08569b51059875bc..6b939124fa44e7378222632b5fa7a107073e1542 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -3,20 +3,21 @@
 #
 # Table name: media_attachments
 #
-#  id                :bigint(8)        not null, primary key
-#  status_id         :bigint(8)
-#  file_file_name    :string
-#  file_content_type :string
-#  file_file_size    :integer
-#  file_updated_at   :datetime
-#  remote_url        :string           default(""), not null
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
-#  shortcode         :string
-#  type              :integer          default("image"), not null
-#  file_meta         :json
-#  account_id        :bigint(8)
-#  description       :text
+#  id                  :bigint(8)        not null, primary key
+#  status_id           :bigint(8)
+#  file_file_name      :string
+#  file_content_type   :string
+#  file_file_size      :integer
+#  file_updated_at     :datetime
+#  remote_url          :string           default(""), not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#  shortcode           :string
+#  type                :integer          default("image"), not null
+#  file_meta           :json
+#  account_id          :bigint(8)
+#  description         :text
+#  scheduled_status_id :bigint(8)
 #
 
 class MediaAttachment < ApplicationRecord
@@ -25,19 +26,20 @@ class MediaAttachment < ApplicationRecord
   enum type: [:image, :gifv, :video, :unknown]
 
   IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif'].freeze
-  VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v'].freeze
+  VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v', '.mov'].freeze
 
-  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
-  VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
+  IMAGE_MIME_TYPES             = ['image/jpeg', 'image/png', 'image/gif'].freeze
+  VIDEO_MIME_TYPES             = ['video/webm', 'video/mp4', 'video/quicktime'].freeze
+  VIDEO_CONVERTIBLE_MIME_TYPES = ['video/webm', 'video/quicktime'].freeze
 
   IMAGE_STYLES = {
     original: {
-      geometry: '1280x1280>',
+      pixels: 1_638_400, # 1280x1280px
       file_geometry_parser: FastGeometryParser,
     },
 
     small: {
-      geometry: '400x400>',
+      pixels: 160_000, # 400x400px
       file_geometry_parser: FastGeometryParser,
     },
   }.freeze
@@ -54,10 +56,30 @@ class MediaAttachment < ApplicationRecord
     },
   }.freeze
 
-  LIMIT = 8.megabytes
+  VIDEO_FORMAT = {
+    format: 'mp4',
+    convert_options: {
+      output: {
+        'loglevel' => 'fatal',
+        'movflags' => 'faststart',
+        'pix_fmt'  => 'yuv420p',
+        'vf'       => 'scale=\'trunc(iw/2)*2:trunc(ih/2)*2\'',
+        'vsync'    => 'cfr',
+        'c:v'      => 'h264',
+        'b:v'      => '500K',
+        'maxrate'  => '1300K',
+        'bufsize'  => '1300K',
+        'crf'      => 18,
+      },
+    },
+  }.freeze
+
+  IMAGE_LIMIT = 8.megabytes
+  VIDEO_LIMIT = 40.megabytes
 
-  belongs_to :account, inverse_of: :media_attachments, optional: true
-  belongs_to :status,  inverse_of: :media_attachments, optional: true
+  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
 
   has_attached_file :file,
                     styles: ->(f) { file_styles f },
@@ -65,16 +87,17 @@ class MediaAttachment < ApplicationRecord
                     convert_options: { all: '-quality 90 -strip' }
 
   validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
-  validates_attachment_size :file, less_than: LIMIT
-  remotable_attachment :file, LIMIT
+  validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :video?
+  validates_attachment_size :file, less_than: VIDEO_LIMIT, if: :video?
+  remotable_attachment :file, VIDEO_LIMIT
 
   include Attachmentable
 
   validates :account, presence: true
   validates :description, length: { maximum: 420 }, if: :local?
 
-  scope :attached,   -> { where.not(status_id: nil) }
-  scope :unattached, -> { where(status_id: nil) }
+  scope :attached,   -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) }
+  scope :unattached, -> { where(status_id: nil, scheduled_status_id: nil) }
   scope :local,      -> { where(remote_url: '') }
   scope :remote,     -> { where.not(remote_url: '') }
 
@@ -110,6 +133,7 @@ class MediaAttachment < ApplicationRecord
     "#{x},#{y}"
   end
 
+  after_commit :reset_parent_cache, on: :update
   before_create :prepare_description, unless: :local?
   before_create :set_shortcode
   before_post_process :set_type_and_extension
@@ -122,25 +146,15 @@ class MediaAttachment < ApplicationRecord
       if f.instance.file_content_type == 'image/gif'
         {
           small: IMAGE_STYLES[:small],
-          original: {
-            format: 'mp4',
-            convert_options: {
-              output: {
-                'movflags' => 'faststart',
-                'pix_fmt'  => 'yuv420p',
-                'vf'       => 'scale=\'trunc(iw/2)*2:trunc(ih/2)*2\'',
-                'vsync'    => 'cfr',
-                'c:v'      => 'h264',
-                'b:v'      => '500K',
-                'maxrate'  => '1300K',
-                'bufsize'  => '1300K',
-                'crf'      => 18,
-              },
-            },
-          },
+          original: VIDEO_FORMAT,
         }
       elsif IMAGE_MIME_TYPES.include? f.instance.file_content_type
         IMAGE_STYLES
+      elsif VIDEO_CONVERTIBLE_MIME_TYPES.include?(f.instance.file_content_type)
+        {
+          small: VIDEO_STYLES[:small],
+          original: VIDEO_FORMAT,
+        }
       else
         VIDEO_STYLES
       end
@@ -152,7 +166,7 @@ class MediaAttachment < ApplicationRecord
       elsif VIDEO_MIME_TYPES.include? f.file_content_type
         [:video_transcoder]
       else
-        [:thumbnail]
+        [:lazy_thumbnail]
       end
     end
   end
@@ -220,4 +234,9 @@ class MediaAttachment < ApplicationRecord
       bitrate: movie.bitrate,
     }
   end
+
+  def reset_parent_cache
+    return if status_id.nil?
+    Rails.cache.delete("statuses/#{status_id}")
+  end
 end
diff --git a/app/models/mention.rb b/app/models/mention.rb
index 8ab886b18434028f17cbc40486c6a269e599f83e..d01a88e32eb976c16b885a9c8fb406c3ab873188 100644
--- a/app/models/mention.rb
+++ b/app/models/mention.rb
@@ -8,6 +8,7 @@
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
 #  account_id :bigint(8)
+#  silent     :boolean          default(FALSE), not null
 #
 
 class Mention < ApplicationRecord
@@ -18,10 +19,17 @@ class Mention < ApplicationRecord
 
   validates :account, uniqueness: { scope: :status }
 
+  scope :active, -> { where(silent: false) }
+  scope :silent, -> { where(silent: true) }
+
   delegate(
     :username,
     :acct,
     to: :account,
     prefix: true
   )
+
+  def active?
+    !silent?
+  end
 end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 4f6ec8e8ea56ac72840affe15b84486c7f71158c..2f0a9b78c7a040d0065ad8256db0229b216045b9 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -24,7 +24,7 @@ class Notification < ApplicationRecord
     favourite:      'Favourite',
   }.freeze
 
-  STATUS_INCLUDES = [:account, :application, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :application, :media_attachments, :tags, mentions: :account]].freeze
+  STATUS_INCLUDES = [:account, :application, :media_attachments, :tags, active_mentions: :account, reblog: [:account, :application, :media_attachments, :tags, active_mentions: :account]].freeze
 
   belongs_to :account, optional: true
   belongs_to :from_account, class_name: 'Account', optional: true
@@ -39,8 +39,6 @@ class Notification < ApplicationRecord
   validates :account_id, uniqueness: { scope: [:activity_type, :activity_id] }
   validates :activity_type, inclusion: { in: TYPE_CLASS_MAP.values }
 
-  scope :cache_ids, -> { select(:id, :updated_at, :activity_type, :activity_id) }
-
   scope :browserable, ->(exclude_types = []) {
     types = TYPE_CLASS_MAP.values - activity_types_from_types(exclude_types + [:follow_request])
     where(activity_type: types)
@@ -68,12 +66,16 @@ class Notification < ApplicationRecord
   end
 
   class << self
+    def cache_ids
+      select(:id, :updated_at, :activity_type, :activity_id)
+    end
+
     def reload_stale_associations!(cached_items)
       account_ids = (cached_items.map(&:from_account_id) + cached_items.map { |item| item.target_status&.account_id }.compact).uniq
 
       return if account_ids.empty?
 
-      accounts = Account.where(id: account_ids).map { |a| [a.id, a] }.to_h
+      accounts = Account.where(id: account_ids).includes(:account_stat).each_with_object({}) { |a, h| h[a.id] = a }
 
       cached_items.each do |item|
         item.from_account = accounts[item.from_account_id]
diff --git a/app/models/relay.rb b/app/models/relay.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7478c110d4557552a8bdd13192d77a1933787070
--- /dev/null
+++ b/app/models/relay.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: relays
+#
+#  id                 :bigint(8)        not null, primary key
+#  inbox_url          :string           default(""), not null
+#  follow_activity_id :string
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  state              :integer          default("idle"), not null
+#
+
+class Relay < ApplicationRecord
+  PRESET_RELAY = 'https://relay.joinmastodon.org/inbox'
+
+  validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
+
+  enum state: [:idle, :pending, :accepted, :rejected]
+
+  scope :enabled, -> { accepted }
+
+  before_destroy :ensure_disabled
+
+  alias enabled? accepted?
+
+  def enable!
+    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    payload     = Oj.dump(follow_activity(activity_id))
+
+    update!(state: :pending, follow_activity_id: activity_id)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  def disable!
+    activity_id = ActivityPub::TagManager.instance.generate_uri_for(nil)
+    payload     = Oj.dump(unfollow_activity(activity_id))
+
+    update!(state: :idle, follow_activity_id: nil)
+    ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
+  end
+
+  private
+
+  def follow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: activity_id,
+      type: 'Follow',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: ActivityPub::TagManager::COLLECTIONS[:public],
+    }
+  end
+
+  def unfollow_activity(activity_id)
+    {
+      '@context': ActivityPub::TagManager::CONTEXT,
+      id: activity_id,
+      type: 'Undo',
+      actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+      object: {
+        id: follow_activity_id,
+        type: 'Follow',
+        actor: ActivityPub::TagManager.instance.uri_for(some_local_account),
+        object: ActivityPub::TagManager::COLLECTIONS[:public],
+      },
+    }
+  end
+
+  def some_local_account
+    @some_local_account ||= Account.representative
+  end
+
+  def ensure_disabled
+    return unless enabled?
+    disable!
+  end
+end
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 070144e2d81dc20f309470234977d8b5084a14bd..2537de36c7b3f3ef8b6526114ebefd8196b4d293 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -22,6 +22,10 @@ class RemoteFollow
     addressable_template.expand(uri: account.local_username_and_domain).to_s
   end
 
+  def interact_address_for(status)
+    addressable_template.expand(uri: ActivityPub::TagManager.instance.uri_for(status)).to_s
+  end
+
   private
 
   def populate_template
diff --git a/app/models/report.rb b/app/models/report.rb
index efe385b2dbb855e2882ee8c3b9f35f35c1fcdcb3..2804020f5273bcfca453adea85dc50230dab733e 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -60,6 +60,10 @@ class Report < ApplicationRecord
     !action_taken?
   end
 
+  def unresolved_siblings?
+    Report.where.not(id: id).where(target_account_id: target_account_id).unresolved.exists?
+  end
+
   def history
     time_range = created_at..updated_at
 
diff --git a/app/models/report_note.rb b/app/models/report_note.rb
index 54b416577a14ee3f176a654188977599c8a1f084..6d7167e0edbc8cb9fa63cfa9774ae53a599ebe39 100644
--- a/app/models/report_note.rb
+++ b/app/models/report_note.rb
@@ -15,7 +15,7 @@ class ReportNote < ApplicationRecord
   belongs_to :account
   belongs_to :report, inverse_of: :notes, touch: true
 
-  scope :latest, -> { reorder('created_at ASC') }
+  scope :latest, -> { reorder(created_at: :desc) }
 
   validates :content, presence: true, length: { maximum: 500 }
 end
diff --git a/app/models/scheduled_status.rb b/app/models/scheduled_status.rb
new file mode 100644
index 0000000000000000000000000000000000000000..27f0cbd280cbf2c3c22110a0cda25820f68fc991
--- /dev/null
+++ b/app/models/scheduled_status.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: scheduled_statuses
+#
+#  id           :bigint(8)        not null, primary key
+#  account_id   :bigint(8)
+#  scheduled_at :datetime
+#  params       :jsonb
+#
+
+class ScheduledStatus < ApplicationRecord
+  include Paginable
+
+  TOTAL_LIMIT = 300
+  DAILY_LIMIT = 25
+
+  belongs_to :account, inverse_of: :scheduled_statuses
+  has_many :media_attachments, inverse_of: :scheduled_status, dependent: :nullify
+
+  validate :validate_future_date
+  validate :validate_total_limit
+  validate :validate_daily_limit
+
+  private
+
+  def validate_future_date
+    errors.add(:scheduled_at, I18n.t('scheduled_statuses.too_soon')) if scheduled_at.present? && scheduled_at <= Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET
+  end
+
+  def validate_total_limit
+    errors.add(:base, I18n.t('scheduled_statuses.over_total_limit', limit: TOTAL_LIMIT)) if account.scheduled_statuses.count >= TOTAL_LIMIT
+  end
+
+  def validate_daily_limit
+    errors.add(:base, I18n.t('scheduled_statuses.over_daily_limit', limit: DAILY_LIMIT)) if account.scheduled_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT
+  end
+end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 033d09fd58022eff94b93bb6259f1048cadbac8c..a5878e96a21cc54ca74dfb86ddcf9aff7f745a7d 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -40,7 +40,7 @@ class Setting < RailsSettings::Base
 
     def all_as_records
       vars    = thing_scoped
-      records = vars.map { |r| [r.var, r] }.to_h
+      records = vars.each_with_object({}) { |r, h| h[r.var] = r }
 
       default_settings.each do |key, default_value|
         next if records.key?(key) || default_value.is_a?(Hash)
diff --git a/app/models/status.rb b/app/models/status.rb
index e7dd0df29e0d66588d680513127a12d020b4ab64..035423b40289d726ce4c7c1c66c73cdb9c5fc6c9 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -15,8 +15,6 @@
 #  visibility             :integer          default("public"), not null
 #  spoiler_text           :text             default(""), not null
 #  reply                  :boolean          default(FALSE), not null
-#  favourites_count       :integer          default(0), not null
-#  reblogs_count          :integer          default(0), not null
 #  language               :string
 #  conversation_id        :bigint(8)
 #  local                  :boolean
@@ -26,6 +24,8 @@
 #
 
 class Status < ApplicationRecord
+  before_destroy :unlink_from_conversations
+
   include Paginable
   include Streamable
   include Cacheable
@@ -37,7 +37,7 @@ class Status < ApplicationRecord
 
   update_index('statuses#status', :proper) if Chewy.enabled?
 
-  enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility
+  enum visibility: [:public, :unlisted, :private, :direct, :limited], _suffix: :visibility
 
   belongs_to :application, class_name: 'Doorkeeper::Application', optional: true
 
@@ -51,7 +51,8 @@ class Status < ApplicationRecord
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
   has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :thread
-  has_many :mentions, dependent: :destroy
+  has_many :mentions, dependent: :destroy, inverse_of: :status
+  has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status
   has_many :media_attachments, dependent: :nullify
 
   has_and_belongs_to_many :tags
@@ -59,6 +60,7 @@ class Status < ApplicationRecord
 
   has_one :notification, as: :activity, dependent: :destroy
   has_one :stream_entry, as: :activity, inverse_of: :status
+  has_one :status_stat, inverse_of: :status
 
   validates :uri, uniqueness: true, presence: true, unless: :local?
   validates :text, presence: true, unless: -> { with_media? || reblog? }
@@ -80,8 +82,39 @@ class Status < ApplicationRecord
   scope :including_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: true }) }
   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) }
-
-  cache_associated :account, :application, :media_attachments, :conversation, :tags, :stream_entry, mentions: :account, reblog: [:account, :application, :stream_entry, :tags, :media_attachments, :conversation, mentions: :account], thread: :account
+  scope :tagged_with_all, ->(tags) {
+    Array(tags).map(&:id).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, ->(tags) {
+    Array(tags).map(&:id).map(&:to_i).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
+  }
+
+  cache_associated :application,
+                   :media_attachments,
+                   :conversation,
+                   :status_stat,
+                   :tags,
+                   :preview_cards,
+                   :stream_entry,
+                   account: :account_stat,
+                   active_mentions: { account: :account_stat },
+                   reblog: [
+                     :application,
+                     :stream_entry,
+                     :tags,
+                     :preview_cards,
+                     :media_attachments,
+                     :conversation,
+                     :status_stat,
+                     account: :account_stat,
+                     active_mentions: { account: :account_stat },
+                   ],
+                   thread: { account: :account_stat }
 
   delegate :domain, to: :account, prefix: true
 
@@ -143,6 +176,10 @@ class Status < ApplicationRecord
     reblog
   end
 
+  def preview_card
+    preview_cards.first
+  end
+
   def title
     if destroyed?
       "#{account.acct} deleted status"
@@ -152,7 +189,11 @@ class Status < ApplicationRecord
   end
 
   def hidden?
-    private_visibility? || direct_visibility?
+    private_visibility? || direct_visibility? || limited_visibility?
+  end
+
+  def distributable?
+    public_visibility? || unlisted_visibility?
   end
 
   def with_media?
@@ -175,8 +216,28 @@ class Status < ApplicationRecord
     @marked_for_mass_destruction
   end
 
-  after_create  :increment_counter_caches
-  after_destroy :decrement_counter_caches
+  def replies_count
+    status_stat&.replies_count || 0
+  end
+
+  def reblogs_count
+    status_stat&.reblogs_count || 0
+  end
+
+  def favourites_count
+    status_stat&.favourites_count || 0
+  end
+
+  def increment_count!(key)
+    update_status_stat!(key => public_send(key) + 1)
+  end
+
+  def decrement_count!(key)
+    update_status_stat!(key => [public_send(key) - 1, 0].max)
+  end
+
+  after_create_commit  :increment_counter_caches
+  after_destroy_commit :decrement_counter_caches
 
   after_create_commit :store_uri, if: :local?
   after_create_commit :update_statistics, if: :local?
@@ -190,6 +251,10 @@ class Status < ApplicationRecord
   before_validation :set_local
 
   class << self
+    def selectable_visibilities
+      visibilities.keys - %w(direct limited)
+    end
+
     def in_chosen_languages(account)
       where(language: nil).or where(language: account.chosen_languages)
     end
@@ -200,7 +265,7 @@ class Status < ApplicationRecord
 
     def as_direct_timeline(account, limit = 20, max_id = nil, since_id = nil, cache_ids = false)
       # direct timeline is mix of direct message from_me and to_me.
-      # 2 querys are executed with pagination.
+      # 2 queries are executed with pagination.
       # constant expression using arel_table is required for partial index
 
       # _from_me part does not require any timeline filters
@@ -256,19 +321,19 @@ class Status < ApplicationRecord
     end
 
     def favourites_map(status_ids, account_id)
-      Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |f| [f.status_id, true] }.to_h
+      Favourite.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |f, h| h[f.status_id] = true }
     end
 
     def reblogs_map(status_ids, account_id)
-      select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).reorder(nil).map { |s| [s.reblog_of_id, true] }.to_h
+      select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).reorder(nil).each_with_object({}) { |s, h| h[s.reblog_of_id] = true }
     end
 
     def mutes_map(conversation_ids, account_id)
-      ConversationMute.select('conversation_id').where(conversation_id: conversation_ids).where(account_id: account_id).map { |m| [m.conversation_id, true] }.to_h
+      ConversationMute.select('conversation_id').where(conversation_id: conversation_ids).where(account_id: account_id).each_with_object({}) { |m, h| h[m.conversation_id] = true }
     end
 
     def pins_map(status_ids, account_id)
-      StatusPin.select('status_id').where(status_id: status_ids).where(account_id: account_id).map { |p| [p.status_id, true] }.to_h
+      StatusPin.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |p, h| h[p.status_id] = true }
     end
 
     def reload_stale_associations!(cached_items)
@@ -283,7 +348,7 @@ class Status < ApplicationRecord
 
       return if account_ids.empty?
 
-      accounts = Account.where(id: account_ids).map { |a| [a.id, a] }.to_h
+      accounts = Account.where(id: account_ids).includes(:account_stat).each_with_object({}) { |a, h| h[a.id] = a }
 
       cached_items.each do |item|
         item.account = accounts[item.account_id]
@@ -343,7 +408,8 @@ class Status < ApplicationRecord
 
     def account_silencing_filter(account)
       if account.silenced?
-        including_silenced_accounts
+        including_myself = left_outer_joins(:account).where(account_id: account.id).references(:accounts)
+        excluding_silenced_accounts.or(including_myself)
       else
         excluding_silenced_accounts
       end
@@ -352,8 +418,15 @@ class Status < ApplicationRecord
 
   private
 
+  def update_status_stat!(attrs)
+    return if marked_for_destruction? || destroyed?
+
+    record = status_stat || build_status_stat
+    record.update(attrs)
+  end
+
   def store_uri
-    update_attribute(:uri, ActivityPub::TagManager.instance.uri_for(self)) if uri.nil?
+    update_column(:uri, ActivityPub::TagManager.instance.uri_for(self)) if uri.nil?
   end
 
   def prepare_contents
@@ -372,6 +445,8 @@ class Status < ApplicationRecord
   end
 
   def set_conversation
+    self.thread = thread.reblog if thread&.reblog?
+
     self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply
 
     if reply? && !thread.nil?
@@ -402,36 +477,27 @@ class Status < ApplicationRecord
   def increment_counter_caches
     return if direct_visibility?
 
-    if association(:account).loaded?
-      account.update_attribute(:statuses_count, account.statuses_count + 1)
-    else
-      Account.where(id: account_id).update_all('statuses_count = COALESCE(statuses_count, 0) + 1')
-    end
-
-    return unless reblog?
-
-    if association(:reblog).loaded?
-      reblog.update_attribute(:reblogs_count, reblog.reblogs_count + 1)
-    else
-      Status.where(id: reblog_of_id).update_all('reblogs_count = COALESCE(reblogs_count, 0) + 1')
-    end
+    account&.increment_count!(:statuses_count)
+    reblog&.increment_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?)
+    thread&.increment_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?)
   end
 
   def decrement_counter_caches
     return if direct_visibility? || marked_for_mass_destruction?
 
-    if association(:account).loaded?
-      account.update_attribute(:statuses_count, [account.statuses_count - 1, 0].max)
-    else
-      Account.where(id: account_id).update_all('statuses_count = GREATEST(COALESCE(statuses_count, 0) - 1, 0)')
-    end
+    account&.decrement_count!(:statuses_count)
+    reblog&.decrement_count!(:reblogs_count) if reblog? && (public_visibility? || unlisted_visibility?)
+    thread&.decrement_count!(:replies_count) if in_reply_to_id.present? && (public_visibility? || unlisted_visibility?)
+  end
 
-    return unless reblog?
+  def unlink_from_conversations
+    return unless direct_visibility?
 
-    if association(:reblog).loaded?
-      reblog.update_attribute(:reblogs_count, [reblog.reblogs_count - 1, 0].max)
-    else
-      Status.where(id: reblog_of_id).update_all('reblogs_count = GREATEST(COALESCE(reblogs_count, 0) - 1, 0)')
+    mentioned_accounts = mentions.includes(:account).map(&:account)
+    inbox_owners       = mentioned_accounts.select(&:local?) + (account.local? ? [account] : [])
+
+    inbox_owners.each do |inbox_owner|
+      AccountConversation.remove_status(inbox_owner, self)
     end
   end
 end
diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb
new file mode 100644
index 0000000000000000000000000000000000000000..024c467e7150ffc055093fed9cb98612ffdb087f
--- /dev/null
+++ b/app/models/status_stat.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: status_stats
+#
+#  id               :bigint(8)        not null, primary key
+#  status_id        :bigint(8)        not null
+#  replies_count    :bigint(8)        default(0), not null
+#  reblogs_count    :bigint(8)        default(0), not null
+#  favourites_count :bigint(8)        default(0), not null
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#
+
+class StatusStat < ApplicationRecord
+  belongs_to :status, inverse_of: :status_stat
+
+  after_commit :reset_parent_cache
+
+  private
+
+  def reset_parent_cache
+    Rails.cache.delete("statuses/#{status_id}")
+  end
+end
diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb
index a2f273281b6df07e7c5e2c43791114bd01babe86..1a9afc5c7b743264aeec96994b07afefa8ca6caf 100644
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@@ -48,7 +48,7 @@ class StreamEntry < ApplicationRecord
   end
 
   def mentions
-    orphaned? ? [] : status.mentions.map(&:account)
+    orphaned? ? [] : status.active_mentions.map(&:account)
   end
 
   private
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 4f31f796e6ab13ec752a2842803857db52e313f6..99830ae92c66e95fb9004ba245f878ddf56f99c0 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -11,12 +11,36 @@
 
 class Tag < ApplicationRecord
   has_and_belongs_to_many :statuses
+  has_and_belongs_to_many :accounts
+  has_and_belongs_to_many :sample_accounts, -> { searchable.discoverable.popular.limit(3) }, class_name: 'Account'
+
+  has_one :account_tag_stat, dependent: :destroy
 
   HASHTAG_NAME_RE = '[[:word:]_]*[[:alpha:]_Â·][[:word:]_]*'
   HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i
 
   validates :name, presence: true, uniqueness: true, format: { with: /\A#{HASHTAG_NAME_RE}\z/i }
 
+  scope :discoverable, -> { joins(:account_tag_stat).where(AccountTagStat.arel_table[:accounts_count].gt(0)).where(account_tag_stats: { hidden: false }).order(Arel.sql('account_tag_stats.accounts_count desc')) }
+  scope :hidden, -> { where(account_tag_stats: { hidden: true }) }
+
+  delegate :accounts_count,
+           :accounts_count=,
+           :increment_count!,
+           :decrement_count!,
+           :hidden?,
+           to: :account_tag_stat
+
+  after_save :save_account_tag_stat
+
+  def account_tag_stat
+    super || build_account_tag_stat
+  end
+
+  def cached_sample_accounts
+    Rails.cache.fetch("#{cache_key}/sample_accounts", expires_in: 12.hours) { sample_accounts }
+  end
+
   def to_param
     name
   end
@@ -43,4 +67,11 @@ class Tag < ApplicationRecord
       Tag.where('lower(name) like lower(?)', pattern).order(:name).limit(limit)
     end
   end
+
+  private
+
+  def save_account_tag_stat
+    return unless account_tag_stat&.changed?
+    account_tag_stat.save
+  end
 end
diff --git a/app/models/tombstone.rb b/app/models/tombstone.rb
new file mode 100644
index 0000000000000000000000000000000000000000..997bb65fd068c4b0f33e8ba03e363e3338de1e4e
--- /dev/null
+++ b/app/models/tombstone.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: tombstones
+#
+#  id         :bigint(8)        not null, primary key
+#  account_id :bigint(8)
+#  uri        :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Tombstone < ApplicationRecord
+  belongs_to :account
+end
diff --git a/app/models/trending_tags.rb b/app/models/trending_tags.rb
index c3641d7fd9552b2d4eec2029eacc8823033153d5..3a8be21649b936a2cd5ad02a4e9621472785a8a7 100644
--- a/app/models/trending_tags.rb
+++ b/app/models/trending_tags.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 class TrendingTags
+  KEY                  = 'trending_tags'
   EXPIRE_HISTORY_AFTER = 7.days.seconds
+  EXPIRE_TRENDS_AFTER  = 1.day.seconds
+  THRESHOLD            = 5
 
   class << self
     def record_use!(tag, account, at_time = Time.now.utc)
@@ -9,6 +12,14 @@ class TrendingTags
 
       increment_historical_use!(tag.id, at_time)
       increment_unique_use!(tag.id, account.id, at_time)
+      increment_vote!(tag.id, at_time)
+    end
+
+    def get(limit)
+      key     = "#{KEY}:#{Time.now.utc.beginning_of_day.to_i}"
+      tag_ids = redis.zrevrange(key, 0, limit - 1).map(&:to_i)
+      tags    = Tag.where(id: tag_ids).to_a.each_with_object({}) { |tag, h| h[tag.id] = tag }
+      tag_ids.map { |tag_id| tags[tag_id] }.compact
     end
 
     private
@@ -25,6 +36,22 @@ class TrendingTags
       redis.expire(key, EXPIRE_HISTORY_AFTER)
     end
 
+    def increment_vote!(tag_id, at_time)
+      key      = "#{KEY}:#{at_time.beginning_of_day.to_i}"
+      expected = redis.pfcount("activity:tags:#{tag_id}:#{(at_time - 1.day).beginning_of_day.to_i}:accounts").to_f
+      expected = 1.0 if expected.zero?
+      observed = redis.pfcount("activity:tags:#{tag_id}:#{at_time.beginning_of_day.to_i}:accounts").to_f
+
+      if expected > observed || observed < THRESHOLD
+        redis.zrem(key, tag_id.to_s)
+      else
+        score = ((observed - expected)**2) / expected
+        redis.zadd(key, score, tag_id.to_s)
+      end
+
+      redis.expire(key, EXPIRE_TRENDS_AFTER)
+    end
+
     def disallowed_hashtags
       return @disallowed_hashtags if defined?(@disallowed_hashtags)
 
diff --git a/app/models/user.rb b/app/models/user.rb
index c820c553a7fd28d0a81446987f460d6aec86e4f5..5aa5c2b15c4a6be9b64fc822092785dc6a9811cc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -36,13 +36,21 @@
 #  invite_id                 :bigint(8)
 #  remember_token            :string
 #  chosen_languages          :string           is an Array
+#  created_by_application_id :bigint(8)
 #
 
 class User < ApplicationRecord
   include Settings::Extend
   include Omniauthable
 
-  ACTIVE_DURATION = 7.days
+  # 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
+  # within this time frame. Lowering the duration may improve performance
+  # if lots of people sign up, but not a lot of them check their feed
+  # every day. Raising the duration reduces the amount of expensive
+  # RegenerationWorker jobs that need to be run when those people come
+  # to check their feed
+  ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
 
   devise :two_factor_authenticatable,
          otp_secret_encryption_key: Rails.configuration.x.otp_secret
@@ -59,6 +67,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
   accepts_nested_attributes_for :account
 
   has_many :applications, class_name: 'Doorkeeper::Application', as: :owner
@@ -66,17 +75,19 @@ class User < ApplicationRecord
 
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
   validates_with BlacklistedEmailValidator, if: :email_changed?
-  validates_with EmailMxValidator, if: :email_changed?
+  validates_with EmailMxValidator, if: :validate_email_dns?
+  validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
 
   scope :recent, -> { order(id: :desc) }
   scope :admins, -> { where(admin: true) }
   scope :moderators, -> { where(moderator: true) }
   scope :staff, -> { admins.or(moderators) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }
+  scope :enabled, -> { where(disabled: false) }
   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: false }) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
-  scope :with_recent_ip_address, ->(value) { where(arel_table[:current_sign_in_ip].eq(value).or(arel_table[:last_sign_in_ip].eq(value))) }
+  scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) }
 
   before_validation :sanitize_languages
 
@@ -88,10 +99,10 @@ 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_sensitive_media, :hide_network,
-           :default_language, to: :settings, prefix: :setting, allow_nil: false
+           :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
+           :expand_spoilers, :default_language, :aggregate_reblogs, to: :settings, prefix: :setting, allow_nil: false
 
-  attr_accessor :invite_code
+  attr_reader :invite_code
 
   def pam_conflict(_)
     # block pam login tries on traditional account
@@ -130,6 +141,10 @@ class User < ApplicationRecord
     confirmed_at.present?
   end
 
+  def invited?
+    invite_id.present?
+  end
+
   def staff?
     admin? || moderator?
   end
@@ -209,10 +224,6 @@ class User < ApplicationRecord
     save!
   end
 
-  def active_for_authentication?
-    super && !disabled?
-  end
-
   def setting_default_privacy
     settings.default_privacy || (account.locked? ? 'private' : 'public')
   end
@@ -221,10 +232,18 @@ class User < ApplicationRecord
     settings.notification_emails['digest']
   end
 
+  def allows_report_emails?
+    settings.notification_emails['report']
+  end
+
   def hides_network?
     @hides_network ||= settings.hide_network
   end
 
+  def aggregates_reblogs?
+    @aggregates_reblogs ||= settings.aggregate_reblogs
+  end
+
   def token_for_app(a)
     return nil if a.nil? || a.owner != self
     Doorkeeper::AccessToken
@@ -255,7 +274,7 @@ class User < ApplicationRecord
   end
 
   def invite_code=(code)
-    self.invite  = Invite.find_by(code: code) unless code.blank?
+    self.invite  = Invite.find_by(code: code) if code.present?
     @invite_code = code
   end
 
@@ -284,7 +303,7 @@ class User < ApplicationRecord
       end
 
     if resource.blank?
-      resource = new(email: attributes[:email])
+      resource = new(email: attributes[:email], agreement: true)
       if Devise.check_at_sign && !resource[:email].index('@')
         resource[:email] = Rpam2.getenv(resource.find_pam_service, attributes[:email], attributes[:password], 'email', false)
         resource[:email] = "#{attributes[:email]}@#{resource.find_pam_suffix}" unless resource[:email]
@@ -297,7 +316,7 @@ class User < ApplicationRecord
     resource = joins(:account).find_by(accounts: { username: attributes[Devise.ldap_uid.to_sym].first })
 
     if resource.blank?
-      resource = new(email: attributes[:mail].first, account_attributes: { username: attributes[Devise.ldap_uid.to_sym].first })
+      resource = new(email: attributes[:mail].first, agreement: true, account_attributes: { username: attributes[Devise.ldap_uid.to_sym].first })
       resource.ldap_setup(attributes)
     end
 
@@ -309,6 +328,14 @@ class User < ApplicationRecord
     super
   end
 
+  def show_all_media?
+    setting_display_media == 'show_all'
+  end
+
+  def hide_all_media?
+    setting_display_media == 'hide_all'
+  end
+
   protected
 
   def send_devise_notification(notification, *args)
@@ -335,11 +362,16 @@ class User < ApplicationRecord
   end
 
   def regenerate_feed!
-    Redis.current.setnx("account:#{account_id}:regeneration", true) && Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
+    return unless Redis.current.setnx("account:#{account_id}:regeneration", true)
+    Redis.current.expire("account:#{account_id}:regeneration", 1.day.seconds)
     RegenerationWorker.perform_async(account_id)
   end
 
   def needs_feed_update?
     last_sign_in_at < ACTIVE_DURATION.ago
   end
+
+  def validate_email_dns?
+    email_changed? && !(Rails.env.test? || Rails.env.development?)
+  end
 end
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index d19b20c483f66f0adbc7e10653b0bf370fc12680..b57807d1c2bd5a38144cc617d4911eaabeeb5e97 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -68,6 +68,9 @@ class Web::PushSubscription < ApplicationRecord
       p256dh: key_p256dh,
       auth: key_auth,
       ttl: ttl,
+      ssl_timeout: 10,
+      open_timeout: 10,
+      read_timeout: 10,
       vapid: {
         subject: "mailto:#{::Setting.site_contact_email}",
         private_key: Rails.configuration.x.vapid_private_key,
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index efabe80d0d58bd357431f36aaab41041d450f343..9c145979d6c2c076577a2359139e457d1164e8e5 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -9,6 +9,10 @@ class AccountPolicy < ApplicationPolicy
     staff?
   end
 
+  def warn?
+    staff? && !record.user&.staff?
+  end
+
   def suspend?
     staff? && !record.user&.staff?
   end
@@ -33,6 +37,10 @@ class AccountPolicy < ApplicationPolicy
     staff?
   end
 
+  def remove_header?
+    staff?
+  end
+
   def subscribe?
     admin?
   end
diff --git a/app/policies/account_warning_preset_policy.rb b/app/policies/account_warning_preset_policy.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bccbd33efd4888ba077f264a7538d617be861be5
--- /dev/null
+++ b/app/policies/account_warning_preset_policy.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AccountWarningPresetPolicy < ApplicationPolicy
+  def index?
+    staff?
+  end
+
+  def create?
+    staff?
+  end
+
+  def update?
+    staff?
+  end
+
+  def destroy?
+    staff?
+  end
+end
diff --git a/app/policies/instance_policy.rb b/app/policies/instance_policy.rb
index d1956e2ded4c3b76946cbd341c85e2d5b110dfcb..a73823556c5ad6ed7b0e23d141ba599a1346bd63 100644
--- a/app/policies/instance_policy.rb
+++ b/app/policies/instance_policy.rb
@@ -5,7 +5,7 @@ class InstancePolicy < ApplicationPolicy
     admin?
   end
 
-  def resubscribe?
+  def show?
     admin?
   end
 end
diff --git a/app/policies/invite_policy.rb b/app/policies/invite_policy.rb
index a2a65f934d9fd2b2769dd917da73ab5ba7cfb6de..14236f78b8c9ab9babd7c0d9c49531dc590c6f6a 100644
--- a/app/policies/invite_policy.rb
+++ b/app/policies/invite_policy.rb
@@ -9,6 +9,10 @@ class InvitePolicy < ApplicationPolicy
     min_required_role?
   end
 
+  def deactivate_all?
+    admin?
+  end
+
   def destroy?
     owner? || (Setting.min_invite_role == 'admin' ? admin? : staff?)
   end
diff --git a/app/policies/relay_policy.rb b/app/policies/relay_policy.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bd75e21977a75b04c2c7e522714b1f4b82fb4d9f
--- /dev/null
+++ b/app/policies/relay_policy.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RelayPolicy < ApplicationPolicy
+  def update?
+    admin?
+  end
+end
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 6addc8a8a8ebe770dca60cb56ab784101ec8dcdb..64a5111fc8f899bbb9e4de6b7da99ee3281f70eb 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -12,7 +12,7 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def show?
-    if direct?
+    if requires_mention?
       owned? || mention_exists?
     elsif private?
       owned? || following_author? || mention_exists?
@@ -22,7 +22,7 @@ class StatusPolicy < ApplicationPolicy
   end
 
   def reblog?
-    !direct? && (!private? || owned?) && show? && !blocking_author?
+    !requires_mention? && (!private? || owned?) && show? && !blocking_author?
   end
 
   def favourite?
@@ -41,8 +41,8 @@ class StatusPolicy < ApplicationPolicy
 
   private
 
-  def direct?
-    record.direct_visibility?
+  def requires_mention?
+    record.direct_visibility? || record.limited_visibility?
   end
 
   def owned?
diff --git a/app/policies/tag_policy.rb b/app/policies/tag_policy.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c63de01dbe9ef4a34de76da9b90c77438928c8e4
--- /dev/null
+++ b/app/policies/tag_policy.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class TagPolicy < ApplicationPolicy
+  def index?
+    staff?
+  end
+
+  def hide?
+    staff?
+  end
+
+  def unhide?
+    staff?
+  end
+end
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index dabdf707a4b3df7eefdb1dbae72ce2d74f7913c3..57af5c61c86b32b7cd32aacdcbde5462de9d4145 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -18,11 +18,11 @@ class UserPolicy < ApplicationPolicy
   end
 
   def enable?
-    admin?
+    staff?
   end
 
   def disable?
-    admin? && !record.admin?
+    staff? && !record.admin?
   end
 
   def promote?
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb
index b1e99b31b7c3641c23197c2ba8524679e7862ffc..e4aaa65f6ff706fb742178c290861f3d83b9b878 100644
--- a/app/presenters/account_relationships_presenter.rb
+++ b/app/presenters/account_relationships_presenter.rb
@@ -2,7 +2,8 @@
 
 class AccountRelationshipsPresenter
   attr_reader :following, :followed_by, :blocking,
-              :muting, :requested, :domain_blocking
+              :muting, :requested, :domain_blocking,
+              :endorsed
 
   def initialize(account_ids, current_account_id, **options)
     @account_ids        = account_ids.map { |a| a.is_a?(Account) ? a.id : a }
@@ -14,6 +15,7 @@ class AccountRelationshipsPresenter
     @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))
     @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))
 
     cache_uncached!
 
@@ -23,6 +25,7 @@ class AccountRelationshipsPresenter
     @muting.merge!(options[:muting_map] || {})
     @requested.merge!(options[:requested_map] || {})
     @domain_blocking.merge!(options[:domain_blocking_map] || {})
+    @endorsed.merge!(options[:endorsed_map] || {})
   end
 
   private
@@ -37,6 +40,7 @@ class AccountRelationshipsPresenter
       muting: {},
       requested: {},
       domain_blocking: {},
+      endorsed: {},
     }
 
     @uncached_account_ids = []
@@ -63,6 +67,7 @@ class AccountRelationshipsPresenter
         muting:          { account_id => muting[account_id] },
         requested:       { account_id => requested[account_id] },
         domain_blocking: { account_id => domain_blocking[account_id] },
+        endorsed:        { account_id => endorsed[account_id] },
       }
 
       Rails.cache.write("relationship:#{@current_account_id}:#{account_id}", maps_for_account, expires_in: 1.day)
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index e4972c9623c71eabee9185f0d62f28645e805cbf..dc77162d441aa3ee8e8f641cc5dacc6e3240a4f1 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -6,6 +6,7 @@ class InstancePresenter
     :site_contact_email,
     :open_registrations,
     :site_title,
+    :site_short_description,
     :site_description,
     :site_extended_description,
     :site_terms,
@@ -13,15 +14,15 @@ class InstancePresenter
   )
 
   def contact_account
-    Account.find_local(Setting.site_contact_username)
+    Account.find_local(Setting.site_contact_username.gsub(/\A@/, ''))
   end
 
   def user_count
-    Rails.cache.fetch('user_count') { User.confirmed.count }
+    Rails.cache.fetch('user_count') { User.confirmed.joins(:account).merge(Account.without_suspended).count }
   end
 
   def status_count
-    Rails.cache.fetch('local_status_count') { Account.local.sum(:statuses_count) }
+    Rails.cache.fetch('local_status_count') { Account.local.joins(:account_stat).sum('account_stats.statuses_count') }.to_i
   end
 
   def domain_count
@@ -43,4 +44,8 @@ class InstancePresenter
   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
 end
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 41c9aa44e81da49eeafb85123fb6c46b24cd7dc6..6746c1782929a94fb622de10ede547f2c822c271 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -14,6 +14,7 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   has_many :virtual_attachments, key: :attachment
 
   attribute :moved_to, if: :moved?
+  attribute :also_known_as, if: :also_known_as?
 
   class EndpointsSerializer < ActiveModel::Serializer
     include RoutingHelper
@@ -93,11 +94,11 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   end
 
   def avatar_exists?
-    object.avatar.exists?
+    object.avatar?
   end
 
   def header_exists?
-    object.header.exists?
+    object.header?
   end
 
   def manually_approves_followers
@@ -105,7 +106,7 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   end
 
   def virtual_tags
-    object.emojis
+    object.emojis + object.tags
   end
 
   def virtual_attachments
@@ -116,9 +117,31 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
     ActivityPub::TagManager.instance.uri_for(object.moved_to_account)
   end
 
+  def also_known_as?
+    !object.also_known_as.empty?
+  end
+
   class CustomEmojiSerializer < ActivityPub::EmojiSerializer
   end
 
+  class TagSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    attributes :type, :href, :name
+
+    def type
+      'Hashtag'
+    end
+
+    def href
+      explore_hashtag_url(object)
+    end
+
+    def name
+      "##{object.name}"
+    end
+  end
+
   class Account::FieldSerializer < ActiveModel::Serializer
     attributes :type, :name, :value
 
diff --git a/app/serializers/activitypub/delete_actor_serializer.rb b/app/serializers/activitypub/delete_actor_serializer.rb
index dfea9db4abf16f4a20a7bce5c6a41eeb9419f1d3..ddf59be9709ef1cc21af267f935fbb28611ac1cb 100644
--- a/app/serializers/activitypub/delete_actor_serializer.rb
+++ b/app/serializers/activitypub/delete_actor_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::DeleteActorSerializer < ActiveModel::Serializer
-  attributes :id, :type, :actor
+  attributes :id, :type, :actor, :to
   attribute :virtual_object, key: :object
 
   def id
@@ -19,4 +19,8 @@ class ActivityPub::DeleteActorSerializer < ActiveModel::Serializer
   def virtual_object
     actor
   end
+
+  def to
+    [ActivityPub::TagManager::COLLECTIONS[:public]]
+  end
 end
diff --git a/app/serializers/activitypub/delete_serializer.rb b/app/serializers/activitypub/delete_serializer.rb
index 2bb65135f7c5c3ca7aca4ac2877f86926b6be1be..5012a8383ff517003906f65474636f6b7e2da4db 100644
--- a/app/serializers/activitypub/delete_serializer.rb
+++ b/app/serializers/activitypub/delete_serializer.rb
@@ -17,7 +17,7 @@ class ActivityPub::DeleteSerializer < ActiveModel::Serializer
     end
   end
 
-  attributes :id, :type, :actor
+  attributes :id, :type, :actor, :to
 
   has_one :object, serializer: TombstoneSerializer
 
@@ -32,4 +32,8 @@ class ActivityPub::DeleteSerializer < ActiveModel::Serializer
   def actor
     ActivityPub::TagManager.instance.uri_for(object.account)
   end
+
+  def to
+    [ActivityPub::TagManager::COLLECTIONS[:public]]
+  end
 end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 82b7ffe95cb87ea97f0ea15da139d787fc0aec24..c9d23e25fa8543e6d594fdc3bd39f57bbac8dc6a 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -68,7 +68,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
   end
 
   def virtual_tags
-    object.mentions.to_a.sort_by(&:id) + object.tags + object.emojis
+    object.active_mentions.to_a.sort_by(&:id) + object.tags + object.emojis
   end
 
   def atom_uri
diff --git a/app/serializers/activitypub/undo_announce_serializer.rb b/app/serializers/activitypub/undo_announce_serializer.rb
index 839847e22c0ff183b7ffd2031155aa94e58de4ab..4fc042727ad6898aae581d824332ba6df3372421 100644
--- a/app/serializers/activitypub/undo_announce_serializer.rb
+++ b/app/serializers/activitypub/undo_announce_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::UndoAnnounceSerializer < ActiveModel::Serializer
-  attributes :id, :type, :actor
+  attributes :id, :type, :actor, :to
 
   has_one :object, serializer: ActivityPub::ActivitySerializer
 
@@ -16,4 +16,8 @@ class ActivityPub::UndoAnnounceSerializer < ActiveModel::Serializer
   def actor
     ActivityPub::TagManager.instance.uri_for(object.account)
   end
+
+  def to
+    [ActivityPub::TagManager::COLLECTIONS[:public]]
+  end
 end
diff --git a/app/serializers/activitypub/update_serializer.rb b/app/serializers/activitypub/update_serializer.rb
index ebc667d9630d17e9252e84d9996b1d1f211d6c74..48d7a192946a70875e79fc5ee8f6d44e605674c4 100644
--- a/app/serializers/activitypub/update_serializer.rb
+++ b/app/serializers/activitypub/update_serializer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ActivityPub::UpdateSerializer < ActiveModel::Serializer
-  attributes :id, :type, :actor
+  attributes :id, :type, :actor, :to
 
   has_one :object, serializer: ActivityPub::ActorSerializer
 
@@ -16,4 +16,8 @@ class ActivityPub::UpdateSerializer < ActiveModel::Serializer
   def actor
     ActivityPub::TagManager.instance.uri_for(object)
   end
+
+  def to
+    [ActivityPub::TagManager::COLLECTIONS[:public]]
+  end
 end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 42d0e4bf324ae1b65916846e4bf18bcdb2bdbbac..a7a3d770ce6eb26b5e560251017d88bacde703ba 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -14,17 +14,22 @@ class InitialStateSerializer < ActiveModel::Serializer
       domain: Rails.configuration.x.local_domain,
       admin: object.admin&.id&.to_s,
       search_enabled: Chewy.enabled?,
+      version: Mastodon::Version.to_s,
       invites_enabled: Setting.min_invite_role == 'user',
+      mascot: instance_presenter.mascot&.file&.url,
+      profile_directory: Setting.profile_directory,
     }
 
     if object.current_account
-      store[:me]                      = object.current_account.id.to_s
-      store[:unfollow_modal]          = object.current_account.user.setting_unfollow_modal
-      store[:boost_modal]             = object.current_account.user.setting_boost_modal
-      store[:delete_modal]            = object.current_account.user.setting_delete_modal
-      store[:auto_play_gif]           = object.current_account.user.setting_auto_play_gif
-      store[:display_sensitive_media] = object.current_account.user.setting_display_sensitive_media
-      store[:reduce_motion]           = object.current_account.user.setting_reduce_motion
+      store[:me]              = object.current_account.id.to_s
+      store[:unfollow_modal]  = object.current_account.user.setting_unfollow_modal
+      store[:boost_modal]     = object.current_account.user.setting_boost_modal
+      store[:delete_modal]    = object.current_account.user.setting_delete_modal
+      store[:auto_play_gif]   = object.current_account.user.setting_auto_play_gif
+      store[:display_media]   = object.current_account.user.setting_display_media
+      store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
+      store[:reduce_motion]   = object.current_account.user.setting_reduce_motion
+      store[:is_staff]        = object.current_account.user.staff?
     end
 
     store
@@ -54,4 +59,10 @@ class InitialStateSerializer < ActiveModel::Serializer
   def media_attachments
     { accept_content_types: MediaAttachment::IMAGE_FILE_EXTENSIONS + MediaAttachment::VIDEO_FILE_EXTENSIONS + MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES }
   end
+
+  private
+
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
 end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 3a724aa7c271491bdb51cea5bb368a0f4ae56ac0..12adc971cb76a6894338b2dcf342d34026b287a3 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -11,7 +11,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
   class FieldSerializer < ActiveModel::Serializer
-    attributes :name, :value
+    attributes :name, :value, :verified_at
 
     def value
       Formatter.instance.format_field(object.account, object.value)
diff --git a/app/serializers/rest/conversation_serializer.rb b/app/serializers/rest/conversation_serializer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b09ca63419f30383471f5da4b506893921ba04ec
--- /dev/null
+++ b/app/serializers/rest/conversation_serializer.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class REST::ConversationSerializer < ActiveModel::Serializer
+  attributes :id, :unread
+
+  has_many :participant_accounts, key: :accounts, serializer: REST::AccountSerializer
+  has_one :last_status, serializer: REST::StatusSerializer
+
+  def id
+    object.id.to_s
+  end
+end
diff --git a/app/serializers/rest/filter_serializer.rb b/app/serializers/rest/filter_serializer.rb
index 3134be371b066bc0c734f8bde72dea7b75115b27..57205630bbbf84fe8765807cd64471e148dc8918 100644
--- a/app/serializers/rest/filter_serializer.rb
+++ b/app/serializers/rest/filter_serializer.rb
@@ -3,4 +3,8 @@
 class REST::FilterSerializer < ActiveModel::Serializer
   attributes :id, :phrase, :context, :whole_word, :expires_at,
              :irreversible
+
+  def id
+    object.id.to_s
+  end
 end
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb
index 45bfd4d6e7635a1372ab84a5e03bd5db6b5d858a..c6c722a54ea0d30a5031c048a4230caa2be64890 100644
--- a/app/serializers/rest/relationship_serializer.rb
+++ b/app/serializers/rest/relationship_serializer.rb
@@ -2,7 +2,8 @@
 
 class REST::RelationshipSerializer < ActiveModel::Serializer
   attributes :id, :following, :showing_reblogs, :followed_by, :blocking,
-             :muting, :muting_notifications, :requested, :domain_blocking
+             :muting, :muting_notifications, :requested, :domain_blocking,
+             :endorsed
 
   def id
     object.id.to_s
@@ -41,4 +42,8 @@ class REST::RelationshipSerializer < ActiveModel::Serializer
   def domain_blocking
     instance_options[:relationships].domain_blocking[object.id] || false
   end
+
+  def endorsed
+    instance_options[:relationships].endorsed[object.id] || false
+  end
 end
diff --git a/app/serializers/rest/scheduled_status_serializer.rb b/app/serializers/rest/scheduled_status_serializer.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5d6311b872156310a50a9c888607b1b8aad99747
--- /dev/null
+++ b/app/serializers/rest/scheduled_status_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class REST::ScheduledStatusSerializer < ActiveModel::Serializer
+  attributes :id, :scheduled_at, :params
+
+  has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
+
+  def id
+    object.id.to_s
+  end
+
+  def params
+    object.params.without(:application_id)
+  end
+end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index fe3dc9bfcfb2838d9bd1a75437f13d2cbe57e374..bfc2d78b41f8f1f9c87599d08f143417bbcde729 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -3,7 +3,8 @@
 class REST::StatusSerializer < ActiveModel::Serializer
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
-             :uri, :content, :url, :reblogs_count, :favourites_count
+             :uri, :content, :url, :replies_count, :reblogs_count,
+             :favourites_count
 
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?
@@ -19,6 +20,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_many :tags
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
+  has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
+
   def id
     object.id.to_s
   end
@@ -35,6 +38,17 @@ class REST::StatusSerializer < ActiveModel::Serializer
     !current_user.nil?
   end
 
+  def visibility
+    # This visibility is masked behind "private"
+    # to avoid API changes because there are no
+    # UX differences
+    if object.limited_visibility?
+      'private'
+    else
+      object.visibility
+    end
+  end
+
   def uri
     OStatus::TagManager.instance.uri_for(object)
   end
@@ -87,7 +101,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   end
 
   def ordered_mentions
-    object.mentions.to_a.sort_by(&:id)
+    object.active_mentions.to_a.sort_by(&:id)
   end
 
   class ApplicationSerializer < ActiveModel::Serializer
diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb
index 43ba4d92a26c2d86ad7429c080875cafa635fce2..ee83ec8b26e7e46376ca490be9f131a0af5b5f41 100644
--- a/app/serializers/web/notification_serializer.rb
+++ b/app/serializers/web/notification_serializer.rb
@@ -33,7 +33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer
   end
 
   def body
-    str = truncate(strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note), length: 140)
-    HTMLEntities.new.decode(str.to_str) # Do not encode entities, since this value will not be used in HTML
+    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
   end
 end
diff --git a/app/serializers/webfinger_serializer.rb b/app/serializers/webfinger_serializer.rb
index f80d12c024f099ce43b411e217017c6e1725e4b2..8c0b077020dcd2ce7833cf7063c8db3bf764bfb0 100644
--- a/app/serializers/webfinger_serializer.rb
+++ b/app/serializers/webfinger_serializer.rb
@@ -20,7 +20,7 @@ class WebfingerSerializer < ActiveModel::Serializer
       { rel: 'self', type: 'application/activity+json', href: account_url(object) },
       { rel: 'salmon', href: api_salmon_url(object.id) },
       { rel: 'magic-public-key', href: "data:application/magic-public-key,#{object.magic_key}" },
-      { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}" },
+      { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_interaction_url}?uri={uri}" },
     ]
   end
 end
diff --git a/app/services/activitypub/fetch_remote_account_service.rb b/app/services/activitypub/fetch_remote_account_service.rb
index 867e7087606fdeb3d4c9e415c373fc0cf865a54d..3c204494128ec10afe6da731ac1c196a37b699f5 100644
--- a/app/services/activitypub/fetch_remote_account_service.rb
+++ b/app/services/activitypub/fetch_remote_account_service.rb
@@ -5,24 +5,25 @@ class ActivityPub::FetchRemoteAccountService < BaseService
 
   SUPPORTED_TYPES = %w(Application Group Organization Person Service).freeze
 
-  # Should be called when uri has already been checked for locality
-  # Does a WebFinger roundtrip on each call
-  def call(uri, id: true, prefetched_body: nil)
+  # 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 ActivityPub::TagManager.instance.uri_to_resource(uri, Account) if ActivityPub::TagManager.instance.local_uri?(uri)
+
     @json = if prefetched_body.nil?
               fetch_resource(uri, id)
             else
-              body_to_json(prefetched_body)
+              body_to_json(prefetched_body, compare_id: id ? uri : nil)
             end
 
-    return unless supported_context? && expected_type?
+    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 verified_webfinger?
+    return unless only_key || verified_webfinger?
 
-    ActivityPub::ProcessAccountService.new.call(@username, @domain, @json)
+    ActivityPub::ProcessAccountService.new.call(@username, @domain, @json, only_key: only_key)
   rescue Oj::ParseError
     nil
   end
diff --git a/app/services/activitypub/fetch_remote_key_service.rb b/app/services/activitypub/fetch_remote_key_service.rb
index 505baccd46e2305e56a6b1d9c786040d0812d629..df17d907932740815745de361492678b736c0133 100644
--- a/app/services/activitypub/fetch_remote_key_service.rb
+++ b/app/services/activitypub/fetch_remote_key_service.rb
@@ -17,7 +17,7 @@ class ActivityPub::FetchRemoteKeyService < BaseService
         @json = fetch_resource(uri, id)
       end
     else
-      @json = body_to_json(prefetched_body)
+      @json = body_to_json(prefetched_body, compare_id: id ? uri : nil)
     end
 
     return unless supported_context?(@json) && expected_type?
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index 2b447abb32eb5fa95771d9cb7424b138326f6125..469821032ab69746c12ea79b868f1e4b1626fa9c 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -8,7 +8,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
     @json = if prefetched_body.nil?
               fetch_resource(uri, id, on_behalf_of)
             else
-              body_to_json(prefetched_body)
+              body_to_json(prefetched_body, compare_id: id ? uri : nil)
             end
 
     return unless supported_context? && expected_type?
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 453253db40502a3341c2e23f671aa720fbccc62c..487456f3afcec2fec587d409a583310ed041d7b5 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -5,9 +5,10 @@ class ActivityPub::ProcessAccountService < BaseService
 
   # Should be called with confirmed valid JSON
   # and WebFinger-resolved username and domain
-  def call(username, domain, json)
+  def call(username, domain, json, options = {})
     return if json['inbox'].blank? || unsupported_uri_scheme?(json['id'])
 
+    @options     = options
     @json        = json
     @uri         = @json['id']
     @username    = username
@@ -31,8 +32,13 @@ class ActivityPub::ProcessAccountService < BaseService
     return if @account.nil?
 
     after_protocol_change! if protocol_changed?
-    after_key_change! if key_changed?
-    check_featured_collection! if @account.featured_collection_url.present?
+    after_key_change! if key_changed? && !@options[:signed_with_known_key]
+    clear_tombstones! if key_changed?
+
+    unless @options[:only_key]
+      check_featured_collection! if @account.featured_collection_url.present?
+      check_links! unless @account.fields.empty?
+    end
 
     @account
   rescue Oj::ParseError
@@ -52,11 +58,11 @@ class ActivityPub::ProcessAccountService < BaseService
   end
 
   def update_account
-    @account.last_webfingered_at = Time.now.utc
+    @account.last_webfingered_at = Time.now.utc unless @options[:only_key]
     @account.protocol            = :activitypub
 
     set_immediate_attributes!
-    set_fetchable_attributes!
+    set_fetchable_attributes! unless @options[:only_keys]
 
     @account.save_with_optional_media!
   end
@@ -73,6 +79,7 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.note                    = @json['summary'] || ''
     @account.locked                  = @json['manuallyApprovesFollowers'] || false
     @account.fields                  = property_values || {}
+    @account.also_known_as           = as_array(@json['alsoKnownAs'] || []).map { |item| value_or_id(item) }
     @account.actor_type              = actor_type
   end
 
@@ -98,6 +105,10 @@ class ActivityPub::ProcessAccountService < BaseService
     ActivityPub::SynchronizeFeaturedCollectionWorker.perform_async(@account.id)
   end
 
+  def check_links!
+    VerifyAccountLinksWorker.perform_async(@account.id)
+  end
+
   def actor_type
     if @json['type'].is_a?(Array)
       @json['type'].find { |type| ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES.include?(type) }
@@ -175,7 +186,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)
+    account ||= ActivityPub::FetchRemoteAccountService.new.call(@json['movedTo'], id: true, break_on_redirect: true)
     account
   end
 
@@ -200,6 +211,10 @@ class ActivityPub::ProcessAccountService < BaseService
     !@old_public_key.nil? && @old_public_key != @account.public_key
   end
 
+  def clear_tombstones!
+    Tombstone.delete_all(account_id: @account.id)
+  end
+
   def protocol_changed?
     !@old_protocol.nil? && @old_protocol != @account.protocol
   end
@@ -226,7 +241,7 @@ class ActivityPub::ProcessAccountService < BaseService
     updated   = tag['updated']
     emoji     = CustomEmoji.find_by(shortcode: shortcode, domain: @account.domain)
 
-    return unless emoji.nil? || emoji.updated_at >= updated
+    return unless emoji.nil? || image_url != emoji.image_remote_url || (updated && updated >= emoji.updated_at)
 
     emoji ||= CustomEmoji.new(domain: @account.domain, shortcode: shortcode, uri: uri)
     emoji.image_remote_url = image_url
diff --git a/app/services/activitypub/process_collection_service.rb b/app/services/activitypub/process_collection_service.rb
index 79cdca297be0571589547d25984a479f48215b76..5c54aad89f18407d6c05d51481717296e066b8d1 100644
--- a/app/services/activitypub/process_collection_service.rb
+++ b/app/services/activitypub/process_collection_service.rb
@@ -27,7 +27,7 @@ class ActivityPub::ProcessCollectionService < BaseService
   private
 
   def different_actor?
-    @json['actor'].present? && value_or_id(@json['actor']) != @account.uri && @json['signature'].present?
+    @json['actor'].present? && value_or_id(@json['actor']) != @account.uri
   end
 
   def process_items(items)
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb
index 0f1a8505d31fe7f583cfe1c465f1b8708a9615ea..180f134032375f8af3d27c7a07d03f1a2471e91b 100644
--- a/app/services/after_block_domain_from_account_service.rb
+++ b/app/services/after_block_domain_from_account_service.rb
@@ -15,13 +15,13 @@ class AfterBlockDomainFromAccountService < BaseService
   private
 
   def reject_existing_followers!
-    @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).find_each do |follow|
+    @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow|
       reject_follow!(follow)
     end
   end
 
   def reject_pending_follow_requests!
-    FollowRequest.where(target_account: @account).where(account: Account.where(domain: @domain)).includes(:account).find_each do |follow_request|
+    FollowRequest.where(target_account: @account).where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow_request|
       reject_follow!(follow_request)
     end
   end
@@ -31,11 +31,11 @@ class AfterBlockDomainFromAccountService < BaseService
 
     return unless follow.account.activitypub?
 
-    json = Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    json = ActiveModelSerializers::SerializableResource.new(
       follow,
       serializer: ActivityPub::RejectFollowSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(@account))
+    ).to_json
 
     ActivityPub::DeliveryWorker.perform_async(json, @account.id, follow.account.inbox_url)
   end
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
index a7dce08c75898dcffa8a2bfbe35cf6b3e2af35fc..706db0d6334d9a82fbbc52bcc90ef7fb7f4050f5 100644
--- a/app/services/after_block_service.rb
+++ b/app/services/after_block_service.rb
@@ -2,16 +2,43 @@
 
 class AfterBlockService < BaseService
   def call(account, target_account)
-    FeedManager.instance.clear_from_timeline(account, target_account)
+    clear_home_feed(account, target_account)
     clear_notifications(account, target_account)
+    clear_conversations(account, target_account)
   end
 
   private
 
+  def clear_home_feed(account, target_account)
+    FeedManager.instance.clear_from_timeline(account, target_account)
+  end
+
+  def clear_conversations(account, target_account)
+    AccountConversation.where(account: account)
+                       .where('? = ANY(participant_account_ids)', target_account.id)
+                       .in_batches
+                       .destroy_all
+  end
+
   def clear_notifications(account, target_account)
-    Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).delete_all
-    Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).delete_all
-    Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).delete_all
-    Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).delete_all
+    Notification.where(account: account)
+                .joins(:follow)
+                .where(activity_type: 'Follow', follows: { account_id: target_account.id })
+                .delete_all
+
+    Notification.where(account: account)
+                .joins(mention: :status)
+                .where(activity_type: 'Mention', statuses: { account_id: target_account.id })
+                .delete_all
+
+    Notification.where(account: account)
+                .joins(:favourite)
+                .where(activity_type: 'Favourite', favourites: { account_id: target_account.id })
+                .delete_all
+
+    Notification.where(account: account)
+                .joins(:status)
+                .where(activity_type: 'Status', statuses: { account_id: target_account.id })
+                .delete_all
   end
 end
diff --git a/app/services/app_sign_up_service.rb b/app/services/app_sign_up_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d621cc462c6460af70157690c1524cb42a0f2735
--- /dev/null
+++ b/app/services/app_sign_up_service.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class AppSignUpService < BaseService
+  def call(app, params)
+    return unless allowed_registrations?
+
+    user_params    = params.slice(:email, :password, :agreement, :locale)
+    account_params = params.slice(:username)
+    user           = User.create!(user_params.merge(created_by_application: app, password_confirmation: user_params[:password], account_attributes: account_params))
+
+    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
+
+  private
+
+  def allowed_registrations?
+    Setting.open_registrations && !Rails.configuration.x.single_user_mode
+  end
+end
diff --git a/app/services/authorize_follow_service.rb b/app/services/authorize_follow_service.rb
index f47d488f11c6db297aab466b2f5fe388ace95425..f2e3ebe7d00b4770fea3dd2e478dfead17ee0027 100644
--- a/app/services/authorize_follow_service.rb
+++ b/app/services/authorize_follow_service.rb
@@ -3,7 +3,7 @@
 class AuthorizeFollowService < BaseService
   def call(source_account, target_account, **options)
     if options[:skip_follow_request]
-      follow_request = FollowRequest.new(account: source_account, target_account: target_account)
+      follow_request = FollowRequest.new(account: source_account, target_account: target_account, uri: options[:follow_request_uri])
     else
       follow_request = FollowRequest.find_by!(account: source_account, target_account: target_account)
       follow_request.authorize!
@@ -24,11 +24,11 @@ class AuthorizeFollowService < BaseService
   end
 
   def build_json(follow_request)
-    Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    ActiveModelSerializers::SerializableResource.new(
       follow_request,
       serializer: ActivityPub::AcceptFollowSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(follow_request.target_account))
+    ).to_json
   end
 
   def build_xml(follow_request)
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb
index 8492c11176364d49ff87e6af12059cc75fcbcb40..4cfa22ab893604277313a921bc1c208de4092c2f 100644
--- a/app/services/backup_service.rb
+++ b/app/services/backup_service.rb
@@ -18,7 +18,7 @@ class BackupService < BaseService
   def build_json!
     @collection = serialize(collection_presenter, ActivityPub::CollectionSerializer)
 
-    account.statuses.with_includes.find_in_batches do |statuses|
+    account.statuses.with_includes.reorder(nil).find_in_batches do |statuses|
       statuses.each do |status|
         item = serialize(status, ActivityPub::ActivitySerializer)
         item.delete(:'@context')
@@ -44,6 +44,7 @@ class BackupService < BaseService
         Gem::Package::TarWriter.new(gz) do |tar|
           dump_media_attachments!(tar)
           dump_outbox!(tar)
+          dump_likes!(tar)
           dump_actor!(tar)
         end
       end
@@ -60,7 +61,7 @@ class BackupService < BaseService
   end
 
   def dump_media_attachments!(tar)
-    MediaAttachment.attached.where(account: account).find_in_batches do |media_attachments|
+    MediaAttachment.attached.where(account: account).reorder(nil).find_in_batches do |media_attachments|
       media_attachments.each do |m|
         download_to_tar(tar, m.file, m.file.path)
       end
@@ -82,6 +83,8 @@ class BackupService < BaseService
 
     actor[:icon][:url]  = 'avatar' + File.extname(actor[:icon][:url])  if actor[:icon]
     actor[:image][:url] = 'header' + File.extname(actor[:image][:url]) if actor[:image]
+    actor[:outbox]      = 'outbox.json'
+    actor[:likes]       = 'likes.json'
 
     download_to_tar(tar, account.avatar, 'avatar' + File.extname(account.avatar.path)) if account.avatar.exists?
     download_to_tar(tar, account.header, 'header' + File.extname(account.header.path)) if account.header.exists?
@@ -91,15 +94,30 @@ class BackupService < BaseService
     tar.add_file_simple('actor.json', 0o444, json.bytesize) do |io|
       io.write(json)
     end
+  end
+
+  def dump_likes!(tar)
+    collection = serialize(ActivityPub::CollectionPresenter.new(id: 'likes.json', type: :ordered, size: 0, items: []), ActivityPub::CollectionSerializer)
+
+    Status.reorder(nil).joins(:favourites).includes(:account).merge(account.favourites).find_in_batches do |statuses|
+      statuses.each do |status|
+        collection[:totalItems] += 1
+        collection[:orderedItems] << ActivityPub::TagManager.instance.uri_for(status)
+      end
 
-    tar.add_file_simple('key.pem', 0o444, account.private_key.bytesize) do |io|
-      io.write(account.private_key)
+      GC.start
+    end
+
+    json = Oj.dump(collection)
+
+    tar.add_file_simple('likes.json', 0o444, json.bytesize) do |io|
+      io.write(json)
     end
   end
 
   def collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: account_outbox_url(account),
+      id: 'outbox.json',
       type: :ordered,
       size: account.statuses_count,
       items: []
diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
index ebb4034aaf13353bb268b7c67b0619018cc995f0..2e61904fc770f6f4011c784fb7dafe77bf502514 100644
--- a/app/services/batched_remove_status_service.rb
+++ b/app/services/batched_remove_status_service.rb
@@ -9,15 +9,17 @@ class BatchedRemoveStatusService < BaseService
   # Remove statuses from home feeds
   # Push delete events to streaming API for home feeds and public feeds
   # @param [Status] statuses A preferably batched array of statuses
-  def call(statuses)
+  # @param [Hash] options
+  # @option [Boolean] :skip_side_effects
+  def call(statuses, **options)
     statuses = Status.where(id: statuses.map(&:id)).includes(:account, :stream_entry).flat_map { |status| [status] + status.reblogs.includes(:account, :stream_entry).to_a }
 
-    @mentions = statuses.map { |s| [s.id, s.mentions.includes(:account).to_a] }.to_h
-    @tags     = statuses.map { |s| [s.id, s.tags.pluck(:name)] }.to_h
+    @mentions = statuses.each_with_object({}) { |s, h| h[s.id] = s.active_mentions.includes(:account).to_a }
+    @tags     = statuses.each_with_object({}) { |s, h| h[s.id] = s.tags.pluck(:name) }
 
     @stream_entry_batches  = []
     @salmon_batches        = []
-    @json_payloads         = statuses.map { |s| [s.id, Oj.dump(event: :delete, payload: s.id.to_s)] }.to_h
+    @json_payloads         = statuses.each_with_object({}) { |s, h| h[s.id] = Oj.dump(event: :delete, payload: s.id.to_s) }
     @activity_xml          = {}
 
     # Ensure that rendered XML reflects destroyed state
@@ -26,6 +28,8 @@ class BatchedRemoveStatusService < BaseService
       status.destroy
     end
 
+    return if options[:skip_side_effects]
+
     # Batch by source account
     statuses.group_by(&:account_id).each_value do |account_statuses|
       account = account_statuses.first.account
@@ -39,7 +43,6 @@ class BatchedRemoveStatusService < BaseService
     # Cannot be batched
     statuses.each do |status|
       unpush_from_public_timelines(status)
-      unpush_from_direct_timelines(status) if status.direct_visibility?
       batch_salmon_slaps(status) if status.local?
     end
 
@@ -96,16 +99,6 @@ class BatchedRemoveStatusService < BaseService
     end
   end
 
-  def unpush_from_direct_timelines(status)
-    payload = @json_payloads[status.id]
-    redis.pipelined do
-      @mentions[status.id].each do |mention|
-        redis.publish("timeline:direct:#{mention.account.id}", payload) if mention.account.local?
-      end
-      redis.publish("timeline:direct:#{status.account.id}", payload) if status.account.local?
-    end
-  end
-
   def batch_salmon_slaps(status)
     return if @mentions[status.id].empty?
 
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index d082de40b9b45057b5ae7e416c6d0b078e5f2a20..a1fe93665b117b7df8051fe88c0d177d302a2714 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -43,14 +43,14 @@ class BlockDomainService < BaseService
   end
 
   def suspend_accounts!
-    blocked_domain_accounts.where(suspended: false).find_each do |account|
+    blocked_domain_accounts.where(suspended: false).reorder(nil).find_each do |account|
       UnsubscribeService.new.call(account) if account.subscribed?
       SuspendAccountService.new.call(account)
     end
   end
 
   def clear_account_images!
-    blocked_domain_accounts.find_each do |account|
+    blocked_domain_accounts.reorder(nil).find_each do |account|
       account.avatar.destroy if account.avatar.exists?
       account.header.destroy if account.header.exists?
       account.save
@@ -58,7 +58,7 @@ class BlockDomainService < BaseService
   end
 
   def clear_account_attachments!
-    media_from_blocked_domain.find_each do |attachment|
+    media_from_blocked_domain.reorder(nil).find_each do |attachment|
       @affected_status_ids << attachment.status_id if attachment.status_id.present?
 
       attachment.file.destroy if attachment.file.exists?
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index b39c3eef2869b57087bbd09af80aff0f060efc70..140b238df3e418dcab536a1506fa021cd9aac094 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class BlockService < BaseService
-  include StreamEntryRenderer
-
   def call(account, target_account)
     return if account.id == target_account.id
 
@@ -27,11 +25,11 @@ class BlockService < BaseService
   end
 
   def build_json(block)
-    Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    ActiveModelSerializers::SerializableResource.new(
       block,
       serializer: ActivityPub::BlockSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(block.account))
+    ).to_json
   end
 
   def build_xml(block)
diff --git a/app/services/concerns/author_extractor.rb b/app/services/concerns/author_extractor.rb
index 1e00eb803b73a00c517e96b48c44d9f8d22ceeb2..c2419e9ecb23d6520897848a6bcd4396d87246de 100644
--- a/app/services/concerns/author_extractor.rb
+++ b/app/services/concerns/author_extractor.rb
@@ -18,6 +18,6 @@ module AuthorExtractor
       acct   = "#{username}@#{domain}"
     end
 
-    ResolveAccountService.new.call(acct, update_profile)
+    ResolveAccountService.new.call(acct, update_profile: update_profile)
   end
 end
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 5efd3edb2e428b3cfc650f540a194d0711cc2afe..f3e9c855dc55441652a6e9cdf2fa3f3773c78b72 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -6,14 +6,14 @@ class FanOutOnWriteService < BaseService
   def call(status)
     raise Mastodon::RaceConditionError if status.visibility.nil?
 
-    deliver_to_self(status) if status.account.local?
-
     render_anonymous_payload(status)
 
     if status.direct_visibility?
+      deliver_to_own_conversation(status)
+    elsif status.limited_visibility?
       deliver_to_mentioned_followers(status)
-      deliver_to_direct_timelines(status)
     else
+      deliver_to_self(status) if status.account.local?
       deliver_to_followers(status)
       deliver_to_lists(status)
     end
@@ -56,12 +56,10 @@ class FanOutOnWriteService < BaseService
   end
 
   def deliver_to_mentioned_followers(status)
-    Rails.logger.debug "Delivering status #{status.id} to mentioned followers"
+    Rails.logger.debug "Delivering status #{status.id} to limited followers"
 
-    status.mentions.includes(:account).each do |mention|
-      mentioned_account = mention.account
-      next if !mentioned_account.local? || !mentioned_account.following?(status.account) || FeedManager.instance.filter?(:home, status, mention.account_id)
-      FeedManager.instance.push_to_home(mentioned_account, status)
+    FeedInsertWorker.push_bulk(status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? && mentioned_account.following?(status.account) }) do |follower|
+      [status.id, follower.id, :home]
     end
   end
 
@@ -93,12 +91,7 @@ class FanOutOnWriteService < BaseService
     Redis.current.publish('timeline:public:local:media', @payload) if status.local?
   end
 
-  def deliver_to_direct_timelines(status)
-    Rails.logger.debug "Delivering status #{status.id} to direct timelines"
-
-    status.mentions.includes(:account).each do |mention|
-      Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local?
-    end
-    Redis.current.publish("timeline:direct:#{status.account.id}", @payload) if status.account.local?
+  def deliver_to_own_conversation(status)
+    AccountConversation.add_status(status.account, status)
   end
 end
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index 6e1ac3ba99b046c97891bac152cd76e8f5fda495..b565bcc3203f30c9f2544c0fccbab496d7fddf7c 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -37,6 +37,7 @@ class FavouriteService < BaseService
   end
 
   def bump_potential_friendship(account, status)
+    ActivityTracker.increment('activity:interactions')
     return if account.following?(status.account_id)
     PotentialFriendshipTracker.record(account.id, status.account_id, :favourite)
   end
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index 550e75f3344b174cd11612707e284c3f5a7274ac..d6508a9888a69fad1b695a3cd59a4cb971120cac 100644
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -29,7 +29,7 @@ class FetchAtomService < BaseService
 
   def perform_request(&block)
     accept = 'text/html'
-    accept = 'application/activity+json, application/ld+json, application/atom+xml, ' + accept unless @unsupported_activity
+    accept = 'application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams", application/atom+xml, ' + accept unless @unsupported_activity
 
     Request.new(:get, @url).add_headers('Accept' => accept).perform(&block)
   end
@@ -39,7 +39,7 @@ class FetchAtomService < BaseService
 
     if response.mime_type == 'application/atom+xml'
       [@url, { prefetched_body: response.body_with_limit }, :ostatus]
-    elsif ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'].include?(response.mime_type)
+    elsif ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
       body = response.body_with_limit
       json = body_to_json(body)
       if supported_context?(json) && equals_or_includes_any?(json['type'], ActivityPub::FetchRemoteAccountService::SUPPORTED_TYPES) && json['inbox'].present?
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 560a8176877a6a6a1388016a27bc28d101977a96..7979c312e5d771c84efbca492e495c4e54ccb019 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -29,7 +29,7 @@ class FetchLinkCardService < BaseService
     end
 
     attach_card if @card&.persisted?
-  rescue HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::LengthValidationError => e
+  rescue HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
     Rails.logger.debug "Error fetching link #{@url}: #{e}"
     nil
   end
@@ -62,6 +62,7 @@ class FetchLinkCardService < BaseService
 
   def attach_card
     @status.preview_cards << @card
+    Rails.cache.delete(@status)
   end
 
   def parse_urls
@@ -81,40 +82,48 @@ class FetchLinkCardService < BaseService
     uri.host.blank? || TagManager.instance.local_url?(uri.to_s) || !%w(http https).include?(uri.scheme)
   end
 
+  def mention_link?(a)
+    @status.mentions.any? do |mention|
+      a['href'] == TagManager.instance.url_for(mention.account)
+    end
+  end
+
   def skip_link?(a)
     # Avoid links for hashtags and mentions (microformats)
-    a['rel']&.include?('tag') || a['class']&.include?('u-url')
+    a['rel']&.include?('tag') || a['class']&.include?('u-url') || mention_link?(a)
   end
 
   def attempt_oembed
-    embed = FetchOEmbedService.new.call(@url, html: @html)
+    service = FetchOEmbedService.new
+    embed   = service.call(@url, html: @html)
+    url     = Addressable::URI.parse(service.endpoint_url)
 
     return false if embed.nil?
 
     @card.type          = embed[:type]
     @card.title         = embed[:title]         || ''
     @card.author_name   = embed[:author_name]   || ''
-    @card.author_url    = embed[:author_url]    || ''
+    @card.author_url    = embed[:author_url].present? ? (url + embed[:author_url]).to_s : ''
     @card.provider_name = embed[:provider_name] || ''
-    @card.provider_url  = embed[:provider_url]  || ''
+    @card.provider_url  = embed[:provider_url].present? ? (url + embed[:provider_url]).to_s : ''
     @card.width         = 0
     @card.height        = 0
 
     case @card.type
     when 'link'
-      @card.image_remote_url = embed[:thumbnail_url] if embed[:thumbnail_url].present?
+      @card.image_remote_url = (url + embed[:thumbnail_url]).to_s if embed[:thumbnail_url].present?
     when 'photo'
       return false if embed[:url].blank?
 
-      @card.embed_url        = embed[:url]
-      @card.image_remote_url = embed[:url]
+      @card.embed_url        = (url + embed[:url]).to_s
+      @card.image_remote_url = (url + embed[:url]).to_s
       @card.width            = embed[:width].presence  || 0
       @card.height           = embed[:height].presence || 0
     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.image_remote_url = embed[:thumbnail_url] if embed[:thumbnail_url].present?
+      @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
       return false
@@ -127,14 +136,16 @@ class FetchLinkCardService < BaseService
     detector = CharlockHolmes::EncodingDetector.new
     detector.strip_tags = true
 
-    guess = detector.detect(@html, @html_charset)
-    page  = Nokogiri::HTML(@html, nil, guess&.fetch(:encoding, nil))
+    guess      = detector.detect(@html, @html_charset)
+    encoding   = guess&.fetch(:confidence, 0).to_i > 60 ? guess&.fetch(:encoding, nil) : nil
+    page       = Nokogiri::HTML(@html, nil, encoding)
+    player_url = meta_property(page, 'twitter:player')
 
-    if meta_property(page, 'twitter:player')
+    if player_url && !bad_url?(Addressable::URI.parse(player_url))
       @card.type   = :video
       @card.width  = meta_property(page, 'twitter:player:width') || 0
       @card.height = meta_property(page, 'twitter:player:height') || 0
-      @card.html   = content_tag(:iframe, nil, src: meta_property(page, 'twitter:player'),
+      @card.html   = content_tag(:iframe, nil, src: player_url,
                                                width: @card.width,
                                                height: @card.height,
                                                allowtransparency: 'true',
@@ -146,7 +157,7 @@ class FetchLinkCardService < BaseService
 
     @card.title            = meta_property(page, 'og:title').presence || page.at_xpath('//title')&.content || ''
     @card.description      = meta_property(page, 'og:description').presence || meta_property(page, 'description') || ''
-    @card.image_remote_url = meta_property(page, 'og:image') if meta_property(page, 'og:image')
+    @card.image_remote_url = (Addressable::URI.parse(@url) + meta_property(page, 'og:image')).to_s if meta_property(page, 'og:image')
 
     return if @card.title.blank? && @card.html.blank?
 
diff --git a/app/services/fetch_oembed_service.rb b/app/services/fetch_oembed_service.rb
index 9982285171b287fbe1f23d4bb5c6a5de2500f15e..10176cfb99466bef0f56dd29fe521f1c2f606a6a 100644
--- a/app/services/fetch_oembed_service.rb
+++ b/app/services/fetch_oembed_service.rb
@@ -31,7 +31,7 @@ class FetchOEmbedService
 
     return if @endpoint_url.blank?
 
-    @endpoint_url = Addressable::URI.parse(@endpoint_url).to_s
+    @endpoint_url = (Addressable::URI.parse(@url) + @endpoint_url).to_s
   rescue Addressable::URI::InvalidURIError
     @endpoint_url = nil
   end
@@ -43,7 +43,7 @@ class FetchOEmbedService
       res.code != 200 ? nil : res.body_with_limit
     end
 
-    validate(parse_for_format(body)) unless body.nil?
+    validate(parse_for_format(body)) if body.present?
   rescue Oj::ParseError, Ox::ParseError
     nil
   end
diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb
index a0f031a4450651dd860200eb4ad8b0871c38dc72..cfc560022fe6d6f7aae8fb122c798aab0bb4dde3 100644
--- a/app/services/fetch_remote_account_service.rb
+++ b/app/services/fetch_remote_account_service.rb
@@ -27,7 +27,7 @@ class FetchRemoteAccountService < BaseService
 
     account = author_from_xml(xml.at_xpath('/xmlns:feed', xmlns: OStatus::TagManager::XMLNS), false)
 
-    UpdateRemoteProfileService.new.call(xml, account) unless account.nil?
+    UpdateRemoteProfileService.new.call(xml, account) if account.present? && trusted_domain?(url, account)
 
     account
   rescue TypeError
@@ -37,4 +37,9 @@ class FetchRemoteAccountService < BaseService
     Rails.logger.debug 'Invalid XML or missing namespace'
     nil
   end
+
+  def trusted_domain?(url, account)
+    domain = Addressable::URI.parse(url).normalized_host
+    domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url.presence || account.uri).normalized_host).zero?
+  end
 end
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 60a389afd34ed9b4099cf1f6f6c6571b7e6633ab..9d36a1449dff3721b028d0400d71b85848c141c5 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
 class FollowService < BaseService
-  include StreamEntryRenderer
-
   # Follow a remote user, notify remote user about the follow
   # @param [Account] source_account From which to follow
   # @param [String, Account] uri User URI to follow in the form of username@domain (or account record)
   # @param [true, false, nil] reblogs Whether or not to show reblogs, defaults to true
-  def call(source_account, uri, reblogs: nil)
+  def call(source_account, target_account, reblogs: nil)
     reblogs = true if reblogs.nil?
-    target_account = uri.is_a?(Account) ? uri : ResolveAccountService.new.call(uri)
+    target_account = ResolveAccountService.new.call(target_account, skip_webfinger: true)
 
     raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
-    raise Mastodon::NotPermittedError  if target_account.blocking?(source_account) || source_account.blocking?(target_account)
+    raise Mastodon::NotPermittedError  if target_account.blocking?(source_account) || source_account.blocking?(target_account) || target_account.moved?
 
     if source_account.following?(target_account)
       # We're already following this account, but we'll call follow! again to
@@ -27,6 +25,8 @@ class FollowService < BaseService
       return
     end
 
+    ActivityTracker.increment('activity:interactions')
+
     if target_account.locked? || target_account.activitypub?
       request_follow(source_account, target_account, reblogs: reblogs)
     else
@@ -40,7 +40,7 @@ class FollowService < BaseService
     follow_request = FollowRequest.create!(account: source_account, target_account: target_account, show_reblogs: reblogs)
 
     if target_account.local?
-      NotifyService.new.call(target_account, follow_request)
+      LocalNotificationWorker.perform_async(target_account.id, follow_request.id, follow_request.class.name)
     elsif target_account.ostatus?
       NotificationWorker.perform_async(build_follow_request_xml(follow_request), source_account.id, target_account.id)
       AfterRemoteFollowRequestWorker.perform_async(follow_request.id)
@@ -55,7 +55,7 @@ class FollowService < BaseService
     follow = source_account.follow!(target_account, reblogs: reblogs)
 
     if target_account.local?
-      NotifyService.new.call(target_account, follow)
+      LocalNotificationWorker.perform_async(target_account.id, follow.id, follow.class.name)
     else
       Pubsubhubbub::SubscribeWorker.perform_async(target_account.id) unless target_account.subscribed?
       NotificationWorker.perform_async(build_follow_xml(follow), source_account.id, target_account.id)
@@ -80,10 +80,10 @@ class FollowService < BaseService
   end
 
   def build_json(follow_request)
-    Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    ActiveModelSerializers::SerializableResource.new(
       follow_request,
       serializer: ActivityPub::FollowSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(follow_request.account))
+    ).to_json
   end
 end
diff --git a/app/services/hashtag_query_service.rb b/app/services/hashtag_query_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5773d78c6e2d2a38275558dce58b59878d59b001
--- /dev/null
+++ b/app/services/hashtag_query_service.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class HashtagQueryService < BaseService
+  def call(tag, params, account = nil, local = false)
+    tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id)
+    all  = tags_for(params[:all])
+    none = tags_for(params[:none])
+
+    Status.distinct
+          .as_tag_timeline(tags, account, local)
+          .tagged_with_all(all)
+          .tagged_with_none(none)
+  end
+
+  private
+
+  def tags_for(tags)
+    Tag.where(name: tags.map(&:downcase)) if tags.presence
+  end
+end
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index c6122a152c0bf2c8e65e6005b60e9a1f3d59c760..676804cb991d97fa718f9b5554c47ea339daf4da 100644
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -5,11 +5,13 @@ class MuteService < BaseService
     return if account.id == target_account.id
 
     mute = account.mute!(target_account, notifications: notifications)
+
     if mute.hide_notifications?
       BlockWorker.perform_async(account.id, target_account.id)
     else
-      FeedManager.instance.clear_from_timeline(account, target_account)
+      MuteWorker.perform_async(account.id, target_account.id)
     end
+
     mute
   end
 end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 6490d2735bc14e8d2cb1fd11444a2ea645852fcf..b80ceef03c2428270ee14a29aebc28773a8938d3 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -8,9 +8,10 @@ class NotifyService < BaseService
 
     return if recipient.user.nil? || blocked?
 
-    create_notification
-    push_notification if @notification.browserable?
-    send_email if email_enabled?
+    create_notification!
+    push_notification! if @notification.browserable?
+    push_to_conversation! if direct_message?
+    send_email! if email_enabled?
   rescue ActiveRecord::RecordInvalid
     return
   end
@@ -30,7 +31,7 @@ class NotifyService < BaseService
   end
 
   def blocked_reblog?
-    @recipient.muting_reblogs?(@notification.from_account)
+    false
   end
 
   def blocked_follow_request?
@@ -50,14 +51,22 @@ class NotifyService < BaseService
     @recipient.user.settings.interactions['must_be_following'] && !following_sender?
   end
 
+  def message?
+    @notification.type == :mention
+  end
+
   def direct_message?
-    @notification.type == :mention && @notification.target_status.direct_visibility?
+    message? && @notification.target_status.direct_visibility?
   end
 
   def response_to_recipient?
     @notification.target_status.in_reply_to_account_id == @recipient.id && @notification.target_status.thread&.direct_visibility?
   end
 
+  def from_staff?
+    @notification.from_account.local? && @notification.from_account.user.present? && @notification.from_account.user.staff?
+  end
+
   def optional_non_following_and_direct?
     direct_message? &&
       @recipient.user.settings.interactions['must_be_following_dm'] &&
@@ -80,6 +89,9 @@ class NotifyService < BaseService
   def blocked?
     blocked   = @recipient.suspended?                            # Skip if the recipient account is suspended anyway
     blocked ||= from_self?                                       # Skip for interactions with self
+
+    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 ||= @recipient.muting_notifications?(@notification.from_account)
@@ -100,18 +112,23 @@ class NotifyService < BaseService
     end
   end
 
-  def create_notification
+  def create_notification!
     @notification.save!
   end
 
-  def push_notification
+  def push_notification!
     return if @notification.activity.nil?
 
     Redis.current.publish("timeline:#{@recipient.id}", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, :notification)))
-    send_push_notifications
+    send_push_notifications!
+  end
+
+  def push_to_conversation!
+    return if @notification.activity.nil?
+    AccountConversation.add_status(@recipient, @notification.target_status)
   end
 
-  def send_push_notifications
+  def send_push_notifications!
     subscriptions_ids = ::Web::PushSubscription.where(user_id: @recipient.user.id)
                                                .select { |subscription| subscription.pushable?(@notification) }
                                                .map(&:id)
@@ -121,9 +138,9 @@ class NotifyService < BaseService
     end
   end
 
-  def send_email
+  def send_email!
     return if @notification.activity.nil?
-    NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later
+    NotificationMailer.public_send(@notification.type, @recipient, @notification).deliver_later(wait: 2.minutes)
   end
 
   def email_enabled?
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 4c3485853dd5a57eec218e799e3205b73a583486..cc3453f995a1722cc9cd2dcfea2889b64f0de65c 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -1,69 +1,98 @@
 # frozen_string_literal: true
 
 class PostStatusService < BaseService
+  MIN_SCHEDULE_OFFSET = 5.minutes.freeze
+
   # Post a text status update, fetch and notify remote users mentioned
   # @param [Account] account Account from which to post
-  # @param [String] text Message
-  # @param [Status] in_reply_to Optional status to reply to
   # @param [Hash] options
+  # @option [String] :text Message
+  # @option [Status] :thread Optional status to reply to
   # @option [Boolean] :sensitive
   # @option [String] :visibility
   # @option [String] :spoiler_text
+  # @option [String] :language
+  # @option [String] :scheduled_at
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
   # @option [Doorkeeper::Application] :application
   # @option [String] :idempotency Optional idempotency key
   # @return [Status]
-  def call(account, text, in_reply_to = nil, **options)
-    if options[:idempotency].present?
-      existing_id = redis.get("idempotency:status:#{account.id}:#{options[:idempotency]}")
-      return Status.find(existing_id) if existing_id
+  def call(account, options = {})
+    @account     = account
+    @options     = options
+    @text        = @options[:text] || ''
+    @in_reply_to = @options[:thread]
+
+    return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
+
+    validate_media!
+    preprocess_attributes!
+
+    if scheduled?
+      schedule_status!
+    else
+      process_status!
+      postprocess_status!
+      bump_potential_friendship!
     end
 
-    media  = validate_media!(options[:media_ids])
-    status = nil
-    text   = options.delete(:spoiler_text) if text.blank? && options[:spoiler_text].present?
+    redis.setex(idempotency_key, 3_600, @status.id) if idempotency_given?
 
-    ApplicationRecord.transaction do
-      status = account.statuses.create!(text: text,
-                                        media_attachments: media || [],
-                                        thread: in_reply_to,
-                                        sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]) || options[:spoiler_text].present?,
-                                        spoiler_text: options[:spoiler_text] || '',
-                                        visibility: options[:visibility] || account.user&.setting_default_privacy,
-                                        language: language_from_option(options[:language]) || account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(text, account),
-                                        application: options[:application])
-    end
+    @status
+  end
 
-    process_hashtags_service.call(status)
-    process_mentions_service.call(status)
+  private
 
-    LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
-    DistributionWorker.perform_async(status.id)
-    Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
-    ActivityPub::DistributionWorker.perform_async(status.id)
-    ActivityPub::ReplyDistributionWorker.perform_async(status.id) if status.reply? && status.thread.account.local?
+  def preprocess_attributes!
+    @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
+    @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
+    @visibility   = :unlisted if @visibility == :public && @account.silenced
+    @scheduled_at = @options[:scheduled_at]&.to_datetime
+    @scheduled_at = nil if scheduled_in_the_past?
+  rescue ArgumentError
+    raise ActiveRecord::RecordInvalid
+  end
 
-    if options[:idempotency].present?
-      redis.setex("idempotency:status:#{account.id}:#{options[:idempotency]}", 3_600, status.id)
-    end
+  def process_status!
+    # The following transaction block is needed to wrap the UPDATEs to
+    # the media attachments when the status is created
 
-    bump_potential_friendship(account, status)
+    ApplicationRecord.transaction do
+      @status = @account.statuses.create!(status_attributes)
+    end
 
-    status
+    process_hashtags_service.call(@status)
+    process_mentions_service.call(@status)
   end
 
-  private
+  def schedule_status!
+    if @account.statuses.build(status_attributes).valid?
+      # The following transaction block is needed to wrap the UPDATEs to
+      # the media attachments when the scheduled status is created
+
+      ApplicationRecord.transaction do
+        @status = @account.scheduled_statuses.create!(scheduled_status_attributes)
+      end
+    else
+      raise ActiveRecord::RecordInvalid
+    end
+  end
 
-  def validate_media!(media_ids)
-    return if media_ids.blank? || !media_ids.is_a?(Enumerable)
+  def postprocess_status!
+    LinkCrawlWorker.perform_async(@status.id) unless @status.spoiler_text?
+    DistributionWorker.perform_async(@status.id)
+    Pubsubhubbub::DistributionWorker.perform_async(@status.stream_entry.id)
+    ActivityPub::DistributionWorker.perform_async(@status.id)
+  end
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if media_ids.size > 4
+  def validate_media!
+    return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
 
-    media = MediaAttachment.where(status_id: nil).where(id: media_ids.take(4).map(&:to_i))
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4
 
-    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media.size > 1 && media.find(&:video?)
+    @media = MediaAttachment.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
 
-    media
+    raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:video?)
   end
 
   def language_from_option(str)
@@ -82,8 +111,68 @@ class PostStatusService < BaseService
     Redis.current
   end
 
-  def bump_potential_friendship(account, status)
-    return if !status.reply? || account.following?(status.in_reply_to_account_id)
-    PotentialFriendshipTracker.record(account.id, status.in_reply_to_account_id, :reply)
+  def scheduled?
+    @scheduled_at.present?
+  end
+
+  def idempotency_key
+    "idempotency:status:#{@account.id}:#{@options[:idempotency]}"
+  end
+
+  def idempotency_given?
+    @options[:idempotency].present?
+  end
+
+  def idempotency_duplicate
+    if scheduled?
+      @account.schedule_statuses.find(@idempotency_duplicate)
+    else
+      @account.statuses.find(@idempotency_duplicate)
+    end
+  end
+
+  def idempotency_duplicate?
+    @idempotency_duplicate = redis.get(idempotency_key)
+  end
+
+  def scheduled_in_the_past?
+    @scheduled_at.present? && @scheduled_at <= Time.now.utc + MIN_SCHEDULE_OFFSET
+  end
+
+  def bump_potential_friendship!
+    return if !@status.reply? || @account.id == @status.in_reply_to_account_id
+    ActivityTracker.increment('activity:interactions')
+    return if @account.following?(@status.in_reply_to_account_id)
+    PotentialFriendshipTracker.record(@account.id, @status.in_reply_to_account_id, :reply)
+  end
+
+  def status_attributes
+    {
+      text: @text,
+      media_attachments: @media || [],
+      thread: @in_reply_to,
+      sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
+      spoiler_text: @options[:spoiler_text] || '',
+      visibility: @visibility,
+      language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
+      application: @options[:application],
+    }
+  end
+
+  def scheduled_status_attributes
+    {
+      scheduled_at: @scheduled_at,
+      media_attachments: @media || [],
+      params: scheduled_options,
+    }
+  end
+
+  def scheduled_options
+    @options.tap do |options_hash|
+      options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id
+      options_hash[:application_id] = options_hash.delete(:application)&.id
+      options_hash[:scheduled_at]   = nil
+      options_hash[:idempotency]    = nil
+    end
   end
 end
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 4f771ff7233966eb307267e805b199eca6cd1576..076dedacab97dfed799c5c417b4ada969e0555e4 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -3,6 +3,7 @@
 class PrecomputeFeedService < BaseService
   def call(account)
     FeedManager.instance.populate_feed(account)
+  ensure
     Redis.current.del("account:#{account.id}:regeneration")
   end
 end
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 2ed6698cf28eba366b800e3055b744aba46bc697..2595c5fd3668c9743e3eed5d318b007c6ac1de15 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -25,7 +25,7 @@ class ProcessMentionsService < BaseService
         end
       end
 
-      next match if mention_undeliverable?(mentioned_account)
+      next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended
 
       mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status)
 
@@ -47,7 +47,7 @@ class ProcessMentionsService < BaseService
     mentioned_account = mention.account
 
     if mentioned_account.local?
-      LocalNotificationWorker.perform_async(mention.id)
+      LocalNotificationWorker.perform_async(mentioned_account.id, mention.id, mention.class.name)
     elsif mentioned_account.ostatus? && !@status.stream_entry.hidden?
       NotificationWorker.perform_async(ostatus_xml, @status.account_id, mentioned_account.id)
     elsif mentioned_account.activitypub?
@@ -60,11 +60,13 @@ class ProcessMentionsService < BaseService
   end
 
   def activitypub_json
-    @activitypub_json ||= Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    return @activitypub_json if defined?(@activitypub_json)
+    payload = ActiveModelSerializers::SerializableResource.new(
       @status,
       serializer: ActivityPub::ActivitySerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(@status.account))
+    ).as_json
+    @activitypub_json = Oj.dump(@status.distributable? ? ActivityPub::LinkedDataSignature.new(payload).sign!(@status.account) : payload)
   end
 
   def resolve_account_service
diff --git a/app/services/pubsubhubbub/subscribe_service.rb b/app/services/pubsubhubbub/subscribe_service.rb
index 2dba05b12f1c362004c8e432558af962fb02a01b..550da632812a5163d091ed35ca5b95d10c7cac3b 100644
--- a/app/services/pubsubhubbub/subscribe_service.rb
+++ b/app/services/pubsubhubbub/subscribe_service.rb
@@ -19,31 +19,18 @@ class Pubsubhubbub::SubscribeService < BaseService
   private
 
   def process_subscribe
-    case subscribe_status
-    when :invalid_topic
+    if account.nil?
       ['Invalid topic URL', 422]
-    when :invalid_callback
+    elsif !valid_callback?
       ['Invalid callback URL', 422]
-    when :callback_not_allowed
+    elsif blocked_domain?
       ['Callback URL not allowed', 403]
-    when :valid
+    else
       confirm_subscription
       ['', 202]
     end
   end
 
-  def subscribe_status
-    if account.nil?
-      :invalid_topic
-    elsif !valid_callback?
-      :invalid_callback
-    elsif blocked_domain?
-      :callback_not_allowed
-    else
-      :valid
-    end
-  end
-
   def confirm_subscription
     subscription = locate_subscription
     Pubsubhubbub::ConfirmationWorker.perform_async(subscription.id, 'subscribe', secret, lease_seconds)
@@ -58,12 +45,7 @@ class Pubsubhubbub::SubscribeService < BaseService
   end
 
   def locate_subscription
-    subscription = Subscription.find_by(account: account, callback_url: callback)
-
-    if subscription.nil?
-      subscription = Subscription.new(account: account, callback_url: callback)
-    end
-
+    subscription = Subscription.find_or_initialize_by(account: account, callback_url: callback)
     subscription.domain = domain
     subscription.save!
     subscription
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 0ee8bac2f24c5bc7a6e9620ca5ab5c04833d6500..33ddef8b88d9482d63b0128ea5a9a53b96e13a6b 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -44,6 +44,7 @@ class ReblogService < BaseService
   end
 
   def bump_potential_friendship(account, reblog)
+    ActivityTracker.increment('activity:interactions')
     return if account.following?(reblog.reblog.account_id)
     PotentialFriendshipTracker.record(account.id, reblog.reblog.account_id, :reblog)
   end
diff --git a/app/services/reject_follow_service.rb b/app/services/reject_follow_service.rb
index c1f7bcb6069b0ef10b78a4129668fcddd7f6619b..a91266aa4b65b6447e1558cdc7373fda46a50aed 100644
--- a/app/services/reject_follow_service.rb
+++ b/app/services/reject_follow_service.rb
@@ -19,11 +19,11 @@ class RejectFollowService < BaseService
   end
 
   def build_json(follow_request)
-    Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    ActiveModelSerializers::SerializableResource.new(
       follow_request,
       serializer: ActivityPub::RejectFollowSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(follow_request.target_account))
+    ).to_json
   end
 
   def build_xml(follow_request)
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 238099169135e57860b412930b65310cbff8e910..11d28e783d04c86d5c48ccca49370badc3311e34 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -8,7 +8,7 @@ class RemoveStatusService < BaseService
     @status       = status
     @account      = status.account
     @tags         = status.tags.pluck(:name).to_a
-    @mentions     = status.mentions.includes(:account).to_a
+    @mentions     = status.active_mentions.includes(:account).to_a
     @reblogs      = status.reblogs.to_a
     @stream_entry = status.stream_entry
     @options      = options
@@ -21,7 +21,6 @@ class RemoveStatusService < BaseService
     remove_from_hashtags
     remove_from_public
     remove_from_media if status.media_attachments.any?
-    remove_from_direct if status.direct_visibility?
 
     @status.destroy!
 
@@ -43,13 +42,13 @@ class RemoveStatusService < BaseService
   end
 
   def remove_from_followers
-    @account.followers_for_local_distribution.find_each do |follower|
+    @account.followers_for_local_distribution.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).find_each do |list|
+    @account.lists_for_local_distribution.select(:id, :account_id).reorder(nil).find_each do |list|
       FeedManager.instance.unpush_from_list(list, @status)
     end
   end
@@ -90,6 +89,18 @@ class RemoveStatusService < BaseService
     ActivityPub::DeliveryWorker.push_bulk(@account.followers.inboxes) do |inbox_url|
       [signed_activity_json, @account.id, inbox_url]
     end
+
+    relay! if relayable?
+  end
+
+  def relayable?
+    @status.public_visibility?
+  end
+
+  def relay!
+    ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
+      [signed_activity_json, @account.id, inbox_url]
+    end
   end
 
   def salmon_xml
@@ -141,13 +152,6 @@ class RemoveStatusService < BaseService
     Redis.current.publish('timeline:public:local:media', @payload) if @status.local?
   end
 
-  def remove_from_direct
-    @mentions.each do |mention|
-      Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local?
-    end
-    Redis.current.publish("timeline:direct:#{@account.id}", @payload) if @account.local?
-  end
-
   def redis
     Redis.current
   end
diff --git a/app/services/report_service.rb b/app/services/report_service.rb
index c06488a6de1628ce9491c3387b07950b173eba06..1bcc1c0d56c3a7e3e15e82ecbf5eccc6078ea9c7 100644
--- a/app/services/report_service.rb
+++ b/app/services/report_service.rb
@@ -26,7 +26,10 @@ class ReportService < BaseService
   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
     end
   end
@@ -49,6 +52,6 @@ class ReportService < BaseService
   end
 
   def some_local_account
-    @some_local_account ||= Account.local.where(suspended: false).first
+    @some_local_account ||= Account.representative
   end
 end
diff --git a/app/services/resolve_account_service.rb b/app/services/resolve_account_service.rb
index 4323e7f06d57f77c8fe37a618ba463a7faddf3c8..4ff351c5f72644253390a6c05ba7fb3b3b7dbcb5 100644
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -9,17 +9,28 @@ class ResolveAccountService < BaseService
   # Find or create a local account for a remote user.
   # When creating, look up the user's webfinger and fetch all
   # important information from their feed
-  # @param [String] uri User URI in the form of username@domain
+  # @param [String, Account] uri User URI in the form of username@domain
+  # @param [Hash] options
   # @return [Account]
-  def call(uri, update_profile = true, redirected = nil)
-    @username, @domain = uri.split('@')
-    @update_profile    = update_profile
+  def call(uri, options = {})
+    @options = options
 
-    return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
+    if uri.is_a?(Account)
+      @account  = uri
+      @username = @account.username
+      @domain   = @account.domain
+      uri       = "#{@username}@#{@domain}"
+
+      return @account if @account.local? || !webfinger_update_due?
+    else
+      @username, @domain = uri.split('@')
 
-    @account = Account.find_remote(@username, @domain)
+      return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
 
-    return @account unless webfinger_update_due?
+      @account = Account.find_remote(@username, @domain)
+
+      return @account unless webfinger_update_due?
+    end
 
     Rails.logger.debug "Looking up webfinger for #{uri}"
 
@@ -30,8 +41,8 @@ class ResolveAccountService < BaseService
     if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
       @username = confirmed_username
       @domain   = confirmed_domain
-    elsif redirected.nil?
-      return call("#{confirmed_username}@#{confirmed_domain}", update_profile, true)
+    elsif options[:redirected].nil?
+      return call("#{confirmed_username}@#{confirmed_domain}", options.merge(redirected: true))
     else
       Rails.logger.debug 'Requested and returned acct URIs do not match'
       return
@@ -76,7 +87,7 @@ class ResolveAccountService < BaseService
   end
 
   def webfinger_update_due?
-    @account.nil? || @account.possibly_stale?
+    @account.nil? || ((!@options[:skip_webfinger] || @account.ostatus?) && @account.possibly_stale?)
   end
 
   def activitypub_ready?
@@ -93,7 +104,7 @@ class ResolveAccountService < BaseService
   end
 
   def update_profile?
-    @update_profile
+    @options[:update_profile]
   end
 
   def handle_activitypub
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb
index a068c1ed86a2ae21f31ec9f58f34741d85eaac2b..ed0c569230f64f3e459eb7f893a3f55738fe8fbf 100644
--- a/app/services/resolve_url_service.rb
+++ b/app/services/resolve_url_service.rb
@@ -2,11 +2,13 @@
 
 class ResolveURLService < BaseService
   include JsonLdHelper
+  include Authorization
 
   attr_reader :url
 
-  def call(url)
+  def call(url, on_behalf_of: nil)
     @url = url
+    @on_behalf_of = on_behalf_of
 
     return process_local_url if local_url?
 
@@ -18,7 +20,7 @@ class ResolveURLService < BaseService
   def process_url
     if equals_or_includes_any?(type, %w(Application Group Organization Person Service))
       FetchRemoteAccountService.new.call(atom_url, body, protocol)
-    elsif equals_or_includes_any?(type, %w(Note Article Image Video))
+    elsif equals_or_includes_any?(type, %w(Note Article Image Video Page))
       FetchRemoteStatusService.new.call(atom_url, body, protocol)
     end
   end
@@ -84,6 +86,10 @@ class ResolveURLService < BaseService
 
   def check_local_status(status)
     return if status.nil?
-    status if status.public_visibility? || status.unlisted_visibility?
+    authorize_with @on_behalf_of, status, :show?
+    status
+  rescue Mastodon::NotPermittedError
+    # Do not disclose the existence of status the user is not authorized to see
+    nil
   end
 end
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index 5bb395942da0bec28894e68d02db0600b8c84beb..1c31e0509a8549ba0de1f20c6cf3cf380ce92ec7 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -34,6 +34,8 @@ class SearchService < BaseService
                             .compact
 
     statuses.reject { |status| StatusFilter.new(status, account).filtered? }
+  rescue Faraday::ConnectionFailed
+    []
   end
 
   def perform_hashtags_search!
@@ -53,7 +55,7 @@ class SearchService < BaseService
   end
 
   def url_resource
-    @_url_resource ||= ResolveURLService.new.call(query)
+    @_url_resource ||= ResolveURLService.new.call(query, on_behalf_of: @account)
   end
 
   def url_resource_symbol
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 708d15e37d9284084daa4c8243f7aee65ae26d35..1bc2314de7156e802fe75c8d0139e00afb4147ea 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -1,6 +1,42 @@
 # frozen_string_literal: true
 
 class SuspendAccountService < BaseService
+  ASSOCIATIONS_ON_SUSPEND = %w(
+    account_pins
+    active_relationships
+    block_relationships
+    blocked_by_relationships
+    conversation_mutes
+    conversations
+    custom_filters
+    domain_blocks
+    favourites
+    follow_requests
+    list_accounts
+    media_attachments
+    mute_relationships
+    muted_by_relationships
+    notifications
+    owned_lists
+    passive_relationships
+    report_notes
+    scheduled_statuses
+    status_pins
+    stream_entries
+    subscriptions
+  ).freeze
+
+  ASSOCIATIONS_ON_DESTROY = %w(
+    reports
+    targeted_moderation_notes
+    targeted_reports
+  ).freeze
+
+  # Suspend an account and remove as much of its data as possible
+  # @param [Account]
+  # @param [Hash] options
+  # @option [Boolean] :including_user Remove the user record as well
+  # @option [Boolean] :destroy Remove the account record instead of suspending
   def call(account, **options)
     @account = account
     @options = options
@@ -8,63 +44,87 @@ class SuspendAccountService < BaseService
     purge_user!
     purge_profile!
     purge_content!
-    unsubscribe_push_subscribers!
   end
 
   private
 
   def purge_user!
-    if @options[:remove_user]
-      @account.user&.destroy
+    return if !@account.local? || @account.user.nil?
+
+    if @options[:including_user]
+      @account.user.destroy
     else
-      @account.user&.disable!
+      @account.user.disable!
     end
   end
 
   def purge_content!
-    ActivityPub::RawDistributionWorker.perform_async(delete_actor_json, @account.id) if @account.local?
+    distribute_delete_actor! if @account.local?
 
     @account.statuses.reorder(nil).find_in_batches do |statuses|
-      BatchedRemoveStatusService.new.call(statuses)
+      BatchedRemoveStatusService.new.call(statuses, skip_side_effects: @options[:destroy])
     end
 
-    [
-      @account.media_attachments,
-      @account.stream_entries,
-      @account.notifications,
-      @account.favourites,
-      @account.active_relationships,
-      @account.passive_relationships,
-    ].each do |association|
-      destroy_all(association)
+    associations_for_destruction.each do |association_name|
+      destroy_all(@account.public_send(association_name))
     end
+
+    @account.destroy if @options[:destroy]
   end
 
   def purge_profile!
-    @account.suspended      = true
-    @account.display_name   = ''
-    @account.note           = ''
-    @account.statuses_count = 0
+    # If the account is going to be destroyed
+    # there is no point wasting time updating
+    # its values first
+
+    return if @options[:destroy]
+
+    @account.silenced         = false
+    @account.suspended        = true
+    @account.locked           = 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.avatar.destroy
     @account.header.destroy
     @account.save!
   end
 
-  def unsubscribe_push_subscribers!
-    destroy_all(@account.subscriptions)
-  end
-
   def destroy_all(association)
     association.in_batches.destroy_all
   end
 
+  def distribute_delete_actor!
+    ActivityPub::DeliveryWorker.push_bulk(delivery_inboxes) do |inbox_url|
+      [delete_actor_json, @account.id, inbox_url]
+    end
+  end
+
   def delete_actor_json
+    return @delete_actor_json if defined?(@delete_actor_json)
+
     payload = ActiveModelSerializers::SerializableResource.new(
       @account,
       serializer: ActivityPub::DeleteActorSerializer,
       adapter: ActivityPub::Adapter
     ).as_json
 
-    Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
+    @delete_actor_json = Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
+  end
+
+  def delivery_inboxes
+    Account.inboxes + Relay.enabled.pluck(:inbox_url)
+  end
+
+  def associations_for_destruction
+    if @options[:destroy]
+      ASSOCIATIONS_ON_SUSPEND + ASSOCIATIONS_ON_DESTROY
+    else
+      ASSOCIATIONS_ON_SUSPEND
+    end
   end
 end
diff --git a/app/services/unblock_service.rb b/app/services/unblock_service.rb
index 869f62d1c53f7366f59b8de8fca51ce78b3da437..72fc5ab150d68702d953fd4efa495945b9bdacaa 100644
--- a/app/services/unblock_service.rb
+++ b/app/services/unblock_service.rb
@@ -20,11 +20,11 @@ class UnblockService < BaseService
   end
 
   def build_json(unblock)
-    Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    ActiveModelSerializers::SerializableResource.new(
       unblock,
       serializer: ActivityPub::UndoBlockSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(unblock.account))
+    ).to_json
   end
 
   def build_xml(block)
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 73a64929fa19beb643a542e63d20a6c09e453713..95da2a667b32c03ba5a1be1a6da8acd2bfbd579e 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -20,6 +20,7 @@ class UnfollowService < BaseService
 
     follow.destroy!
     create_notification(follow) unless @target_account.local?
+    create_reject_notification(follow) if @target_account.local? && !@source_account.local?
     UnmergeWorker.perform_async(@target_account.id, @source_account.id)
     follow
   end
@@ -42,12 +43,26 @@ class UnfollowService < BaseService
     end
   end
 
+  def create_reject_notification(follow)
+    # Rejecting an already-existing follow request
+    return unless follow.account.activitypub?
+    ActivityPub::DeliveryWorker.perform_async(build_reject_json(follow), follow.target_account_id, follow.account.inbox_url)
+  end
+
   def build_json(follow)
-    Oj.dump(ActivityPub::LinkedDataSignature.new(ActiveModelSerializers::SerializableResource.new(
+    ActiveModelSerializers::SerializableResource.new(
       follow,
       serializer: ActivityPub::UndoFollowSerializer,
       adapter: ActivityPub::Adapter
-    ).as_json).sign!(follow.account))
+    ).to_json
+  end
+
+  def build_reject_json(follow)
+    ActiveModelSerializers::SerializableResource.new(
+      follow,
+      serializer: ActivityPub::RejectFollowSerializer,
+      adapter: ActivityPub::Adapter
+    ).to_json
   end
 
   def build_xml(follow)
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb
index 09ea377e731500458164bba65b37eb6161bacdd4..01756a73d4bbeafdc8cef1af40849c59b916a575 100644
--- a/app/services/update_account_service.rb
+++ b/app/services/update_account_service.rb
@@ -2,20 +2,34 @@
 
 class UpdateAccountService < BaseService
   def call(account, params, raise_error: false)
-    was_locked = account.locked
+    was_locked    = account.locked
     update_method = raise_error ? :update! : :update
+
     account.send(update_method, params).tap do |ret|
       next unless ret
+
       authorize_all_follow_requests(account) if was_locked && !account.locked
+      check_links(account)
+      process_hashtags(account)
     end
+  rescue Mastodon::DimensionsValidationError => de
+    account.errors.add(:avatar, de.message)
+    false
   end
 
   private
 
   def authorize_all_follow_requests(account)
-    follow_requests = FollowRequest.where(target_account: account)
-    AuthorizeFollowWorker.push_bulk(follow_requests) do |req|
+    AuthorizeFollowWorker.push_bulk(FollowRequest.where(target_account: account).select(:account_id, :target_account_id)) do |req|
       [req.account_id, req.target_account_id]
     end
   end
+
+  def check_links(account)
+    VerifyAccountLinksWorker.perform_async(account.id)
+  end
+
+  def process_hashtags(account)
+    account.tags_as_strings = Extractor.extract_hashtags(account.note)
+  end
 end
diff --git a/app/services/verify_link_service.rb b/app/services/verify_link_service.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c6557876137f778c0aefbebba8430b56d42e1421
--- /dev/null
+++ b/app/services/verify_link_service.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+class VerifyLinkService < BaseService
+  def call(field)
+    @link_back = ActivityPub::TagManager.instance.url_for(field.account)
+    @url       = field.value_for_verification
+
+    perform_request!
+
+    return unless link_back_present?
+
+    field.mark_verified!
+  rescue HTTP::Error, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
+    Rails.logger.debug "Error fetching link #{@url}: #{e}"
+    nil
+  end
+
+  private
+
+  def perform_request!
+    @body = Request.new(:get, @url).add_headers('Accept' => 'text/html').perform do |res|
+      res.code != 200 ? nil : res.body_with_limit
+    end
+  end
+
+  def link_back_present?
+    return false if @body.blank?
+
+    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 }
+      true
+    elsif links.empty?
+      false
+    else
+      link_redirects_back?(links.first['href'])
+    end
+  end
+
+  def link_redirects_back?(test_url)
+    redirect_to_url = Request.new(:head, test_url, follow: false).perform do |res|
+      res.headers['Location']
+    end
+
+    redirect_to_url == @link_back
+  end
+end
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index 3f203f49a6ee7dce10a526f6c201aa4ed3d8e534..a2061fdd311069b06d0ff3444c3f911890d1ca86 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -2,31 +2,32 @@
 
 class BlacklistedEmailValidator < ActiveModel::Validator
   def validate(user)
-    user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?(user.email)
+    @email = user.email
+    user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?
   end
 
   private
 
-  def blocked_email?(value)
-    on_blacklist?(value) || not_on_whitelist?(value)
+  def blocked_email?
+    on_blacklist? || not_on_whitelist?
   end
 
-  def on_blacklist?(value)
-    return true if EmailDomainBlock.block?(value)
+  def on_blacklist?
+    return true if EmailDomainBlock.block?(@email)
     return false if Rails.configuration.x.email_domains_blacklist.blank?
 
     domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
     regexp  = Regexp.new("@(.+\\.)?(#{domains})", true)
 
-    value =~ regexp
+    @email =~ regexp
   end
 
-  def not_on_whitelist?(value)
+  def not_on_whitelist?
     return false if Rails.configuration.x.email_domains_whitelist.blank?
 
     domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
     regexp  = Regexp.new("@(.+\\.)?(#{domains})$", true)
 
-    value !~ regexp
+    @email !~ regexp
   end
 end
diff --git a/app/validators/disallowed_hashtags_validator.rb b/app/validators/disallowed_hashtags_validator.rb
index 22c027b0fcac07819c5ae77e6658990b554a881d..ee06b20f6b49bd03f5f71a86daafa4c5dda3a748 100644
--- a/app/validators/disallowed_hashtags_validator.rb
+++ b/app/validators/disallowed_hashtags_validator.rb
@@ -4,14 +4,19 @@ class DisallowedHashtagsValidator < ActiveModel::Validator
   def validate(status)
     return unless status.local? && !status.reblog?
 
-    tags = Extractor.extract_hashtags(status.text)
-    tags.keep_if { |tag| disallowed_hashtags.include? tag.downcase }
+    @status = status
+    tags    = select_tags
 
     status.errors.add(:text, I18n.t('statuses.disallowed_hashtags', tags: tags.join(', '), count: tags.size)) unless tags.empty?
   end
 
   private
 
+  def select_tags
+    tags = Extractor.extract_hashtags(@status.text)
+    tags.keep_if { |tag| disallowed_hashtags.include? tag.downcase }
+  end
+
   def disallowed_hashtags
     return @disallowed_hashtags if @disallowed_hashtags
 
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index e9e6b56e876fca750763ad4c283604bee2df2425..5b4c684b2c4b449ee98c8d693ce1b25cd5328701 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -4,7 +4,6 @@ require 'resolv'
 
 class EmailMxValidator < ActiveModel::Validator
   def validate(user)
-    return if Rails.env.test? || Rails.env.development?
     user.errors.add(:email, I18n.t('users.invalid_email')) if invalid_mx?(user.email)
   end
 
@@ -15,13 +14,23 @@ class EmailMxValidator < ActiveModel::Validator
 
     return true if domain.nil?
 
-    records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
-    records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.exchange.to_s } if records.empty?
+    hostnames = []
+    ips       = []
 
-    records.empty? || on_blacklist?(records)
+    Resolv::DNS.open do |dns|
+      dns.timeouts = 1
+
+      hostnames = dns.getresources(domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }
+
+      ([domain] + hostnames).uniq.each do |hostname|
+        ips.concat(dns.getresources(hostname, Resolv::DNS::Resource::IN::A).to_a.map { |e| e.address.to_s })
+      end
+    end
+
+    ips.empty? || on_blacklist?(hostnames + ips)
   end
 
   def on_blacklist?(values)
-    EmailDomainBlock.where(domain: values).any?
+    EmailDomainBlock.where(domain: values.uniq).any?
   end
 end
diff --git a/app/validators/follow_limit_validator.rb b/app/validators/follow_limit_validator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..409bf01763b45e89840f7b1bb386861b162683ad
--- /dev/null
+++ b/app/validators/follow_limit_validator.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class FollowLimitValidator < ActiveModel::Validator
+  LIMIT = ENV.fetch('MAX_FOLLOWS_THRESHOLD', 7_500).to_i
+  RATIO = ENV.fetch('MAX_FOLLOWS_RATIO', 1.1).to_f
+
+  def validate(follow)
+    return if follow.account.nil? || !follow.account.local?
+    follow.errors.add(:base, I18n.t('users.follow_limit_reached', limit: self.class.limit_for_account(follow.account))) if limit_reached?(follow.account)
+  end
+
+  class << self
+    def limit_for_account(account)
+      if account.following_count < LIMIT
+        LIMIT
+      else
+        [(account.followers_count * RATIO).round, LIMIT].max
+      end
+    end
+  end
+
+  private
+
+  def limit_reached?(account)
+    account.following_count >= self.class.limit_for_account(account)
+  end
+end
diff --git a/app/validators/note_length_validator.rb b/app/validators/note_length_validator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5ff6df6df24279b4a1c716ab1ca7078a3b148d12
--- /dev/null
+++ b/app/validators/note_length_validator.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class NoteLengthValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, I18n.t('statuses.over_character_limit', max: options[:maximum])) if too_long?(value)
+  end
+
+  private
+
+  def too_long?(value)
+    countable_text(value).mb_chars.grapheme_length > options[:maximum]
+  end
+
+  def countable_text(value)
+    return '' if value.nil?
+
+    value.dup.tap do |new_text|
+      new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
+      new_text.gsub!(Account::MENTION_RE, '@\2')
+    end
+  end
+end
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 429ad6c383bedaf961be2a4d342db35c998cddd9..8daa46857b15a9315fc1878e654648a9feaacc98 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -5,27 +5,29 @@ class StatusLengthValidator < ActiveModel::Validator
 
   def validate(status)
     return unless status.local? && !status.reblog?
-    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?(status)
+
+    @status = status
+    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?
   end
 
   private
 
-  def too_long?(status)
-    countable_length(status) > MAX_CHARS
+  def too_long?
+    countable_length > MAX_CHARS
   end
 
-  def countable_length(status)
-    total_text(status).mb_chars.grapheme_length
+  def countable_length
+    total_text.mb_chars.grapheme_length
   end
 
-  def total_text(status)
-    [status.spoiler_text, countable_text(status)].join
+  def total_text
+    [@status.spoiler_text, countable_text].join
   end
 
-  def countable_text(status)
-    return '' if status.text.nil?
+  def countable_text
+    return '' if @status.text.nil?
 
-    status.text.dup.tap do |new_text|
+    @status.text.dup.tap do |new_text|
       new_text.gsub!(FetchLinkCardService::URL_PATTERN, 'x' * 23)
       new_text.gsub!(Account::MENTION_RE, '@\2')
     end
diff --git a/app/validators/unreserved_username_validator.rb b/app/validators/unreserved_username_validator.rb
index c2311a89abbf0f776b223296d3fa701ed3001cf2..634ceb06e6eb4def92efd23d1a33f094e4d436ca 100644
--- a/app/validators/unreserved_username_validator.rb
+++ b/app/validators/unreserved_username_validator.rb
@@ -2,20 +2,22 @@
 
 class UnreservedUsernameValidator < ActiveModel::Validator
   def validate(account)
-    return if account.username.nil?
-    account.errors.add(:username, I18n.t('accounts.reserved_username')) if reserved_username?(account.username)
+    @username = account.username
+    return if @username.nil?
+
+    account.errors.add(:username, I18n.t('accounts.reserved_username')) if reserved_username?
   end
 
   private
 
-  def pam_controlled?(value)
+  def pam_controlled?
     return false unless Devise.pam_authentication && Devise.pam_controlled_service
-    Rpam2.account(Devise.pam_controlled_service, value).present?
+    Rpam2.account(Devise.pam_controlled_service, @username).present?
   end
 
-  def reserved_username?(value)
-    return true if pam_controlled?(value)
+  def reserved_username?
+    return true if pam_controlled?
     return false unless Setting.reserved_usernames
-    Setting.reserved_usernames.include?(value.downcase)
+    Setting.reserved_usernames.include?(@username.downcase)
   end
 end
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb
index f39560d90aca48f0d5a783b7e60eee3787c85e0b..d95a03fbf86cda5494459f1c45cfe4eb642fe60a 100644
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
@@ -8,7 +8,7 @@ class UrlValidator < ActiveModel::EachValidator
   private
 
   def compliant?(url)
-    parsed_url = Addressable::URI.parse(url).normalize
-    !parsed_url.nil? && %w(http https).include?(parsed_url.scheme) && parsed_url.host
+    parsed_url = Addressable::URI.parse(url)
+    parsed_url && %w(http https).include?(parsed_url.scheme) && parsed_url.host
   end
 end
diff --git a/app/views/about/_administration.html.haml b/app/views/about/_administration.html.haml
deleted file mode 100644
index 02286d68b7be589708749beb37e0fbb6213843d5..0000000000000000000000000000000000000000
--- a/app/views/about/_administration.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-.account
-  .account__wrapper
-    - if @instance_presenter.contact_account
-      = link_to TagManager.instance.url_for(@instance_presenter.contact_account), class: 'account__display-name' do
-        .account__avatar-wrapper
-          .account__avatar{ style: "background-image: url(#{@instance_presenter.contact_account.avatar.url})" }
-        %span.display-name
-          %bdi
-            %strong.display-name__html.emojify= display_name(@instance_presenter.contact_account, custom_emojify: true)
-          %span.display-name__account @#{@instance_presenter.contact_account.acct}
-    - else
-      .account__display-name
-        .account__avatar-wrapper
-          .account__avatar{ style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)})" }
-        %span.display-name
-          %strong= t 'about.contact_missing'
-          %span.display-name__account= t 'about.contact_unavailable'
-
-    = link_to t('about.learn_more'), about_more_path, class: 'button button-alternative'
diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml
deleted file mode 100644
index 3215d50b5315cc4e0761e877bbf73b5c581c5453..0000000000000000000000000000000000000000
--- a/app/views/about/_contact.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-.panel
-  .panel-header
-    = succeed ':' do
-      = t 'about.contact'
-    - if contact.site_contact_email.present?
-      = mail_to contact.site_contact_email, nil, title: contact.site_contact_email
-    - else
-      %span= t 'about.contact_unavailable'
-  .panel-body
-    - if contact.contact_account
-      .owner
-        .avatar= image_tag contact.contact_account.avatar.url
-        .name
-          = link_to TagManager.instance.url_for(contact.contact_account) do
-            %span.display_name.emojify= display_name(contact.contact_account, custom_emojify: true)
-            %span.username @#{contact.contact_account.acct}
-    - else
-      .owner
-        .avatar= image_tag full_asset_url('avatars/original/missing.png', skip_pipeline: true)
-        .name
-          %span.display_name= t 'about.contact_missing'
-          %span.username= t 'about.contact_unavailable'
diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml
index 6ca1d71290b9e702c77091a9a022fda0373fec34..ee4f8fe2e61d8994af7ce0888ff72d8981c2e146 100644
--- a/app/views/about/_registration.html.haml
+++ b/app/views/about/_registration.html.haml
@@ -1,13 +1,10 @@
 = simple_form_for(new_user, url: user_registration_path) do |f|
   = f.simple_fields_for :account do |account_fields|
-    .input-with-append
-      = account_fields.input :username, autofocus: true, placeholder: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' }
-      .append
-        = "@#{site_hostname}"
+    = account_fields.input :username, wrapper: :with_label, autofocus: true, label: false, required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off', placeholder: t('simple_form.labels.defaults.username') }, 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 => 'off' }
-  = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }
-  = 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' }
+  = 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
+  = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }, 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 => 'off' }, hint: false
 
   .actions
     = f.button :button, t('auth.register'), type: :submit, class: 'button button-primary'
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index df072b8aec425ed234b2a4d0d3db1ec87d12265d..f94c7c06f8ce05a00dcffb6404948c54f5251bb4 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -5,39 +5,43 @@
   = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
   = render partial: 'shared/og'
 
-.landing-page
-  .header-wrapper.compact
-    .header
-      = render 'links'
+.grid-3
+  .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('preview.jpg'), alt: @instance_presenter.site_title, class: 'parallax'
 
-      .container-alt.hero
-        .heading
-          %h3= t('about.description_headline', domain: site_hostname)
-          %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
+  .column-1
+    .landing-page__call-to-action{ dir: 'ltr' }
+      .row
+        .row__information-board
+          .information-board__section
+            %span= t 'about.user_count_before'
+            %strong= number_with_delimiter @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= number_with_delimiter @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('elephant_ui_plane.svg'), alt: ''
 
-  .information-board
-    .container-alt
-      .information-board__sections
-        .information-board__section
-          %span= t 'about.user_count_before'
-          %strong= number_with_delimiter @instance_presenter.user_count
-          %span= t 'about.user_count_after'
-        .information-board__section
-          %span= t 'about.status_count_before'
-          %strong= number_with_delimiter @instance_presenter.status_count
-          %span= t 'about.status_count_after'
-        .information-board__section
-          %span= t 'about.domain_count_before'
-          %strong= number_with_delimiter @instance_presenter.domain_count
-          %span= t 'about.domain_count_after'
-      = render 'contact', contact: @instance_presenter
+  .column-2
+    .landing-page__information.contact-widget
+      %p
+        %strong= t 'about.administered_by'
 
-  .extended-description
-    .container-alt
-      = @instance_presenter.site_extended_description.html_safe.presence || t('about.extended_description_html')
+      = account_link_to(@instance_presenter.contact_account)
 
-  .footer-links
-    .container-alt
-      %p
-        = link_to t('about.source_code'), @instance_presenter.source_url
-        = " (#{@instance_presenter.version_number})"
+      - if @instance_presenter.site_contact_email.present?
+        %p.contact-widget__mail
+          %strong
+            = succeed ':' do
+              = t 'about.contact'
+          %br/
+          = mail_to @instance_presenter.site_contact_email, nil, title: @instance_presenter.site_contact_email
+
+  .column-3
+    .box-widget
+      .rich-formatting= @instance_presenter.site_extended_description.html_safe.presence || t('about.extended_description_html')
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index fba46d54b74755f0cfece97ce3b9eed99d3542f2..f5a78665d3d84c0ea68ef2c981aa5278eecfdef9 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -56,14 +56,14 @@
                 .information-board__section
                   %span= t 'about.user_count_before'
                   %strong= number_with_delimiter @instance_presenter.user_count
-                  %span= t 'about.user_count_after'
+                  %span= t 'about.user_count_after', count: @instance_presenter.user_count
                 .information-board__section
                   %span= t 'about.status_count_before'
                   %strong= number_with_delimiter @instance_presenter.status_count
-                  %span= t 'about.status_count_after'
+                  %span= t 'about.status_count_after', count: @instance_presenter.status_count
               .row__mascot
                 .landing-page__mascot
-                  = image_tag asset_pack_path('elephant_ui_plane.svg')
+                  = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('elephant_ui_plane.svg'), alt: ''
 
       - else
         .column-2.non-preview
@@ -88,14 +88,14 @@
                 .information-board__section
                   %span= t 'about.user_count_before'
                   %strong= number_with_delimiter @instance_presenter.user_count
-                  %span= t 'about.user_count_after'
+                  %span= t 'about.user_count_after', count: @instance_presenter.user_count
                 .information-board__section
                   %span= t 'about.status_count_before'
                   %strong= number_with_delimiter @instance_presenter.status_count
-                  %span= t 'about.status_count_after'
+                  %span= t 'about.status_count_after', count: @instance_presenter.status_count
               .row__mascot
                 .landing-page__mascot
-                  = image_tag asset_pack_path('elephant_ui_plane.svg')
+                  = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('elephant_ui_plane.svg'), alt: ''
 
       - if Setting.timeline_preview
         .column-3
@@ -110,7 +110,7 @@
                 %p= t 'about.about_mastodon_html'
               %div.contact
                 %h3= t 'about.administered_by'
-                = render 'administration'
+                = account_link_to(@instance_presenter.contact_account, link_to(t('about.learn_more'), about_more_path, class: 'button button-alternative'))
 
             = render 'features'
 
@@ -131,7 +131,7 @@
                 %p= t 'about.about_mastodon_html'
               %div.contact
                 %h3= t 'about.administered_by'
-                = render 'administration'
+                = account_link_to(@instance_presenter.contact_account, link_to(t('about.learn_more'), about_more_path, class: 'button button-alternative'))
 
             = render 'features'
 
diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml
index c7d36ed47a875b5ecb2088067d638aebd778aa09..9d076a91b41982373e9c60e352dc746f75ea1438 100644
--- a/app/views/about/terms.html.haml
+++ b/app/views/about/terms.html.haml
@@ -1,11 +1,9 @@
 - content_for :page_title do
   = t('terms.title', instance: site_hostname)
 
-.landing-page
-  .header-wrapper.compact
-    .header
-      = render 'links'
-
-  .extended-description
-    .container-alt
-      = @instance_presenter.site_terms.html_safe.presence || t('terms.body_html')
+.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
new file mode 100644
index 0000000000000000000000000000000000000000..2ea34a0485fa30e450bb93d142eca5f5040d914f
--- /dev/null
+++ b/app/views/accounts/_bio.html.haml
@@ -0,0 +1,18 @@
+.public-account-bio
+  - unless account.fields.empty?
+    .account__header__fields
+      - account.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/_follow_button.html.haml b/app/views/accounts/_follow_button.html.haml
deleted file mode 100644
index 558ced010f32053e831f315c7369ec0c07cb7811..0000000000000000000000000000000000000000
--- a/app/views/accounts/_follow_button.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-- relationships ||= nil
-
-- unless account.memorial? || account.moved?
-  - if user_signed_in?
-    - requested = relationships ? relationships.requested[account.id].present? : current_account.requested?(account)
-    - following = relationships ? relationships.following[account.id].present? : current_account.following?(account)
-
-  - if user_signed_in? && current_account.id != account.id && !requested
-    .controls
-      - if following
-        = link_to (account.local? ? account_unfollow_path(account) : remote_unfollow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do
-          = fa_icon 'user-times'
-          = t('accounts.unfollow')
-      - else
-        = link_to (account.local? ? account_follow_path(account) : authorize_follow_path(acct: account.acct)), data: { method: :post }, class: 'icon-button' do
-          = fa_icon 'user-plus'
-          = t('accounts.follow')
-  - elsif user_signed_in? && current_account.id == account.id
-    .controls
-      = link_to settings_profile_url, class: 'icon-button' do
-        = fa_icon 'pencil'
-        = t('settings.edit_profile')
-  - elsif !user_signed_in?
-    .controls
-      .remote-follow
-        = link_to (account.local? ? account_remote_follow_path(account) : "web+mastodon://follow?uri=#{account.uri}"), class: 'icon-button' do
-          = fa_icon 'user-plus'
-          = t('accounts.remote_follow')
diff --git a/app/views/accounts/_follow_grid.html.haml b/app/views/accounts/_follow_grid.html.haml
deleted file mode 100644
index fdcef84be2c57e1e6312db1eba77f593b4fe1d6e..0000000000000000000000000000000000000000
--- a/app/views/accounts/_follow_grid.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.accounts-grid{ class: accounts.empty? ? 'empty' : '' }
-  - if accounts.empty?
-    = image_tag asset_pack_path('elephant_ui_greeting.svg'), alt: '', role: 'presentational'
-    = render partial: 'accounts/nothing_here'
-  - else
-    = render partial: 'accounts/grid_card', collection: accounts, as: :account, cached: !user_signed_in?
-
-= paginate follows
diff --git a/app/views/accounts/_follow_grid_hidden.html.haml b/app/views/accounts/_follow_grid_hidden.html.haml
deleted file mode 100644
index e970350e639e10c3293c2c78e910fbd980a8fc30..0000000000000000000000000000000000000000
--- a/app/views/accounts/_follow_grid_hidden.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-.accounts-grid.empty
-  = image_tag asset_pack_path('elephant_ui_greeting.svg'), alt: '', role: 'presentational'
-  %p.nothing-here= t('accounts.network_hidden')
diff --git a/app/views/accounts/_grid_card.html.haml b/app/views/accounts/_grid_card.html.haml
deleted file mode 100644
index a59ed128e6e2c6e671a53bb2974fac4625b0af49..0000000000000000000000000000000000000000
--- a/app/views/accounts/_grid_card.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-.account-grid-card
-  .account-grid-card__header{ style: "background-image: url(#{account.header.url(:original)})" }
-    = render 'accounts/follow_button', account: account, relationships: @relationships
-  .account-grid-card__avatar
-    .avatar= image_tag account.avatar.url(:original)
-  .name
-    = link_to TagManager.instance.url_for(account) do
-      %span.display_name.emojify= display_name(account, custom_emojify: true)
-      %span.username
-        @#{account.local? ? account.local_username_and_domain : account.acct}
-        = fa_icon('lock') if account.locked?
-  .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account)
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 4098d6778aadaeb52edb2799c74244eadf52d3ab..370e7e470f50dc6aa3decb02695fbce3afa058a4 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -1,51 +1,43 @@
-.card.h-card.p-author{ style: "background-image: url(#{account.header.url(:original)})" }
-  .card__illustration
-    = render 'accounts/follow_button', account: account
-    .avatar= image_tag account.avatar.url(:original), class: 'u-photo'
+.public-account-header{:class => ("inactive" if account.moved?)}
+  .public-account-header__image
+    = image_tag (current_account&.user&.setting_auto_play_gif ? 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 (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)
+    .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= number_to_human account.statuses_count, strip_insignificant_zeros: true
+              %span.counter-label= t('accounts.posts', count: account.statuses_count)
 
-  .card__bio
-    %h1.name
-      %span.p-name.emojify= display_name(account, custom_emojify: true)
-      %small<
-        %span>< @#{account.local_username_and_domain}
-        = fa_icon('lock') if account.locked?
+          .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= number_to_human account.following_count, strip_insignificant_zeros: true
+              %span.counter-label= t('accounts.following', count: account.following_count)
 
-    - if account.bot?
-      .roles
-        .account-role.bot
-          = t 'accounts.roles.bot'
-    - elsif Setting.show_staff_badge
-      - if account.user_admin?
-        .roles
-          .account-role.admin
-            = t 'accounts.roles.admin'
-      - elsif account.user_moderator?
-        .roles
-          .account-role.moderator
-            = t 'accounts.roles.moderator'
+          .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= number_to_human account.followers_count, strip_insignificant_zeros: true
+              %span.counter-label= t('accounts.followers', count: account.followers_count)
+        .spacer
+        .public-account-header__tabs__tabs__buttons
+          = account_action_button(account)
 
-    .bio
-      .account__header__content.p-note.emojify= Formatter.instance.simplified_format(account, custom_emojify: true)
+    .public-account-header__extra
+      = render 'accounts/bio', account: account
 
-      - unless account.fields.empty?
-        .account__header__fields
-          - account.fields.each do |field|
-            %dl
-              %dt.emojify{ title: field.name }= field.name
-              %dd.emojify{ title: field.value }= Formatter.instance.format_field(account, field.value, custom_emojify: true)
-
-    .details-counters
-      .counter{ class: active_nav_class(short_account_url(account)) }
-        = link_to short_account_url(account), class: 'u-url u-uid' do
-          %span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true
-          %span.counter-label= t('accounts.posts')
-
-      .counter{ class: active_nav_class(account_following_index_url(account)) }
+      .public-account-header__extra__links
         = link_to account_following_index_url(account) do
-          %span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true
-          %span.counter-label= t('accounts.following')
-
-      .counter{ class: active_nav_class(account_followers_url(account)) }
+          %strong= number_to_human account.following_count, strip_insignificant_zeros: true
+          = t('accounts.following', count: account.following_count)
         = link_to account_followers_url(account) do
-          %span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true
-          %span.counter-label= t('accounts.followers')
+          %strong= number_to_human account.followers_count, strip_insignificant_zeros: true
+          = t('accounts.followers', count: account.followers_count)
diff --git a/app/views/accounts/_moved_strip.html.haml b/app/views/accounts/_moved.html.haml
similarity index 52%
rename from app/views/accounts/_moved_strip.html.haml
rename to app/views/accounts/_moved.html.haml
index ae18c6dc70005781babc4ec0f53c71a3f55fe919..7a777bfea84f1c9e1644e4dd198eeaf39d2e502c 100644
--- a/app/views/accounts/_moved_strip.html.haml
+++ b/app/views/accounts/_moved.html.haml
@@ -1,17 +1,18 @@
 - moved_to_account = account.moved_to_account
 
-.moved-strip
-  .moved-strip__message
+.moved-account-widget
+  .moved-account-widget__message
     = fa_icon 'suitcase'
-    = t('accounts.moved_html', name: 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)])), TagManager.instance.url_for(moved_to_account), class: 'mention'))
+    = 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)])), TagManager.instance.url_for(moved_to_account), class: 'mention'))
 
-  .moved-strip__card
-    = link_to TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
+  .moved-account-widget__card
+    = link_to TagManager.instance.url_for(moved_to_account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'me noopener' do
       .detailed-status__display-avatar
         .account__avatar-overlay
           .account__avatar-overlay-base{ style: "background-image: url('#{moved_to_account.avatar.url(:original)}')" }
           .account__avatar-overlay-overlay{ style: "background-image: url('#{account.avatar.url(:original)}')" }
 
       %span.display-name
-        %strong.emojify= display_name(moved_to_account, custom_emojify: true)
+        %bdi
+          %strong.emojify= display_name(moved_to_account, custom_emojify: true)
         %span @#{moved_to_account.acct}
diff --git a/app/views/accounts/_nothing_here.html.haml b/app/views/accounts/_nothing_here.html.haml
deleted file mode 100644
index 0c6dc116845f8696e813e02cb3563d50868ad3a7..0000000000000000000000000000000000000000
--- a/app/views/accounts/_nothing_here.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%p.nothing-here= t('accounts.nothing_here')
diff --git a/app/views/accounts/_og.html.haml b/app/views/accounts/_og.html.haml
index a583b39c2c9db93557e76af7de2dc5b790f7de58..de948ec6ab56cf5237db3f11cfcf8d0d3f9900f0 100644
--- a/app/views/accounts/_og.html.haml
+++ b/app/views/accounts/_og.html.haml
@@ -1,7 +1,11 @@
+- description = account_description(account)
+
+%meta{ name: 'description', content: description }/
+
 = opengraph 'og:url', url
 = opengraph 'og:site_name', site_title
 = opengraph 'og:title', yield(:page_title).strip
-= opengraph 'og:description', account_description(account)
+= opengraph 'og:description', description
 = opengraph 'og:image', full_asset_url(account.avatar.url(:original))
 = opengraph 'og:image:width', '120'
 = opengraph 'og:image:height', '120'
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index cfdd3a9452080a8c59fb81bd01ecdd7a48614321..0ee9dd7deda4dc53a78c899a0fc811b706498d41 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -8,8 +8,8 @@
     %meta{ name: 'robots', content: 'noindex' }/
 
   %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
-  %link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
+  %link{ rel: 'alternate', type: 'application/rss+xml', href: account_url(@account, format: 'rss') }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@account) }/
 
   - if @older_url
@@ -20,36 +20,47 @@
   = opengraph 'og:type', 'profile'
   = render 'og', account: @account, url: short_account_url(@account, only_path: false)
 
-- if @account.memorial?
-  .memoriam-strip= t('in_memoriam_html')
-- elsif @account.moved?
-  = render partial: 'moved_strip', locals: { account: @account }
-- elsif show_landing_strip?
-  = render partial: 'shared/landing_strip', locals: { account: @account }
-
-.h-feed
-  %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
-
-  = render 'header', account: @account
-
-  .activity-stream-tabs
-    = active_link_to t('accounts.posts'), 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 @statuses.empty?
-    .accounts-grid
-      = render 'nothing_here'
-  - else
-    .activity-stream.with-header
-      - if params[:page].to_i.zero?
-        = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }
-
-      = render partial: 'stream_entries/status', collection: @statuses, as: :status
-
-  - if @newer_url || @older_url
-    .pagination
-      - if @older_url
-        = link_to safe_join([fa_icon('chevron-left'), t('pagination.older')], ' '), @older_url, class: 'older', rel: 'next'
-      - if @newer_url
-        = link_to safe_join([t('pagination.newer'), fa_icon('chevron-right')], ' '), @newer_url, class: 'newer', rel: 'prev'
+
+= 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 @statuses.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        .activity-stream
+          - if params[:page].to_i.zero?
+            = render partial: 'stream_entries/status', collection: @pinned_statuses, as: :status, locals: { pinned: true }
+
+          - if @newer_url
+            .entry= link_to_more @newer_url
+
+          = render partial: 'stream_entries/status', collection: @statuses, as: :status
+
+          - if @older_url
+            .entry= link_to_more @older_url
+
+  .column-1
+    - if @account.memorial?
+      .memoriam-widget= t('in_memoriam_html')
+    - elsif @account.moved?
+      = render 'moved', account: @account
+
+    = render 'bio', account: @account
+
+    - unless @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
+
+    = render 'application/sidebar'
diff --git a/app/views/admin/account_actions/new.html.haml b/app/views/admin/account_actions/new.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..97286c8e5b5ef1edd35d7b6ddd14a450d24dce71
--- /dev/null
+++ b/app/views/admin/account_actions/new.html.haml
@@ -0,0 +1,26 @@
+- content_for :page_title do
+  = t('admin.account_actions.title', acct: @account.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, collection: Admin::AccountAction.types_for_account(@account), include_blank: false, wrapper: :with_block_label, label_method: ->(type) { I18n.t("simple_form.labels.admin_account_action.types.#{type}")}, hint: t('simple_form.hints.admin_account_action.type_html', acct: @account.acct)
+
+  - if @account.local?
+    %hr.spacer/
+
+    .fields-group
+      = f.input :send_email_notification, as: :boolean, wrapper: :with_label
+
+    %hr.spacer/
+
+    - unless @warning_presets.empty?
+      .fields-group
+        = f.input :warning_preset_id, collection: @warning_presets, label_method: :text, wrapper: :with_block_label
+
+    .fields-group
+      = f.input :text, as: :text, wrapper: :with_block_label, hint: t('simple_form.hints.admin_account_action.text_html', path: admin_warning_presets_path)
+
+  .actions
+    = f.button :button, t('admin.account_actions.action'), type: :submit
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..8c9c9679ceda9fb5d8ed6d4ab31e80bf43541023
--- /dev/null
+++ b/app/views/admin/account_warnings/_account_warning.html.haml
@@ -0,0 +1,6 @@
+.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
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index c6e63152d5c7d8e3158bc0d9be0cb23a7f09611c..1e1bb1812b0436666a3534444ce8aa8aa291d209 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -1,18 +1,18 @@
 %tr
-  %td.username
-    = account.username
   %td
-    - unless account.local?
-      = link_to account.domain, admin_accounts_path(by_domain: account.domain)
+    = admin_account_link_to(account)
   %td
-    - if account.local?
-      - if account.user.nil?
-        = t("admin.accounts.moderation.suspended")
-      - else
-        = t("admin.accounts.roles.#{account.user.role}")
+    %div{ style: 'margin: -2px 0' }= account_badge(account, all: true)
+  %td
+    - if account.user_current_sign_in_ip
+      %samp= account.user_current_sign_in_ip
+    - else
+      \-
+  %td
+    - if account.user_current_sign_in_at
+      %time.time-ago{ datetime: account.user_current_sign_in_at.iso8601, title: l(account.user_current_sign_in_at) }= l account.user_current_sign_in_at
     - else
-      = account.protocol.humanize
+      \-
   %td
     = table_link_to 'circle', t('admin.accounts.web'), web_path("accounts/#{account.id}")
     = table_link_to 'globe', t('admin.accounts.public'), TagManager.instance.url_for(account)
-    = table_link_to 'pencil', t('admin.accounts.edit'), admin_account_path(account.id)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 6aa39a80a0d92967f21440a45c6cdac8c369d655..91fddadf81d41edb6c626851a29a8b798b70c60a 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -5,41 +5,19 @@
   .filter-subset
     %strong= t('admin.accounts.location.title')
     %ul
-      %li= filter_link_to t('admin.accounts.location.all'), local: nil, remote: nil
-      %li
-        - if selected? local: '1', remote: nil
-          = filter_link_to t('admin.accounts.location.local'), {local: nil, remote: nil}, {local: '1', remote: nil}
-        - else
-          = filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil
-      %li
-        - if selected? remote: '1', local: nil
-          = filter_link_to t('admin.accounts.location.remote'), {remote: nil, local: nil}, {remote: '1', local: nil}
-        - else
-          = filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil
+      %li= filter_link_to t('admin.accounts.location.local'), remote: nil
+      %li= filter_link_to t('admin.accounts.location.remote'), remote: '1'
   .filter-subset
     %strong= t('admin.accounts.moderation.title')
     %ul
-      %li= filter_link_to t('admin.accounts.moderation.all'), silenced: nil, suspended: nil
-      %li
-        - if selected? silenced: '1'
-          = filter_link_to t('admin.accounts.moderation.silenced'), {silenced: nil}, {silenced: '1'}
-        - else
-          = filter_link_to t('admin.accounts.moderation.silenced'), silenced: '1'
-      %li
-        - if selected? suspended: '1'
-          = filter_link_to t('admin.accounts.moderation.suspended'), {suspended: nil}, {suspended: '1'}
-        - else
-          = filter_link_to t('admin.accounts.moderation.suspended'), suspended: '1'
+      %li= filter_link_to t('admin.accounts.moderation.active'), silenced: nil, suspended: nil
+      %li= filter_link_to t('admin.accounts.moderation.silenced'), silenced: '1', suspended: nil
+      %li= filter_link_to t('admin.accounts.moderation.suspended'), suspended: '1', silenced: nil
   .filter-subset
     %strong= t('admin.accounts.role')
     %ul
       %li= filter_link_to t('admin.accounts.moderation.all'), staff: nil
       %li= filter_link_to t('admin.accounts.roles.staff'), staff: '1'
-  .filter-subset
-    %strong= t('admin.accounts.order.title')
-    %ul
-      %li= filter_link_to t('admin.accounts.order.alphabetic'), recent: nil
-      %li= filter_link_to t('admin.accounts.order.most_recent'), recent: '1'
 
 = form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
   .fields-group
@@ -60,8 +38,9 @@
     %thead
       %tr
         %th= t('admin.accounts.username')
-        %th= t('admin.accounts.domain')
-        %th
+        %th= t('admin.accounts.role')
+        %th= t('admin.accounts.most_recent_ip')
+        %th= t('admin.accounts.most_recent_activity')
         %th
     %tbody
       = render @accounts
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index ed8190af5af34ec50c4ce24cffbf79a01fbd8eb0..280a834ba268d0ae2da9b188f1ee1b77dffe2c6c 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -1,189 +1,185 @@
 - content_for :page_title do
   = @account.acct
 
-.table-wrapper
-  %table.table.inline-table
-    %tbody
-      %tr
-        %th= t('admin.accounts.username')
-        %td= @account.username
-      %tr
-        %th= t('admin.accounts.domain')
-        %td= @account.domain
-      %tr
-        %th= t('admin.accounts.display_name')
-        %td= @account.display_name
-
-      %tr
-        %th= t('admin.accounts.avatar')
-        %th
-          = link_to @account.avatar.url(:original) do
-            = image_tag @account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar'
-          - if @account.local? && @account.avatar?
-            = table_link_to 'trash', t('admin.accounts.remove_avatar'), remove_avatar_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_avatar, @account)
-
-      - if @account.local?
-        %tr
-          %th= t('admin.accounts.role')
-          %td
-            - if @account.user.nil?
-              = t("admin.accounts.moderation.suspended")
-            - else
-              = t("admin.accounts.roles.#{@account.user&.role}")
-            = 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)
-        %tr
-          %th= t('admin.accounts.email')
-          %td
-            = @account.user_email
-            = table_link_to 'edit', t('admin.accounts.change_email.label'), admin_account_change_email_path(@account.id) if can?(:change_email, @account.user)
-        - if @account.user_unconfirmed_email.present?
-          %th= t('admin.accounts.unconfirmed_email')
-          %td
-            = @account.user_unconfirmed_email
-        %tr
-          %th= t('admin.accounts.email_status')
-          %td
-            - if @account.user&.confirmed?
-              = t('admin.accounts.confirmed')
-            - else
-              = t('admin.accounts.confirming')
-              = table_link_to 'refresh', t('admin.accounts.resend_confirmation.send'), resend_admin_account_confirmation_path(@account.id), method: :post if can?(:confirm, @account.user)
-        %tr
-          %th= t('admin.accounts.login_status')
-          %td
-            - if @account.user&.disabled?
-              = t('admin.accounts.disabled')
-              = table_link_to 'unlock', t('admin.accounts.enable'), enable_admin_account_path(@account.id), method: :post if can?(:enable, @account.user)
-            - else
-              = t('admin.accounts.enabled')
-              = table_link_to 'lock', t('admin.accounts.disable'), disable_admin_account_path(@account.id), method: :post if can?(:disable, @account.user)
-        %tr
-          %th= t('admin.accounts.most_recent_ip')
-          %td= @account.user_current_sign_in_ip
-        %tr
-          %th= t('admin.accounts.most_recent_activity')
-          %td
-            - if @account.user_current_sign_in_at
-              %time.formatted{ datetime: @account.user_current_sign_in_at.iso8601, title: l(@account.user_current_sign_in_at) }
-                = l @account.user_current_sign_in_at
-            - else
-              Never
-      - else
-        %tr
-          %th= t('admin.accounts.profile_url')
-          %td= link_to @account.url, @account.url
-        %tr
-          %th= t('admin.accounts.protocol')
-          %td= @account.protocol.humanize
-
-      %tr
-        %th= t('admin.accounts.follows')
-        %td= number_to_human @account.following_count
-      %tr
-        %th= t('admin.accounts.followers')
-        %td= number_to_human @account.followers_count
-      %tr
-        %th= t('admin.accounts.statuses')
-        %td= link_to number_to_human(@account.statuses_count), admin_account_statuses_path(@account.id)
-      %tr
-        %th= t('admin.accounts.media_attachments')
-        %td
-          = link_to number_to_human(@account.media_attachments.count), admin_account_statuses_path(@account.id, { media: true })
-          = surround '(', ')' do
-            = number_to_human_size @account.media_attachments.sum('file_file_size')
-      %tr
-        %th= t('.created_reports')
-        %td= link_to pluralize(@account.reports.count, t('.report')), admin_reports_path(account_id: @account.id)
-      %tr
-        %th= t('.targeted_reports')
-        %td= link_to pluralize(@account.targeted_reports.count, t('.report')), admin_reports_path(target_account_id: @account.id)
-
-%div{ style: 'overflow: hidden' }
-  %div{ style: 'float: right' }
-    - if @account.local?
-      = link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' if can?(:reset_password, @account.user)
-      - if @account.user&.otp_required_for_login?
-        = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user)
-      - unless @account.memorial?
-        = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:memorialize, @account)
-    - else
-      = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account)
-
-  %div{ style: 'float: left' }
-    - if @account.silenced?
-      = link_to t('admin.accounts.undo_silenced'), admin_account_silence_path(@account.id), method: :delete, class: 'button' if can?(:unsilence, @account)
-    - else
-      = link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button' if can?(:silence, @account)
-
-    - if @account.local?
-      - unless @account.user_confirmed?
-        = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(@account.id), method: :post, class: 'button' if can?(:confirm, @account.user)
-
-    - if @account.suspended?
-      = link_to t('admin.accounts.undo_suspension'), admin_account_suspension_path(@account.id), method: :delete, class: 'button' if can?(:unsuspend, @account)
-    - else
-      = link_to t('admin.accounts.perform_full_suspension'), admin_account_suspension_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button' if can?(:suspend, @account)
-
-- if !@account.local? && @account.hub_url.present?
-  %hr.spacer/
-
-  %h3 OStatus
-
+= render 'application/card', account: @account
+
+.dashboard__counters{ style: 'margin-top: 10px' }
+  %div
+    = link_to admin_account_statuses_path(@account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.statuses_count
+      .dashboard__counters__label= t 'admin.accounts.statuses'
+  %div
+    = link_to admin_account_statuses_path(@account.id, { media: true }) do
+      .dashboard__counters__num= number_to_human_size @account.media_attachments.sum('file_file_size')
+      .dashboard__counters__label= t 'admin.accounts.media_attachments'
+  %div
+    = link_to admin_account_followers_path(@account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.local_followers_count
+      .dashboard__counters__label= t 'admin.accounts.followers'
+  %div
+    = link_to admin_reports_path(account_id: @account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.reports.count
+      .dashboard__counters__label= t '.created_reports'
+  %div
+    = link_to admin_reports_path(target_account_id: @account.id) do
+      .dashboard__counters__num= number_with_delimiter @account.targeted_reports.count
+      .dashboard__counters__label= t '.targeted_reports'
+  %div
+    %div
+      .dashboard__counters__text
+        - if @account.local? && @account.user.nil?
+          %span.neutral= t('admin.accounts.deleted')
+        - elsif @account.suspended?
+          %span.red= t('admin.accounts.suspended')
+        - elsif @account.silenced?
+          %span.red= t('admin.accounts.silenced')
+        - elsif @account.local? && @account.user&.disabled?
+          %span.red= t('admin.accounts.disabled')
+        - elsif @account.local? && !@account.user&.confirmed?
+          %span.neutral= t('admin.accounts.confirming')
+        - else
+          %span.neutral= t('admin.accounts.no_limits_imposed')
+      .dashboard__counters__label= t 'admin.accounts.login_status'
+
+- unless @account.local? && @account.user.nil?
   .table-wrapper
     %table.table.inline-table
       %tbody
-        %tr
-          %th= t('admin.accounts.feed_url')
-          %td= link_to @account.remote_url, @account.remote_url
-        %tr
-          %th= t('admin.accounts.push_subscription_expires')
-          %td
-            - if @account.subscribed?
-              %time.formatted{ datetime: @account.subscription_expires_at.iso8601, title: l(@account.subscription_expires_at) }
-                = l @account.subscription_expires_at
-            - else
-              = t('admin.accounts.not_subscribed')
-        %tr
-          %th= t('admin.accounts.salmon_url')
-          %td= link_to @account.salmon_url, @account.salmon_url
+        - if @account.local?
+          - if @account.avatar?
+            %tr
+              %th= t('admin.accounts.avatar')
+              %td= table_link_to 'trash', t('admin.accounts.remove_avatar'), remove_avatar_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_avatar, @account)
+              %td
+
+          - if @account.header?
+            %tr
+              %th= t('admin.accounts.header')
+              %td= table_link_to 'trash', t('admin.accounts.remove_header'), remove_header_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:remove_header, @account)
+              %td
+
+          %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)
+
+          %tr
+            %th= t('admin.accounts.email')
+            %td= @account.user_email
+            %td= table_link_to 'edit', t('admin.accounts.change_email.label'), admin_account_change_email_path(@account.id) if can?(:change_email, @account.user)
+
+          - if @account.user_unconfirmed_email.present?
+            %tr
+              %th= t('admin.accounts.unconfirmed_email')
+              %td= @account.user_unconfirmed_email
+              %td
+
+          %tr
+            %th= t('admin.accounts.email_status')
+            %td
+              - if @account.user&.confirmed?
+                = t('admin.accounts.confirmed')
+              - else
+                = t('admin.accounts.confirming')
+            %td= table_link_to 'refresh', t('admin.accounts.resend_confirmation.send'), resend_admin_account_confirmation_path(@account.id), method: :post if can?(:confirm, @account.user)
+
+          %tr
+            %th= t('admin.accounts.login_status')
+            %td
+              - if @account.user&.disabled?
+                = t('admin.accounts.disabled')
+              - else
+                = t('admin.accounts.enabled')
+            %td
+              - if @account.user&.disabled?
+                = table_link_to 'unlock', t('admin.accounts.enable'), enable_admin_account_path(@account.id), method: :post if can?(:enable, @account.user)
+              - else
+                = table_link_to 'lock', t('admin.accounts.disable'), new_admin_account_action_path(@account.id, type: 'disable') if can?(:disable, @account.user)
+
+          %tr
+            %th= t('simple_form.labels.defaults.locale')
+            %td= @account.user_locale
+            %td
+
+          %tr
+            %th= t('admin.accounts.joined')
+            %td
+              %time.formatted{ datetime: @account.created_at.iso8601, title: l(@account.created_at) }= l @account.created_at
+            %td
+
+          %tr
+            %th= t('admin.accounts.most_recent_ip')
+            %td= @account.user_current_sign_in_ip
+            %td
+
+          %tr
+            %th= t('admin.accounts.most_recent_activity')
+            %td
+              - if @account.user_current_sign_in_at
+                %time.formatted{ datetime: @account.user_current_sign_in_at.iso8601, title: l(@account.user_current_sign_in_at) }= l @account.user_current_sign_in_at
+
+          - if @account.user&.invited?
+            %tr
+              %th= t('admin.accounts.invited_by')
+              %td= admin_account_link_to @account.user.invite.user.account
+              %td
+
+        - else
+          %tr
+            %th= t('admin.accounts.inbox_url')
+            %td
+              = @account.inbox_url
+              = fa_icon DeliveryFailureTracker.unavailable?(@account.inbox_url) ? 'times' : 'check'
+          %tr
+            %th= t('admin.accounts.shared_inbox_url')
+            %td
+              = @account.shared_inbox_url
+              = fa_icon DeliveryFailureTracker.unavailable?(@account.shared_inbox_url) ? 'times' : 'check'
 
   %div{ style: 'overflow: hidden' }
     %div{ style: 'float: right' }
-      = link_to @account.subscribed? ? t('admin.accounts.resubscribe') : t('admin.accounts.subscribe'), subscribe_admin_account_path(@account.id), method: :post, class: 'button' if can?(:subscribe, @account)
-      - if @account.subscribed?
-        = link_to t('admin.accounts.unsubscribe'), unsubscribe_admin_account_path(@account.id), method: :post, class: 'button negative' if can?(:unsubscribe, @account)
+      - if @account.local?
+        = link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button' if can?(:reset_password, @account.user)
+        - if @account.user&.otp_required_for_login?
+          = link_to t('admin.accounts.disable_two_factor_authentication'), admin_user_two_factor_authentication_path(@account.user.id), method: :delete, class: 'button' if can?(:disable_2fa, @account.user)
+        - unless @account.memorial?
+          = link_to t('admin.accounts.memorialize'), memorialize_admin_account_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button button--destructive' if can?(:memorialize, @account)
+      - else
+        = link_to t('admin.accounts.redownload'), redownload_admin_account_path(@account.id), method: :post, class: 'button' if can?(:redownload, @account)
+
+    %div{ style: 'float: left' }
+      - if @account.local?
+        = link_to t('admin.accounts.warn'), new_admin_account_action_path(@account.id, type: 'none'), class: 'button' if can?(:warn, @account)
+      - if @account.silenced?
+        = link_to t('admin.accounts.undo_silenced'), unsilence_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsilence, @account)
+      - else
+        = link_to t('admin.accounts.silence'), new_admin_account_action_path(@account.id, type: 'silence'), class: 'button button--destructive' if can?(:silence, @account)
+
+      - if @account.local?
+        - unless @account.user_confirmed?
+          = link_to t('admin.accounts.confirm'), admin_account_confirmation_path(@account.id), method: :post, class: 'button' if can?(:confirm, @account.user)
+
+      - if @account.suspended?
+        = link_to t('admin.accounts.undo_suspension'), unsuspend_admin_account_path(@account.id), method: :post, class: 'button' if can?(:unsuspend, @account)
+      - else
+        = link_to t('admin.accounts.perform_full_suspension'), new_admin_account_action_path(@account.id, type: 'suspend'), class: 'button button--destructive' if can?(:suspend, @account)
 
-- if !@account.local? && @account.inbox_url.present?
   %hr.spacer/
 
-  %h3 ActivityPub
+  - unless @warnings.empty?
+    = render @warnings
 
-  .table-wrapper
-    %table.table.inline-table
-      %tbody
-        %tr
-          %th= t('admin.accounts.inbox_url')
-          %td= link_to @account.inbox_url, @account.inbox_url
-        %tr
-          %th= t('admin.accounts.outbox_url')
-          %td= link_to @account.outbox_url, @account.outbox_url
-        %tr
-          %th= t('admin.accounts.shared_inbox_url')
-          %td= link_to @account.shared_inbox_url, @account.shared_inbox_url
-        %tr
-          %th= t('admin.accounts.followers_url')
-          %td= link_to @account.followers_url, @account.followers_url
-
-%hr.spacer/
-
-= render @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
-
-  .actions
-    = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
+    %hr.spacer/
+
+  = render @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
+
+    .actions
+      = f.button :button, t('admin.account_moderation_notes.create'), type: :submit
diff --git a/app/views/admin/change_emails/show.html.haml b/app/views/admin/change_emails/show.html.haml
index a661b1ad618e31d3b3b41b2e093945ad1093b69f..6febef9b1a811abdd045cf22b50cdaf6ded699d9 100644
--- a/app/views/admin/change_emails/show.html.haml
+++ b/app/views/admin/change_emails/show.html.haml
@@ -2,6 +2,11 @@
   = t('admin.accounts.change_email.title', username: @account.acct)
 
 = simple_form_for @user, url: admin_account_change_email_path(@account.id) do |f|
-  = f.input :email, wrapper: :with_label, disabled: true, label: t('admin.accounts.change_email.current_email')
-  = f.input :unconfirmed_email, wrapper: :with_label, label: t('admin.accounts.change_email.new_email')
-  = f.button :submit, class: "button", value: t('admin.accounts.change_email.submit')
+  .fields-group
+    = f.input :email, wrapper: :with_label, disabled: true, label: t('admin.accounts.change_email.current_email')
+
+  .fields-group
+    = f.input :unconfirmed_email, wrapper: :with_label, label: t('admin.accounts.change_email.new_email')
+
+  .actions
+    = f.button :submit, class: "button", value: t('admin.accounts.change_email.submit')
diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml
index 672afe435fc85f9d466c8f1c0550810c776d74f2..e15a07cb8146c7b819a36223bd8e70f512f72f3b 100644
--- a/app/views/admin/custom_emojis/new.html.haml
+++ b/app/views/admin/custom_emojis/new.html.haml
@@ -5,8 +5,9 @@
   = render 'shared/error_messages', object: @custom_emoji
 
   .fields-group
-    = f.input :shortcode, placeholder: t('admin.custom_emojis.shortcode'), hint: t('admin.custom_emojis.shortcode_hint')
-    = f.input :image, input_html: { accept: 'image/png' }, hint: t('admin.custom_emojis.image_hint')
+    = 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')
 
   .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
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d70e9eddd4b45d5bd53ffedc55926c595f1e0
--- /dev/null
+++ b/app/views/admin/dashboard/index.html.haml
@@ -0,0 +1,155 @@
+- content_for :page_title do
+  = t('admin.dashboard.title')
+
+.dashboard__counters
+  %div
+    = link_to admin_accounts_url(local: 1, recent: 1) do
+      .dashboard__counters__num= number_with_delimiter @users_count
+      .dashboard__counters__label= t 'admin.dashboard.total_users'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @registrations_week
+      .dashboard__counters__label= t 'admin.dashboard.week_users_new'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @logins_week
+      .dashboard__counters__label= t 'admin.dashboard.week_users_active'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @interactions_week
+      .dashboard__counters__label= t 'admin.dashboard.week_interactions'
+  %div
+    = link_to admin_reports_url do
+      .dashboard__counters__num= number_with_delimiter @reports_count
+      .dashboard__counters__label= t 'admin.dashboard.open_reports'
+  %div
+    = link_to sidekiq_url do
+      .dashboard__counters__num= number_with_delimiter @queue_backlog
+      .dashboard__counters__label= t 'admin.dashboard.backlog'
+
+.dashboard__widgets
+  .dashboard__widgets__users
+    %div
+      %h4= t 'admin.dashboard.recent_users'
+      %ul
+        - @recent_users.each do |user|
+          %li= admin_account_link_to(user.account)
+
+  .dashboard__widgets__features
+    %div
+      %h4= t 'admin.dashboard.features'
+      %ul
+        %li
+          = link_to t('admin.dashboard.feature_registrations'), edit_admin_settings_path
+          - if @registrations_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = link_to t('admin.dashboard.feature_invites'), edit_admin_settings_path
+          - if @invites_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = link_to t('admin.dashboard.feature_deletions'), edit_admin_settings_path
+          - if @deletions_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = link_to t('admin.dashboard.feature_profile_directory'), edit_admin_settings_path
+          - if @profile_directory
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = link_to t('admin.dashboard.feature_relay'), admin_relays_path
+          - if @relay_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+
+  .dashboard__widgets__versions
+    %div
+      %h4= t 'admin.dashboard.software'
+      %ul
+        %li
+          Mastodon
+          %span.pull-right= @version
+        %li
+          Ruby
+          %span.pull-right= "#{RUBY_VERSION}p#{RUBY_PATCHLEVEL}"
+        %li
+          PostgreSQL
+          %span.pull-right= @database_version
+        %li
+          Redis
+          %span.pull-right= @redis_version
+
+  .dashboard__widgets__space
+    %div
+      %h4= t 'admin.dashboard.space'
+      %ul
+        %li
+          PostgreSQL
+          %span.pull-right= number_to_human_size @database_size
+        %li
+          Redis
+          %span.pull-right= number_to_human_size @redis_size
+
+  .dashboard__widgets__config
+    %div
+      %h4= t 'admin.dashboard.config'
+      %ul
+        %li
+          = t('admin.dashboard.search')
+          - if @search_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = t('admin.dashboard.single_user_mode')
+          - if @single_user_mode
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          LDAP
+          - if @ldap_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          CAS
+          - if @cas_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          SAML
+          - if @saml_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          PAM
+          - if @pam_enabled
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+        %li
+          = t 'admin.dashboard.hidden_service'
+          - if @hidden_service
+            %span.pull-right.positive-hint= fa_icon 'check fw'
+          - else
+            %span.pull-right.negative-hint= fa_icon 'times fw'
+
+  .dashboard__widgets__trends
+    %div
+      %h4= t 'admin.dashboard.trends'
+      %ul
+        - @trending_hashtags.each do |tag|
+          %li
+            = link_to "##{tag.name}", web_url("timelines/tag/#{tag.name}")
+            %span.pull-right= number_with_delimiter(tag.history[0][:accounts].to_i)
diff --git a/app/views/admin/domain_blocks/_domain_block.html.haml b/app/views/admin/domain_blocks/_domain_block.html.haml
deleted file mode 100644
index 17a3de81c64314d4fb933af19765137cf258bbb1..0000000000000000000000000000000000000000
--- a/app/views/admin/domain_blocks/_domain_block.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-%tr
-  %td.domain
-    %samp= domain_block.domain
-  %td.severity
-    = t("admin.domain_blocks.severities.#{domain_block.severity}")
-  %td.reject_media
-    - if domain_block.reject_media? || domain_block.suspend?
-      %i.fa.fa-check
-  %td
-    = table_link_to 'undo', t('admin.domain_blocks.undo'), admin_domain_block_path(domain_block)
diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml
deleted file mode 100644
index 42b8ca53f484fa2af4527c14c0f9f8094635334a..0000000000000000000000000000000000000000
--- a/app/views/admin/domain_blocks/index.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-- content_for :page_title do
-  = t('admin.domain_blocks.title')
-
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.domain_blocks.domain')
-        %th= t('admin.domain_blocks.severity')
-        %th= t('admin.domain_blocks.reject_media')
-        %th
-    %tbody
-      = render @domain_blocks
-
-= paginate @domain_blocks
-= link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
diff --git a/app/views/admin/domain_blocks/new.html.haml b/app/views/admin/domain_blocks/new.html.haml
index 38fa9016905a9d5e4ba1d0e0dd51a43ce61f7e07..055d2fbd7e44dc81cb490ccbb64d7ec4844b238a 100644
--- a/app/views/admin/domain_blocks/new.html.haml
+++ b/app/views/admin/domain_blocks/new.html.haml
@@ -1,17 +1,24 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
 - content_for :page_title do
   = t('.title')
 
 = simple_form_for @domain_block, url: admin_domain_blocks_path do |f|
   = render 'shared/error_messages', object: @domain_block
 
-  %p.hint= t('.hint')
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :domain, wrapper: :with_label, label: t('admin.domain_blocks.domain'), hint: t('.hint'), required: true
 
-  = f.input :domain, placeholder: t('admin.domain_blocks.domain')
-  = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| t(".severity.#{type}") }
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :severity, collection: DomainBlock.severities.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| t(".severity.#{type}") }, hint: t('.severity.desc_html')
 
-  %p.hint= t('.severity.desc_html')
+  .fields-group
+    = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
 
-  = f.input :reject_media, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_media'), hint: I18n.t('admin.domain_blocks.reject_media_hint')
+  .fields-group
+    = f.input :reject_reports, as: :boolean, wrapper: :with_label, label: I18n.t('admin.domain_blocks.reject_reports'), hint: I18n.t('admin.domain_blocks.reject_reports_hint')
 
   .actions
     = f.button :button, t('.create'), 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 61cff93955f7e6f13684970a8d362ea54442ac9f..bf66c9001da4b3c15b3724fc38967351d41094f5 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,5 +1,5 @@
 %tr
-  %td.domain
+  %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
diff --git a/app/views/admin/email_domain_blocks/new.html.haml b/app/views/admin/email_domain_blocks/new.html.haml
index bcae867d957b9e3dd1c5b799779ff3aab84ead75..f372fa51200676b544b40229c931ca8d9d40d631 100644
--- a/app/views/admin/email_domain_blocks/new.html.haml
+++ b/app/views/admin/email_domain_blocks/new.html.haml
@@ -4,7 +4,8 @@
 = simple_form_for @email_domain_block, url: admin_email_domain_blocks_path do |f|
   = render 'shared/error_messages', object: @email_domain_block
 
-  = f.input :domain, placeholder: t('admin.email_domain_blocks.domain')
+  .fields-group
+    = f.input :domain, wrapper: :with_label, label: t('admin.email_domain_blocks.domain')
 
   .actions
     = f.button :button, t('.create'), type: :submit
diff --git a/app/views/admin/followers/index.html.haml b/app/views/admin/followers/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..25f1f290f42686a741a6ff0a5a7731520a31d618
--- /dev/null
+++ b/app/views/admin/followers/index.html.haml
@@ -0,0 +1,28 @@
+- content_for :page_title do
+  = t('admin.followers.title', acct: @account.acct)
+
+.filters
+  .filter-subset
+    %strong= t('admin.accounts.location.title')
+    %ul
+      %li= link_to t('admin.accounts.location.local'), admin_account_followers_path(@account.id), class: 'selected'
+  .back-link{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to admin_account_path(@account.id) do
+      = fa_icon 'chevron-left fw'
+      = t('admin.followers.back_to_account')
+
+%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: @followers
+
+= paginate @followers
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
deleted file mode 100644
index 6efbbbe60a56a969ccc150339d3f9a63991d05c2..0000000000000000000000000000000000000000
--- a/app/views/admin/instances/_instance.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-%tr
-  %td.domain
-    = link_to instance.domain, admin_accounts_path(by_domain: instance.domain)
-  %td.count
-    = instance.accounts_count
-  %td
-    = table_link_to 'paper-plane-o', t('admin.accounts.resubscribe'), resubscribe_admin_instances_url(by_domain: instance.domain), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/admin/instances/index.html.haml b/app/views/admin/instances/index.html.haml
index 3314ce07789e0159b15d711baa7e2b1f7b83c8ec..ce35b5db4751ade39b32b4e7f17798b9cd611710 100644
--- a/app/views/admin/instances/index.html.haml
+++ b/app/views/admin/instances/index.html.haml
@@ -1,23 +1,39 @@
 - content_for :page_title do
   = t('admin.instances.title')
 
-= form_tag admin_instances_url, method: 'GET', class: 'simple_form' do
-  .fields-group
-    - %i(domain_name).each do |key|
-      .input.string.optional
-        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.instances.#{key}")
+.filters
+  .filter-subset
+    %strong= t('admin.instances.moderation.title')
+    %ul
+      %li= filter_link_to t('admin.instances.moderation.all'), limited: nil
+      %li= filter_link_to t('admin.instances.moderation.limited'), limited: '1'
 
-    .actions
-      %button= t('admin.instances.search')
-      = link_to t('admin.instances.reset'), admin_instances_path, class: 'button negative'
+  %div{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path, class: 'button'
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.instances.domain_name')
-        %th= t('admin.instances.account_count')
-    %tbody
-      = render @instances
+%hr.spacer/
+
+- @instances.each do |instance|
+  .directory__tag
+    = link_to admin_instance_path(instance) do
+      %h4
+        = instance.domain
+        %small
+          = t('admin.instances.known_accounts', count: instance.accounts_count)
+
+          - if instance.domain_block
+            - if !instance.domain_block.noop?
+              &bull;
+              = t("admin.domain_blocks.severity.#{instance.domain_block.severity}")
+            - if instance.domain_block.reject_media?
+              &bull;
+              = t('admin.domain_blocks.rejecting_media')
+            - if instance.domain_block.reject_reports?
+              &bull;
+              = t('admin.domain_blocks.rejecting_reports')
+
+      .avatar-stack
+        - instance.cached_sample_accounts.each do |account|
+          = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar'
 
 = paginate paginated_instances
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..c7992a490d09b576e8cc9bf595bfbc9cbdcfda86
--- /dev/null
+++ b/app/views/admin/instances/show.html.haml
@@ -0,0 +1,44 @@
+- content_for :page_title do
+  = @instance.domain
+
+.dashboard__counters
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @following_count
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_them'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @followers_count
+      .dashboard__counters__label= t 'admin.instances.total_followed_by_us'
+  %div
+    %div
+      .dashboard__counters__num= number_to_human_size @media_storage
+      .dashboard__counters__label= t 'admin.instances.total_storage'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @blocks_count
+      .dashboard__counters__label= t 'admin.instances.total_blocked_by_us'
+  %div
+    %div
+      .dashboard__counters__num= number_with_delimiter @reports_count
+      .dashboard__counters__label= t 'admin.instances.total_reported'
+  %div
+    %div
+      .dashboard__counters__num
+        - if @available
+          = fa_icon 'check'
+        - else
+          = fa_icon 'times'
+      .dashboard__counters__label= t 'admin.instances.delivery_available'
+
+%hr.spacer/
+
+%div{ style: 'overflow: hidden' }
+  %div{ style: 'float: left' }
+    = link_to t('admin.accounts.title'), admin_accounts_path(remote: '1', by_domain: @instance.domain), class: 'button'
+
+  %div{ style: 'float: right' }
+    - if @domain_block
+      = link_to t('admin.domain_blocks.undo'), admin_domain_block_path(@domain_block), class: 'button'
+    - else
+      = link_to t('admin.domain_blocks.add_new'), new_admin_domain_block_path(_domain: @instance.domain), class: 'button'
diff --git a/app/views/admin/invites/index.html.haml b/app/views/admin/invites/index.html.haml
index 944a6047141b8f3651c87b28a9383a3fc6a4b7d9..42159e9f36750429856bfcba7de82aa8afb6ba66 100644
--- a/app/views/admin/invites/index.html.haml
+++ b/app/views/admin/invites/index.html.haml
@@ -9,22 +9,28 @@
       %li= filter_link_to t('admin.invites.filter.available'), available: 1, expired: nil
       %li= filter_link_to t('admin.invites.filter.expired'), available: nil, expired: 1
 
+%hr.spacer/
+
 - if policy(:invite).create?
   %p= t('invites.prompt')
 
   = render 'invites/form'
 
-  %hr/
+  %hr.spacer/
 
-%table.table
-  %thead
-    %tr
-      %th
-      %th= t('invites.table.uses')
-      %th= t('invites.table.expires_at')
-      %th
-      %th
-  %tbody
-    = render @invites
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th
+        %th= t('invites.table.uses')
+        %th= t('invites.table.expires_at')
+        %th
+        %th
+    %tbody
+      = render @invites
 
 = paginate @invites
+
+- if policy(:invite).deactivate_all?
+  = link_to t('admin.invites.deactivate_all'), deactivate_all_admin_invites_path, method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button'
diff --git a/app/views/admin/relays/_relay.html.haml b/app/views/admin/relays/_relay.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..6678218947e609d88056823ce889c601888304aa
--- /dev/null
+++ b/app/views/admin/relays/_relay.html.haml
@@ -0,0 +1,25 @@
+%tr
+  %td
+    %samp= relay.inbox_url
+  %td
+    - if relay.accepted?
+      %span.positive-hint
+        = fa_icon('check')
+        = ' '
+        = t 'admin.relays.enabled'
+    - elsif relay.pending?
+      = fa_icon('hourglass')
+      = ' '
+      = t 'admin.relays.pending'
+    - else
+      %span.negative-hint
+        = fa_icon('times')
+        = ' '
+        = t 'admin.relays.disabled'
+  %td
+    - if relay.accepted?
+      = table_link_to 'power-off', t('admin.relays.disable'), disable_admin_relay_path(relay), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+    - elsif !relay.pending?
+      = table_link_to 'power-off', t('admin.relays.enable'), enable_admin_relay_path(relay), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
+
+    = table_link_to 'times', t('admin.relays.delete'), admin_relay_path(relay), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/admin/relays/index.html.haml b/app/views/admin/relays/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..1636a53f8521df4b1a9f2b23b683632ef3b44315
--- /dev/null
+++ b/app/views/admin/relays/index.html.haml
@@ -0,0 +1,20 @@
+- content_for :page_title do
+  = t('admin.relays.title')
+
+.simple_form
+  %p.hint= t('admin.relays.description_html')
+  = link_to @relays.empty? ? t('admin.relays.setup') : t('admin.relays.add_new'), new_admin_relay_path, class: 'block-button'
+
+- unless @relays.empty?
+  %hr.spacer
+
+  .table-wrapper
+    %table.table
+      %thead
+        %tr
+          %th= t('admin.relays.inbox_url')
+          %th= t('admin.relays.status')
+          %th
+      %tbody
+        = render @relays
+
diff --git a/app/views/admin/relays/new.html.haml b/app/views/admin/relays/new.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..126794acfe5a3833940e40e2b2e2f1712b69e863
--- /dev/null
+++ b/app/views/admin/relays/new.html.haml
@@ -0,0 +1,13 @@
+- content_for :page_title do
+  = t('admin.relays.add_new')
+
+= simple_form_for @relay, url: admin_relays_path do |f|
+  = render 'shared/error_messages', object: @relay
+
+  .field-group
+    = f.input :inbox_url, as: :string, wrapper: :with_block_label
+
+  .actions
+    = f.button :button, t('admin.relays.save_and_enable'), type: :submit
+
+  %p.hint.subtle-hint= t('admin.relays.enable_hint')
diff --git a/app/views/admin/reports/_account.html.haml b/app/views/admin/reports/_account.html.haml
deleted file mode 100644
index 9ac161c9c6980a1c565628e6d34f45f19f0f7dee..0000000000000000000000000000000000000000
--- a/app/views/admin/reports/_account.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-- size ||= 36
-
-.account.compact
-  .account__wrapper
-    - if account.nil?
-      .account__display-name
-        .account__avatar-wrapper
-          .account__avatar{ style: "background-image: url(#{full_asset_url('avatars/original/missing.png', skip_pipeline: true)}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" }
-        %span.display-name
-          %strong= t 'about.contact_missing'
-          %span.display-name__account= t 'about.contact_unavailable'
-    - else
-      = link_to TagManager.instance.url_for(account), class: 'account__display-name' do
-        .account__avatar-wrapper
-          .account__avatar{ style: "background-image: url(#{account.avatar.url}); width: #{size}px; height: #{size}px; background-size: #{size}px #{size}px" }
-        %span.display-name
-          %bdi
-            %strong.display-name__html.emojify= display_name(account, custom_emojify: true)
-          %span.display-name__account @#{account.acct}
diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml
deleted file mode 100644
index 7b25c924bc9a18bff51ff52399ff15704c5501e9..0000000000000000000000000000000000000000
--- a/app/views/admin/reports/_report.html.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-%tr
-  %td.id
-    = "##{report.id}"
-  %td.target
-    = admin_account_link_to report.target_account
-  %td.reporter
-    - if report.account.local?
-      = admin_account_link_to report.account
-    - else
-      = report.account.domain
-  %td
-    %div{ title: report.comment }
-      = truncate(report.comment, length: 30, separator: ' ')
-    %div
-      - unless report.statuses.empty?
-        %span{ title: t('admin.accounts.statuses') }
-          = fa_icon('comment')
-          = report.statuses.count
-      - unless report.media_attachments.empty?
-        %span{ title: t('admin.accounts.media_attachments') }
-          = fa_icon('camera')
-          = report.media_attachments.count
-  %td
-    - if report.assigned_account.nil?
-      \-
-    - else
-      = admin_account_link_to report.assigned_account
-  %td
-    = table_link_to 'circle', t('admin.reports.view'), admin_report_path(report)
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 5e174f312ec1c3b34c830e6d9fd7287485cde862..b3c145120a08c555365167ef80f4b60b1c0b6f8f 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -3,18 +3,20 @@
     = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
   .batch-table__row__content
     .status__content><
-      - unless status.proper.spoiler_text.blank?
-        %p><
-          %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)}
-
-      = Formatter.instance.format(status.proper, custom_emojify: true)
+      - if status.proper.spoiler_text.blank?
+        = Formatter.instance.format(status.proper, custom_emojify: true)
+      - else
+        %details<
+          %summary><
+            %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)}
+          = Formatter.instance.format(status.proper, custom_emojify: true)
 
     - 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), sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true
+        = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.proper.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description
       - else
-        = react_component :media_gallery, height: 343, sensitive: status.proper.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.proper.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+        = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.proper.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
 
     .detailed-status__meta
       = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime', target: stream_link_target, rel: 'noopener' do
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index 44a531f2c66c2c17db1995195e560c02af1718ad..d73faccb0d9d971b6c4a8144bfdb95f9e9e0ae01 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -8,17 +8,45 @@
       %li= filter_link_to t('admin.reports.unresolved'), resolved: nil
       %li= filter_link_to t('admin.reports.resolved'), resolved: '1'
 
-.table-wrapper
-  %table.table
-    %thead
-      %tr
-        %th= t('admin.reports.id')
-        %th= t('admin.reports.target')
-        %th= t('admin.reports.reported_by')
-        %th= t('admin.reports.report_contents')
-        %th= t('admin.reports.assigned')
-        %th
-    %tbody
-      = render @reports
+- @reports.group_by(&:target_account_id).each do |target_account_id, reports|
+  - target_account = reports.first.target_account
+  .report-card
+    .report-card__profile
+      = account_link_to target_account, '', size: 36, path: admin_account_path(target_account.id)
+      .report-card__profile__stats
+        = link_to pluralize(target_account.targeted_moderation_notes.count, t('admin.reports.account.note')), admin_account_path(target_account.id)
+        %br/
+        - if target_account.suspended?
+          %span.red= t('admin.accounts.suspended')
+        - elsif target_account.silenced?
+          %span.red= t('admin.accounts.silenced')
+        - elsif target_account.user&.disabled?
+          %span.red= t('admin.accounts.disabled')
+        - else
+          %span.neutral= t('admin.accounts.no_limits_imposed')
+    .report-card__summary
+      - reports.each do |report|
+        .report-card__summary__item
+          .report-card__summary__item__reported-by
+            - if report.account.local?
+              = admin_account_link_to report.account
+            - else
+              = report.account.domain
+          .report-card__summary__item__content
+            = link_to admin_report_path(report) do
+              .one-line= report.comment.presence || t('admin.reports.comment.none')
 
+              %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') }
+                = fa_icon('comment')
+                = report.statuses.count
+
+              %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') }
+                = fa_icon('camera')
+                = report.media_attachments.count
+
+          .report-card__summary__item__assigned
+            - if report.assigned_account.present?
+              = admin_account_link_to report.assigned_account
+            - else
+              \-
 = paginate @reports
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index b13bb530350f7c3d36bf7eb824f3b19feb8a7102..863dada9e27c1e5acc9bbe5b462705e777e97087 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -7,12 +7,15 @@
 %div{ style: 'overflow: hidden; margin-bottom: 20px' }
   - if @report.unresolved?
     %div{ style: 'float: right' }
-      = link_to t('admin.reports.silence_account'), admin_report_path(@report, outcome: 'silence'), method: :put, class: 'button'
-      = link_to t('admin.reports.suspend_account'), admin_report_path(@report, outcome: 'suspend'), method: :put, class: 'button'
+      - 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'
     %div{ style: 'float: left' }
-      = link_to t('admin.reports.mark_as_resolved'), admin_report_path(@report, outcome: 'resolve'), method: :put, class: 'button'
+      = link_to t('admin.reports.mark_as_resolved'), resolve_admin_report_path(@report), method: :post, class: 'button'
   - else
-    = link_to t('admin.reports.mark_as_unresolved'), admin_report_path(@report, outcome: 'reopen'), method: :put, class: 'button'
+    = link_to t('admin.reports.mark_as_unresolved'), reopen_admin_report_path(@report), method: :post, class: 'button'
 
 %hr.spacer
 
@@ -65,10 +68,10 @@
               = 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'), admin_report_path(@report, outcome: 'assign_to_self'), method: :put
+              = 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'), admin_report_path(@report, outcome: 'unassign'), method: :put
+              = table_link_to 'trash', t('admin.reports.unassign'), unassign_admin_report_path(@report), method: :post
 
 %hr.spacer
 
@@ -102,7 +105,7 @@
 - @report_notes.each do |item|
   - if item.is_a?(Admin::ActionLog)
     = render partial: 'action_log', locals: { action_log: item }
-  - elsif item.is_a?(ReportNote)
+  - else
     = render item
 
 = simple_form_for @report_note, url: admin_report_notes_path do |f|
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index f5c5deca850d97084ebb993c540db7c1eef4e564..7afa9ec3718df12ab521d70a448aeb0067595b01 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -2,22 +2,41 @@
   = t('admin.settings.title')
 
 = simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
-  .actions.actions--top
-    = f.button :button, t('generic.save_changes'), type: :submit
 
   .fields-group
-    = f.input :site_title, placeholder: t('admin.settings.site_title')
-    = 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: 8 }
-    = f.input :site_contact_username, placeholder: t('admin.settings.contact_information.username')
-    = f.input :site_contact_email, placeholder: t('admin.settings.contact_information.email')
+    = f.input :site_title, wrapper: :with_label, label: t('admin.settings.site_title')
+
+  .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-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')
 
-  %hr/
+  .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: 4 }
 
   .fields-group
-    = f.input :thumbnail, as: :file, wrapper: :with_block_label, label: t('admin.settings.thumbnail.title'), hint: t('admin.settings.thumbnail.desc_html')
-    = f.input :hero, as: :file, wrapper: :with_block_label, label: t('admin.settings.hero.title'), hint: t('admin.settings.hero.desc_html')
+    = 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-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: t('admin.settings.thumbnail.desc_html')
+    .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: t('admin.settings.hero.desc_html')
 
-  %hr/
+  .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: t('admin.settings.mascot.desc_html')
+
+  %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/
 
   .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')
@@ -35,34 +54,27 @@
     = f.input :open_deletion, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.deletion.title'), hint: t('admin.settings.registrations.deletion.desc_html')
 
   .fields-group
-    = 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 }
-
-  %hr/
+    = 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')
 
   .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}") }, as: :radio_buttons, include_blank: false, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-
-  %hr/
+    = 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')
 
   .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 }
-    = 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 }
-
-  %hr/
+    = 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 :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/
+    = 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 :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')
+  %hr.spacer/
 
   .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')
+    = 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-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')
+    = 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_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 }
+    = 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/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index 880a24f7692a214f6307f382f9a128c42b10782d..dd3c798150e25c827c5929828d64f66df329d22e 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -14,7 +14,7 @@
       %li= link_to t('admin.statuses.with_media'), admin_account_statuses_path(@account.id, current_params.merge(media: true)), class: params[:media] && 'selected'
   .back-link{ style: 'flex: 1 1 auto; text-align: right' }
     = link_to admin_account_path(@account.id) do
-      %i.fa.fa-chevron-left.fa-fw
+      = fa_icon 'chevron-left fw'
       = t('admin.statuses.back_to_account')
 
 %hr.spacer/
diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..a7a392272fc25c7f5901abdc9af6fefac9e769e2
--- /dev/null
+++ b/app/views/admin/statuses/show.html.haml
@@ -0,0 +1,27 @@
+- content_for :page_title do
+  = t('admin.statuses.title')
+  \-
+  = "@#{@account.acct}"
+
+.filters
+  .back-link{ style: 'flex: 1 1 auto; text-align: right' }
+    = link_to admin_account_path(@account.id) do
+      %i.fa.fa-chevron-left.fa-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]
+
+  .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 }
diff --git a/app/views/admin/tags/_tag.html.haml b/app/views/admin/tags/_tag.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..961b83f93c23c1b4f1d235e390d50eb284db3c44
--- /dev/null
+++ b/app/views/admin/tags/_tag.html.haml
@@ -0,0 +1,12 @@
+%tr
+  %td
+    = link_to explore_hashtag_path(tag) do
+      = fa_icon 'hashtag'
+      = tag.name
+  %td
+    = t('directories.people', count: tag.accounts_count)
+  %td
+    - if tag.hidden?
+      = table_link_to 'eye', t('admin.tags.unhide'), unhide_admin_tag_path(tag.id, **@filter_params), method: :post
+    - else
+      = table_link_to 'eye-slash', t('admin.tags.hide'), hide_admin_tag_path(tag.id, **@filter_params), method: :post
diff --git a/app/views/admin/tags/index.html.haml b/app/views/admin/tags/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..4ba3958605d69e1d989ce05bc83417f824010d0a
--- /dev/null
+++ b/app/views/admin/tags/index.html.haml
@@ -0,0 +1,19 @@
+- content_for :page_title do
+  = t('admin.tags.title')
+
+.filters
+  .filter-subset
+    %strong= t('admin.reports.status')
+    %ul
+      %li= filter_link_to t('admin.tags.visible'), hidden: nil
+      %li= filter_link_to t('admin.tags.hidden'), hidden: '1'
+
+.table-wrapper
+  %table.table
+    %thead
+      %tr
+        %th= t('admin.tags.name')
+        %th= t('admin.tags.accounts')
+        %th
+    %tbody
+      = render @tags
diff --git a/app/views/admin/warning_presets/edit.html.haml b/app/views/admin/warning_presets/edit.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..9522746cd11c4c077d8e80d2f8cd76063d8777d8
--- /dev/null
+++ b/app/views/admin/warning_presets/edit.html.haml
@@ -0,0 +1,11 @@
+- content_for :page_title do
+  = t('admin.warning_presets.edit_preset')
+
+= simple_form_for @warning_preset, url: admin_warning_preset_path(@warning_preset) do |f|
+  = render 'shared/error_messages', object: @warning_preset
+
+  .fields-group
+    = f.input :text, wrapper: :with_block_label
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/warning_presets/index.html.haml b/app/views/admin/warning_presets/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..45913ef73384382d83ec3424728134cf8d0ef6a5
--- /dev/null
+++ b/app/views/admin/warning_presets/index.html.haml
@@ -0,0 +1,30 @@
+- content_for :page_title do
+  = t('admin.warning_presets.title')
+
+- if can? :create, :account_warning_preset
+  = simple_form_for @warning_preset, url: admin_warning_presets_path do |f|
+    = render 'shared/error_messages', object: @warning_preset
+
+    .fields-group
+      = f.input :text, wrapper: :with_block_label
+
+    .actions
+      = f.button :button, t('admin.warning_presets.add_new'), type: :submit
+
+  %hr.spacer/
+
+- unless @warning_presets.empty?
+  .table-wrapper
+    %table.table
+      %thead
+        %tr
+          %th= t('simple_form.labels.account_warning_preset.text')
+          %th
+      %tbody
+        - @warning_presets.each do |preset|
+          %tr
+            %td
+              = Formatter.instance.linkify(preset.text)
+            %td
+              = table_link_to 'pencil', t('admin.warning_presets.edit'), edit_admin_warning_preset_path(preset)
+              = table_link_to 'trash', t('admin.warning_presets.delete'), admin_warning_preset_path(preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..e6059b03507aa0e7322474cbd973f263fe0ac59b
--- /dev/null
+++ b/app/views/application/_card.html.haml
@@ -0,0 +1,17 @@
+- account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account)
+
+.card.h-card
+  = link_to account_url, target: '_blank', rel: 'noopener' do
+    .card__img
+      = image_tag account.header.url, alt: ''
+    .card__bar
+      .avatar
+        = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo'
+
+      .display-name
+        %span{id: "default_account_display_name", style: "display:none;"}= account.username
+        %bdi
+          %strong.emojify.p-name= display_name(account, custom_emojify: true)
+        %span
+          = acct(account)
+          = fa_icon('lock') if account.locked?
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..2ff14b2526fed39494e7f090143dc6f4ad080772
--- /dev/null
+++ b/app/views/application/_sidebar.html.haml
@@ -0,0 +1,6 @@
+.hero-widget
+  .hero-widget__img
+    = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('preview.jpg'), alt: @instance_presenter.site_title
+
+  .hero-widget__text
+    %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
diff --git a/app/views/auth/confirmations/finish_signup.html.haml b/app/views/auth/confirmations/finish_signup.html.haml
index 4b5161d6b05fa14ec589fb00348cacdd39804efc..9d09b74e1627515eed3641c78374041ddcdd36af 100644
--- a/app/views/auth/confirmations/finish_signup.html.haml
+++ b/app/views/auth/confirmations/finish_signup.html.haml
@@ -8,7 +8,8 @@
         = msg
         %br
 
-  = f.input :email
+  .fields-group
+    = f.input :email, wrapper: :with_label, required: true, hint: false
 
   .actions
     = f.submit t('auth.confirm_email'), class: 'button'
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml
index 07ca4a7da900aa09f1ed698ceff0f6bb5bb3c0df..4a1bedaa4231644c1490ba067e2662861549a9f2 100644
--- a/app/views/auth/confirmations/new.html.haml
+++ b/app/views/auth/confirmations/new.html.haml
@@ -4,7 +4,8 @@
 = simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, autofocus: true, required: true, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
+  .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
 
   .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 53d1769d623a0f9681e2573f60f90ccd5540b596..383d44f00fa3f9ae49109f2c7e9b2ddf40d09bbe 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -7,8 +7,10 @@
   - if !use_seamless_external_login? || resource.encrypted_password.present?
     = f.input :reset_password_token, as: :hidden
 
-    = f.input :password, autofocus: true, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }
-    = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }
+    .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' }, 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
 
     .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 f4d22031a5ab65730bba31b13451333607b5e5aa..bae5b24ba8fe5175d9ec29627b10c3d6cdf980c4 100644
--- a/app/views/auth/passwords/new.html.haml
+++ b/app/views/auth/passwords/new.html.haml
@@ -4,7 +4,8 @@
 = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
   = render 'shared/error_messages', object: resource
 
-  = f.input :email, autofocus: true, required: true, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
+  .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
 
   .actions
     = f.button :button, t('auth.reset_password'), type: :submit
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
index 8586c0549573fb9a65159c13e34a84680d4b5d71..d7d96a1bb3338617854e9063e5b88eb344142187 100644
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -8,7 +8,7 @@
         %th= t 'sessions.browser'
         %th= t 'sessions.ip'
         %th= t 'sessions.activity'
-        %td
+        %th
     %tbody
       - @sessions.each do |session|
         %tr
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 05fc7df313bc99738e67a595d8db55b1781ddb0d..694461fdf2ec4f71161201e20e010e08ca5bbece 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -1,24 +1,33 @@
 - content_for :page_title do
   = t('auth.security')
 
-%h4= t('auth.change_password')
 = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit' }) do |f|
   = render 'shared/error_messages', object: resource
 
   - if !use_seamless_external_login? || resource.encrypted_password.present?
-    = f.input :email, placeholder: t('simple_form.labels.defaults.email'), input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
-    = f.input :password, placeholder: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }
-    = f.input :password_confirmation, placeholder: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }
-    = f.input :current_password, placeholder: t('simple_form.labels.defaults.current_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password'), :autocomplete => 'off' }
+    .fields-group
+      = f.input :email, wrapper: :with_label, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }, required: true, hint: false
+
+    .fields-group
+      = f.input :current_password, wrapper: :with_label, input_html: { 'aria-label' => t('simple_form.labels.defaults.current_password'), :autocomplete => 'off' }, required: true
+
+    .fields-group
+      = 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' }, hint: false
+
+    .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' }
+
 
     .actions
       = f.button :button, t('generic.save_changes'), type: :submit
   - else
     %p.hint= t('users.seamless_external_login')
 
+%hr.spacer/
+
 = render 'sessions'
 
 - if open_deletion?
-
+  %hr.spacer/
   %h4= 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 0fac8e10da121576ea9c9072bbc9b9dbddd867fd..72ce8e531fc322789a52f3b2dcd1343e83ea9cb0 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -10,21 +10,25 @@
   - if @invite.present? && @invite.autofollow?
     .fields-group{ style: 'margin-bottom: 30px' }
       %p.hint{ style: 'text-align: center' }= t('invites.invited_by')
-      = render 'authorize_follows/card', account: @invite.user.account
+      = render 'application/card', account: @invite.user.account
 
   = f.simple_fields_for :account do |ff|
-    .input-with-append
-      = ff.input :username, autofocus: true, placeholder: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' }
-      .append
-        = "@#{site_hostname}"
-
-  = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }
-  = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }
-  = 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' }
+    .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' }, 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' }
+  .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 :invite_code, as: :hidden
 
+  %p.hint= t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path)
+
   .actions
     = f.button :button, t('auth.register'), type: :submit
 
-  %p.hint.subtle-hint=t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path)
 .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 0c9f9d5fe8fa9cfc40d0c60a9f88ba529e4a05d0..ceb1694084bee70ebe50a7cfdb41623d6282465f 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -5,11 +5,13 @@
   = render partial: 'shared/og'
 
 = simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-  - if use_seamless_external_login?
-    = f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.username_or_email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username_or_email') }
-  - else
-    = f.input :email, autofocus: true, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
-  = f.input :password, placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password'), :autocomplete => 'off' }
+  .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
 
   .actions
     = f.button :button, t('auth.login'), type: :submit
diff --git a/app/views/auth/sessions/two_factor.html.haml b/app/views/auth/sessions/two_factor.html.haml
index 1af3193ae0e58d8688a1b8df3fe253ec1c24e043..4e6bbd7a9583c58c4a6183718739bec4f053fa26 100644
--- a/app/views/auth/sessions/two_factor.html.haml
+++ b/app/views/auth/sessions/two_factor.html.haml
@@ -4,7 +4,8 @@
 = simple_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post) do |f|
   %p.hint{ style: 'margin-bottom: 25px' }= t('simple_form.hints.sessions.otp')
 
-  = f.input :otp_attempt, type: :number, placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { 'aria-label' => t('simple_form.labels.defaults.otp_attempt'), :autocomplete => 'off' }, required: true, autofocus: true
+  .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
 
   .actions
     = f.button :button, t('auth.login'), type: :submit
diff --git a/app/views/auth/shared/_links.html.haml b/app/views/auth/shared/_links.html.haml
index 08b38509272f1bac46290669edd0e3d73cdffde2..516c625a6b564cfe2877e77c377dab80802c1b8d 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('auth.login'), new_session_path(resource_name)
 
   - if devise_mapping.registerable? && controller_name != 'registrations'
-    %li= link_to t('auth.register'), new_registration_path(resource_name)
+    %li= link_to t('auth.register'), open_registrations? ? new_registration_path(resource_name) : 'https://joinmastodon.org/#getting-started'
 
   - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
     %li= link_to t('auth.forgot_password'), new_password_path(resource_name)
diff --git a/app/views/authorize_follows/_card.html.haml b/app/views/authorize_follows/_card.html.haml
deleted file mode 100644
index edc03131f4b4cc1bbed4b3cfd67d7ae487ff3582..0000000000000000000000000000000000000000
--- a/app/views/authorize_follows/_card.html.haml
+++ /dev/null
@@ -1,23 +0,0 @@
-.account-card
-  .account-card__header{ style: "background-image: url(#{account.header.url(:original)})" }
-  .detailed-status__display-name
-    %div
-      = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
-
-    %span.display-name
-      - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account)
-      = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
-        %strong.emojify= display_name(account, custom_emojify: true)
-        %span @#{account.acct}
-
-    .counter
-      %span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true
-      %span.counter-label= t('accounts.posts')
-
-    .counter
-      %span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true
-      %span.counter-label= t('accounts.following')
-
-    .counter
-      %span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true
-      %span.counter-label= t('accounts.followers')
diff --git a/app/views/authorize_follows/show.html.haml b/app/views/authorize_follows/show.html.haml
deleted file mode 100644
index a1fd01dd6b7b4dbfcdf30c466fb9c8fa83f611b3..0000000000000000000000000000000000000000
--- a/app/views/authorize_follows/show.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- content_for :page_title do
-  = t('authorize_follow.title', acct: @account.acct)
-
-.form-container
-  .follow-prompt
-    = render 'card', account: @account
-
-  - if current_account.following?(@account)
-    .flash-message
-      %strong
-        = t('authorize_follow.already_following')
-    = render 'post_follow_actions'
-
-  - else
-    = form_tag authorize_follow_path, method: :post, class: 'simple_form' do
-      = hidden_field_tag :acct, @account.acct
-      = button_tag t('authorize_follow.follow'), type: :submit
diff --git a/app/views/authorize_follows/_post_follow_actions.html.haml b/app/views/authorize_interactions/_post_follow_actions.html.haml
similarity index 61%
rename from app/views/authorize_follows/_post_follow_actions.html.haml
rename to app/views/authorize_interactions/_post_follow_actions.html.haml
index 2a9c062e9c78e3a4975e390ddef01f6a5bf57bc8..561c60137fc4ac7a01f201499297fd73555b7fe7 100644
--- a/app/views/authorize_follows/_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/#{@account.id}"), class: 'button button--block'
-  %div= link_to t('authorize_follow.post_follow.return'), TagManager.instance.url_for(@account), class: 'button button--block'
+  %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.return'), TagManager.instance.url_for(@resource), class: 'button button--block'
   %div= t('authorize_follow.post_follow.close')
diff --git a/app/views/authorize_follows/error.html.haml b/app/views/authorize_interactions/error.html.haml
similarity index 100%
rename from app/views/authorize_follows/error.html.haml
rename to app/views/authorize_interactions/error.html.haml
diff --git a/app/views/authorize_interactions/show.html.haml b/app/views/authorize_interactions/show.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..7ca9b98c1b8cc2a65bd622b0d35a2fb29260eabc
--- /dev/null
+++ b/app/views/authorize_interactions/show.html.haml
@@ -0,0 +1,18 @@
+- content_for :page_title do
+  = t('authorize_follow.title', acct: @resource.acct)
+
+.form-container
+  .follow-prompt
+    = render 'application/card', account: @resource
+
+  - if current_account.following?(@resource)
+    .flash-message
+      %strong
+        = t('authorize_follow.already_following')
+
+    = render 'post_follow_actions'
+  - else
+    = form_tag authorize_interaction_path, method: :post, class: 'simple_form' do
+      = hidden_field_tag :action, :follow
+      = hidden_field_tag :acct, @resource.acct
+      = button_tag t('authorize_follow.follow'), type: :submit
diff --git a/app/views/authorize_follows/success.html.haml b/app/views/authorize_interactions/success.html.haml
similarity index 60%
rename from app/views/authorize_follows/success.html.haml
rename to app/views/authorize_interactions/success.html.haml
index fa59b24b8e038b79db452c7edcddd0be7592128c..47fd09767c6afd26dab6cf5cf03d5c91382eee3a 100644
--- a/app/views/authorize_follows/success.html.haml
+++ b/app/views/authorize_interactions/success.html.haml
@@ -1,13 +1,13 @@
 - content_for :page_title do
-  = t('authorize_follow.title', acct: @account.acct)
+  = t('authorize_follow.title', acct: @resource.acct)
 
 .form-container
   .follow-prompt
-    - if @account.locked?
+    - if @resource.locked?
       %h2= t('authorize_follow.follow_request')
     - else
       %h2= t('authorize_follow.following')
 
-    = render 'card', account: @account
+    = render 'application/card', account: @resource
 
   = render 'post_follow_actions'
diff --git a/app/views/directories/index.html.haml b/app/views/directories/index.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..a8aa68cc434e1e6c1d35fa25d0c03e9c276f5b2a
--- /dev/null
+++ b/app/views/directories/index.html.haml
@@ -0,0 +1,71 @@
+- 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')
+
+.grid
+  .column-0
+    - if @accounts.empty?
+      = nothing_here
+    - else
+      .directory
+        %table.accounts-table
+          %tbody
+            - @accounts.each do |account|
+              %tr
+                %td= account_link_to account
+                %td.accounts-table__count.optional
+                  = number_to_human account.statuses_count, strip_insignificant_zeros: true
+                  %small= t('accounts.posts', count: account.statuses_count).downcase
+                %td.accounts-table__count.optional
+                  = number_to_human account.followers_count, strip_insignificant_zeros: true
+                  %small= t('accounts.followers', count: account.followers_count).downcase
+                %td.accounts-table__count
+                  - if account.last_status_at.present?
+                    %time.time-ago{ datetime: account.last_status_at.iso8601, title: l(account.last_status_at) }= l account.last_status_at
+                  - else
+                    \-
+                  %small= t('accounts.last_active')
+
+      = paginate @accounts
+
+  .column-1
+    - if user_signed_in?
+      .box-widget.notice-widget
+        - if current_account.discoverable?
+          - if current_account.followers_count < Account::MIN_FOLLOWERS_DISCOVERY
+            %p= t('directories.enabled_but_waiting', min_followers: Account::MIN_FOLLOWERS_DISCOVERY)
+          - else
+            %p= t('directories.enabled')
+        - else
+          %p= t('directories.how_to_enable')
+
+          = link_to settings_profile_path do
+            = t('settings.edit_profile')
+            = fa_icon 'chevron-right fw'
+
+    - if @tags.empty? && !user_signed_in?
+      .nothing-here
+    - else
+      - @tags.each do |tag|
+        .directory__tag{ class: tag.id == @tag&.id ? 'active' : nil }
+          = link_to explore_hashtag_path(tag) do
+            %h4
+              = fa_icon 'hashtag'
+              = tag.name
+              %small= t('directories.people', count: tag.accounts_count)
+
+            .avatar-stack
+              - tag.cached_sample_accounts.each do |account|
+                = image_tag current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar'
diff --git a/app/views/filters/_fields.html.haml b/app/views/filters/_fields.html.haml
index a5a3f03375dc5866bec420e5af1a2d4f257740ba..fb94a07fce2a8bb4805aa1037058005497c62f78 100644
--- a/app/views/filters/_fields.html.haml
+++ b/app/views/filters/_fields.html.haml
@@ -1,14 +1,16 @@
-.fields-group
-  = f.input :phrase, as: :string, wrapper: :with_block_label
+.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}") }, prompt: 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
-
-.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}") }, prompt: I18n.t('invites.expires_in_prompt')
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
index 65af81a5b70276f01edb6e8a182f4d467c1d7c7e..31dab68bf57c144a8eb4932e11cc83ac2df56a24 100644
--- a/app/views/follower_accounts/index.html.haml
+++ b/app/views/follower_accounts/index.html.haml
@@ -8,6 +8,11 @@
 = render 'accounts/header', account: @account
 
 - if @account.user_hides_network?
-  = render 'accounts/follow_grid_hidden'
+  .nothing-here= t('accounts.network_hidden')
+- elsif @follows.empty?
+  = nothing_here
 - else
-  = render 'accounts/follow_grid', follows: @follows, accounts: @follows.map(&:account)
+  .card-grid
+    = render partial: 'application/card', collection: @follows.map(&:account), as: :account
+
+  = paginate @follows
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
index 8fd95a0b4da43ac954cc9e6c1bf9c5f85630f790..8b49b529b4d91a159c0822d74d6f11d252d7b81a 100644
--- a/app/views/following_accounts/index.html.haml
+++ b/app/views/following_accounts/index.html.haml
@@ -8,6 +8,11 @@
 = render 'accounts/header', account: @account
 
 - if @account.user_hides_network?
-  = render 'accounts/follow_grid_hidden'
+  .nothing-here= t('accounts.network_hidden')
+- elsif @follows.empty?
+  = nothing_here
 - else
-  = render 'accounts/follow_grid', follows: @follows, accounts: @follows.map(&:target_account)
+  .card-grid
+    = render partial: 'application/card', collection: @follows.map(&:target_account), as: :account
+
+  = paginate @follows
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 7b1a7e50aea4fa348fbcb56ffa0ebc3757955299..6f3a6942e93d85a565cd830d500596304927eadc 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -14,4 +14,4 @@
     = image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
 
     %div
-      = t('errors.noscript_html')
+      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml
index 42a107bb2c139ed8700c6de9b7534bd602490b2a..3a2a5ef0e1c78d64a84d92fdb361ad43f0bcc105 100644
--- a/app/views/invites/_form.html.haml
+++ b/app/views/invites/_form.html.haml
@@ -1,9 +1,11 @@
 = simple_form_for(@invite, url: controller.is_a?(Admin::InvitesController) ? admin_invites_path : invites_path) do |f|
   = render 'shared/error_messages', object: @invite
 
-  .fields-group
-    = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt')
-    = 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}") }, prompt: I18n.t('invites.expires_in_prompt')
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt')
+    .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}") }, prompt: I18n.t('invites.expires_in_prompt')
 
   .fields-group
     = f.input :autofollow, wrapper: :with_label
diff --git a/app/views/invites/index.html.haml b/app/views/invites/index.html.haml
index f4c5047fa0670fba9ba404275d30c559a526dff1..fb827f6e6d0b55f331d09e6341d3105d3909b807 100644
--- a/app/views/invites/index.html.haml
+++ b/app/views/invites/index.html.haml
@@ -6,7 +6,7 @@
 
   = render 'form'
 
-  %hr/
+  %hr.spacer/
 
 %table.table
   %thead
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index c98d85f7bfe7ec38d50b58cc4cb54be9d7c55c1c..6ce67d91e7059d4019f405ba93910a27e2a6904e 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -17,4 +17,4 @@
 
         = yield
 
-= render template: 'layouts/application', locals: { body_classes: 'admin' }
+= render template: 'layouts/application'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index a903b865bca76e7f74459c693bc8659dc2b51bbf..d0f50c8e9bcfe32db8fe4af20ac893092b54acc3 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -3,6 +3,13 @@
   %head
     %meta{ charset: 'utf-8' }/
     %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
+
+    - if cdn_host?
+      %link{ rel: 'dns-prefetch', href: cdn_host }/
+
+    - 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' }/
@@ -20,11 +27,10 @@
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = csrf_meta_tags
 
-    = yield :header_tags
+    - if Setting.custom_css.present?
+      = stylesheet_link_tag custom_css_path, media: 'all'
 
-  - body_classes ||= @body_classes || ''
-  - body_classes += ' system-font' if current_account&.user&.setting_system_font_ui
-  - body_classes += current_account&.user&.setting_reduce_motion ? ' reduce-motion' : ' no-reduce-motion'
+    = yield :header_tags
 
-  %body{ class: add_rtl_body_class(body_classes) }
+  %body{ class: body_classes }
     = content_for?(:content) ? yield(:content) : yield
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index ac11cfbe72e4e9ce9eb857ece4e06f1a98f01dbe..0503dcdc101a47dd25bfb4d3b50d79acaa4689cc 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -4,6 +4,12 @@
     %meta{ charset: 'utf-8' }/
     %meta{ name: 'robots', content: 'noindex' }/
 
+    - if cdn_host?
+      %link{ rel: 'dns-prefetch', href: cdn_host }/
+
+    - if storage_host?
+      %link{ rel: 'dns-prefetch', href: storage_host }/
+
     = stylesheet_pack_tag 'common', media: 'all'
     = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
diff --git a/app/views/layouts/modal.html.haml b/app/views/layouts/modal.html.haml
index 325b4ec726282696f1ffd4febedc998ba7903a20..2ef49e413208ad2e9fa717f4a53d8675a0884e0a 100644
--- a/app/views/layouts/modal.html.haml
+++ b/app/views/layouts/modal.html.haml
@@ -2,13 +2,13 @@
   = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
 
 - content_for :content do
-  - if user_signed_in?
+  - if user_signed_in? && !@hide_header
     .account-header
       .avatar= image_tag current_account.avatar.url(:original)
       .name
         = t 'users.signed_in_as'
         %span.username @#{current_account.local_username_and_domain}
-      = link_to destroy_user_session_path, method: :delete, class: 'logout-link icon-button' do
+      = link_to destroy_user_session_path(continue: true), method: :delete, class: 'logout-link icon-button' do
         = fa_icon 'sign-out'
 
   .container-alt= yield
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 600290297dc57d6dbf97be48e85b4d0bec55fabc..caccd5bb67f66a7875c351562d68f2a5ad60d1a6 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -2,16 +2,54 @@
   = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
 
 - content_for :content do
-  .container-alt= yield
-  .footer
-    - if !user_signed_in? && single_user_mode?
-      %span.single-user-login
-        = link_to t('auth.login'), new_user_session_path
-        &mdash;
-      %span.footer__domain= link_to site_hostname, about_path
-    - else
-      %span.footer__domain= link_to site_hostname, root_path
-    %span.powered-by
-      != t('generic.powered_by', link: link_to('https://joinmastodon.org') { image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon' })
+  .public-layout
+    .container
+      %nav.header
+        .nav-left
+          = link_to root_url, class: 'brand' do
+            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+
+          - if Setting.profile_directory
+            = link_to t('directories.directory'), explore_path, class: 'nav-link optional'
+          = 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'), open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started', 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/api/guidelines/'
+          .column-2
+            %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
+
+            = link_to root_url, class: 'brand' do
+              = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
+          .column-3
+            %h4= site_hostname
+            %ul
+              %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/digest.html.haml b/app/views/notification_mailer/digest.html.haml
index 10e44f8dde98e0d4a42a150d9e0a283773144936..a94ace228d84853c16f6c0dfac05cf54edb9414d 100644
--- a/app/views/notification_mailer/digest.html.haml
+++ b/app/views/notification_mailer/digest.html.haml
@@ -14,7 +14,7 @@
                           %tr
                             %td.column-cell.text-center.padded
                               %h1= t 'notification_mailer.digest.title'
-                              %p.lead= t('notification_mailer.digest.body', since: l(@since.to_date, format: :short), instance: site_hostname)
+                              %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
diff --git a/app/views/notification_mailer/digest.text.erb b/app/views/notification_mailer/digest.text.erb
index e0d1f9b8b9d0bd9563130e30731597bfe52a82db..b2c85a9e3dcf3ee960834d9c8e716939ad3da697 100644
--- a/app/views/notification_mailer/digest.text.erb
+++ b/app/views/notification_mailer/digest.text.erb
@@ -1,6 +1,6 @@
 <%= raw t('application_mailer.salutation', name: display_name(@me)) %>
 
-<%= raw t('notification_mailer.digest.body', since: l(@since), instance: root_url) %>
+<%= 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) %>
diff --git a/app/views/remote_follow/new.html.haml b/app/views/remote_follow/new.html.haml
index 9b22fda5f38c134a71c29707cfa7f55f77acf786..5cf6977ba17014fb4d3d156e41f1d1e129fcd66e 100644
--- a/app/views/remote_follow/new.html.haml
+++ b/app/views/remote_follow/new.html.haml
@@ -6,7 +6,7 @@
   .follow-prompt
     %h2= t('remote_follow.prompt')
 
-    = render partial: 'authorize_follows/card', locals: { account: @account }
+    = 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
@@ -16,4 +16,6 @@
     .actions
       = f.button :button, t('remote_follow.proceed'), type: :submit
 
-    %p.hint.subtle-hint= t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started')
+    %p.hint.subtle-hint
+      = t('remote_follow.reason_html', instance: site_hostname)
+      = t('remote_follow.no_account_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started')
diff --git a/app/views/remote_interaction/new.html.haml b/app/views/remote_interaction/new.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..a0b10681483d97e76221390acf558de7a83a8110
--- /dev/null
+++ b/app/views/remote_interaction/new.html.haml
@@ -0,0 +1,21 @@
+.form-container
+  .follow-prompt
+    %h2= t("remote_interaction.#{@interaction_type}.prompt")
+
+    .public-layout
+      .activity-stream.activity-stream--highlighted
+        = render 'stream_entries/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: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started')
diff --git a/app/views/remote_unfollows/success.html.haml b/app/views/remote_unfollows/success.html.haml
index aa3c838a09636f5d3ba845ec6328908cb286f4b7..b007eedc7e43c6f5de7295e8f3f904b08a5326ac 100644
--- a/app/views/remote_unfollows/success.html.haml
+++ b/app/views/remote_unfollows/success.html.haml
@@ -5,6 +5,6 @@
   .follow-prompt
     %h2= t('remote_unfollow.unfollowed')
 
-    = render 'card', account: @account
+    = render 'application/card', account: @account
 
   = render 'post_follow_actions'
diff --git a/app/views/settings/applications/_fields.html.haml b/app/views/settings/applications/_fields.html.haml
index db90df3491996f725488904979e5345c49f3197f..6a2863b200b00ce3d2e6a1cd12b7e31120a23fb0 100644
--- a/app/views/settings/applications/_fields.html.haml
+++ b/app/views/settings/applications/_fields.html.haml
@@ -1,6 +1,8 @@
 .fields-group
-  = f.input :name, placeholder: t('activerecord.attributes.doorkeeper/application.name')
-  = f.input :website, placeholder: t('activerecord.attributes.doorkeeper/application.website')
+  = f.input :name, wrapper: :with_label, label: t('activerecord.attributes.doorkeeper/application.name')
+
+.fields-group
+  = f.input :website, wrapper: :with_label, label: t('activerecord.attributes.doorkeeper/application.website')
 
 .fields-group
   = f.input :redirect_uri, wrapper: :with_block_label, label: t('activerecord.attributes.doorkeeper/application.redirect_uri'), hint: t('doorkeeper.applications.help.redirect_uri')
diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml
index 30cd26914076070c82742354b4caaf2799947b37..b13cea976a1de6e1a4b20a6418259f033dd0053c 100644
--- a/app/views/settings/exports/show.html.haml
+++ b/app/views/settings/exports/show.html.haml
@@ -8,18 +8,34 @@
         %th= t('exports.storage')
         %td= number_to_human_size @export.total_storage
         %td
+      %tr
+        %th= t('accounts.posts', count: @export.total_statuses)
+        %td= number_with_delimiter @export.total_statuses
+        %td
       %tr
         %th= t('exports.follows')
-        %td= number_to_human @export.total_follows
+        %td= number_with_delimiter @export.total_follows
         %td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
+      %tr
+        %th= t('exports.lists')
+        %td= number_with_delimiter @export.total_lists
+        %td= table_link_to 'download', t('exports.csv'), settings_exports_lists_path(format: :csv)
+      %tr
+        %th= t('accounts.followers', count: @export.total_followers)
+        %td= number_with_delimiter @export.total_followers
+        %td
       %tr
         %th= t('exports.blocks')
-        %td= number_to_human @export.total_blocks
+        %td= number_with_delimiter @export.total_blocks
         %td= table_link_to 'download', t('exports.csv'), settings_exports_blocks_path(format: :csv)
       %tr
         %th= t('exports.mutes')
-        %td= number_to_human @export.total_mutes
+        %td= number_with_delimiter @export.total_mutes
         %td= table_link_to 'download', t('exports.csv'), settings_exports_mutes_path(format: :csv)
+      %tr
+        %th= t('exports.domain_blocks')
+        %td= number_with_delimiter @export.total_domain_blocks
+        %td= table_link_to 'download', t('exports.csv'), settings_exports_domain_blocks_path(format: :csv)
 
 %p.muted-hint= t('exports.archive_takeout.hint_html')
 
diff --git a/app/views/settings/imports/show.html.haml b/app/views/settings/imports/show.html.haml
index 991dd4e941d1f659b4fc1a20ab5cb56631cc9304..4512fc714dc7e929470a26a65052a0f04086bd67 100644
--- a/app/views/settings/imports/show.html.haml
+++ b/app/views/settings/imports/show.html.haml
@@ -1,11 +1,12 @@
 - content_for :page_title do
   = t('settings.import')
 
-%p.hint= t('imports.preface')
-
 = simple_form_for @import, url: settings_import_path do |f|
-  = f.input :type, collection: Import.types.keys, wrapper: :with_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
-  = f.input :data, wrapper: :with_label, hint: t('simple_form.hints.imports.data')
+  .field-group
+    = f.input :type, collection: Import.types.keys, wrapper: :with_block_label, include_blank: false, label_method: lambda { |type| I18n.t("imports.types.#{type}") }, hint: t('imports.preface')
+
+  .field-group
+    = f.input :data, wrapper: :with_block_label, hint: t('simple_form.hints.imports.data')
 
   .actions
     = f.button :button, t('imports.upload'), type: :submit
diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml
index b7c34761f30a47af75f0e0c35e2ff7fd962cf386..c69061d50bcd023a2b0c82e7ad6e5f253b1db4c7 100644
--- a/app/views/settings/migrations/show.html.haml
+++ b/app/views/settings/migrations/show.html.haml
@@ -6,7 +6,7 @@
     %p.hint= t('migrations.currently_redirecting')
 
     .fields-group
-      = render partial: 'authorize_follows/card', locals: { account: @migration.account }
+      = render partial: 'application/card', locals: { account: @migration.account }
 
   = render 'shared/error_messages', object: @migration
 
diff --git a/app/views/settings/notifications/show.html.haml b/app/views/settings/notifications/show.html.haml
index b718b62df5694f249df6618c116bf4dc5dbfd05b..8aaac043b711d013dfe2231c94fbda6718234542 100644
--- a/app/views/settings/notifications/show.html.haml
+++ b/app/views/settings/notifications/show.html.haml
@@ -12,6 +12,9 @@
       = 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
+
   .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
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 43430069f6e224f4b41e5eee8d361e3be77ea5f6..a2c61c9a6810c1a1c1a59225fb9957ca7d1c51b9 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -1,29 +1,32 @@
 - content_for :page_title do
   = t('settings.preferences')
 
+%ul.quick-nav
+  %li= link_to t('preferences.languages'), '#settings_languages'
+  %li= link_to t('preferences.publishing'), '#settings_publishing'
+  %li= link_to t('preferences.other'), '#settings_other'
+  %li= link_to t('preferences.web'), '#settings_web'
+
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
 
-  .actions.actions--top
-    = f.button :button, t('generic.save_changes'), type: :submit
-
-  %h4= t 'preferences.languages'
+  .fields-row#settings_languages
+    .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
+    .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
 
   .fields-group
-    = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale
-
-    = 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
-
     = 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'
 
-  %h4= t 'preferences.publishing'
+  %hr#settings_publishing/
 
   .fields-group
-    = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+    = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
 
     = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
 
-  %h4= t 'preferences.other'
+  %hr#settings_other/
 
   .fields-group
     = f.input :setting_noindex, as: :boolean, wrapper: :with_label
@@ -31,19 +34,25 @@
   .fields-group
     = f.input :setting_hide_network, as: :boolean, wrapper: :with_label
 
-  %h4= t 'preferences.web'
+  %hr#settings_web/
 
-  .fields-group
-    - if Themes.instance.names.size > 1
-      = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
+  .fields-row
+    .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
+    .fields-group.fields-row__column.fields-row__column-6
+      = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false
 
+  .fields-group
     = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
 
+  .fields-group
+    = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label
+
   .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
-    = f.input :setting_display_sensitive_media, as: :boolean, wrapper: :with_label
+    = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
     = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
     = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
 
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 658f29f579fd0fe87ac58168226e497465a993da..932638dbe2faac6c07b81ebd1fd624501fe89a8a 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -4,17 +4,21 @@
 = simple_form_for @account, url: settings_profile_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: @account
 
-  .fields-group
-    = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
-    = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 65535 - @account.note.size).html_safe
+  .fields-row
+    .fields-row__column.fields-group.fields-row__column-6
+      = f.input :display_name, wrapper: :with_label, input_html: { maxlength: 30 }, hint: false
+      = f.input :note, wrapper: :with_label, input_html: { maxlength: 65535 }, hint: false
 
-  .card.compact{ style: "background-image: url(#{@account.header.url(:original)})", data: { original_src: @account.header.url(:original) } }
-    .avatar= image_tag @account.avatar.url(:original), data: { original_src: @account.avatar.url(:original) }
+  .fields-row
+    .fields-row__column.fields-row__column-6
+      = render 'application/card', account: @account
 
-  .fields-group
-    = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar')
+    .fields-row__column.fields-group.fields-row__column-6
+      = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header', dimensions: '1500x500', size: number_to_human_size(AccountHeader::LIMIT))
+
+      = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))
 
-    = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header')
+  %hr.spacer/
 
   .fields-group
     = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
@@ -22,15 +26,31 @@
   .fields-group
     = f.input :bot, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.bot')
 
-  .fields-group
-    .input.with_block_label
-      %label= t('simple_form.labels.defaults.fields')
-      %span.hint= t('simple_form.hints.defaults.fields')
+  - if Setting.profile_directory
+    .fields-group
+      = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable_html', min_followers: Account::MIN_FOLLOWERS_DISCOVERY, path: explore_path)
+
+  %hr.spacer/
 
-      = f.simple_fields_for :fields do |fields_f|
-        .row
-          = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name')
-          = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value')
+  .fields-row
+    .fields-row__column.fields-group.fields-row__column-6
+      .input.with_block_label
+        %label= t('simple_form.labels.defaults.fields')
+        %span.hint= t('simple_form.hints.defaults.fields')
+
+        = f.simple_fields_for :fields do |fields_f|
+          .row
+            = fields_f.input :name, placeholder: t('simple_form.labels.account.fields.name'), input_html: { maxlength: 255 }
+            = fields_f.input :value, placeholder: t('simple_form.labels.account.fields.value'), input_html: { maxlength: 255 }
+
+    .fields-row__column.fields-group.fields-row__column-6
+      %h6= t('verification.verification')
+      %p.hint= t('verification.explanation_html')
+
+      .input-copy
+        .input-copy__wrapper
+          %input{ type: :text, maxlength: '999', spellcheck: 'false', readonly: 'true', value: link_to('Mastodon', ActivityPub::TagManager.instance.url_for(@account), rel: 'me').to_str }
+        %button{ type: :button }= t('generic.copy')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
@@ -39,3 +59,9 @@
 
 %h6= t('auth.migrate_account')
 %p.muted-hint= t('auth.migrate_account_html', path: settings_migration_path)
+
+- if open_deletion?
+  %hr.spacer/
+
+  %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 fd4a3e768344b42377766a65fb5ab3599c6e44fa..e641552991c0bb6ed494214c8482404f1b830f72 100644
--- a/app/views/settings/two_factor_authentication/confirmations/new.html.haml
+++ b/app/views/settings/two_factor_authentication/confirmations/new.html.haml
@@ -11,7 +11,8 @@
       %p.hint= t('two_factor_authentication.manual_instructions')
       %samp.qr-alternative__code= current_user.otp_secret.scan(/.{4}/).join(' ')
 
-  = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }
+  .fields-group
+    = f.input :code, wrapper: :with_label, hint: t('two_factor_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }, required: true
 
   .actions
     = f.button :button, t('two_factor_authentication.enable'), type: :submit
diff --git a/app/views/settings/two_factor_authentications/show.html.haml b/app/views/settings/two_factor_authentications/show.html.haml
index 67a64a0468f587c708899d9f6916ff991a55d73b..259bcd1ef33aeb5256d8d50ff810b5d2c6aa751b 100644
--- a/app/views/settings/two_factor_authentications/show.html.haml
+++ b/app/views/settings/two_factor_authentications/show.html.haml
@@ -10,7 +10,7 @@
   %hr/
 
   = simple_form_for @confirmation, url: settings_two_factor_authentication_path, method: :delete do |f|
-    = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }
+    = f.input :code, wrapper: :with_label, hint: t('two_factor_authentication.code_hint'), label: t('simple_form.labels.defaults.otp_attempt'), input_html: { :autocomplete => 'off' }, required: true
 
     .actions
       = f.button :button, t('two_factor_authentication.disable'), type: :submit
diff --git a/app/views/shared/_error_messages.html.haml b/app/views/shared/_error_messages.html.haml
index b73890216f5091895dfdb78aa190e0d381aa2d58..28becd6c4482da59d232e33a93894b9e4279ed91 100644
--- a/app/views/shared/_error_messages.html.haml
+++ b/app/views/shared/_error_messages.html.haml
@@ -1,3 +1,3 @@
 - if object.errors.any?
-  .flash-message#error_explanation
+  .flash-message.alert#error_explanation
     %strong= t('generic.validation_errors', count: object.errors.count)
diff --git a/app/views/shared/_landing_strip.html.haml b/app/views/shared/_landing_strip.html.haml
deleted file mode 100644
index 9a4144723f91a5f46a5bd8274d376710ba1a4668..0000000000000000000000000000000000000000
--- a/app/views/shared/_landing_strip.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-.landing-strip
-  = image_tag asset_pack_path('logo.svg'), class: 'logo'
-
-  %div
-    = t('landing_strip_html', name: content_tag(:span, display_name(account, custom_emojify: true), class: :emojify), link_to_root_path: link_to(content_tag(:strong, site_hostname), root_path))
-    = t('landing_strip_signup_html', sign_up_path: open_registrations? ? new_user_registration_path : 'https://joinmastodon.org/#getting-started')
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index a6d805bea22ab334b5570868ad8c8d681d5a9859..802d8c41d4596c3e04b1944456c3c6e9930c8357 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -1,9 +1,13 @@
 - thumbnail = @instance_presenter.thumbnail
+- description = strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_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:description', strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html'))
+= opengraph 'og:description', description
 = opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('preview.jpg', protocol: :request))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
 = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
diff --git a/app/views/stream_entries/_attachment_list.html.haml b/app/views/stream_entries/_attachment_list.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..d9706f47bd849a1db87c24e30dc431345d3beb7e
--- /dev/null
+++ b/app/views/stream_entries/_attachment_list.html.haml
@@ -0,0 +1,8 @@
+.attachment-list
+  .attachment-list__icon
+    = fa_icon 'link'
+  %ul.attachment-list__list
+    - attachments.each do |media|
+      %li
+        - url = media.remote_url.presence || media.file.url
+        = link_to File.basename(url), url, title: media.description
diff --git a/app/views/stream_entries/_content_spoiler.html.haml b/app/views/stream_entries/_content_spoiler.html.haml
deleted file mode 100644
index 798dfce670da4d8c05dcc65247d0d75dbd7c9c43..0000000000000000000000000000000000000000
--- a/app/views/stream_entries/_content_spoiler.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' }
-  .spoiler-button
-    .icon-button.overlayed
-      %i.fa.fa-fw.fa-eye
-  .media-spoiler
-    %span= t('stream_entries.sensitive_content')
-    %span= t('stream_entries.click_to_show')
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index db09dd6f34c20376e802beb2ec572ce9e072b684..27170d2c6388eca0627affc46d27ac390b4fa842 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -1,35 +1,41 @@
-.detailed-status.light
-  = link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do
-    %div
-      .avatar
-        = image_tag status.account.avatar.url(:original), width: 48, height: 48, alt: '', class: 'u-photo'
-    %span.display-name
-      %strong.p-name.emojify= display_name(status.account, custom_emojify: true)
-      %span= acct(status.account)
+.detailed-status.detailed-status--flex
+  .p-author.h-card
+    = link_to TagManager.instance.url_for(status.account), class: 'detailed-status__display-name u-url', target: stream_link_target, rel: 'noopener' do
+      .detailed-status__display-avatar
+        - if current_account&.user&.setting_auto_play_gif || autoplay
+          = image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo'
+        - else
+          = image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'account__avatar u-photo'
+      %span.display-name
+        %bdi
+          %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
+        %span.display-name__account
+          = acct(status.account)
+          = fa_icon('lock') if status.account.locked?
 
-  - if !user_signed_in? || embedded_view?
-    = link_to account_remote_follow_path(status.account), class: 'button button-secondary logo-button', target: '_new' do
-      = render file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')
-      = t('accounts.follow')
+  = account_action_button(status.account)
 
   .status__content.emojify<
     - if status.spoiler_text?
-      %p{ style: 'margin-bottom: 0' }<
-        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
+      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
+        %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
         %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
 
   - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 670, height: 380, detailed: true, inline: true
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 670, height: 380, detailed: true, inline: true, alt: video.description do
+        = render partial: 'stream_entries/attachment_list', locals: { attachments: status.media_attachments }
     - else
-      = react_component :media_gallery, height: 380, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
-  - elsif status.preview_cards.first
-    = react_component :card, 'maxDescription': 65535, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json
+      = react_component :media_gallery, height: 380, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
+        = render partial: 'stream_entries/attachment_list', locals: { attachments: status.media_attachments }
+  - elsif status.preview_card
+    = react_component :card, 'maxDescription': 65535, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
+
     = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: stream_link_target, rel: 'noopener' do
       %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
     Â·
@@ -39,21 +45,31 @@
       - else
         = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener'
       Â·
+    = link_to remote_interaction_path(status, type: :reply), class: 'modal-button detailed-status__link' do
+      - if status.in_reply_to_id.nil?
+        = fa_icon('reply')
+      - else
+        = fa_icon('reply-all')
+      %span.detailed-status__reblogs>= number_to_human status.replies_count, strip_insignificant_zeros: true
+      = " "
+    Â·
     - if status.direct_visibility?
-      %span<
+      %span.detailed-status__link<
         = fa_icon('envelope')
-    - elsif status.private_visibility?
-      %span<
+    - elsif status.private_visibility? || status.limited_visibility?
+      %span.detailed-status__link<
         = fa_icon('lock')
     - else
-      %span<
+      = link_to remote_interaction_path(status, type: :reblog), class: 'modal-button detailed-status__link' do
         = fa_icon('retweet')
-        %span= status.reblogs_count
+        %span.detailed-status__reblogs>= number_to_human status.reblogs_count, strip_insignificant_zeros: true
+        = " "
     Â·
-    %span<
+    = link_to remote_interaction_path(status, type: :favourite), class: 'modal-button detailed-status__link' do
       = fa_icon('star')
-      %span= status.favourites_count
+      %span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true
+      = " "
 
     - if user_signed_in?
       Â·
-      = link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'open-in-web-link', target: '_blank'
+      = link_to t('statuses.open_in_web'), web_url("statuses/#{status.id}"), class: 'detailed-status__application', target: '_blank'
diff --git a/app/views/stream_entries/_media.html.haml b/app/views/stream_entries/_media.html.haml
deleted file mode 100644
index 779f02c8d9166be02264f565daab4f8d7c17f1e1..0000000000000000000000000000000000000000
--- a/app/views/stream_entries/_media.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.media-item
-  = link_to media.remote_url.blank? ? media.file.url(:original) : media.remote_url, style: media.image? ? "background-image: url(#{media.file.url(:original)})" : '', target: '_blank', rel: 'noopener', class: "u-#{media.video? || media.gifv? ? 'video' : 'photo'}" do
-    - unless media.image?
-      %video{ src: media.file.url(:original), autoplay: true, loop: true }/
diff --git a/app/views/stream_entries/_more.html.haml b/app/views/stream_entries/_more.html.haml
deleted file mode 100644
index 9b1dfe4a71e913fc886506b23b8ad0643cc54b14..0000000000000000000000000000000000000000
--- a/app/views/stream_entries/_more.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= link_to url, class: 'more light'  do
-  = t('statuses.show_more')
diff --git a/app/views/stream_entries/_og_description.html.haml b/app/views/stream_entries/_og_description.html.haml
index 3d122b94ef4efde8dfa8e68f5b387d6c6db7b252..a7b18424d28f178b64ef63a7584ebbaca0e55b6e 100644
--- a/app/views/stream_entries/_og_description.html.haml
+++ b/app/views/stream_entries/_og_description.html.haml
@@ -1 +1,4 @@
-= opengraph 'og:description', status_description(activity)
+- description = status_description(activity)
+
+%meta{ name: 'description', content: description }/
+= opengraph 'og:description', description
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index 0f27585a16aa689c5ad0afb071cd7769eca0c08b..b0b6e80c89bf7176ce307dedba60cda16f2a661d 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -1,28 +1,56 @@
-.status.light
-  .status__header
-    .status__meta
-      = link_to TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener' do
-        %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
-      %data.dt-published{ value: status.created_at.to_time.iso8601 }
-
-    = link_to TagManager.instance.url_for(status.account), class: 'status__display-name p-author h-card', target: stream_link_target, rel: 'noopener' do
-      .status__avatar
-        %div
-          = image_tag status.account.avatar(:original), width: 48, height: 48, alt: '', class: 'u-photo'
-      %span.display-name
-        %strong.p-name.emojify= display_name(status.account, custom_emojify: true)
-        %span= acct(status.account)
+.status
+  .status__info
+    = link_to TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener' do
+      %time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
+    %data.dt-published{ value: status.created_at.to_time.iso8601 }
 
+    .p-author.h-card
+      = link_to TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
+        .status__avatar
+          %div
+            - if current_account&.user&.setting_auto_play_gif || autoplay
+              = image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar'
+            - else
+              = image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar'
+        %span.display-name
+          %bdi
+            %strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
+          &nbsp;
+          %span.display-name__account
+            = acct(status.account)
+            = fa_icon('lock') if status.account.locked?
   .status__content.emojify<
     - if status.spoiler_text?
-      %p{ style: 'margin-bottom: 0' }<
-        %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
+      %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
+        %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
         %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
-    .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true)
+    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
 
-  - unless status.media_attachments.empty?
+  - if !status.media_attachments.empty?
     - if status.media_attachments.first.video?
       - video = status.media_attachments.first
-      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true
+      = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description do
+        = render partial: 'stream_entries/attachment_list', locals: { attachments: status.media_attachments }
     - else
-      = react_component :media_gallery, height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+      = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json } do
+        = render partial: 'stream_entries/attachment_list', locals: { attachments: status.media_attachments }
+  - elsif status.preview_card
+    = react_component :card, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
+
+  .status__action-bar
+    .status__action-bar__counter
+      = link_to remote_interaction_path(status, type: :reply), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
+        - if status.in_reply_to_id.nil?
+          = fa_icon 'reply fw'
+        - else
+          = fa_icon 'reply-all fw'
+      .status__action-bar__counter__label= obscured_counter status.replies_count
+    = link_to remote_interaction_path(status, type: :reblog), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
+      - if status.public_visibility? || status.unlisted_visibility?
+        = fa_icon 'retweet fw'
+      - elsif status.private_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', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
+      = fa_icon 'star fw'
diff --git a/app/views/stream_entries/_status.html.haml b/app/views/stream_entries/_status.html.haml
index b87ca217719f4182638aa3311be85981703276fa..83887cd87437f7a73548a5e69062c5cd3038f5da 100644
--- a/app/views/stream_entries/_status.html.haml
+++ b/app/views/stream_entries/_status.html.haml
@@ -5,6 +5,7 @@
   is_successor    ||= false
   direct_reply_id ||= false
   parent_id       ||= false
+  autoplay        ||= current_account&.user&.setting_auto_play_gif
   is_direct_parent  = direct_reply_id == status.id
   is_direct_child   = parent_id == status.in_reply_to_id
   centered        ||= include_threads && !is_predecessor && !is_successor
@@ -16,39 +17,46 @@
 - if status.reply? && include_threads
   - if @next_ancestor
     .entry{ class: entry_classes }
-      = render 'stream_entries/more', url: TagManager.instance.url_for(@next_ancestor)
+      = link_to_more TagManager.instance.url_for(@next_ancestor)
 
-  = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }
+  = render partial: 'stream_entries/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }, autoplay: autoplay
 
 .entry{ class: entry_classes }
 
   - if status.reblog?
-    .pre-header
-      .pre-header__icon
-        = fa_icon('retweet fw')
+    .status__prepend
+      .status__prepend-icon-wrapper
+        %i.status__prepend-icon.fa.fa-fw.fa-retweet
       %span
         = link_to TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
-          %strong.emojify= display_name(status.account, custom_emojify: true)
+          %bdi
+            %strong.emojify= display_name(status.account, custom_emojify: true)
         = t('stream_entries.reblogged')
   - elsif pinned
-    .pre-header
-      .pre-header__icon
-        = fa_icon('thumb-tack fw')
+    .status__prepend
+      .status__prepend-icon-wrapper
+        %i.status__prepend-icon.fa.fa-fw.fa-thumb-tack
       %span
         = t('stream_entries.pinned')
 
-  = render (centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status'), status: status.proper
+  = render (centered ? 'stream_entries/detailed_status' : 'stream_entries/simple_status'), status: status.proper, autoplay: autoplay
 
 - if include_threads
   - if @since_descendant_thread_id
     .entry{ class: entry_classes }
-      = render 'stream_entries/more', url: short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
+      = link_to_more short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
   - @descendant_threads.each do |thread|
-    = render partial: 'stream_entries/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }
+    = render partial: 'stream_entries/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }, autoplay: autoplay
 
     - if thread[:next_status]
       .entry{ class: entry_classes }
-        = render 'stream_entries/more', url: TagManager.instance.url_for(thread[:next_status])
+        = link_to_more TagManager.instance.url_for(thread[:next_status])
   - if @next_descendant_thread
     .entry{ class: entry_classes }
-      = render 'stream_entries/more', url: short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
+      = link_to_more short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
+
+- if include_threads && !embedded_view? && !user_signed_in?
+  .entry{ class: entry_classes }
+    = link_to new_user_session_path, class: 'load-more load-gap' do
+      = fa_icon 'comments'
+      = t('statuses.sign_in_to_participate')
diff --git a/app/views/stream_entries/embed.html.haml b/app/views/stream_entries/embed.html.haml
index b703c15d2f022665078520060c7babdea9e01801..4871c101e1cbf38e2f6fc574d8850fdd3fab787e 100644
--- a/app/views/stream_entries/embed.html.haml
+++ b/app/views/stream_entries/embed.html.haml
@@ -1,3 +1,3 @@
 - cache @stream_entry.activity do
-  .activity-stream.activity-stream-headless
-    = render "stream_entries/#{@type}", @type.to_sym => @stream_entry.activity, centered: true
+  .activity-stream.activity-stream--headless
+    = render "stream_entries/#{@type}", @type.to_sym => @stream_entry.activity, centered: true, autoplay: @autoplay
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index dfb83e747b3ec2c82ad2e3fc6b9dabe3b7ce5b03..0e81c4f6853f6756772246d043d3855174bad39c 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -12,13 +12,14 @@
   = opengraph 'og:site_name', site_title
   = opengraph 'og:type', 'article'
   = opengraph 'og:title', "#{display_name(@account)} (@#{@account.local_username_and_domain})"
-  = opengraph 'og:url', short_account_status_url(@account, @stream_entry)
+  = opengraph 'og:url', short_account_status_url(@account, @stream_entry.activity)
 
   = render 'stream_entries/og_description', activity: @stream_entry.activity
   = render 'stream_entries/og_image', activity: @stream_entry.activity, account: @account
 
-- if show_landing_strip?
-  = render partial: 'shared/landing_strip', locals: { account: @stream_entry.account }
-
-.activity-stream.activity-stream-headless.h-entry
-  = render partial: "stream_entries/#{@type}", locals: { @type.to_sym => @stream_entry.activity, include_threads: true }
+.grid
+  .column-0
+    .activity-stream.h-entry
+      = render partial: "stream_entries/#{@type}", locals: { @type.to_sym => @stream_entry.activity, include_threads: true }
+  .column-1
+    = render 'application/sidebar'
diff --git a/app/views/tags/_features.html.haml b/app/views/tags/_features.html.haml
deleted file mode 100644
index 8fbc6b7607334ae839704962f6555263c7ccf3ff..0000000000000000000000000000000000000000
--- a/app/views/tags/_features.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-.features-list
-  .features-list__row
-    .text
-      %h6= t 'about.features.real_conversation_title'
-      = t 'about.features.real_conversation_body'
-    .visual
-      = fa_icon 'fw comments'
-  .features-list__row
-    .text
-      %h6= t 'about.features.not_a_product_title'
-      = t 'about.features.not_a_product_body'
-    .visual
-      = fa_icon 'fw users'
-  .features-list__row
-    .text
-      %h6= t 'about.features.within_reach_title'
-      = t 'about.features.within_reach_body'
-    .visual
-      = fa_icon 'fw mobile'
-  .features-list__row
-    .text
-      %h6= t 'about.features.humane_approach_title'
-      = t 'about.features.humane_approach_body'
-    .visual
-      = fa_icon 'fw leaf'
diff --git a/app/views/tags/show.html.haml b/app/views/tags/show.html.haml
index f6e452f188e9d551b9f378617c3e9819412d1b8f..18de48eea2cc9201efcb992cc6fe1a3a4acb93ce 100644
--- a/app/views/tags/show.html.haml
+++ b/app/views/tags/show.html.haml
@@ -8,33 +8,9 @@
   = javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous'
   = render 'og'
 
-.landing-page.tag-page.alternative
-  .features
-    .container
-      .grid
-        .column-1
-          #mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) } }
-
-        .column-2
-          .about-mastodon
-            .about-hashtag.landing-page__information
-              .brand
-                = link_to root_url do
-                  = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
-
-              %p= t 'about.about_hashtag_html', hashtag: @tag.name
-
-              .cta
-                - if user_signed_in?
-                  = link_to t('settings.back'), root_path, class: 'button button-secondary'
-                - else
-                  = link_to t('auth.login'), new_user_session_path, class: 'button button-secondary'
-                = link_to t('about.learn_more'), about_path, class: 'button button-alternative'
-
-            .landing-page__features.landing-page__information
-              %h3= t 'about.what_is_mastodon'
-              %p= t 'about.about_mastodon_html'
-
-              = render 'features'
+.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)) }}
 #modal-container
diff --git a/app/views/user_mailer/confirmation_instructions.html.haml b/app/views/user_mailer/confirmation_instructions.html.haml
index 1f088a16f4f6b2fc0cd8d327de6e0bd665f4fa80..f75f7529a8f2286c19862413fe387f1695ec3356 100644
--- a/app/views/user_mailer/confirmation_instructions.html.haml
+++ b/app/views/user_mailer/confirmation_instructions.html.haml
@@ -55,8 +55,12 @@
                             %tbody
                               %tr
                                 %td.button-primary
-                                  = link_to confirmation_url(@resource, confirmation_token: @token) do
-                                    %span= t 'devise.mailer.confirmation_instructions.action'
+                                  - if @resource.created_by_application
+                                    = link_to confirmation_url(@resource, confirmation_token: @token, redirect_to_app: 'true') do
+                                      %span= t 'devise.mailer.confirmation_instructions.action_with_app', app: @resource.created_by_application.name
+                                  - else
+                                    = link_to confirmation_url(@resource, confirmation_token: @token) do
+                                      %span= t 'devise.mailer.confirmation_instructions.action'
 
 %table.email-table{ cellspacing: 0, cellpadding: 0 }
   %tbody
diff --git a/app/views/user_mailer/confirmation_instructions.text.erb b/app/views/user_mailer/confirmation_instructions.text.erb
index e01eecb27e263a6256bc4c7ef9e36c62132377b6..65b4626c669d07a0c3a738ae58d058ea0e8ce83a 100644
--- a/app/views/user_mailer/confirmation_instructions.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.text.erb
@@ -4,7 +4,7 @@
 
 <%= t 'devise.mailer.confirmation_instructions.explanation', host: site_hostname %>
 
-=> <%= confirmation_url(@resource, confirmation_token: @token) %>
+=> <%= 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)) %>
 
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..c5e1f5a289832833a7722588dc886068358f6a37
--- /dev/null
+++ b/app/views/user_mailer/warning.html.haml
@@ -0,0 +1,63 @@
+%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.alert-icon{ align: 'center', cellspacing: 0, cellpadding: 0 }
+                                %tbody
+                                  %tr
+                                    %td
+                                      = image_tag full_pack_url('icon_warning.png'), alt: ''
+
+                              %h1= t "user_mailer.warning.title.#{@warning.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.content-start
+                  .email-row
+                    .col-6
+                      %table.column{ cellspacing: 0, cellpadding: 0 }
+                        %tbody
+                          %tr
+                            %td.column-cell.text-center
+                              - unless @warning.none_action?
+                                %p= t "user_mailer.warning.explanation.#{@warning.action}"
+
+                              - unless @warning.text.blank?
+                                = Formatter.instance.linkify(@warning.text)
+
+%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 about_more_url do
+                                    %span= t 'user_mailer.warning.review_server_policies'
diff --git a/app/views/user_mailer/warning.text.erb b/app/views/user_mailer/warning.text.erb
new file mode 100644
index 0000000000000000000000000000000000000000..b4f2402cb3743e0d2f237f3e23e4bfcb1f3473d9
--- /dev/null
+++ b/app/views/user_mailer/warning.text.erb
@@ -0,0 +1,9 @@
+<%= t "user_mailer.warning.title.#{@warning.action}" %>
+
+===
+
+<% unless @warning.none_action? %>
+<%= t "user_mailer.warning.explanation.#{@warning.action}" %>
+
+<% end %>
+<%= @warning.text %>
diff --git a/app/views/user_mailer/welcome.html.haml b/app/views/user_mailer/welcome.html.haml
index d734da67db2d2cde0cccd507d9f3b5cf092022fc..4a5788bf6e507674e734701bf05232f4decc3b2a 100644
--- a/app/views/user_mailer/welcome.html.haml
+++ b/app/views/user_mailer/welcome.html.haml
@@ -136,8 +136,6 @@
                               %ul
                                 %li
                                   %span= t 'user_mailer.welcome.tip_mobile_webapp'
-                                %li
-                                  %span= t 'user_mailer.welcome.tip_bridge_html', bridge_url: 'https://bridge.joinmastodon.org'
                                 %li
                                   %span= t 'user_mailer.welcome.tip_following'
                                 %li
diff --git a/app/views/user_mailer/welcome.text.erb b/app/views/user_mailer/welcome.text.erb
index 5bd0cab2a5879912e72aba30523429cb22b67786..e310d7ca6f963a1e6e431b847defbe5fdb5d1c0a 100644
--- a/app/views/user_mailer/welcome.text.erb
+++ b/app/views/user_mailer/welcome.text.erb
@@ -2,7 +2,7 @@
 
 ===
 
-<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.username}@#{@instance}" %>)
+<%= t 'user_mailer.welcome.full_handle' %> (<%= "@#{@resource.account.local_username_and_domain}" %>)
 <%= t 'user_mailer.welcome.full_handle_hint', instance: @instance %>
 
 ---
@@ -24,7 +24,6 @@
 <%= t 'user_mailer.welcome.tips' %>
 
 * <%= t 'user_mailer.welcome.tip_mobile_webapp' %>
-* <%= strip_tags(t('user_mailer.welcome.tip_bridge_html')) %> (https://bridge.joinmastodon.org)
 * <%= 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/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby
index 4352a24e910f4176835d5d3dfb53463cd31036ba..968c8c1380c0d70543e60ce8f9348e18a5f1735d 100644
--- a/app/views/well_known/webfinger/show.xml.ruby
+++ b/app/views/well_known/webfinger/show.xml.ruby
@@ -37,7 +37,7 @@ doc << Ox::Element.new('XRD').tap do |xrd|
 
   xrd << Ox::Element.new('Link').tap do |link|
     link['rel']      = 'http://ostatus.org/schema/1.0/subscribe'
-    link['template'] = "#{authorize_follow_url}?acct={uri}"
+    link['template'] = "#{authorize_interaction_url}?acct={uri}"
   end
 end
 
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 323a9f85b91820fa39494cd2f4685ea83ffe95a0..f9c385ea3e20ab77f7a5ef4ebeaed47e4b497d23 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -10,7 +10,10 @@ class ActivityPub::DeliveryWorker
 
   HEADERS = { 'Content-Type' => 'application/activity+json' }.freeze
 
-  def perform(json, source_account_id, inbox_url)
+  def perform(json, source_account_id, inbox_url, options = {})
+    return if DeliveryFailureTracker.unavailable?(inbox_url)
+
+    @options        = options.with_indifferent_access
     @json           = json
     @source_account = Account.find(source_account_id)
     @inbox_url      = inbox_url
@@ -27,7 +30,7 @@ class ActivityPub::DeliveryWorker
 
   def build_request
     request = Request.new(:post, @inbox_url, body: @json)
-    request.on_behalf_of(@source_account, :uri)
+    request.on_behalf_of(@source_account, :uri, sign_with: @options[:sign_with])
     request.add_headers(HEADERS)
   end
 
diff --git a/app/workers/activitypub/distribution_worker.rb b/app/workers/activitypub/distribution_worker.rb
index 14bb933c0066684fa6a53d3e7a10d03fc1d7f7c9..d83f017000896eb9dc0f9320f65a1db544da839d 100644
--- a/app/workers/activitypub/distribution_worker.rb
+++ b/app/workers/activitypub/distribution_worker.rb
@@ -12,8 +12,10 @@ class ActivityPub::DistributionWorker
     return if skip_distribution?
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [signed_payload, @account.id, inbox_url]
+      [payload, @account.id, inbox_url]
     end
+
+    relay! if relayable?
   rescue ActiveRecord::RecordNotFound
     true
   end
@@ -21,22 +23,43 @@ class ActivityPub::DistributionWorker
   private
 
   def skip_distribution?
-    @status.direct_visibility?
+    @status.direct_visibility? || @status.limited_visibility?
+  end
+
+  def relayable?
+    @status.public_visibility?
   end
 
   def inboxes
-    @inboxes ||= @account.followers.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.reply? && @status.thread.account.local? && @status.distributable?
+                   @account.followers.or(@status.thread.account.followers).inboxes
+                 else
+                   @account.followers.inboxes
+                 end
   end
 
   def signed_payload
-    @signed_payload ||= Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
+    Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@account))
   end
 
-  def payload
-    @payload ||= ActiveModelSerializers::SerializableResource.new(
+  def unsigned_payload
+    ActiveModelSerializers::SerializableResource.new(
       @status,
       serializer: ActivityPub::ActivitySerializer,
       adapter: ActivityPub::Adapter
     ).as_json
   end
+
+  def payload
+    @payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
+  end
+
+  def relay!
+    ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
+      [payload, @account.id, inbox_url]
+    end
+  end
 end
diff --git a/app/workers/activitypub/processing_worker.rb b/app/workers/activitypub/processing_worker.rb
index 0e2e0edddba98b56db5ab48e7056e5e147d672ab..a8a3ebf0f56987c433c8ccc67d7bfe45543318e9 100644
--- a/app/workers/activitypub/processing_worker.rb
+++ b/app/workers/activitypub/processing_worker.rb
@@ -5,7 +5,7 @@ class ActivityPub::ProcessingWorker
 
   sidekiq_options backtrace: true
 
-  def perform(account_id, body)
-    ActivityPub::ProcessCollectionService.new.call(body, Account.find(account_id), override_timestamps: true)
+  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)
   end
 end
diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb
index fe99fc05f295691d412417fd555c056f1fcf5384..d8fea6c4e5cafacbca0fc15f10373ce44ab0edb7 100644
--- a/app/workers/activitypub/reply_distribution_worker.rb
+++ b/app/workers/activitypub/reply_distribution_worker.rb
@@ -1,5 +1,8 @@
 # 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
 
@@ -9,10 +12,10 @@ class ActivityPub::ReplyDistributionWorker
     @status  = Status.find(status_id)
     @account = @status.thread&.account
 
-    return if @account.nil? || skip_distribution?
+    return unless @account.present? && @status.distributable?
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [signed_payload, @status.account_id, inbox_url]
+      [payload, @status.account_id, inbox_url]
     end
   rescue ActiveRecord::RecordNotFound
     true
@@ -20,23 +23,23 @@ class ActivityPub::ReplyDistributionWorker
 
   private
 
-  def skip_distribution?
-    @status.private_visibility? || @status.direct_visibility?
-  end
-
   def inboxes
     @inboxes ||= @account.followers.inboxes
   end
 
   def signed_payload
-    @signed_payload ||= Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@status.account))
+    Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@status.account))
   end
 
-  def payload
-    @payload ||= ActiveModelSerializers::SerializableResource.new(
+  def unsigned_payload
+    ActiveModelSerializers::SerializableResource.new(
       @status,
       serializer: ActivityPub::ActivitySerializer,
       adapter: ActivityPub::Adapter
     ).as_json
   end
+
+  def payload
+    @payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
+  end
 end
diff --git a/app/workers/activitypub/update_distribution_worker.rb b/app/workers/activitypub/update_distribution_worker.rb
index f3377dcec5a38e0389a4ac0eeecf7edbd2c8b176..b9e5ff064f2e532ec1eb8b2c79eb6867badfab1d 100644
--- a/app/workers/activitypub/update_distribution_worker.rb
+++ b/app/workers/activitypub/update_distribution_worker.rb
@@ -5,11 +5,16 @@ class ActivityPub::UpdateDistributionWorker
 
   sidekiq_options queue: 'push'
 
-  def perform(account_id)
+  def perform(account_id, options = {})
+    @options = options.with_indifferent_access
     @account = Account.find(account_id)
 
     ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
-      [payload, @account.id, 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
   rescue ActiveRecord::RecordNotFound
     true
@@ -21,11 +26,15 @@ class ActivityPub::UpdateDistributionWorker
     @inboxes ||= @account.followers.inboxes
   end
 
+  def signed_payload
+    @signed_payload ||= Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account, sign_with: @options[:sign_with]))
+  end
+
   def payload
     @payload ||= ActiveModelSerializers::SerializableResource.new(
       @account,
       serializer: ActivityPub::UpdateSerializer,
       adapter: ActivityPub::Adapter
-    ).to_json
+    ).as_json
   end
 end
diff --git a/app/workers/admin/suspension_worker.rb b/app/workers/admin/suspension_worker.rb
index e41465ccca02223ec367ec8dd60868417a20933c..ae8b24d8c3e34823caf1cbfc0ab2b7c083d6cb5c 100644
--- a/app/workers/admin/suspension_worker.rb
+++ b/app/workers/admin/suspension_worker.rb
@@ -6,6 +6,6 @@ class Admin::SuspensionWorker
   sidekiq_options queue: 'pull'
 
   def perform(account_id, remove_user = false)
-    SuspendAccountService.new.call(Account.find(account_id), remove_user: remove_user)
+    SuspendAccountService.new.call(Account.find(account_id), including_user: remove_user)
   end
 end
diff --git a/app/workers/block_worker.rb b/app/workers/block_worker.rb
index 0820490d39f71328d15f862c12d2999f8e5b4741..25f5dd808fdb3590d5c0f2d3000fb5177a7568df 100644
--- a/app/workers/block_worker.rb
+++ b/app/workers/block_worker.rb
@@ -4,6 +4,9 @@ class BlockWorker
   include Sidekiq::Worker
 
   def perform(account_id, target_account_id)
-    AfterBlockService.new.call(Account.find(account_id), Account.find(target_account_id))
+    AfterBlockService.new.call(
+      Account.find(account_id),
+      Account.find(target_account_id)
+    )
   end
 end
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
index d7c126f75bff1c0f2b5a2606218b3aaca10bae8b..aeb221cf688ec958bbceebed1c7cf21d8e32de41 100644
--- a/app/workers/import_worker.rb
+++ b/app/workers/import_worker.rb
@@ -37,6 +37,8 @@ class ImportWorker
   end
 
   def import_rows
-    CSV.new(import_contents).reject(&:blank?)
+    rows = CSV.new(import_contents).reject(&:blank?)
+    rows = rows.take(FollowLimitValidator.limit_for_account(@import.account)) if @import.type == 'following'
+    rows
   end
 end
diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb
index 748270563c532a73f1ebf6bf3d7dff253d1e2ebb..48635e498fffd7e09893fd25ec92d509da241f0e 100644
--- a/app/workers/local_notification_worker.rb
+++ b/app/workers/local_notification_worker.rb
@@ -3,9 +3,16 @@
 class LocalNotificationWorker
   include Sidekiq::Worker
 
-  def perform(mention_id)
-    mention = Mention.find(mention_id)
-    NotifyService.new.call(mention.account, mention)
+  def perform(receiver_account_id, activity_id = nil, activity_class_name = nil)
+    if activity_id.nil? && activity_class_name.nil?
+      activity = Mention.find(receiver_account_id)
+      receiver = activity.account
+    else
+      receiver = Account.find(receiver_account_id)
+      activity = activity_class_name.constantize.find(activity_id)
+    end
+
+    NotifyService.new.call(receiver, activity)
   rescue ActiveRecord::RecordNotFound
     true
   end
diff --git a/app/workers/maintenance/destroy_media_worker.rb b/app/workers/maintenance/destroy_media_worker.rb
index 5f052983be6b42e5432cf474e7dad053fcf1b6fe..cde33d6d79a53df409cdb49c72ff7ea10e3e9351 100644
--- a/app/workers/maintenance/destroy_media_worker.rb
+++ b/app/workers/maintenance/destroy_media_worker.rb
@@ -6,7 +6,7 @@ class Maintenance::DestroyMediaWorker
   sidekiq_options queue: 'pull'
 
   def perform(media_attachment_id)
-    media = MediaAttachment.find(media_attachment_id)
+    media = media_attachment_id.is_a?(MediaAttachment) ? media_attachment_id : MediaAttachment.find(media_attachment_id)
     media.destroy
   rescue ActiveRecord::RecordNotFound
     true
diff --git a/app/workers/maintenance/redownload_account_media_worker.rb b/app/workers/maintenance/redownload_account_media_worker.rb
index fc26815f25e87f6bc2705b8a343a1f2d5b58b333..6afbe6e19cef35261697b5e92be3e1d438e36717 100644
--- a/app/workers/maintenance/redownload_account_media_worker.rb
+++ b/app/workers/maintenance/redownload_account_media_worker.rb
@@ -6,7 +6,7 @@ class Maintenance::RedownloadAccountMediaWorker
   sidekiq_options queue: 'pull', retry: false
 
   def perform(account_id)
-    account = Account.find(account_id)
+    account = account_id.is_a?(Account) ? account_id : Account.find(account_id)
     account.reset_avatar!
     account.reset_header!
     account.save
diff --git a/app/workers/maintenance/uncache_media_worker.rb b/app/workers/maintenance/uncache_media_worker.rb
index f6a51a1b8b274f75d42835a5858cbe732b48a08c..4bc62ef755c30e712420a494fd71a82fcf623b09 100644
--- a/app/workers/maintenance/uncache_media_worker.rb
+++ b/app/workers/maintenance/uncache_media_worker.rb
@@ -6,9 +6,9 @@ class Maintenance::UncacheMediaWorker
   sidekiq_options queue: 'pull'
 
   def perform(media_attachment_id)
-    media = MediaAttachment.find(media_attachment_id)
+    media = media_attachment_id.is_a?(MediaAttachment) ? media_attachment_id : MediaAttachment.find(media_attachment_id)
 
-    return unless media.file.exists?
+    return if media.file.blank?
 
     media.file.destroy
     media.save
diff --git a/app/workers/mute_worker.rb b/app/workers/mute_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7bf0923a5dbfb32b07dea86b665b2389279dcde3
--- /dev/null
+++ b/app/workers/mute_worker.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class MuteWorker
+  include Sidekiq::Worker
+
+  def perform(account_id, target_account_id)
+    FeedManager.instance.clear_from_timeline(
+      Account.find(account_id),
+      Account.find(target_account_id)
+    )
+  end
+end
diff --git a/app/workers/publish_scheduled_status_worker.rb b/app/workers/publish_scheduled_status_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..850610c4e3cdb932dc16dd150a9a58d22039d44f
--- /dev/null
+++ b/app/workers/publish_scheduled_status_worker.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class PublishScheduledStatusWorker
+  include Sidekiq::Worker
+
+  sidekiq_options unique: :until_executed
+
+  def perform(scheduled_status_id)
+    scheduled_status = ScheduledStatus.find(scheduled_status_id)
+    scheduled_status.destroy!
+
+    PostStatusService.new.call(
+      scheduled_status.account,
+      options_with_objects(scheduled_status.params.with_indifferent_access)
+    )
+  rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid
+    true
+  end
+
+  def options_with_objects(options)
+    options.tap do |options_hash|
+      options_hash[:application] = Doorkeeper::Application.find(options_hash.delete(:application_id)) if options[:application_id]
+      options_hash[:thread]      = Status.find(options_hash.delete(:in_reply_to_id)) if options_hash[:in_reply_to_id]
+    end
+  end
+end
diff --git a/app/workers/push_conversation_worker.rb b/app/workers/push_conversation_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..16f5382152c2b29946450c23bf396a56c3c48f11
--- /dev/null
+++ b/app/workers/push_conversation_worker.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class PushConversationWorker
+  include Sidekiq::Worker
+
+  def perform(conversation_account_id)
+    conversation = AccountConversation.find(conversation_account_id)
+    message      = InlineRenderer.render(conversation, conversation.account, :conversation)
+    timeline_id  = "timeline:direct:#{conversation.account_id}"
+
+    Redis.current.publish(timeline_id, Oj.dump(event: :conversation, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i))
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/refollow_worker.rb b/app/workers/refollow_worker.rb
index 66bcd27c3e40c4816c262cb763fd19c710de744e..12f2bf671b83f9f9520f226e08ae169aa70013f9 100644
--- a/app/workers/refollow_worker.rb
+++ b/app/workers/refollow_worker.rb
@@ -9,7 +9,7 @@ class RefollowWorker
     target_account = Account.find(target_account_id)
     return unless target_account.protocol == :activitypub
 
-    target_account.followers.where(domain: nil).find_each do |follower|
+    target_account.followers.where(domain: nil).reorder(nil).find_each do |follower|
       # Locally unfollow remote account
       follower.unfollow!(target_account)
 
diff --git a/app/workers/scheduler/backup_cleanup_scheduler.rb b/app/workers/scheduler/backup_cleanup_scheduler.rb
index 5ab16c057da02defa504529ecf8a962fba09f29a..d436606999f1f5c5eac4bebceecdd5b510622871 100644
--- a/app/workers/scheduler/backup_cleanup_scheduler.rb
+++ b/app/workers/scheduler/backup_cleanup_scheduler.rb
@@ -3,8 +3,10 @@
 class Scheduler::BackupCleanupScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
-    old_backups.find_each(&:destroy!)
+    old_backups.reorder(nil).find_each(&:destroy!)
   end
 
   private
diff --git a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
index bab4ae8869b4dad834725e507750daadbc437581..e5e5f6bc42fcb035a3453442180d3529be3875fa 100644
--- a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
+++ b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
@@ -3,6 +3,8 @@
 class Scheduler::DoorkeeperCleanupScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
     Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
     Doorkeeper::AccessGrant.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
diff --git a/app/workers/scheduler/email_scheduler.rb b/app/workers/scheduler/email_scheduler.rb
index 36866061b235b9ec4667f6f1e252dbb55e256be3..1eeeee412d7b12249f624090fe4b67e02bbb8b8c 100644
--- a/app/workers/scheduler/email_scheduler.rb
+++ b/app/workers/scheduler/email_scheduler.rb
@@ -3,8 +3,13 @@
 class Scheduler::EmailScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
+  FREQUENCY      = 7.days.freeze
+  SIGN_IN_OFFSET = 1.day.freeze
+
   def perform
-    eligible_users.find_each do |user|
+    eligible_users.reorder(nil).find_each do |user|
       next unless user.allows_digest_emails?
       DigestMailerWorker.perform_async(user.id)
     end
@@ -13,11 +18,8 @@ class Scheduler::EmailScheduler
   private
 
   def eligible_users
-    User.confirmed
-        .joins(:account)
-        .where(accounts: { silenced: false, suspended: false })
-        .where(disabled: false)
-        .where('current_sign_in_at < ?', 20.days.ago)
-        .where('last_emailed_at IS NULL OR last_emailed_at < ?', 20.days.ago)
+    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
index 42cf14128f2eec34b75dfcf734715a166d42f034..cd22734180572c8bd6151f00df95d6220af415de 100644
--- a/app/workers/scheduler/feed_cleanup_scheduler.rb
+++ b/app/workers/scheduler/feed_cleanup_scheduler.rb
@@ -3,6 +3,8 @@
 class Scheduler::FeedCleanupScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
     clean_home_feeds!
     clean_list_feeds!
diff --git a/app/workers/scheduler/ip_cleanup_scheduler.rb b/app/workers/scheduler/ip_cleanup_scheduler.rb
index 613a5e336d5e9079875bc26fabf3bc8ec2c4d7cb..42620332e7ee8cad0e42ae6622c0d96d1d59159c 100644
--- a/app/workers/scheduler/ip_cleanup_scheduler.rb
+++ b/app/workers/scheduler/ip_cleanup_scheduler.rb
@@ -5,6 +5,8 @@ class Scheduler::IpCleanupScheduler
 
   RETENTION_PERIOD = 1.year
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
     time_ago = RETENTION_PERIOD.ago
     SessionActivation.where('updated_at < ?', time_ago).destroy_all
diff --git a/app/workers/scheduler/media_cleanup_scheduler.rb b/app/workers/scheduler/media_cleanup_scheduler.rb
index c35686fcb908b209d7de4905e25b537af1106b61..fb01aa70c9957237ebdd5fdfb02039e04f9fbc81 100644
--- a/app/workers/scheduler/media_cleanup_scheduler.rb
+++ b/app/workers/scheduler/media_cleanup_scheduler.rb
@@ -3,6 +3,8 @@
 class Scheduler::MediaCleanupScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
     unattached_media.find_each(&:destroy)
   end
diff --git a/app/workers/scheduler/pghero_scheduler.rb b/app/workers/scheduler/pghero_scheduler.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4453bf2cd0018b504d5dac83f0d0baf523172530
--- /dev/null
+++ b/app/workers/scheduler/pghero_scheduler.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Scheduler::PgheroScheduler
+  include Sidekiq::Worker
+
+  sidekiq_options unique: :until_executed, retry: 0
+
+  def perform
+    PgHero.capture_space_stats
+  end
+end
diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1772a246bc92dfd779f5d9168bd3efc4ba7ca806
--- /dev/null
+++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Scheduler::ScheduledStatusesScheduler
+  include Sidekiq::Worker
+
+  sidekiq_options unique: :until_executed, retry: 0
+
+  def perform
+    due_statuses.find_each do |scheduled_status|
+      PublishScheduledStatusWorker.perform_at(scheduled_status.scheduled_at, scheduled_status.id)
+    end
+  end
+
+  private
+
+  def due_statuses
+    ScheduledStatus.where('scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET)
+  end
+end
diff --git a/app/workers/scheduler/subscriptions_cleanup_scheduler.rb b/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
index af2ae3120145127ffea83b012fd6cecd610adce3..5fba120f6ab339ccfede1b8b232a762b84f9f815 100644
--- a/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
+++ b/app/workers/scheduler/subscriptions_cleanup_scheduler.rb
@@ -3,6 +3,8 @@
 class Scheduler::SubscriptionsCleanupScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
     Subscription.expired.in_batches.delete_all
   end
diff --git a/app/workers/scheduler/subscriptions_scheduler.rb b/app/workers/scheduler/subscriptions_scheduler.rb
index dc16e85c228d0b28da129f72e9f90570b7c763ac..d5873bccb0ea2bfe9d392e827305a6e3a23b46b0 100644
--- a/app/workers/scheduler/subscriptions_scheduler.rb
+++ b/app/workers/scheduler/subscriptions_scheduler.rb
@@ -3,6 +3,8 @@
 class Scheduler::SubscriptionsScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
     Pubsubhubbub::SubscribeWorker.push_bulk(expiring_accounts.pluck(:id))
   end
diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
index 245536ceac91d4bf6942b9e2905bf4fe9467f738..881b911be75c2b3967426432546e75852a4148ea 100644
--- a/app/workers/scheduler/user_cleanup_scheduler.rb
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -3,8 +3,10 @@
 class Scheduler::UserCleanupScheduler
   include Sidekiq::Worker
 
+  sidekiq_options unique: :until_executed, retry: 0
+
   def perform
-    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).find_in_batches do |batch|
+    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch|
       Account.where(id: batch.map(&:account_id)).delete_all
       User.where(id: batch.map(&:id)).delete_all
     end
diff --git a/app/workers/unfollow_follow_worker.rb b/app/workers/unfollow_follow_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..50d3bf034adfb9acd9713465f921a7b6ffc245ef
--- /dev/null
+++ b/app/workers/unfollow_follow_worker.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class UnfollowFollowWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull'
+
+  def perform(follower_account_id, old_target_account_id, new_target_account_id)
+    follower_account   = Account.find(follower_account_id)
+    old_target_account = Account.find(old_target_account_id)
+    new_target_account = Account.find(new_target_account_id)
+
+    FollowService.new.call(follower_account, new_target_account)
+    UnfollowService.new.call(follower_account, old_target_account)
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
+    true
+  end
+end
diff --git a/app/workers/verify_account_links_worker.rb b/app/workers/verify_account_links_worker.rb
new file mode 100644
index 0000000000000000000000000000000000000000..901498583e86dc19ed2f4881453051a183bda11f
--- /dev/null
+++ b/app/workers/verify_account_links_worker.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class VerifyAccountLinksWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'pull', retry: false, unique: :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)
+    end
+
+    account.save! if account.changed?
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb
index 4a40e5c8bd98f49f1e7e8a281cad23fa9831fb00..8e8a359735674ea753a6b0fed60b5ab71f90cf9a 100644
--- a/app/workers/web/push_notification_worker.rb
+++ b/app/workers/web/push_notification_worker.rb
@@ -10,8 +10,8 @@ class Web::PushNotificationWorker
     notification = Notification.find(notification_id)
 
     subscription.push(notification) unless notification.activity.nil?
-  rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
-    subscription.destroy!
+  rescue Webpush::ResponseError => e
+    subscription.destroy! if (400..499).cover?(e.response.code.to_i)
   rescue ActiveRecord::RecordNotFound
     true
   end
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..a506ad8ce6e27031c5f021fd6e771991fc323b16
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,65 @@
+module.exports = (api) => {
+  const env = api.env();
+
+  const envOptions = {
+    debug: false,
+    loose: true,
+    modules: false,
+  };
+
+  const config = {
+    presets: [
+      '@babel/react',
+      ['@babel/env', envOptions],
+    ],
+    plugins: [
+      '@babel/syntax-dynamic-import',
+      ['@babel/proposal-object-rest-spread', { useBuiltIns: true }],
+      ['@babel/proposal-decorators', { legacy: true }],
+      '@babel/proposal-class-properties',
+      ['react-intl', { messagesDir: './build/messages' }],
+      'preval',
+    ],
+  };
+
+  switch (env) {
+  case 'production':
+    envOptions.debug = false;
+    config.plugins.push(...[
+      'lodash',
+      [
+        'transform-react-remove-prop-types',
+        {
+          mode: 'remove',
+          removeImport: true,
+          additionalLibraries: [
+            'react-immutable-proptypes',
+          ],
+        },
+      ],
+      '@babel/transform-react-inline-elements',
+      [
+        '@babel/transform-runtime',
+        {
+          helpers: true,
+          regenerator: false,
+          useESModules: true,
+        },
+      ],
+    ]);
+    break;
+  case 'development':
+    envOptions.debug = true;
+    config.plugins.push(...[
+      '@babel/transform-react-jsx-source',
+      '@babel/transform-react-jsx-self',
+    ]);
+    break;
+  case 'test':
+    envOptions.modules = 'commonjs';
+    break;
+  }
+
+  return config;
+};
+
diff --git a/bin/tootctl b/bin/tootctl
new file mode 100755
index 0000000000000000000000000000000000000000..f26e1c7edcc43b90a93a45f97d22fbacaadd7d54
--- /dev/null
+++ b/bin/tootctl
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require_relative '../lib/cli'
+Mastodon::CLI.start(ARGV)
diff --git a/bin/webpack b/bin/webpack
index 0869ad277ef40ad05e67b7836532a469c7639fc8..465832722c9810c7b0dce67fdc1dacd6d8add213 100755
--- a/bin/webpack
+++ b/bin/webpack
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
index 251f65e8e3bb8f0dee4d2f14d3cd016f7421377f..faa69f078005c888e213e79159787b7a5e1015d1 100755
--- a/bin/webpack-dev-server
+++ b/bin/webpack-dev-server
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
-ENV["NODE_ENV"]  ||= ENV["NODE_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
 
 require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
diff --git a/config/application.rb b/config/application.rb
index b100d7fccc18504afedd06d797552beacaf4eba1..b4a39b5c8a6014b6245eadb4207c1c083613fded 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -38,9 +38,12 @@ module Mastodon
     config.i18n.available_locales = [
       :en,
       :ar,
+      :ast,
       :bg,
       :ca,
       :co,
+      :cs,
+      :cy,
       :da,
       :de,
       :el,
@@ -59,6 +62,7 @@ module Mastodon
       :io,
       :it,
       :ja,
+      :ka,
       :ko,
       :nl,
       :no,
@@ -66,12 +70,14 @@ module Mastodon
       :pl,
       :pt,
       :'pt-BR',
+      :ro,
       :ru,
       :sk,
       :sl,
       :sr,
       :'sr-Latn',
       :sv,
+      :ta,
       :te,
       :th,
       :tr,
@@ -82,6 +88,7 @@ module Mastodon
     ]
 
     config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym
+
     unless config.i18n.available_locales.include?(config.i18n.default_locale)
       config.i18n.default_locale = :en
     end
diff --git a/config/boot.rb b/config/boot.rb
index 0a3cd4ebee6728c0bd0519c4bd9abd609ff3f1b1..f3e36203aad90ff0b9874d6def3c6fa842941e0c 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -4,11 +4,11 @@ require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap' # Speed up boot time by caching expensive operations.
 
 Bootsnap.setup(
-  cache_dir:            'tmp/cache',
-  development_mode:     ENV['RAILS_ENV'] == 'development',
+  cache_dir:            File.expand_path('../tmp/cache', __dir__),
+  development_mode:     ENV.fetch('RAILS_ENV', 'development') == 'development',
   load_path_cache:      true,
   autoload_paths_cache: true,
-  disable_trace:        true,
+  disable_trace:        false,
   compile_cache_iseq:   false,
   compile_cache_yaml:   false
 )
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index e8956639c30aa66bed47e0bb1d891a3954567ff8..58fb243da4589610d1da8f126ea2ad65b228ae78 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -1,5 +1,25 @@
 {
   "ignored_warnings": [
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "04dbbc249b989db2e0119bbb0f59c9818e12889d2b97c529cdc0b1526002ba4b",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/report.rb",
+      "line": 90,
+      "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": "Cross-Site Scripting",
       "warning_code": 4,
@@ -7,8 +27,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 147,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 167,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).inbox_url, Account.find(params[:id]).inbox_url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -19,6 +39,26 @@
       "confidence": "Weak",
       "note": ""
     },
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "19df3740b8d02a9fe0eb52c939b4b87d3a2a591162a6adfa8d64e9c26aeebe6d",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/status.rb",
+      "line": 84,
+      "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,
+      "location": {
+        "type": "method",
+        "class": "Status",
+        "method": null
+      },
+      "user_input": "id",
+      "confidence": "Weak",
+      "note": ""
+    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 4,
@@ -26,8 +66,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 153,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 173,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).shared_inbox_url, Account.find(params[:id]).shared_inbox_url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -45,8 +85,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 57,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 75,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).url, Account.find(params[:id]).url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -58,22 +98,23 @@
       "note": ""
     },
     {
-      "warning_type": "Dynamic Render Path",
-      "warning_code": 15,
-      "fingerprint": "44d3f14e05d8fbb5b23e13ac02f15aa38b2a2f0f03b9ba76bab7f98e155a4a4e",
-      "check_name": "Render",
-      "message": "Render path contains parameter value",
-      "file": "app/views/stream_entries/embed.html.haml",
-      "line": 3,
-      "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(action => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :centered => true })",
-      "render_path": [{"type":"controller","class":"StatusesController","method":"embed","line":45,"file":"app/controllers/statuses_controller.rb"}],
+      "warning_type": "Mass Assignment",
+      "warning_code": 105,
+      "fingerprint": "28d81cc22580ef76e912b077b245f353499aa27b3826476667224c00227af2a9",
+      "check_name": "PermitAttributes",
+      "message": "Potentially dangerous key allowed for mass assignment",
+      "file": "app/controllers/admin/reports_controller.rb",
+      "line": 80,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params.permit(:account_id, :resolved, :target_account_id)",
+      "render_path": null,
       "location": {
-        "type": "template",
-        "template": "stream_entries/embed"
+        "type": "method",
+        "class": "Admin::ReportsController",
+        "method": "filter_params"
       },
-      "user_input": "params[:id]",
-      "confidence": "Weak",
+      "user_input": ":account_id",
+      "confidence": "High",
       "note": ""
     },
     {
@@ -83,8 +124,8 @@
       "check_name": "Render",
       "message": "Render path contains parameter value",
       "file": "app/views/admin/action_logs/index.html.haml",
-      "line": 5,
-      "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "line": 4,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
       "code": "render(action => Admin::ActionLog.page(params[:page]), {})",
       "render_path": [{"type":"controller","class":"Admin::ActionLogsController","method":"index","line":7,"file":"app/controllers/admin/action_logs_controller.rb"}],
       "location": {
@@ -95,6 +136,26 @@
       "confidence": "Weak",
       "note": ""
     },
+    {
+      "warning_type": "Redirect",
+      "warning_code": 18,
+      "fingerprint": "5fad11cd67f905fab9b1d5739d01384a1748ebe78c5af5ac31518201925265a7",
+      "check_name": "Redirect",
+      "message": "Possible unprotected redirect",
+      "file": "app/controllers/remote_interaction_controller.rb",
+      "line": 20,
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
+      "code": "redirect_to(RemoteFollow.new(resource_params).interact_address_for(Status.find(params[:id])))",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "RemoteInteractionController",
+        "method": "create"
+      },
+      "user_input": "RemoteFollow.new(resource_params).interact_address_for(Status.find(params[:id]))",
+      "confidence": "High",
+      "note": ""
+    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 4,
@@ -102,8 +163,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 156,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 176,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).followers_url, Account.find(params[:id]).followers_url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -114,6 +175,45 @@
       "confidence": "Weak",
       "note": ""
     },
+    {
+      "warning_type": "Dynamic Render Path",
+      "warning_code": 15,
+      "fingerprint": "67afc0d5f7775fa5bd91d1912e1b5505aeedef61876347546fa20f92fd6915e6",
+      "check_name": "Render",
+      "message": "Render path contains parameter value",
+      "file": "app/views/stream_entries/embed.html.haml",
+      "line": 3,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "code": "render(action => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :centered => true, :autoplay => ActiveModel::Type::Boolean.new.cast(params[:autoplay]) })",
+      "render_path": [{"type":"controller","class":"StatusesController","method":"embed","line":59,"file":"app/controllers/statuses_controller.rb"}],
+      "location": {
+        "type": "template",
+        "template": "stream_entries/embed"
+      },
+      "user_input": "params[:id]",
+      "confidence": "Weak",
+      "note": ""
+    },
+    {
+      "warning_type": "SQL Injection",
+      "warning_code": 0,
+      "fingerprint": "6f075c1484908e3ec9bed21ab7cf3c7866be8da3881485d1c82e13093aefcbd7",
+      "check_name": "SQL",
+      "message": "Possible SQL injection",
+      "file": "app/models/status.rb",
+      "line": 89,
+      "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",
+      "confidence": "Weak",
+      "note": ""
+    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 4,
@@ -121,8 +221,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 130,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 149,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).salmon_url, Account.find(params[:id]).salmon_url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -141,7 +241,7 @@
       "message": "Render path contains parameter value",
       "file": "app/views/admin/custom_emojis/index.html.haml",
       "line": 45,
-      "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
       "code": "render(action => filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]), {})",
       "render_path": [{"type":"controller","class":"Admin::CustomEmojisController","method":"index","line":11,"file":"app/controllers/admin/custom_emojis_controller.rb"}],
       "location": {
@@ -160,7 +260,7 @@
       "message": "Possible SQL injection",
       "file": "lib/mastodon/snowflake.rb",
       "line": 87,
-      "link": "http://brakemanscanner.org/docs/warning_types/sql_injection/",
+      "link": "https://brakemanscanner.org/docs/warning_types/sql_injection/",
       "code": "connection.execute(\"        CREATE OR REPLACE FUNCTION timestamp_id(table_name text)\\n        RETURNS bigint AS\\n        $$\\n          DECLARE\\n            time_part bigint;\\n            sequence_base bigint;\\n            tail bigint;\\n          BEGIN\\n            time_part := (\\n              -- Get the time in milliseconds\\n              ((date_part('epoch', now()) * 1000))::bigint\\n              -- And shift it over two bytes\\n              << 16);\\n\\n            sequence_base := (\\n              'x' ||\\n              -- Take the first two bytes (four hex characters)\\n              substr(\\n                -- Of the MD5 hash of the data we documented\\n                md5(table_name ||\\n                  '#{SecureRandom.hex(16)}' ||\\n                  time_part::text\\n                ),\\n                1, 4\\n              )\\n            -- And turn it into a bigint\\n            )::bit(16)::bigint;\\n\\n            -- Finally, add our sequence number to our base, and chop\\n            -- it to the last two bytes\\n            tail := (\\n              (sequence_base + nextval(table_name || '_id_seq'))\\n              & 65535);\\n\\n            -- Return the time part and the sequence part. OR appears\\n            -- faster here than addition, but they're equivalent:\\n            -- time_part has no trailing two bytes, and tail is only\\n            -- the last two bytes.\\n            RETURN time_part | tail;\\n          END\\n        $$ LANGUAGE plpgsql VOLATILE;\\n\")",
       "render_path": null,
       "location": {
@@ -180,7 +280,7 @@
       "message": "Render path contains parameter value",
       "file": "app/views/admin/accounts/index.html.haml",
       "line": 67,
-      "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
       "code": "render(action => filtered_accounts.page(params[:page]), {})",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"index","line":12,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -191,25 +291,6 @@
       "confidence": "Weak",
       "note": ""
     },
-    {
-      "warning_type": "Cross-Site Request Forgery",
-      "warning_code": 7,
-      "fingerprint": "ab491f72606337a348482d006eb67a3b1616685fd48644d5ac909bbcd62a5000",
-      "check_name": "ForgerySetting",
-      "message": "'protect_from_forgery' should be called in WellKnown::HostMetaController",
-      "file": "app/controllers/well_known/host_meta_controller.rb",
-      "line": 4,
-      "link": "http://brakemanscanner.org/docs/warning_types/cross-site_request_forgery/",
-      "code": null,
-      "render_path": null,
-      "location": {
-        "type": "controller",
-        "controller": "WellKnown::HostMetaController"
-      },
-      "user_input": null,
-      "confidence": "High",
-      "note": ""
-    },
     {
       "warning_type": "Redirect",
       "warning_code": 18,
@@ -218,7 +299,7 @@
       "message": "Possible unprotected redirect",
       "file": "app/controllers/media_controller.rb",
       "line": 10,
-      "link": "http://brakemanscanner.org/docs/warning_types/redirect/",
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
       "code": "redirect_to(MediaAttachment.attached.find_by!(:shortcode => ((params[:id] or params[:medium_id]))).file.url(:original))",
       "render_path": null,
       "location": {
@@ -237,8 +318,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 119,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 138,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).remote_url, Account.find(params[:id]).remote_url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -256,8 +337,8 @@
       "check_name": "Redirect",
       "message": "Possible unprotected redirect",
       "file": "app/controllers/remote_follow_controller.rb",
-      "line": 18,
-      "link": "http://brakemanscanner.org/docs/warning_types/redirect/",
+      "line": 19,
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
       "code": "redirect_to(RemoteFollow.new(resource_params).subscribe_address_for(Account.find_local!(params[:account_username])))",
       "render_path": null,
       "location": {
@@ -269,44 +350,6 @@
       "confidence": "High",
       "note": ""
     },
-    {
-      "warning_type": "Dynamic Render Path",
-      "warning_code": 15,
-      "fingerprint": "c5d6945d63264af106d49367228d206aa2f176699ecdce2b98fac101bc6a96cf",
-      "check_name": "Render",
-      "message": "Render path contains parameter value",
-      "file": "app/views/admin/reports/index.html.haml",
-      "line": 25,
-      "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(action => filtered_reports.page(params[:page]), {})",
-      "render_path": [{"type":"controller","class":"Admin::ReportsController","method":"index","line":10,"file":"app/controllers/admin/reports_controller.rb"}],
-      "location": {
-        "type": "template",
-        "template": "admin/reports/index"
-      },
-      "user_input": "params[:page]",
-      "confidence": "Weak",
-      "note": ""
-    },
-    {
-      "warning_type": "Cross-Site Request Forgery",
-      "warning_code": 7,
-      "fingerprint": "d4278f04e807ec58a23925f8ab31fad5e84692f2fb9f2f57e7931aff05d57cf8",
-      "check_name": "ForgerySetting",
-      "message": "'protect_from_forgery' should be called in WellKnown::WebfingerController",
-      "file": "app/controllers/well_known/webfinger_controller.rb",
-      "line": 4,
-      "link": "http://brakemanscanner.org/docs/warning_types/cross-site_request_forgery/",
-      "code": null,
-      "render_path": null,
-      "location": {
-        "type": "controller",
-        "controller": "WellKnown::WebfingerController"
-      },
-      "user_input": null,
-      "confidence": "High",
-      "note": ""
-    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 4,
@@ -314,8 +357,8 @@
       "check_name": "LinkToHref",
       "message": "Potentially unsafe model attribute in link_to href",
       "file": "app/views/admin/accounts/show.html.haml",
-      "line": 150,
-      "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
+      "line": 170,
+      "link": "https://brakemanscanner.org/docs/warning_types/link_to_href",
       "code": "link_to(Account.find(params[:id]).outbox_url, Account.find(params[:id]).outbox_url)",
       "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
       "location": {
@@ -326,6 +369,26 @@
       "confidence": "Weak",
       "note": ""
     },
+    {
+      "warning_type": "Mass Assignment",
+      "warning_code": 105,
+      "fingerprint": "e867661b2c9812bc8b75a5df12b28e2a53ab97015de0638b4e732fe442561b28",
+      "check_name": "PermitAttributes",
+      "message": "Potentially dangerous key allowed for mass assignment",
+      "file": "app/controllers/api/v1/reports_controller.rb",
+      "line": 37,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params.permit(:account_id, :comment, :forward, :status_ids => ([]))",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Api::V1::ReportsController",
+        "method": "report_params"
+      },
+      "user_input": ":account_id",
+      "confidence": "High",
+      "note": ""
+    },
     {
       "warning_type": "Dynamic Render Path",
       "warning_code": 15,
@@ -333,10 +396,10 @@
       "check_name": "Render",
       "message": "Render path contains parameter value",
       "file": "app/views/stream_entries/show.html.haml",
-      "line": 24,
-      "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
+      "line": 23,
+      "link": "https://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
       "code": "render(partial => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { :locals => ({ Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :include_threads => true }) })",
-      "render_path": [{"type":"controller","class":"StatusesController","method":"show","line":22,"file":"app/controllers/statuses_controller.rb"}],
+      "render_path": [{"type":"controller","class":"StatusesController","method":"show","line":30,"file":"app/controllers/statuses_controller.rb"}],
       "location": {
         "type": "template",
         "template": "stream_entries/show"
@@ -346,6 +409,6 @@
       "note": ""
     }
   ],
-  "updated": "2018-02-16 06:42:53 +0100",
-  "brakeman_version": "4.0.1"
+  "updated": "2018-10-20 23:24:45 +1300",
+  "brakeman_version": "4.2.1"
 }
diff --git a/config/deploy.rb b/config/deploy.rb
index e0cd60f5438273a72576a12fe76dd371a450ecfa..f0db50788c26b6c602dce3d2a907c3941898bb73 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lock '3.10.2'
+lock '3.11.0'
 
 set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')
diff --git a/config/environments/development.rb b/config/environments/development.rb
index b6478f16e40c1db43e5173a4f195bb2f0977f5bd..0791b82ab6ea1393efcb3faff300d998c2ee7fa1 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -87,7 +87,7 @@ Rails.application.configure do
   config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
 end
 
-ActiveRecordQueryTrace.enabled = ENV.fetch('QUERY_TRACE_ENABLED') { false }
+ActiveRecordQueryTrace.enabled = ENV['QUERY_TRACE_ENABLED'] == 'true'
 
 module PrivateAddressCheck
   def self.private_address?(*)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 30239671c08c0a1a205f0310d41d84b7347de906..70baa6ad1a7b7d993f8a08989487e8bda723510f 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -13,7 +13,7 @@ Rails.application.configure do
   # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-  config.action_controller.asset_host      = ENV['CDN_HOST'] if ENV.key?('CDN_HOST')
+  config.action_controller.asset_host      = ENV['CDN_HOST'] if ENV['CDN_HOST'].present?
 
   # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
   # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
@@ -42,7 +42,7 @@ 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) } unless ENV['TRUSTED_PROXY_IP'].blank?
+  config.action_dispatch.trusted_proxies = ENV['TRUSTED_PROXY_IP'].split.map { |item| IPAddr.new(item) } if ENV['TRUSTED_PROXY_IP'].present?
 
   # Use the lowest log level to ensure availability of diagnostic information
   # when problems arise.
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 1c1891561fd8072e6617d876e0b049744fac785b..a35cadcfa30e608228686a07d95022a3ebaffeda 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -23,7 +23,7 @@ Rails.application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # The default store, file_store is shared by processses parallely executed
+  # The default store, file_store is shared by processes parallelly executed
   # and should not be used.
   config.cache_store = :memory_store
 
diff --git a/config/initializers/0_post_deployment_migrations.rb b/config/initializers/0_post_deployment_migrations.rb
new file mode 100644
index 0000000000000000000000000000000000000000..61121ccd70a188dc8a260ba2d79b1eb058481c32
--- /dev/null
+++ b/config/initializers/0_post_deployment_migrations.rb
@@ -0,0 +1,15 @@
+# Post deployment migrations are included by default. This file must be loaded
+# before other initializers as Rails may otherwise memoize a list of migrations
+# excluding the post deployment migrations.
+
+unless ENV['SKIP_POST_DEPLOYMENT_MIGRATIONS']
+  Rails.application.config.paths['db'].each do |db_path|
+    path = Rails.root.join(db_path, 'post_migrate').to_s
+
+    Rails.application.config.paths['db/migrate'] << path
+
+    # Rails memoizes migrations at certain points where it won't read the above
+    # path just yet. As such we must also update the following list of paths.
+    ActiveRecord::Migrator.migrations_paths << path
+  end
+end
diff --git a/config/initializers/ostatus.rb b/config/initializers/1_hosts.rb
similarity index 93%
rename from config/initializers/ostatus.rb
rename to config/initializers/1_hosts.rb
index 5773b72903905800483205112166ed638a4c7446..757f1f73554568a447356d6adc918e7677bfc317 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/1_hosts.rb
@@ -7,7 +7,7 @@ web_host = ENV.fetch('WEB_DOMAIN') { host }
 alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' }
 
 Rails.application.configure do
-  https    = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
+  https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
 
   config.x.local_domain = host
   config.x.web_domain   = web_host
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index 37f2c0d45053eed901fa43171c95e803449a4a03..59cfbba173c33606540ae0e21b3bd7263d867ef1 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -2,17 +2,31 @@
 # For further information see the following documentation
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
 
-# Rails.application.config.content_security_policy do |p|
-#   p.default_src :self, :https
-#   p.font_src    :self, :https, :data
-#   p.img_src     :self, :https, :data
-#   p.object_src  :none
-#   p.script_src  :self, :https
-#   p.style_src   :self, :https, :unsafe_inline
-#
-#   # Specify URI for violation reports
-#   # p.report_uri "/csp-violation-report-endpoint"
-# end
+base_host     = Rails.configuration.x.web_domain
+assets_host   = Rails.configuration.action_controller.asset_host
+assets_host ||= "http#{Rails.configuration.x.use_https ? 's' : ''}://#{base_host}"
+
+Rails.application.config.content_security_policy do |p|
+  p.base_uri        :none
+  p.default_src     :none
+  p.frame_ancestors :none
+  p.font_src        :self, assets_host
+  p.img_src         :self, :https, :data, :blob, assets_host
+  p.style_src       :self, :unsafe_inline, assets_host
+  p.media_src       :self, :https, :data, assets_host
+  p.frame_src       :self, :https
+  p.manifest_src    :self, assets_host
+
+  if Rails.env.development?
+    webpacker_urls = %w(ws http).map { |protocol| "#{protocol}#{Webpacker.dev_server.https? ? 's' : ''}://#{Webpacker.dev_server.host_with_port}" }
+
+    p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url, *webpacker_urls
+    p.script_src  :self, :unsafe_inline, :unsafe_eval, assets_host
+  else
+    p.connect_src :self, :blob, assets_host, Rails.configuration.x.streaming_api_base_url
+    p.script_src  :self, assets_host
+  end
+end
 
 # Report CSP violations to a specified URI
 # For further information see the following documentation:
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 681a7498f969b702f4a888c434d0fdc5bce7ac0b..55f8c9c9193c8387770f1e62fdc2b4c1810b8710 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -9,10 +9,18 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
   allow do
     origins '*'
 
+    resource '/.well-known/*',
+      headers: :any,
+      methods: [:get],
+      credentials: false
     resource '/@:username',
       headers: :any,
       methods: [:get],
       credentials: false
+    resource '/users/:username',
+      headers: :any,
+      methods: [:get],
+      credentials: false
     resource '/api/*',
       headers: :any,
       methods: [:post, :put, :delete, :get, :patch, :options],
diff --git a/config/initializers/delivery_job.rb b/config/initializers/delivery_job.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cc29272729dde267958d7b84c8828c4a4f2b0360
--- /dev/null
+++ b/config/initializers/delivery_job.rb
@@ -0,0 +1,3 @@
+ActionMailer::DeliveryJob.class_eval do
+  discard_on ActiveJob::DeserializationError
+end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index e0d263f16f6cc153099a083bf2036c3db70d5774..cd9bacf68033e609abf0e662b9958b8b00555499 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -9,6 +9,7 @@ Warden::Manager.after_set_user except: :fetch do |user, warden|
     value: session_id,
     expires: 1.year.from_now,
     httponly: true,
+    secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
   }
 end
 
@@ -18,6 +19,7 @@ Warden::Manager.after_fetch do |user, warden|
       value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'],
       expires: 1.year.from_now,
       httponly: true,
+      secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'),
     }
   else
     warden.logout
@@ -57,6 +59,8 @@ module Devise
   @@ldap_password = nil
   mattr_accessor :ldap_tls_no_verify
   @@ldap_tls_no_verify = false
+  mattr_accessor :ldap_search_filter
+  @@ldap_search_filter = nil
 
   class Strategies::PamAuthenticatable
     def valid?
@@ -360,5 +364,6 @@ Devise.setup do |config|
     config.ldap_password       = ENV.fetch('LDAP_PASSWORD')
     config.ldap_uid            = ENV.fetch('LDAP_UID', 'cn')
     config.ldap_tls_no_verify  = ENV['LDAP_TLS_NO_VERIFY'] == 'true'
+    config.ldap_search_filter  = ENV.fetch('LDAP_SEARCH_FILTER', '%{uid}=%{email}')
   end
 end
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index fe2490b326ababd31221d4b4a1662d8c3a274572..367eead6a40ebd27044459a116bd12d795694c8c 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -58,6 +58,7 @@ Doorkeeper.configure do
   optional_scopes :write,
                   :'write:accounts',
                   :'write:blocks',
+                  :'write:conversations',
                   :'write:favourites',
                   :'write:filters',
                   :'write:follows',
@@ -76,7 +77,6 @@ Doorkeeper.configure do
                   :'read:lists',
                   :'read:mutes',
                   :'read:notifications',
-                  :'read:reports',
                   :'read:search',
                   :'read:statuses',
                   :follow,
diff --git a/config/initializers/ffmpeg.rb b/config/initializers/ffmpeg.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4c0bf779d88992cfbde11f160057340651c1de8c
--- /dev/null
+++ b/config/initializers/ffmpeg.rb
@@ -0,0 +1,3 @@
+if ENV['FFMPEG_BINARY'].present?
+    FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
+end
diff --git a/config/initializers/http_client_proxy.rb b/config/initializers/http_client_proxy.rb
index e607aff3c406addd93413f8954d95defc4c52cb6..9d7b16e69c87a671b53cf57440e0b5cfcaceeadd 100644
--- a/config/initializers/http_client_proxy.rb
+++ b/config/initializers/http_client_proxy.rb
@@ -6,7 +6,7 @@ Rails.application.configure do
     raise "No proxy host" unless proxy.host
 
     host = proxy.host
-    host = host[1...-1] if host[0] == '[' #for IPv6 address
+    host = host[1...-1] if host[0] == '[' # for IPv6 address
     config.x.http_client_proxy[:proxy] = { proxy_address: host, proxy_port: proxy.port, proxy_username: proxy.user, proxy_password: proxy.password }.compact
   end
 
diff --git a/config/initializers/json_ld.rb b/config/initializers/json_ld.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d5575d135464f18fddbed4cd8353b3d59044c1d1
--- /dev/null
+++ b/config/initializers/json_ld.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative '../../lib/json_ld/security'
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 85fb812506066f461eb36c09a84c4767895128c6..254e751d42ea93f4d3f98a9638ae25cbeb22b66f 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -3,7 +3,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 
 Devise.setup do |config|
-  #Â Devise omniauth strategies
+  # Devise omniauth strategies
   options = {}
   options[:redirect_at_sign_in] = ENV['OAUTH_REDIRECT_AT_SIGN_IN'] == 'true'
 
@@ -38,7 +38,7 @@ Devise.setup do |config|
     saml_options = options
     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']
+    saml_options[:idp_sso_target_url] = ENV['SAML_IDP_SSO_TARGET_URL'] if ENV['SAML_IDP_SSO_TARGET_URL']
     saml_options[:idp_sso_target_url_runtime_params] = ENV['SAML_IDP_SSO_TARGET_PARAMS'] if ENV['SAML_IDP_SSO_TARGET_PARAMS'] # FIXME: Should be parsable Hash
     saml_options[:idp_cert] = ENV['SAML_IDP_CERT'] if ENV['SAML_IDP_CERT']
     saml_options[:idp_cert_fingerprint] = ENV['SAML_IDP_CERT_FINGERPRINT'] if ENV['SAML_IDP_CERT_FINGERPRINT']
@@ -62,5 +62,4 @@ Devise.setup do |config|
     saml_options[:uid_attribute] = ENV['SAML_UID_ATTRIBUTE'] if ENV['SAML_UID_ATTRIBUTE']
     config.omniauth :saml, saml_options
   end
-
 end
diff --git a/config/initializers/open_uri_redirection.rb b/config/initializers/open_uri_redirection.rb
index e24fdecabc0e457f4a75d33d6e0e2deefacd3506..e9de85bdc54e4efedd04bb0b74c645644756ec53 100644
--- a/config/initializers/open_uri_redirection.rb
+++ b/config/initializers/open_uri_redirection.rb
@@ -1,8 +1,8 @@
 require 'open-uri'
 
 module OpenURI
-  def OpenURI.redirectable?(uri1, uri2) # :nodoc:
-    uri1.scheme.downcase == uri2.scheme.downcase ||
+  def self.redirectable?(uri1, uri2) # :nodoc:
+    uri1.scheme.casecmp(uri2.scheme).zero? ||
       (/\A(?:http|https|ftp)\z/i =~ uri1.scheme && /\A(?:http|https|ftp)\z/i =~ uri2.scheme)
   end
 end
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index c134bc5b8feb00e29a1044d9423a8edfd4d25c23..ce4185e024dbf92e7c02357e0dd37276a948ed3d 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -25,7 +25,7 @@ if ENV['S3_ENABLED'] == 'true'
     s3_protocol: s3_protocol,
     s3_host_name: s3_hostname,
     s3_headers: {
-      'Cache-Control' => 'max-age=315576000',
+      'Cache-Control' => 'public, max-age=315576000, immutable',
     },
     s3_permissions: ENV.fetch('S3_PERMISSION') { 'public-read' },
     s3_region: s3_region,
@@ -36,6 +36,9 @@ if ENV['S3_ENABLED'] == 'true'
     },
     s3_options: {
       signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
+      http_open_timeout: 5,
+      http_read_timeout: 5,
+      http_idle_timeout: 5,
     }
   )
 
@@ -47,10 +50,10 @@ if ENV['S3_ENABLED'] == 'true'
     Paperclip::Attachment.default_options[:url] = ':s3_path_url'
   end
 
-  if ENV.has_key?('S3_CLOUDFRONT_HOST')
+  if ENV.has_key?('S3_ALIAS_HOST') || ENV.has_key?('S3_CLOUDFRONT_HOST')
     Paperclip::Attachment.default_options.merge!(
       url: ':s3_alias_url',
-      s3_host_alias: ENV['S3_CLOUDFRONT_HOST']
+      s3_host_alias: ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST']
     )
   end
 elsif ENV['SWIFT_ENABLED'] == 'true'
@@ -74,14 +77,10 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
     fog_public: true
   )
 else
-  require 'fog/local'
-
   Paperclip::Attachment.default_options.merge!(
-    fog_credentials: {
-      provider: 'Local',
-      local_root: ENV.fetch('PAPERCLIP_ROOT_PATH') { Rails.root.join('public', 'system') },
-    },
-    fog_directory: '',
-    fog_host: ENV.fetch('PAPERCLIP_ROOT_URL') { '/system' }
+    storage: :filesystem,
+    use_timestamp: true,
+    path: (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + '/:class/:attachment/:id_partition/:style/:filename',
+    url: (ENV['PAPERCLIP_ROOT_URL'] || '/system') + '/:class/:attachment/:id_partition/:style/:filename',
   )
 end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 0ca0a7e7fd526679ac3f769df7f9634e0e99f20b..35302e37b1be76c7d35291fc31342a98af09b97f 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -42,7 +42,7 @@ class Rack::Attack
   # (blocklist & throttles are skipped)
   Rack::Attack.safelist('allow from localhost') do |req|
     # Requests are allowed if the return value is truthy
-    '127.0.0.1' == req.ip || '::1' == req.ip
+    req.ip == '127.0.0.1' || req.ip == '::1'
   end
 
   throttle('throttle_authenticated_api', limit: 300, period: 5.minutes) do |req|
@@ -57,6 +57,10 @@ class Rack::Attack
     req.authenticated_user_id if req.post? && req.path.start_with?('/api/v1/media')
   end
 
+  throttle('throttle_api_sign_up', limit: 5, period: 30.minutes) do |req|
+    req.ip if req.post? && req.path == '/api/v1/accounts'
+  end
+
   throttle('protected_paths', limit: 25, period: 5.minutes) do |req|
     req.ip if req.post? && req.path =~ PROTECTED_PATHS_REGEX
   end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 05c804100564f491e9f45bd6a98e747b0ec6a7b6..7f8a40d7ba7684e8589d9b5c2a1c51653f44220f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -19,4 +19,4 @@ Sidekiq.configure_client do |config|
   config.redis = redis_params
 end
 
-Sidekiq::Logging.logger.level = ::Logger::const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
+Sidekiq::Logging.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 5983918cd420ff6cd0e410ce805c0daf1e3dad1a..386ede654c62d26395a6dd1dde9e2fd3f2f4381f 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -1,4 +1,15 @@
 # Use this setup block to configure all options available in SimpleForm.
+
+module AppendComponent
+  def append(wrapper_options = nil)
+    @append ||= begin
+      options[:append].to_s.html_safe if options[:append].present?
+    end
+  end
+end
+
+SimpleForm.include_component(AppendComponent)
+
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a
   # complete input. You can remove any component from the
@@ -52,6 +63,22 @@ SimpleForm.setup do |config|
 
   config.wrappers :with_label, class: [:input, :with_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     b.use :html5
+
+    b.wrapper tag: :div, class: :label_input do |ba|
+      ba.use :label
+
+      ba.wrapper tag: :div, class: :label_input__wrapper do |bb|
+        bb.use :input
+        bb.optional :append, wrap_with: { tag: :div, class: 'label_input__append' }
+      end
+    end
+
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+  end
+
+  config.wrappers :with_floating_label, class: [:input, :with_floating_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    b.use :html5
     b.use :label_input, wrap_with: { tag: :div, class: :label_input }
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
     b.use :error, wrap_with: { tag: :span, class: :error }
@@ -111,12 +138,12 @@ SimpleForm.setup do |config|
   # config.item_wrapper_class = nil
 
   # How the label text should be generated altogether with the required text.
-  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+  config.label_text = lambda { |label, required, explicit_label| "#{label} #{required}" }
 
   # You can define the class to use on all labels. Default is nil.
   # config.label_class = nil
 
-  # You can define the default class to be used on forms. Can be overriden
+  # You can define the default class to be used on forms. Can be overridden
   # with `html: { :class }`. Defaulting to none.
   # config.default_form_class = nil
 
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
index 45702ac94de671b14563ce1de24ee2646832a66f..ce83fd9de2d484aec51dbcc223081d427559a3de 100644
--- a/config/initializers/statsd.rb
+++ b/config/initializers/statsd.rb
@@ -9,7 +9,7 @@ if ENV['STATSD_ADDR'].present?
   ::NSA.inform_statsd(statsd) do |informant|
     informant.collect(:action_controller, :web)
     informant.collect(:active_record, :db)
-    informant.collect(:cache, :cache)
+    informant.collect(:active_support_cache, :cache)
     informant.collect(:sidekiq, :sidekiq)
   end
 end
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb
index c227f92d3ead98b247e8c1c47e60b43e10c0316e..0e8f5bfeb47353d1c151e8917f03650e000067b6 100644
--- a/config/initializers/twitter_regex.rb
+++ b/config/initializers/twitter_regex.rb
@@ -1,6 +1,5 @@
 module Twitter
   class Regex
-
     REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}\(\)\?]/iou
     REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*';:=\,\.\$%\[\]~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou
     REGEXEN[:valid_url_balanced_parens] = /
@@ -28,7 +27,7 @@ module Twitter
     )/iox
     REGEXEN[:valid_url] = %r{
       (                                                                                     #   $1 total match
-        (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceeding chracter
+        (#{REGEXEN[:valid_url_preceding_chars]})                                            #   $2 Preceding character
         (                                                                                   #   $3 URL
           ((https?|dat|dweb|ipfs|ipns|ssb|gopher):\/\/)?                                    #   $4 Protocol (optional)
           (#{REGEXEN[:valid_domain]})                                                       #   $5 Domain(s)
diff --git a/config/initializers/vapid.rb b/config/initializers/vapid.rb
index 618f5a3fbbd1f056d510af1933baf051bc4faf35..7dd870c8b7d9afe3824752f167774f1ed16229cf 100644
--- a/config/initializers/vapid.rb
+++ b/config/initializers/vapid.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 Rails.application.configure do
-
   # 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.
diff --git a/config/locales/activerecord.ast.yml b/config/locales/activerecord.ast.yml
new file mode 100644
index 0000000000000000000000000000000000000000..de95817c1fb9c1e83a059f38e355d5ada5bba2dc
--- /dev/null
+++ b/config/locales/activerecord.ast.yml
@@ -0,0 +1,9 @@
+---
+ast:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: namÃ¡i lletres, nÃºmberos y guiones baxos
diff --git a/config/locales/activerecord.cs.yml b/config/locales/activerecord.cs.yml
index 006d3e6005beeffa15bb6b6f870f8c2d9fcebd74..838dee15f89339d1c1b2dd11b644c08758717a9f 100644
--- a/config/locales/activerecord.cs.yml
+++ b/config/locales/activerecord.cs.yml
@@ -10,4 +10,4 @@ cs:
         status:
           attributes:
             reblog:
-              taken: stavu jiÅ¾ existuje
+              taken: pÅ™ÃspÄ›vku jiÅ¾ existuje
diff --git a/config/locales/activerecord.cy.yml b/config/locales/activerecord.cy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..26553012472a326d374bbb34085d653f1f8c41f6
--- /dev/null
+++ b/config/locales/activerecord.cy.yml
@@ -0,0 +1,13 @@
+---
+cy:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: dim ond llythrennau, rhifau a tanlinellau
+        status:
+          attributes:
+            reblog:
+              taken: o'r statws yn bodoli'n barod
diff --git a/config/locales/activerecord.ka.yml b/config/locales/activerecord.ka.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cdd4f9c4c68826f9f0a5e10c6bd76e01e74a4290
--- /dev/null
+++ b/config/locales/activerecord.ka.yml
@@ -0,0 +1,13 @@
+---
+ka:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: áƒ›áƒ®áƒáƒšáƒáƒ“ áƒáƒ¡áƒáƒ”áƒ‘áƒ˜, áƒªáƒ˜áƒ¤áƒ áƒ”áƒ‘áƒ˜ áƒ“áƒ "áƒ¥áƒ•áƒ”áƒ“áƒ-áƒ¢áƒ˜áƒ áƒ”"
+        status:
+          attributes:
+            reblog:
+              taken: áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜áƒ¡ áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡
diff --git a/config/locales/activerecord.ru.yml b/config/locales/activerecord.ru.yml
index 1a7ac997841e6b0f34c13213537f72f345b40cd9..2a2d62a7ef57e04954a3b42a64a847bbf65d6984 100644
--- a/config/locales/activerecord.ru.yml
+++ b/config/locales/activerecord.ru.yml
@@ -6,7 +6,7 @@ ru:
         account:
           attributes:
             username:
-              invalid: Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð±ÑƒÐºÐ²Ñ‹, Ñ†Ð¸Ñ„Ñ€Ñ‹ Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð» Ð¿Ð¾Ð´ÐµÑ€ÐºÐ¸Ð²Ð°Ð½Ð¸Ñ
+              invalid: Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð±ÑƒÐºÐ²Ñ‹, Ñ†Ð¸Ñ„Ñ€Ñ‹ Ð¸ ÑÐ¸Ð¼Ð²Ð¾Ð» Ð¿Ð¾Ð´Ñ‡Ñ‘Ñ€ÐºÐ¸Ð²Ð°Ð½Ð¸Ñ
         status:
           attributes:
             reblog:
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index df47ad290aa256c47aa90faa65ff0c7b5d0f8cfa..9d31e48407d7feb24efd29368db8c76f6323e26f 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1,25 +1,25 @@
 ---
 ar:
   about:
-    about_hashtag_html: Ù‡Ø°Ù‡ Ù‡ÙŠ Ø§Ù„Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ø¹Ø§Ù…Ø© Ù…Ø¹ Ø§Ù„ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø¯Ù„Ø§Ù„ÙŠØ©  <strong> 1#%{hashtag}</strong>. ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„ØªÙØ§Ø¹Ù„ Ù…Ø¹Ù‡Ù… Ø¥Ø°Ø§ ÙƒØ§Ù† Ù„Ø¯ÙŠÙƒ ØØ³Ø§Ø¨ ÙÙŠ Ø£ÙŠ Ù…ÙƒØ§Ù† Ø¹Ù„Ù‰ Ø§Ù„Ø¥Ù†ØªØ±Ù†Øª Ø§Ù„Ù…ØªØØ¯.
-    about_mastodon_html: Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø´Ø¨ÙƒØ© Ø¥Ø¬ØªÙ…Ø§Ø¹ÙŠØ© <em>ØØ±Ø© Ùˆ Ù…ÙØªÙˆØØ© Ø§Ù„Ù…ØµØ¯Ø±</em>. Ù‡Ùˆ Ø¨Ø¯ÙŠÙ„ <em>Ù„Ø§Ù…Ø±ÙƒØ²ÙŠ</em> Ù„Ù…Ù†ØµØ§Øª ØªØ¬Ø§Ø±ÙŠØ© ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ù…Ù† ØªØ¬Ù†Ø¨ Ø§ØØªÙƒØ§Ø± Ø´Ø±ÙƒØ© ÙˆØ§ØØ¯Ø© Ù„Ù„Ø¥ØªØµØ§Ù„Ø§Øª Ø§Ù„Ø®Ø§ØµØ© Ø¨Ùƒ. ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø®ØªÙŠØ§Ø± Ø£ÙŠ Ø®Ø§Ø¯Ù… ØªØ«Ù‚ ÙÙŠÙ‡. Ø£ÙŠÙ‡Ù…Ø§ ØªØ®ØªØ§Ø±ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„ØªÙØ§Ø¹Ù„ Ù…Ø¹ Ø£ÙŠ Ø´Ø®Øµ Ø¢Ø®Ø± Ø¹Ù„Ù‰ Ø§Ù„Ø´Ø¨ÙƒØ©. ÙŠÙ…ÙƒÙ† Ù„Ø£ÙŠ Ø´Ø®Øµ ØªÙ†ØµÙŠØ¨ Ùˆ ØªØ´ØºÙŠÙ„ Ø®Ø§Ø¯Ù… Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø®Ø§Øµ Ø¨Ù‡ ÙˆØ§Ù„Ù…Ø´Ø§Ø±ÙƒØ© ÙÙŠ <em>Ø§Ù„Ø´Ø¨ÙƒØ§Øª Ø§Ù„Ø§Ø¬ØªÙ…Ø§Ø¹ÙŠØ©</em> Ø¨ÙƒÙ„ Ø´ÙØ§ÙÙŠØ©.
+    about_hashtag_html: Ù‡Ø°Ù‡ ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ù…ØªØ§ØØ© Ù„Ù„Ø¬Ù…Ù‡ÙˆØ± ØªØØªÙˆÙŠ Ø¹Ù„Ù‰ Ø§Ù„ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø¯Ù„Ø§Ù„ÙŠØ© <strong>#%{hashtag}</strong>. ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„ØªÙØ§Ø¹Ù„ Ù…Ø¹Ù‡Ø§ Ø¥Ù† ÙƒØ§Ù† Ù„Ø¯ÙŠÙƒ ØØ³Ø§Ø¨ ÙÙŠ Ø£ÙŠ Ù…ÙƒØ§Ù† Ø¹Ù„Ù‰ Ø§Ù„ÙØ¯ÙŠÙØ±Ø³.
+    about_mastodon_html: Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø´Ø¨ÙƒØ© Ø¥Ø¬ØªÙ…Ø§Ø¹ÙŠØ© Ù…Ø¨Ù†ÙŠØ© Ø¹Ù„Ù‰ Ø£Ø³ÙØ³ Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„Ø§Øª Ø¨Ø±Ù…Ø¬ÙŠØ§Øª Ø§Ù„ÙˆÙŠØ¨ Ø§Ù„ØØ±Ø© Ùˆ Ù…ÙØªÙˆØØ© Ø§Ù„Ù…ØµØ¯Ø±. Ùˆ Ù‡Ùˆ Ù„Ø§Ù…Ø±ÙƒØ²ÙŠ ØªÙ…Ø§Ù…Ù‹Ø§ ÙƒØ§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ.
     about_this: Ø¹Ù† Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ù‡Ø°Ø§
-    administered_by: 'ÙŠØ¯ÙŠØ±Ù‡ :'
-    closed_registrations: Ø§Ù„ØªØ³Ø¬ÙŠÙ„Ø§Øª ÙÙŠ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ù‡Ø°Ø§ Ù…ÙØºÙ„Ù‚Ø© ØØ§Ù„ÙŠÙ‹Ø§.
+    administered_by: 'ÙŠÙØ¯ÙŠØ±Ù‡ :'
+    api: ÙˆØ§Ø¬Ù‡Ø© Ø¨Ø±Ù…Ø¬Ø© Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª
+    apps: ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø§Ù„Ø£Ø¬Ù‡Ø²Ø© Ø§Ù„Ù…ØÙ…ÙˆÙ„Ø©
+    closed_registrations: Ø§Ù„ØªØ³Ø¬ÙŠÙ„Ø§Øª ÙÙŠ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ù‡Ø°Ø§ Ù…ÙØºÙ„Ù‚Ø© ØØ§Ù„ÙŠÙ‹Ø§. ØºÙŠØ± Ø£Ù†Ù‡ Ø¨Ø§Ù…ÙƒØ§Ù†Ùƒ Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø®Ø§Ø¯Ù… Ø¢Ø®Ø± Ù„Ø¥Ù†Ø´Ø§Ø¡ ØØ³Ø§Ø¨Ùƒ Ùˆ Ù…ÙÙ† Ø«Ù… Ø§Ù„Ù†ÙØ§Ø° Ø¥Ù„Ù‰ Ù†ÙØ³ Ø§Ù„Ø´Ø¨ÙƒØ© Ù…ÙÙ† Ù‡Ù†Ø§Ùƒ.
     contact: Ù„Ù„ØªÙˆØ§ØµÙ„ Ù…Ø¹Ù†Ø§
-    contact_missing: ØºÙŠØ± Ù…ØØ¯Ø¯
+    contact_missing: Ù„Ù… ÙŠØªÙ… ØªØ¹ÙŠÙŠÙ†Ù‡
     contact_unavailable: ØºÙŠØ± Ù…ØªÙˆÙØ±
-    description_headline: Ù…Ø§ Ù‡Ùˆ %{domain}?
-    domain_count_after: Ø®ÙˆØ§Ø¯Ù… Ø£Ø®Ø±Ù‰
-    domain_count_before: Ù…ØªØµÙ„ Ø¨Ù€
+    documentation: Ø§Ù„Ø¯Ù„ÙŠÙ„
     extended_description_html: |
       <h3>Ù…ÙƒØ§Ù† Ø¬ÙŠØ¯ Ù„Ù„Ù‚ÙˆØ§Ø¹Ø¯</h3>
-      <p>Ù„Ø§ ÙŠÙˆØ¬Ø¯ ØªÙØµÙŠÙ„ Ø·ÙˆÙŠÙ„ ØØªÙ‰ Ø§Ù„Ø¢Ù†.</p>
+      <p>Ù„Ù… ÙŠØªÙ… Ø¨Ø¹Ø¯ Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„ÙˆØµÙ Ø§Ù„Ø·ÙˆÙŠÙ„.</p>
     features:
       humane_approach_body: ØªØ¹Ù„Ù‘ÙÙ…Ù‹Ø§ Ù…ÙÙ† ÙØ´Ù„ Ø§Ù„Ø´Ø¨ÙƒØ§Øª Ø§Ù„Ø£Ø®Ø±Ù‰ØŒ ØºØ§ÙŠØ© Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ù‡ÙŠ Ø¨Ù„ÙˆØº Ø§Ù„Ø®ÙŠØ§Ø±Ø§Øª Ø§Ù„Ø£Ø®Ù„Ø§Ù‚ÙŠØ© ÙÙŠ Ø§Ù„ØªØµÙ…ÙŠÙ… Ù„Ù…ÙØØ§Ø±ÙŽØ¨Ø© Ø¥Ø³Ø§Ø¦Ø© Ø¥Ø³ØªØ¹Ù…Ø§Ù„ Ø´Ø¨ÙƒØ§Øª Ø§Ù„ØªÙˆØ§ØµÙ„ Ø§Ù„Ø¥Ø¬ØªÙ…Ø§Ø¹ÙŠØ©.
-      humane_approach_title: Ø£Ø³Ù„ÙˆØ¨ ÙŠØ¹ÙŠØ¯ Ø§Ù„Ø¥Ø¹ØªØ¨Ø§Ø± Ù„Ù„Ø¥Ù†Ø³Ø§Ù†
+      humane_approach_title: Ø£Ø³Ù„ÙˆØ¨ ÙŠÙØ¹ÙŠØ¯ Ø§Ù„Ø¥Ø¹ØªØ¨Ø§Ø± Ù„Ù„ÙÙŽØ±Ø¯
       not_a_product_body: Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ù„ÙŠØ³ Ø´Ø¨ÙƒØ© ØªØ¬Ø§Ø±ÙŠØ©. Ù„Ø§ ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ Ø¥Ø¹Ù„Ø§Ù†Ø§Øª Ùˆ Ù„Ø§ ÙŠÙ‚ÙˆÙ… Ø¨Ø§Ø³ØªØºÙ„Ø§Ù„ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ùˆ Ù„Ø§ Ù‡Ùˆ Ø¨ÙØ¨ÙØ³ØªØ§Ù† Ù…ÙØ³ÙŠÙ‘ÙŽØ¬. Ù„Ø§ ØªØÙƒÙ… ÙÙŠÙ‡ ÙˆÙ„ÙŠØ³ Ù„Ù‡ Ø£ÙŠØ© Ù‡ÙŠØ¦Ø©Ù Ù…Ø±ÙƒØ²ÙŠØ©Ù.
-      not_a_product_title: Ø¥Ù†Ùƒ Ø¥Ù†Ø³Ø§Ù† Ùˆ Ù„Ø³Øª Ø³Ù„Ø¹Ø©
+      not_a_product_title: Ø¥Ù†Ùƒ ÙØ±Ø¯ Ùˆ Ù„Ø³Øª Ø³Ù„Ø¹Ø©
       real_conversation_body: ÙŠÙÙ…ÙƒÙ†ÙƒÙ… Ø§Ù„ØªØ¹Ø¨ÙŠØ± Ø¹Ù† Ø¢Ø±Ø§Ø¦ÙƒÙ… Ø¨ÙƒÙ„ ØØ±ÙŠØ© Ø¨ÙØ¶Ù„ 65535 ØØ±Ù Ùˆ Ø§Ù†ØªÙ‚Ø§Ø¡ Ø¯Ù‚ÙŠÙ‚ Ù„Ù„Ù…ØØªÙˆÙ‰ Ùˆ Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø¨ÙØ¶Ù„ Ø£Ø¯ÙˆØ§Øª Ø§Ù„ØªØØ°ÙŠØ± Ø§Ù„ØªÙŠ Ù‡ÙŠ Ø¨ÙŠÙ† Ø£ÙŠØ¯ÙŠÙƒÙ….
       real_conversation_title: Ù…Ø¨Ù†ÙŠ Ù„ØªØÙ‚ÙŠÙ‚ ØªÙˆØ§ØµÙ„ ØÙ‚ÙŠÙ‚ÙŠ
       within_reach_body: Ø¥Ø¨Ù‚ÙˆØ§ Ø¹Ù„Ù‰ Ø§ØªØµØ§Ù„ Ø¯Ø§Ø¦Ù… Ø¨Ø£ØµØ¯Ù‚Ø§Ø¦ÙƒÙ… ØÙŠØ«Ù…Ø§ ÙƒØ§Ù†ÙˆØ§ Ø¹Ø¨Ø± Ø¹Ø¯Ø© ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ù„Ù†Ø¸Ø§Ù… Ø¢ÙŠ Ø£ÙˆØ§Ø³ Ùˆ Ø£Ù†Ø¯Ø±ÙˆÙŠØ¯ Ùˆ Ø¹Ø¯Ø© Ù…Ù†ØµØ§Øª Ø£Ø®Ø±Ù‰ Ø¨ÙØ¶Ù„ ÙˆØ§Ø¬Ù‡Ø© Ø¨Ø±Ù…Ø¬ÙŠØ© Ù„Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ùˆ Ø¨ÙŠØ¦Ø© ØµØ¯ÙŠÙ‚Ø© Ù„Ù„ØªØ·ÙˆÙŠØ±.
@@ -28,25 +28,57 @@ ar:
     hosted_on: Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ù…ÙØ³ØªØ¶Ø§Ù Ø¹Ù„Ù‰ %{domain}
     learn_more: ØªØ¹Ù„Ù… Ø§Ù„Ù…Ø²ÙŠØ¯
     other_instances: Ø®ÙˆØ§Ø¯Ù… Ø£Ø®Ø±Ù‰
+    privacy_policy: Ø³ÙŠØ§Ø³Ø© Ø§Ù„Ø®ØµÙˆØµÙŠØ©
     source_code: Ø§Ù„Ø´ÙØ±Ø© Ø§Ù„Ù…ØµØ¯Ø±ÙŠØ©
-    status_count_after: Ù…Ù†Ø´ÙˆØ±Ø§
+    status_count_after:
+      few: Ù…Ù†Ø´ÙˆØ±Ø§Øª
+      many: Ù…Ù†Ø´ÙˆØ±Ø§Øª
+      one: Ù…Ù†Ø´ÙˆØ±
+      other: Ù…Ù†Ø´ÙˆØ±Ø§Øª
+      two: Ù…Ù†Ø´ÙˆØ±Ø§Øª
+      zero: Ù…Ù†Ø´ÙˆØ±Ø§Øª
     status_count_before: Ù†Ø´Ø±ÙˆØ§
-    user_count_after: Ù…Ø³ØªØ®Ø¯Ù…
+    terms: Ø´Ø±ÙˆØ· Ø§Ù„Ø®Ø¯Ù…Ø©
+    user_count_after:
+      few: Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
+      many: Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
+      one: Ù…Ø³ØªØ®Ø¯Ù…
+      other: Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
+      two: Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
+      zero: Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
     user_count_before: ÙŠØ³ØªØ¶ÙŠÙ
     what_is_mastodon: Ù…Ø§ Ù‡Ùˆ Ù…Ø§Ø³ØªØ¯ÙˆÙ† ØŸ
   accounts:
+    choices_html: 'ØªÙˆØµÙŠØ§Øª %{name} :'
     follow: Ø¥ØªØ¨Ø¹
-    followers: Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
-    following: ÙŠØªØ§Ø¨Ø¹ÙˆÙ†
+    followers:
+      few: Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
+      many: Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
+      one: Ù…ØªØ§Ø¨ÙØ¹
+      other: Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
+      two: Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
+      zero: Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
+    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}
-    posts: Ù…Ù†Ø´ÙˆØ±Ø§Øª
+    pin_errors:
+      following: ÙŠØ¬Ø¨ Ø£Ù† ØªÙƒÙˆÙ† Ù…ÙÙ† Ù…ØªØ§Ø¨Ø¹ÙŠ ØØ³Ø§Ø¨ Ø§Ù„Ø´Ø®Øµ Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯ Ø¥Ø¨Ø±Ø§Ø²Ù‡
+    posts:
+      few: ØªØ¨ÙˆÙŠÙ‚Ø§Øª
+      many: ØªØ¨ÙˆÙŠÙ‚Ø§Øª
+      one: ØªØ¨ÙˆÙŠÙ‚
+      other: ØªØ¨ÙˆÙŠÙ‚Ø§Øª
+      two: ØªØ¨ÙˆÙŠÙ‚Ø§Øª
+      zero: ØªØ¨ÙˆÙŠÙ‚Ø§Øª
+    posts_tab_heading: ØªØ¨ÙˆÙŠÙ‚Ø§Øª
     posts_with_replies: Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ùˆ Ø§Ù„Ø±Ø¯ÙˆØ¯
-    remote_follow: Ø¥ØªØ¨Ø¹ Ø¹Ù† Ø¨Ø¹Ø¯
     reserved_username: Ø¥Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù…ØØ¬ÙˆØ²
     roles:
       admin: Ø§Ù„Ù…Ø¯ÙŠØ±
@@ -54,6 +86,9 @@ ar:
       moderator: Ù…ÙØ´Ø±ÙÙ
     unfollow: Ø¥Ù„ØºØ§Ø¡ Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©
   admin:
+    account_actions:
+      action: ØªÙ†ÙÙŠØ° Ø§Ù„Ø§Ø¬Ø±Ø§Ø¡
+      title: Ø§ØªØ®Ø§Ø° Ø¥Ø¬Ø±Ø§Ø¡ Ø¥Ø´Ø±Ø§Ù Ø¹Ù„Ù‰ %{acct}
     account_moderation_notes:
       create: Ø¥ØªØ±Ùƒ Ù…Ù„Ø§ØØ¸Ø©
       created_msg: ØªÙ… Ø¥Ù†Ø´Ø§Ø¡ Ù…Ù„Ø§ØØ¸Ø© Ø§Ù„Ø¥Ø´Ø±Ø§Ù Ø¨Ù†Ø¬Ø§Ø !
@@ -73,9 +108,10 @@ ar:
       confirm: ØªØ£ÙƒÙŠØ¯
       confirmed: Ù…Ø¤ÙƒÙ‘ÙŽØ¯
       confirming: Ø§Ù„ØªØ£ÙƒØ¯
+      deleted: ØªÙ…Øª Ø¥Ø²Ø§Ù„ØªÙ‡
       demote: Ø¥Ù†Ø²Ø§Ù„ Ø§Ù„Ø±ÙØªØ¨Ø© Ø§Ù„ÙˆØ¸ÙŠÙÙŠØ©
       disable: ØªØ¹Ø·ÙŠÙ„
-      disable_two_factor_authentication: ØªØ¹Ø·ÙŠÙ„ 2FA
+      disable_two_factor_authentication: ØªØ¹Ø·ÙŠÙ„ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ†
       disabled: Ù…Ø¹Ø·Ù‘ÙŽÙ„
       display_name: Ø¹Ø±Ø¶ Ø§Ù„Ø¥Ø³Ù…
       domain: Ø§Ù„Ù†Ø·Ø§Ù‚
@@ -88,8 +124,11 @@ ar:
       followers: Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙˆÙ†
       followers_url: Ø¹Ù†ÙˆØ§Ù† Ø±Ø§Ø¨Ø· Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ†
       follows: ÙŠØªØ§Ø¨Ø¹
+      header: Ø§Ù„Ø±Ø£Ø³ÙŠØ©
       inbox_url: Ø±Ø§Ø¨Ø· ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„ÙˆØ§Ø±Ø¯
+      invited_by: ØªÙ…Øª Ø¯Ø¹ÙˆØªÙ‡ Ù…ÙÙ† Ø·Ø±Ù
       ip: Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¥ÙŠØ¨ÙŠ
+      joined: Ø§Ù†Ø¶Ù…
       location:
         all: Ø§Ù„ÙƒÙ„
         local: Ø§Ù„Ù…ØÙ„ÙŠ
@@ -97,8 +136,9 @@ ar:
         title: Ø§Ù„Ù…ÙˆÙ‚Ø¹
       login_status: ÙˆØ¶Ø¹ Ø§Ù„Ø¯Ø®ÙˆÙ„
       media_attachments: Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„Ù…Ø±ÙÙ‚Ø©
-      memorialize: ØªØÙˆÙ„ Ø¥Ù„Ù‰ ØµÙØØ© Ù„Ù„Ø°Ø§ÙƒØ±Ø©
+      memorialize: ØªØÙˆÙŠÙ„ Ø§Ù„ØØ³Ø§Ø¨ Ø¥Ù„Ù‰ ØµÙØØ© Ø°ÙƒØ±Ù‰
       moderation:
+        active: Ù†Ø´ÙØ·
         all: Ø§Ù„ÙƒÙ„
         silenced: ØªÙ… ÙƒØªÙ…Ù‡
         suspended: Ù…ÙØ¬ÙŽÙ…Ù‘ÙŽØ¯
@@ -106,28 +146,26 @@ ar:
       moderation_notes: Ù…Ù„Ø§ØØ¸Ø§Øª Ø§Ù„Ø¥Ø´Ø±Ø§Ù
       most_recent_activity: Ø¢Ø®Ø± Ù†Ø´Ø§Ø· ØØ¯ÙŠØ«
       most_recent_ip: Ø£ØØ¯Ø« Ø¹Ù†ÙˆØ§Ù† Ø¥ÙŠØ¨ÙŠ
+      no_limits_imposed: Ù…ÙÙ† Ø¯ÙˆÙ† ØØ¯ÙˆØ¯ Ù…Ø´Ø±ÙˆØ·Ø©
       not_subscribed: ØºÙŠØ± Ù…Ø´ØªØ±Ùƒ
-      order:
-        alphabetic: Ø£Ø¨Ø¬Ø¯ÙŠÙ‹Ø§
-        most_recent: Ø§Ù„Ø£ØØ¯Ø«
-        title: Ø§Ù„ØªØ±ØªÙŠØ¨
       outbox_url: Ø±Ø§Ø¨Ø· ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„ØµØ§Ø¯Ø±
-      perform_full_suspension: ØªØ¹Ø·ÙŠÙ„ Ø§Ù„ØØ³Ø§Ø¨ Ø¨Ø§Ù„ÙƒØ§Ù…Ù„
+      perform_full_suspension: ØªØ¹Ù„ÙŠÙ‚ Ø§Ù„ØØ³Ø§Ø¨
       profile_url: Ø±Ø§Ø¨Ø· Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ
       promote: ØªØ±Ù‚ÙŠØ©
       protocol: Ø§Ù„Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„
       public: Ø¹Ù…ÙˆÙ…ÙŠ
       push_subscription_expires: Ø§Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„Ø§Ø´ØªØ±Ø§Ùƒ â€PuSHâ€œ
-      redownload: ØªØØ¯ÙŠØ« Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ù…Ø²ÙŠØ©
+      redownload: ØªØØ¯ÙŠØ« Ø§Ù„ØµÙØØ© Ø§Ù„Ø´Ø®ØµÙŠØ©
       remove_avatar: ØØ°Ù Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ù…Ø²ÙŠØ©
+      remove_header: ØØ°Ù Ø§Ù„Ø±Ø£Ø³ÙŠØ©
       resend_confirmation:
         already_confirmed: Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ù…Ø¤ÙƒØ¯ Ø¨Ø§Ù„ÙØ¹Ù„
         send: Ø£Ø¹Ø¯ Ø¥Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ù„Ø© Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø§Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø§Ù„Ø®Ø§ØµØ© Ø¨Ø§Ù„ØªØ£ÙƒÙŠØ¯
         success: ØªÙ… Ø¥Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ù„Ø© Ø§Ù„ØªØ£ÙƒÙŠØ¯ Ø¨Ù†Ø¬Ø§Ø!
       reset: Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„ØªØ¹ÙŠÙŠÙ†
       reset_password: Ø¥Ø¹Ø§Ø¯Ø© Ø¶Ø¨Ø· ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±
-      resubscribe: Ø§Ø´ØªØ±Ùƒ Ù…Ø±Ø© Ø£Ø®Ø±Ù‰
-      role: Ø§Ù„ØªØµØ±ÙŠØØ§Øª
+      resubscribe: Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ø¥Ø´ØªØ±Ø§Ùƒ
+      role: Ø§Ù„ØµÙ„Ø§ØÙŠØ§Øª
       roles:
         admin: Ù…Ø¯ÙŠØ±
         moderator: Ù…Ø´Ø±Ù
@@ -138,27 +176,30 @@ ar:
       shared_inbox_url: Ø±Ø§Ø¨Ø· Ø§Ù„ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„Ù…ÙØ´ØªØ±ÙŽÙƒ Ù„Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„ÙˆØ§Ø±Ø¯
       show:
         created_reports: Ø§Ù„Ø¨Ù„Ø§ØºØ§Øª Ø§Ù„ØªÙŠ Ø£Ù†Ø´Ø£Ù‡Ø§ Ù‡Ø°Ø§ Ø§Ù„ØØ³Ø§Ø¨
-        report: Ø§Ù„ØªÙ‚Ø±ÙŠØ±
-        targeted_reports: Ø§Ù„ØªÙ‚Ø±ÙŠØ±Ø§Øª Ø§Ù„ØªÙŠ Ø£ÙÙ†Ø´ÙØ£Øª Ø¶Ø¯ Ù‡Ø°Ø§ Ø§Ù„ØØ³Ø§Ø¨
-      silence: Ø³ÙƒØªÙ‡Ù…
+        targeted_reports: Ø§Ù„Ø´ÙƒØ§ÙˆÙŠ Ø§Ù„ØªÙŠ Ø£ÙÙ†Ø´ÙØ£Øª Ù…ÙÙ† Ø·Ø±Ù Ø§Ù„Ø¢Ø®ÙŽØ±ÙŠÙ†
+      silence: ÙƒØªÙ…
+      silenced: ØªÙ… ÙƒØªÙ…Ù‡
       statuses: Ø§Ù„Ù…Ù†Ø´ÙˆØ±Ø§Øª
       subscribe: Ø§Ø´ØªØ±Ùƒ
+      suspended: ØªÙ… ØªØ¹Ù„ÙŠÙ‚Ù‡
       title: Ø§Ù„ØØ³Ø§Ø¨Ø§Øª
-      unconfirmed_email: Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ ØºÙŠØ± Ø§Ù„Ù…Ø¤ÙƒØ¯
+      unconfirmed_email: Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ ØºÙŠØ± Ù…Ø¤ÙƒØ¯
       undo_silenced: Ø±ÙØ¹ Ø§Ù„ØµÙ…Øª
       undo_suspension: Ø¥Ù„ØºØ§Ø¡ ØªØ¹Ù„ÙŠÙ‚ Ø§Ù„ØØ³Ø§Ø¨
       unsubscribe: Ø¥Ù„ØºØ§Ø¡ Ø§Ù„Ø§Ø´ØªØ±Ø§Ùƒ
       username: Ø¥Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…
+      warn: ØªØØ°ÙŠØ±
       web: Ø§Ù„ÙˆÙŠØ¨
     action_logs:
       actions:
-        assigned_to_self_report: Ù‚Ø§Ù… {name} Ø¨ØªØ¹ÙŠÙŠÙ† Ø§Ù„ØªÙ‚Ø±ÙŠØ±Ùª {target} Ù„Ø£Ù†ÙØ³Ù‡Ù…
-        change_email_user: ØºÙŠÙ‘Ø±Ùª {name} Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…Ùª {target}
+        assigned_to_self_report: Ù‚Ø§Ù… %{name} Ø¨ØªØ¹ÙŠÙŠÙ† Ø§Ù„ØªÙ‚Ø±ÙŠØ± %{target} Ù„Ø£Ù†ÙØ³Ù‡Ù…
+        change_email_user: ØºÙŠÙ‘Ø± %{name} Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù… %{target}
         confirm_user: "%{name} Ù‚Ø¯ Ù‚Ø§Ù… Ø¨ØªØ£ÙƒÙŠØ¯ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ù„Ù€ %{target}"
         create_custom_emoji: "%{name} Ù‚Ø§Ù… Ø¨Ø±ÙØ¹ Ø¥ÙŠÙ…ÙˆØ¬ÙŠ Ø¬Ø¯ÙŠØ¯ %{target}"
         create_domain_block: "%{name} Ù‚Ø§Ù… Ø¨ØØ¬Ø¨ Ù†Ø·Ø§Ù‚ %{target}"
         create_email_domain_block: "%{name} Ù‚Ø¯ Ù‚Ø§Ù… Ø¨ØØ¸Ø± Ù†Ø·Ø§Ù‚ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ %{target}"
         demote_user: "%{name} Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ø¥Ù†Ø²Ø§Ù„ Ø§Ù„Ø±ØªØ¨Ø© Ø§Ù„ÙˆØ¸ÙŠÙÙŠØ© Ù„Ù€ %{target}"
+        destroy_custom_emoji: Ù‚Ø§Ù… %{name} Ø¨ØØ°Ù Ø§Ù„Ø¥ÙŠÙ…ÙˆØ¬ÙŠ %{target}
         destroy_domain_block: "%{name} Ù‚Ø§Ù… Ø¨Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØØ¬Ø¨ Ø¹Ù† Ø§Ù„Ù†Ø·Ø§Ù‚ %{target}"
         destroy_email_domain_block: Ù‚Ø§Ù… %{name} Ø¨Ø¥Ø¶Ø§ÙØ© Ù†Ø·Ø§Ù‚ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ %{target} Ø¥Ù„Ù‰ Ø§Ù„Ù„Ø§Ø¦ØØ© Ø§Ù„Ø¨ÙŠØ¶Ø§Ø¡
         destroy_status: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨ØØ°Ù Ù…Ù†Ø´ÙˆØ± %{target}
@@ -169,17 +210,18 @@ ar:
         enable_user: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨ØªÙ†Ø´ÙŠØ· ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ Ù„Ù„Ù…Ø³ØªØ®Ø¯ÙÙ… %{target}
         memorialize_account: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨ØªØÙˆÙŠÙ„ ØØ³Ø§Ø¨ %{target} Ø¥Ù„Ù‰ ØµÙØØ© ØªØ°ÙƒØ§Ø±ÙŠØ©
         promote_user: "%{name} Ù‚Ø§Ù… Ø¨ØªØ±Ù‚ÙŠØ© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… %{target}"
-        remove_avatar_user: ØªÙ…Øª Ø¥Ø²Ø§Ù„Ø©Ùª {name} Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ù…Ø²ÙŠØ©Ùª {target}
-        reopen_report: ØªÙ…Øª Ø¥Ø¹Ø§Ø¯Ø© ÙØªØ Ø§Ù„ØªÙ‚Ø±ÙŠØ± {name}Ùª {target}
+        remove_avatar_user: ØªÙ…Øª Ø¥Ø²Ø§Ù„Ø© %{name} Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ù…Ø²ÙŠØ© %{target}
+        reopen_report: ØªÙ…Øª Ø¥Ø¹Ø§Ø¯Ø© ÙØªØ Ø§Ù„Ø´ÙƒÙˆÙ‰ %{name} %{target}
         reset_password_user: "%{name} Ù„Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† Ø§Ù„ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±ÙŠØ© Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù€ %{target}"
-        resolve_report: Ù‚Ø§Ù… %{name} Ø¨ØÙ„ Ø§Ù„ØªÙ‚Ø±ÙŠØ± %{target}
+        resolve_report: Ù‚Ø§Ù… %{name} Ø¨ØÙ„ Ø§Ù„Ø´ÙƒÙˆÙ‰ %{target}
         silence_account: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨ÙƒØªÙ… ØØ³Ø§Ø¨ %{target}
         suspend_account: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨ØªØ¹Ù„ÙŠÙ‚ ØØ³Ø§Ø¨ %{target}
-        unassigned_report: "Ùª {name} ØªÙ‚Ø±ÙŠØ± ØºÙŠØ± Ù…Ø¹ØªÙ…Ø¯Ùª {target}"
+        unassigned_report: "%{name} ØªÙ‚Ø±ÙŠØ± ØºÙŠØ± Ù…Ø¹ØªÙ…Ø¯ %{target}"
         unsilence_account: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ÙƒØªÙ… Ø¹Ù† ØØ³Ø§Ø¨ %{target}
         unsuspend_account: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªØ¹Ù„ÙŠÙ‚ Ø§Ù„Ù…ÙØ±ÙˆØ¶ Ø¹Ù„Ù‰ ØØ³Ø§Ø¨ %{target}
         update_custom_emoji: "%{name} Ù‚Ø§Ù… Ø¨ØªØØ¯ÙŠØ« Ø§Ù„Ø¥ÙŠÙ…ÙˆØ¬ÙŠ %{target}"
         update_status: Ù„Ù‚Ø¯ Ù‚Ø§Ù… %{name} Ø¨ØªØØ¯ÙŠØ« Ù…Ù†Ø´ÙˆØ± %{target}
+      deleted_status: "(Ù…Ù†Ø´ÙˆØ± Ù…ØØ°ÙˆÙ)"
       title: Ø³ÙØ¬Ù„Ù‘ Ø§Ù„ØªÙØªÙŠØ´ Ùˆ Ø§Ù„Ù…Ø¹Ø§ÙŠÙ†Ø©
     custom_emojis:
       by_domain: Ø§Ù„Ù†Ø·Ø§Ù‚
@@ -206,8 +248,30 @@ ar:
       update_failed_msg: ØªØ¹Ø°Ø±Øª Ø¹Ù…Ù„ÙŠØ© ØªØØ°ÙŠØ« Ø°Ø§Ùƒ Ø§Ù„Ø¥ÙŠÙ…ÙˆØ¬ÙŠ
       updated_msg: ØªÙ… ØªØØ¯ÙŠØ« Ø§Ù„Ø¥ÙŠÙ…ÙˆØ¬ÙŠ Ø¨Ù†Ø¬Ø§Ø !
       upload: Ø±ÙØ¹
+    dashboard:
+      backlog: Ø§Ù„Ø£Ø¹Ù…Ø§Ù„ Ø§Ù„Ù…ØªØ±Ø§ÙƒÙ…Ø©
+      config: Ø§Ù„Ø¥Ø¹Ø¯Ø§Ø¯
+      feature_deletions: Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…ØØ°ÙˆÙØ©
+      feature_invites: Ø±ÙˆØ§Ø¨Ø· Ø§Ù„Ø¯Ø¹ÙˆØ§Øª
+      feature_profile_directory: Ø¯Ù„ÙŠÙ„ Ø§Ù„ØØ³Ø§Ø¨Ø§Øª
+      feature_registrations: Ø§Ù„ØªØ³Ø¬ÙŠÙ„Ø§Øª
+      feature_relay: Ø§Ù„Ù…ÙØ±ØÙ‘Ù„ Ø§Ù„ÙØ¯ÙŠØ±Ø§Ù„ÙŠ
+      features: Ø§Ù„Ù…ÙŠÙ‘Ø²Ø§Øª
+      hidden_service: Ø§Ù„ÙÙŠØ¯ÙŠØ±Ø§Ù„ÙŠØ© Ù…Ø¹ Ø§Ù„Ø®Ø¯Ù…Ø§Øª Ø§Ù„Ø®ÙÙŠØ©
+      open_reports: ÙØªØ Ø§Ù„Ø´ÙƒØ§ÙˆÙŠ
+      recent_users: Ø£ØØ¯Ø« Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ†
+      search: Ø§Ù„Ø¨ØØ« Ø§Ù„Ù†ØµÙŠ Ø§Ù„ÙƒØ§Ù…Ù„
+      single_user_mode: ÙˆØ¶Ø¹ Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ… Ø§Ù„Ø£ÙˆØØ¯
+      software: Ø§Ù„Ø¨Ø±Ù†Ø§Ù…Ø¬
+      space: Ø§Ù„Ù…Ø³Ø§ØØ© Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙŽÙ…Ø©
+      title: Ù„ÙˆØ Ø§Ù„Ù…Ø±Ø§Ù‚Ø¨Ø©
+      total_users: Ø¥Ø¬Ù…Ø§Ù„ÙŠ Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ†
+      trends: Ø§Ù„Ù…Ø¤Ø´Ø±Ø§Øª
+      week_interactions: ØªÙØ§Ø¹ÙÙ„Ø§Øª Ù‡Ø°Ø§ Ø§Ù„Ø£Ø³Ø¨ÙˆØ¹
+      week_users_active: Ù†Ø´Ø· Ù‡Ø°Ø§ Ø§Ù„Ø£Ø³Ø¨ÙˆØ¹
+      week_users_new: Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ† Ù‡Ø°Ø§ Ø§Ù„Ø£Ø³Ø¨ÙˆØ¹
     domain_blocks:
-      add_new: Ø¥Ø¶Ø§ÙØ© Ù†Ø·Ø§Ù‚ Ø¬Ø¯ÙŠØ¯
+      add_new: Ø¥Ø¶Ø§ÙØ© ØØ¬Ø¨ Ø¬Ø¯ÙŠØ¯ Ù„Ù†Ø·Ø§Ù‚
       created_msg: Ø¥Ù†Ù‘ ØØ¬Ø¨ Ø§Ù„Ù†Ø·Ø§Ù‚ ØÙŠØ² Ø§Ù„ØªØ´ØºÙŠÙ„
       destroyed_msg: ØªÙ… Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØØ¬Ø¨ Ø§Ù„Ù…ÙØ±ÙˆØ¶ Ø¹Ù„Ù‰ Ø§Ù„Ù†Ø·Ø§Ù‚
       domain: Ø§Ù„Ù†Ø·Ø§Ù‚
@@ -222,22 +286,24 @@ ar:
         title: ØØ¬Ø¨ Ù†Ø·Ø§Ù‚ Ø¬Ø¯ÙŠØ¯
       reject_media: Ø±ÙØ¶ Ù…Ù„ÙØ§Øª Ø§Ù„ÙˆØ³Ø§Ø¦Ø·
       reject_media_hint: ÙŠØ²ÙŠÙ„ Ù…Ù„ÙØ§Øª Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„Ù…Ø®Ø²Ù†Ø© Ù…ØÙ„ÙŠÙ‹Ø§ ÙˆÙŠØ±ÙØ¶ ØªÙ†Ø²ÙŠÙ„ Ø£ÙŠ Ù…Ù„ÙØ§Øª ÙÙŠ Ø§Ù„Ù…Ø³ØªÙ‚Ø¨Ù„. ØºÙŠØ± Ø°ÙŠ ØµÙ„Ø© Ù„Ù„ØªØ¹Ù„ÙŠÙ‚
-      severities:
-        noop: Ù„Ø§ Ø´ÙŠØ¡
-        silence: Ø¥Ø®ÙØ§Ø¡ Ø£Ùˆ ÙƒØªÙ…
-        suspend: ØªØ¹Ù„ÙŠÙ‚
-      severity: Ø§Ù„Ø´Ø¯Ø©
+      reject_reports: Ø±ÙØ¶ Ø§Ù„ØªÙ‚Ø§Ø±ÙŠØ±
+      severity:
+        silence: ØªÙ… ÙƒØªÙ…Ù‡
+        suspend: ØªÙ… ØªØ¹Ù„ÙŠÙ‚Ù‡
       show:
         affected_accounts:
-          one: Ù‡Ù†Ø§Ùƒ ØØ³Ø§Ø¨ ÙˆØ§ØØ¯ Ù…ØªØ£Ø«Ø± ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª
-          other: Ù‡Ù†Ø§Ùƒ %{count} ØØ³Ø§Ø¨Ø§Øª ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ù…ØªØ£Ø«Ø±Ø© Ø¨Ø°Ù„Ùƒ
+          few: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ù†ÙŠØ© ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+          many: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ù†ÙŠØ© ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+          one: ØØ³Ø§Ø¨ ÙˆØ§ØØ¯ Ù…Ø¹Ù†ÙŠ ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª
+          other: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ù†ÙŠØ© ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
+          two: ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ù†ÙŠØ© ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª
+          zero: ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ù†ÙŠØ© ÙÙŠ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª
         retroactive:
           silence: Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ÙƒØªÙ… Ø¹Ù† ÙƒØ§ÙØ© Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…ØªÙˆØ§Ø¬Ø¯Ø© Ø¹Ù„Ù‰ Ù‡Ø°Ø§ Ø§Ù„Ù†Ø·Ø§Ù‚
           suspend: Ø¥Ù„ØºØ§Ø¡ Ø§Ù„ØªØ¹Ù„ÙŠÙ‚ Ø§Ù„Ù…ÙØ±ÙˆØ¶ Ø¹Ù„Ù‰ ÙƒØ§ÙØ© ØØ³Ø§Ø¨Ø§Øª Ù‡Ø°Ø§ Ø§Ù„Ù†Ø·Ø§Ù‚
         title: Ø±ÙØ¹ ØØ¸Ø± Ø§Ù„Ù†Ø·Ø§Ù‚ Ø¹Ù† %{domain}
         undo: Ø¥Ù„ØºØ§Ø¡
-      title: ØØ¸Ø± Ø§Ù„Ù†Ø·Ø§Ù‚Ø§Øª
-      undo: Ø¥Ù„ØºØ§Ø¡
+      undo: Ø¥Ù„ØºØ§Ø¡ ØØ¬Ø¨ Ø§Ù„Ù†Ø·Ø§Ù‚
     email_domain_blocks:
       add_new: Ø¥Ø¶Ø§ÙØ©
       created_msg: Ù„Ù‚Ø¯ Ø¯Ø®Ù„ ØØ¸Ø± Ù†Ø·Ø§Ù‚ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ ØÙŠÙ‘Ø² Ø§Ù„Ø®Ø¯Ù…Ø©
@@ -248,24 +314,51 @@ ar:
         create: Ø¥Ø¶Ø§ÙØ© Ù†Ø·Ø§Ù‚
         title: Ø¥Ø¶Ø§ÙØ© Ù†Ø·Ø§Ù‚ Ø¨Ø±ÙŠØ¯ Ø¬Ø¯ÙŠØ¯ Ø¥Ù„Ù‰ Ø§Ù„Ù„Ø§Ø¦ØØ© Ø§Ù„Ø³ÙˆØ¯Ø§Ø¡
       title: Ø§Ù„Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ø³ÙˆØ¯Ø§Ø¡ Ù„Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
+    followers:
+      back_to_account: Ø§Ù„Ø¹ÙˆØ¯Ø© Ø¥Ù„Ù‰ Ø§Ù„ØØ³Ø§Ø¨
+      title: "%{acct} Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ†"
     instances:
-      account_count: Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…Ø¹Ø±ÙˆÙØ©
-      domain_name: Ø§Ù„Ù†Ø·Ø§Ù‚
-      reset: Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ†
-      search: Ø§Ù„Ø¨ØØ«
-      title: Ù…Ø«ÙŠÙ„Ø§Øª Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„Ù…Ø¹Ø±ÙˆÙØ©
+      known_accounts:
+        few: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ø±ÙˆÙØ©"
+        many: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ø±ÙˆÙØ©"
+        one: ØØ³Ø§Ø¨ Ù…Ø¹Ø±ÙˆÙ %{count}
+        other: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ø±ÙˆÙØ©"
+        two: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ø±ÙˆÙØ©"
+        zero: "%{count} ØØ³Ø§Ø¨Ø§Øª Ù…Ø¹Ø±ÙˆÙØ©"
+      moderation:
+        all: ÙƒØ§ÙØªÙ‡Ø§
+        title: Ø§Ù„Ø¥Ø´Ø±Ø§Ù
+      title: Ø§Ù„ÙØ¯ÙŠØ±Ø§Ù„ÙŠØ©
+      total_blocked_by_us: Ø§Ù„Ù…ØØ¬ÙˆØ¨Ø© Ù…ÙÙ† Ø·Ø±ÙÙ†Ø§
+      total_followed_by_them: ÙŠÙØªØ§Ø¨ÙØ¹ÙˆÙ†Ù‡Ø§
+      total_followed_by_us: Ø§Ù„ØªÙŠ Ù†ÙØªØ§Ø¨ÙØ¹Ù‡Ø§
+      total_reported: ØªÙ‚Ø§Ø±ÙŠØ± Ø¹Ù†Ù‡Ù…
+      total_storage: Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„Ù…ÙØ±ÙÙŽÙ‚Ø©
     invites:
+      deactivate_all: ØªØ¹Ø·ÙŠÙ„Ù‡Ø§ ÙƒØ§ÙØ©
       filter:
         all: Ø§Ù„ÙƒÙ„
         available: Ø§Ù„Ù…ØªÙˆÙØ±Ø©
         expired: Ø§Ù„Ù…Ù†ØªÙ‡ÙŠ ØµÙ„Ø§ØÙŠØªÙ‡Ø§
         title: Ø§Ù„ØªØµÙÙŠØ©
       title: Ø§Ù„Ø¯Ø¹ÙˆØ§Øª
+    relays:
+      add_new: Ø¥Ø¶Ø§ÙØ© Ù…ÙØ±ØÙ‘Ù„ Ø¬Ø¯ÙŠØ¯
+      delete: ØØ°Ù
+      disable: ØªØ¹Ø·ÙŠÙ„
+      disabled: Ù…ÙØ¹Ø·Ù‘ÙŽÙ„
+      enable: ØªØ´ØºÙŠÙ„
+      enable_hint: Ø¹Ù†Ø¯Ù…Ø§ ØªÙ‚ÙˆÙ… Ø¨ØªÙ†Ø´ÙŠØ· Ù‡Ø°Ù‡ Ø§Ù„Ù…ÙŠØ²Ø©ØŒ Ø³ÙˆÙ ÙŠØ´ØªØ±Ùƒ Ø®Ø§Ø¯ÙˆÙ…Ùƒ ÙÙŠ Ø¬Ù…ÙŠØ¹ Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„Ù‚Ø§Ø¯Ù…Ø© Ù…ÙÙ† Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØ±ØÙ‘ÙÙ„ Ùˆ Ø³ÙŠØ´Ø±Ø¹ ÙƒØ°Ù„Ùƒ Ø¨Ø¥Ø±Ø³Ø§Ù„ ÙƒØ§ÙØ© Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø¥Ù„ÙŠÙ‡.
+      enabled: Ù…ÙØ´ØºÙ‘ÙŽÙ„
+      inbox_url: Ø±Ø§Ø¨Ø· Ø§Ù„Ù…ÙØ±ØÙ‘Ù„
+      pending: ÙÙŠ Ø§Ù†ØªØ¸Ø§Ø± ØªØ³Ø±ÙŠØ Ø§Ù„Ù…ÙØ±ØÙ‘ÙÙ„
+      save_and_enable: ØÙØ¸ ÙˆØªØ´ØºÙŠÙ„
+      setup: Ø¥Ø¹Ø¯Ø§Ø¯ Ø§ØªØµØ§Ù„ Ø¨Ù…ÙØ±ØÙ‘Ù„
+      status: Ø§Ù„ØØ§Ù„Ø©
+      title: Ø§Ù„Ù…ÙØ±ØÙ‘Ù„Ø§Øª
     report_notes:
-      created_msg: |-
-        41/5000
-        ØªÙ… Ø¥Ù†Ø´Ø§Ø¡ Ù…Ù„Ø§ØØ¸Ø© Ø§Ù„ØªÙ‚Ø±ÙŠØ± Ø¨Ù†Ø¬Ø§Ø!
-      destroyed_msg: ØªÙ… ØØ°Ù Ù…Ù„Ø§ØØ¸Ø© Ø§Ù„ØªÙ‚Ø±ÙŠØ± Ø¨Ù†Ø¬Ø§Ø!
+      created_msg: ØªÙ… Ø¥Ù†Ø´Ø§Ø¡ Ù…Ù„Ø§ØØ¸Ø© Ø§Ù„Ø´ÙƒÙˆÙ‰ Ø¨Ù†Ø¬Ø§Ø!
+      destroyed_msg: ØªÙ… ØØ°Ù Ù…Ù„Ø§ØØ¸Ø© Ø§Ù„Ø´ÙƒÙˆÙ‰ Ø¨Ù†Ø¬Ø§Ø!
     reports:
       account:
         note: Ù…Ù„ØÙˆØ¸Ø©
@@ -277,8 +370,7 @@ ar:
       comment:
         none: Ù„Ø§ Ø´ÙŠØ¡
       created_at: Ø°ÙƒØ±Øª
-      id: Ù…Ø¹Ø±Ù‘Ù ID
-      mark_as_resolved: Ø¥Ø¹ØªØ¨Ø§Ø± Ø§Ù„ØªÙ‚Ø±ÙŠØ± ÙƒÙ…ØÙ„ÙˆÙ„
+      mark_as_resolved: Ø¥Ø¹ØªØ¨Ø§Ø± Ø§Ù„Ø´ÙƒÙˆÙ‰ ÙƒÙ…ØÙ„ÙˆÙ„Ø©
       mark_as_unresolved: Ø¹Ù„Ø§Ù… ÙƒØºÙŠØ± Ù…ØÙ„ÙˆÙ„Ø©
       notes:
         create: Ø§Ø¶Ù Ù…Ù„Ø§ØØ¸Ø©
@@ -286,22 +378,17 @@ ar:
         create_and_unresolve: Ø¥Ø¹Ø§Ø¯Ø© ÙØªØ Ù…Ø¹ Ù…Ù„Ø§ØØ¸Ø©
         delete: ØØ°Ù
         placeholder: Ù‚Ù… Ø¨ÙˆØµÙ Ø§Ù„Ø¥Ø¬Ø±Ø§Ø¡Ø§Øª Ø§Ù„ØªÙŠ ØªÙ… Ø§ØªØ®Ø§Ø°Ù‡Ø§ Ø£Ùˆ Ø£ÙŠ ØªØØ¯ÙŠØ«Ø§Øª Ø£Ø®Ø±Ù‰ Ø°Ø§Øª Ø¹Ù„Ø§Ù‚Ø© â€¦
-      reopen: Ø¥Ø¹Ø§Ø¯Ø© ÙØªØ Ø§Ù„ØªÙ‚Ø±ÙŠØ±
-      report: 'Ø§Ù„ØªÙ‚Ø±ÙŠØ± #%{id}'
-      report_contents: Ø§Ù„Ù…ØØªÙˆÙŠØ§Øª
+      reopen: Ø¥Ø¹Ø§Ø¯Ø© ÙØªØ Ø§Ù„Ø´ÙƒÙˆÙ‰
+      report: 'Ø§Ù„Ø´ÙƒÙˆÙ‰ #%{id}'
       reported_account: ØØ³Ø§Ø¨ Ù…ÙØ¨Ù„Ù‘Øº Ø¹Ù†Ù‡
       reported_by: Ø£Ø¨Ù„Øº Ø¹Ù†Ù‡ Ù…Ù† Ø·Ø±Ù
       resolved: Ù…Ø¹Ø§Ù„Ø¬Ø©
       resolved_msg: ØªÙ… ØÙ„ ØªÙ‚Ø±ÙŠØ± Ø¨Ù†Ø¬Ø§Ø!
-      silence_account: ÙƒØªÙ… Ùˆ Ø¥Ø®ÙØ§Ø¡ Ø§Ù„ØØ³Ø§Ø¨
       status: Ø§Ù„ØØ§Ù„Ø©
-      suspend_account: ÙØ±Ø¶ ØªØ¹Ù„ÙŠÙ‚ Ø¹Ù„Ù‰ Ø§Ù„ØØ³Ø§Ø¨
-      target: Ø§Ù„Ù‡Ø¯Ù
-      title: Ø§Ù„ØªÙ‚Ø§Ø±ÙŠØ±
+      title: Ø§Ù„Ø´ÙƒØ§ÙˆÙŠ
       unassign: Ø¥Ù„ØºØ§Ø¡ ØªØ¹ÙŠÙŠÙ†
       unresolved: ØºÙŠØ± Ù…Ø¹Ø§Ù„Ø¬Ø©
       updated_at: Ù…ØØ¯Ø«
-      view: Ø¹Ø±Ø¶
     settings:
       activity_api_enabled:
         desc_html: Ø¹Ø¯Ø¯ Ø§Ù„Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø§Ù„Ù…ØÙ„ÙŠØ© Ùˆ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ù†Ø´Ø·ÙŠÙ† Ùˆ Ø§Ù„ØªØ³Ø¬ÙŠÙ„Ø§Øª Ø§Ù„Ø£Ø³Ø¨ÙˆØ¹ÙŠØ© Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©
@@ -312,12 +399,21 @@ ar:
       contact_information:
         email: Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø§Ù„Ù…Ù‡Ù†ÙŠ
         username: Ø§Ù„Ø¥ØªØµØ§Ù„ Ø¨Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ…
+      custom_css:
+        desc_html: ÙŠÙ‚ÙˆÙ… Ø¨ØªØºÙŠÙŠØ± Ø§Ù„Ù…Ø¸Ù‡Ø± Ø¨ÙˆØ§Ø³Ø·Ø© Ø³ÙŠ Ø£Ø³ Ø£Ø³ ÙŠÙØÙ…Ù‘ÙŽÙ„ Ø¹Ù„Ù‰ ÙƒØ§ÙØ© Ø§Ù„ØµÙØØ§Øª
+        title: Ø³ÙŠ Ø£Ø³ Ø£Ø³ Ù…Ø®ØµØµ
       hero:
         desc_html: Ù…Ø¹Ø±ÙˆØ¶ Ø¹Ù„Ù‰ Ø§Ù„ØµÙØØ© Ø§Ù„Ø£ÙˆÙ„Ù‰. Ù„Ø§ ÙŠÙ‚Ù„ Ø¹Ù† 600 Ã— 100 Ø¨ÙƒØ³Ù„. Ø¹Ù†Ø¯ Ø¹Ø¯Ù… Ø§Ù„ØªØ¹ÙŠÙŠÙ† ØŒ ØªØ¹ÙˆØ¯ Ø§Ù„ØµÙˆØ±Ø© Ø¥Ù„Ù‰ Ø§Ù„Ù†Ø³Ø®Ø© Ø§Ù„Ù…ØµØºØ±Ø© Ø¹Ù„Ù‰ Ø³Ø¨ÙŠÙ„ Ø§Ù„Ù…Ø«Ø§Ù„
         title: Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ø£Ø³ÙŠØ©
       peers_api_enabled:
         desc_html: Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„Ù†Ø·Ø§Ù‚Ø§Øª Ø§Ù„ØªÙŠ Ø¥Ù„ØªÙ‚Ù‰ Ø¨Ù‡Ø§ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ø¹Ù„Ù‰ Ø§Ù„Ø¨ÙŠØ¦Ø© Ø§Ù„Ù…ÙˆØÙ‘ÙŽØ¯Ø© ÙÙŠØ¯ÙŠÙØ±Ø³
         title: Ù†Ø´Ø± Ø¹Ø¯Ø¯ Ù…Ø«ÙŠÙ„Ø§Øª Ø§Ù„Ø®ÙˆØ§Ø¯Ù… Ø§Ù„ØªÙŠ ØªÙ… Ù…ØµØ§Ø¯ÙØªÙ‡Ø§
+      preview_sensitive_media:
+        desc_html: Ø±ÙˆØ§Ø¨Ø· Ø§Ù„Ù…ÙØ¹ÙŽØ§ÙŠÙ†Ø© Ø¹Ù„Ù‰ Ù…ÙˆØ§Ù‚Ø¹ Ø§Ù„ÙˆÙŠØ¨ Ø§Ù„Ø£Ø®Ø±Ù‰ Ø³ØªÙ‚ÙˆÙ… Ø¨Ø¹Ø±Ø¶ ØµÙÙˆÙŽØ± Ù…ØµØºÙ‘Ø±Ø© ØØªÙ‰ Ùˆ Ø¥Ù† ÙƒØ§Ù†Øª Ø§Ù„ÙˆØ³Ø§Ø¦Ø· ØØ³Ø§Ø³Ø©
+        title: Ø¥Ø¸Ù‡Ø§Ø± Ø§Ù„ØµÙˆØ± Ø§Ù„ØØ³Ø§Ø³Ø© ÙÙŠ Ù…ÙØ¹Ø§ÙŠÙ†Ø§Øª Ø£ÙˆØ¨Ù† ØºØ±Ø§Ù
+      profile_directory:
+        desc_html: Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„ÙƒØ´Ù Ø¹Ù† ØØ³Ø§Ø¨Ø§ØªÙ‡Ù…
+        title: ØªÙØ¹ÙŠÙ„ Ø³Ø¬Ù„ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø´Ø®ØµÙŠØ©
       registrations:
         closed_message:
           desc_html: ÙŠØªÙ… Ø¹Ø±Ø¶Ù‡ Ø¹Ù„Ù‰ Ø§Ù„ØµÙØØ© Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠØ© Ø¹Ù†Ø¯Ù…Ø§ ÙŠØªÙ… ØºÙ„Ù‚ ØªØ³Ø¬ÙŠÙ„ Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø©. ÙŠÙ…ÙƒÙ†ÙƒÙ… Ø¥Ø³ØªØ®Ø¯Ø§Ù… Ø¹Ù„Ø§Ù…Ø§Øª Ø§Ù„Ø£ÙŠØªØ´ ØªÙŠ Ø£Ù… Ø£Ù„ HTML
@@ -338,11 +434,14 @@ ar:
         desc_html: Ø¹Ø±Ø¶ Ø´Ø§Ø±Ø© Ø§Ù„Ù…ÙˆØ¸ÙÙŠÙ† Ø¹Ù„Ù‰ ØµÙØØ© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…
         title: Ø¥Ø¸Ù‡Ø§Ø± Ø´Ø§Ø±Ø© Ø§Ù„Ù…ÙˆØ¸ÙÙŠÙ†
       site_description:
-        desc_html: ÙÙ‚Ø±Ø© ØªÙ…Ù‡ÙŠØ¯ÙŠØ© Ø¹Ù„Ù‰ Ø§Ù„ØµÙØØ© Ø§Ù„Ø£ÙˆÙ„Ù‰ ÙˆÙÙŠ Ø§Ù„Ø¹Ù„Ø§Ù…Ø§Øª Ø§Ù„ÙˆØµÙÙŠØ©. ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø¹Ù„Ø§Ù…Ø§Øª HTML ØŒ ÙˆÙ„Ø§ Ø³ÙŠÙ…Ø§ <code>&lt;a&gt;</code> Ùˆ <code>&lt;em&gt;</code>.
+        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: Ø´Ø±ÙˆØ· Ø§Ù„Ø®Ø¯Ù…Ø© Ø§Ù„Ù…Ø®ØµØµØ©
@@ -358,14 +457,15 @@ ar:
       back_to_account: Ø§Ù„Ø¹ÙˆØ¯Ø© Ø¥Ù„Ù‰ ØµÙØØ© Ø§Ù„ØØ³Ø§Ø¨
       batch:
         delete: ØØ°Ù
-        nsfw_off: Ø¶Ø¹ Ø¹Ù„Ø§Ù…Ø© Ø§Ù†Ù‡Ø§ ØºÙŠØ± ØØ³Ø§Ø³Ø©
-        nsfw_on: Ø¶Ø¹ Ø¹Ù„Ø§Ù…Ø© Ø§Ù†Ù‡Ø§ ØØ³Ø§Ø³Ø©
+        nsfw_off: ØªØ¹ÙŠÙŠÙ†Ù‡ ÙƒÙ…Ù†Ø´ÙˆØ± ØºÙŠØ± ØØ³Ø§Ø³
+        nsfw_on: ØªØ¹ÙŠÙŠÙ†Ù‡ ÙƒÙ…Ù†Ø´ÙˆØ± ØØ³Ø§Ø³
       failed_to_execute: Ø®Ø·Ø£ ÙÙŠ Ø§Ù„ØªÙØ¹ÙŠÙ„
       media:
         title: Ø§Ù„ÙˆØ³Ø§Ø¦Ø·
-      no_media: Ù„Ø§ ÙŠÙˆØ¬Ø¯ ÙˆØ³Ø§Ø¦Ø·
+      no_media: Ù„Ø§ ØªØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³Ø§Ø¦Ø·
+      no_status_selected: Ù„Ù… ÙŠØ·Ø±Ø£ Ø£ÙŠ ØªØºÙŠÙŠØ± Ø¹Ù„Ù‰ Ø£ÙŠ Ù…Ù†Ø´ÙˆØ± Ø¨Ù…Ø§ Ø£Ù†Ù‡ Ù„Ù… ÙŠØªÙ… Ø§Ø®ØªÙŠØ§Ø± Ø£ÙŠ ÙˆØ§ØØ¯
       title: Ù…Ù†Ø´ÙˆØ±Ø§Øª Ø§Ù„ØØ³Ø§Ø¨
-      with_media: Ø¨Ø§Ù„ÙˆØ³Ø§Ø¦Ø·
+      with_media: ØªØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³Ø§Ø¦Ø·
     subscriptions:
       callback_url: Ø¹Ø§ÙˆØ¯ Ø§Ù„Ø§ØªØµØ§Ù„ Ø¨Ø§Ù„Ø¹Ù†ÙˆØ§Ù†
       confirmed: Ù…Ø¤ÙƒÙ‘ÙŽØ¯
@@ -373,11 +473,25 @@ ar:
       last_delivery: Ø¢Ø®Ø± Ø¥ÙŠØ¯Ø§Ø¹
       title: WebSub
       topic: Ø§Ù„Ù…ÙˆØ¶ÙˆØ¹
+    tags:
+      accounts: Ø§Ù„ØØ³Ø§Ø¨Ø§Øª
+      hidden: Ø§Ù„Ù…Ø®ÙÙŠØ©
+      hide: Ø§Ù„Ø¥Ø®ÙØ§Ø¡ Ø¹Ù† Ø³Ø¬Ù„ Ø§Ù„ØØ³Ø§Ø¨Ø§Øª
+      name: Ø§Ù„ÙˆØ³Ù…
+      title: Ø§Ù„ÙˆØ³ÙˆÙ…
+      unhide: Ø¥Ø¸Ù‡Ø§Ø±Ù‡ ÙÙŠ Ø³Ø¬Ù„ ØØ³Ø§Ø¨Ø§Øª Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†
+      visible: Ø¸Ø§Ù‡Ø±
     title: Ø§Ù„Ø¥Ø¯Ø§Ø±Ø©
+    warning_presets:
+      add_new: Ø¥Ø¶Ø§ÙØ© ÙˆØ§ØØ¯ Ø¬Ø¯ÙŠØ¯
+      delete: ØØ°Ù
+      edit: ØªØ¹Ø¯ÙŠÙ„
+      edit_preset: ØªØ¹Ø¯ÙŠÙ„ Ù†Ù…ÙˆØ°Ø¬ Ø§Ù„ØªØØ°ÙŠØ±
+      title: Ø¥Ø¯Ø§Ø±Ø© Ù†Ù…Ø§Ø°Ø¬ Ø§Ù„ØªØØ°ÙŠØ±
   admin_mailer:
     new_report:
       body: Ù‚Ø§Ù… %{reporter} Ø¨Ø§Ù„Ø¥Ø¨Ù„Ø§Øº Ø¹Ù† %{target}
-      body_remote: Ø£Ø¨Ù„Øº Ø´Ø®Øµ Ù…Ø§ Ù…Ù†Ùª {domain} Ø¹Ù†Ùª {target}
+      body_remote: Ø£Ø¨Ù„Øº Ø´Ø®Øµ Ù…Ø§ Ù…Ù† %{domain} Ø¹Ù† %{target}
       subject: ØªÙ‚Ø±ÙŠØ± Ø¬Ø¯ÙŠØ¯ Ù„%{instance} (#%{id})
   application_mailer:
     notification_preferences: ØªØ¹Ø¯ÙŠÙ„ Ø®ÙŠØ§Ø±Ø§Øª Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
@@ -395,7 +509,7 @@ ar:
     warning: ÙƒÙ† ØØ°Ø±Ø§ Ù…Ø¹ Ù‡Ø°Ù‡ Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª. Ù„Ø§ ØªÙ‚Ù… Ø£Ø¨Ø¯Ø§ Ø¨Ù…Ø´Ø§Ø±ÙƒØªÙ‡Ø§ Ù…Ø¹ Ø§Ù„Ø¢Ø®ÙŽØ±ÙŠÙ† !
     your_token: Ø±Ù…Ø² Ù†ÙØ§Ø°Ùƒ
   auth:
-    agreement_html: Ø¨Ù‚Ø¨ÙˆÙ„Ùƒ Ø§Ù„ØªØ³Ø¬ÙŠÙ„ ÙØ¥Ù†Ùƒ ØªÙØµØ±Ù‘ÙØ Ù‚Ø¨ÙˆÙ„ <a href="%{rules_path}">Ù‚ÙˆØ§Ø¹Ø¯ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…</a> Ùˆ <a href="%{terms_path}">Ø´Ø±ÙˆØ· Ø§Ù„Ø®Ø¯Ù…Ø© Ø§Ù„ØªÙŠ Ù†ÙˆÙØ±Ù‡Ø§ Ù„Ùƒ</a>.
+    agreement_html: Ø¨Ù…Ø¬Ø±Ø¯ Ø§Ù„Ù†Ù‚Ø± Ø¹Ù„Ù‰ "Ø§Ù„ØªØ³Ø¬ÙŠÙ„" Ø£Ø³ÙÙ„Ù‡ØŒ ÙØ¥Ù†Ùƒ ØªÙØµØ±Ù‘ÙØ Ù‚Ø¨ÙˆÙ„ <a href="%{rules_path}">Ù‚ÙˆØ§Ø¹Ø¯ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…</a> Ùˆ <a href="%{terms_path}">Ø´Ø±ÙˆØ· Ø§Ù„Ø®Ø¯Ù…Ø© Ø§Ù„ØªÙŠ Ù†ÙˆÙØ±Ù‡Ø§ Ù„Ùƒ</a>.
     change_password: Ø§Ù„ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±ÙŠØ©
     confirm_email: ØªØ£ÙƒÙŠØ¯ Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
     delete_account: ØØ°Ù ØØ³Ø§Ø¨
@@ -449,6 +563,18 @@ ar:
     proceed: ØØ°Ù ØØ³Ø§Ø¨
     success_msg: ØªÙ… ØØ°Ù ØØ³Ø§Ø¨Ùƒ Ø¨Ù†Ø¬Ø§Ø
     warning_title: ØªÙˆØ§ÙØ± Ø§Ù„Ù…ØØªÙˆÙ‰ Ø§Ù„Ù…Ù†Ø´ÙˆØ± Ùˆ Ø§Ù„Ù…Ø¨Ø¹Ø«ÙŽØ±
+  directories:
+    directory: Ø³ÙØ¬Ù„Ù‘ Ø§Ù„ØØ³Ø§Ø¨Ø§Øª
+    enabled: Ø¥Ù†Ù‘ ØØ³Ø§Ø¨Ùƒ Ø§Ù„Ø¢Ù† Ø¶Ù…Ù† ÙÙ‡Ø±Ø³ Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ†.
+    explanation: Ø§Ø³ØªÙƒØ´Ù Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ† Ø¢Ø®Ø±ÙŠÙ† ØØ³Ø¨ Ø§Ù„Ù…ÙˆØ§Ø¶ÙŠØ¹ Ø§Ù„ØªÙŠ ØªÙ‡Ù…Ù‡Ù…
+    explore_mastodon: Ø§Ø³ØªÙƒØ´Ù %{title}
+    people:
+      few: "%{count} Ø´Ø®Øµ"
+      many: "%{count} Ø´Ø®Øµ"
+      one: "%{count} Ø´Ø®Øµ"
+      other: "%{count} Ø´Ø®Øµ"
+      two: "%{count} Ø´Ø®Øµ"
+      zero: "%{count} Ø´Ø®Øµ"
   errors:
     '403': Ù„ÙŠØ³ Ù„Ùƒ Ø§Ù„ØµÙ„Ø§ØÙŠØ§Øª Ø§Ù„ÙƒØ§ÙÙŠØ© Ù„Ø¹Ø±Ø¶ Ù‡Ø°Ù‡ Ø§Ù„ØµÙØØ©.
     '404': Ø¥Ù†Ù‘ Ø§Ù„ØµÙØØ© Ø§Ù„ØªÙŠ ØªØ¨ØØ« Ø¹Ù†Ù‡Ø§ Ù„Ø§ ÙˆØ¬ÙˆØ¯ Ù„Ù‡Ø§ Ø£ØµÙ„Ø§.
@@ -460,7 +586,7 @@ ar:
     '500':
       content: Ù†ØÙ† Ù…ØªØ£Ø³ÙÙˆÙ†ØŒ Ù„Ù‚Ø¯ ØØ¯Ø« Ø®Ø·Ø£ Ù…Ø§ Ù…ÙÙ† Ø¬Ø§Ù†Ø¨Ù†Ø§.
       title: Ù‡Ø°Ù‡ Ø§Ù„ØµÙØØ© Ø®Ø§Ø·Ø¦Ø©
-    noscript_html: ÙŠØ±Ø¬Ù‰ ØªÙØ¹ÙŠÙ„ Ø§Ù„Ø¬Ø§ÙØ§ Ø³ÙƒØ±ÙŠØ¨Øª Ù„Ø§Ø³ØªØ®Ø¯Ø§Ù… ØªØ·Ø¨ÙŠÙ‚ Ø§Ù„ÙˆÙŠØ¨ Ù„Ù…Ø§Ø³ØªØ¯ÙˆÙ†ØŒ Ø£Ùˆ Ø¹ÙÙˆØ¶ Ø°Ù„Ùƒ Ù‚ÙˆÙ…ÙˆØ§ Ø¨ØªØ¬Ø±ÙŠØ¨ Ø¥ØØ¯Ù‰ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø§Ù„Ø£ØµÙ„ÙŠØ©</a> Ø§Ù„Ø¯Ù‘Ø§Ø¹Ù…Ø© Ù„Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¹Ù„Ù‰ Ù…Ù†ØµÙ‘ØªÙƒÙ….
+    noscript_html: ÙŠØ±Ø¬Ù‰ ØªÙØ¹ÙŠÙ„ Ø§Ù„Ø¬Ø§ÙØ§ Ø³ÙƒØ±ÙŠØ¨Øª Ù„Ø§Ø³ØªØ®Ø¯Ø§Ù… ØªØ·Ø¨ÙŠÙ‚ Ø§Ù„ÙˆÙŠØ¨ Ù„Ù…Ø§Ø³ØªØ¯ÙˆÙ†ØŒ Ø£Ùˆ Ø¹ÙÙˆØ¶ Ø°Ù„Ùƒ Ù‚ÙˆÙ…ÙˆØ§ Ø¨ØªØ¬Ø±ÙŠØ¨ Ø¥ØØ¯Ù‰ <a href="%{apps_path}">Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª Ø§Ù„Ø£ØµÙ„ÙŠØ©</a> Ø§Ù„Ø¯Ù‘Ø§Ø¹Ù…Ø© Ù„Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¹Ù„Ù‰ Ù…Ù†ØµÙ‘ØªÙƒÙ….
   exports:
     archive_takeout:
       date: Ø§Ù„ØªØ§Ø±ÙŠØ®
@@ -472,6 +598,7 @@ ar:
     blocks: Ù‚Ù…Øª Ø¨ØØ¸Ø±
     csv: CSV
     follows: Ø£Ù†Øª ØªØªØ¨Ø¹
+    lists: Ø§Ù„Ù‚ÙˆØ§Ø¦Ù…
     mutes: Ù‚ÙÙ…ØªÙŽ Ø¨ÙƒØªÙ…
     storage: Ø°Ø§ÙƒØ±Ø© Ø§Ù„ØªØ®Ø²ÙŠÙ†
   filters:
@@ -482,6 +609,9 @@ ar:
       thread: Ø§Ù„Ù…ØØ§Ø¯Ø«Ø§Øª
     edit:
       title: ØªØ¹Ø¯ÙŠÙ„ Ø¹Ø§Ù…Ù„ Ø§Ù„ØªØµÙÙŠØ©
+    errors:
+      invalid_context: Ù„Ù… ØªÙ‚Ù… Ø¨ØªØØ¯ÙŠØ¯ Ø£ÙŠ Ù…Ø¬Ø§Ù„ Ø£Ùˆ Ø£Ù†Ù‘ Ø§Ù„Ù…Ø¬Ø§Ù„ ØºÙŠØ± ØµØ§Ù„Ø
+      invalid_irreversible: Ø¥Ù„Ù‘Ø§ Ù…Ø¬Ø§Ù„Ø§Øª Ø§Ù„Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ùˆ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠ Ù…Ø¹Ù†ÙŠØ© Ø¨Ø§Ù„ØªØµÙÙŠØ© Ø§Ù„Ù„Ø§Ø±Ø¬Ø¹ÙŠØ©
     index:
       delete: Ø¥Ø²Ø§Ù„Ø©
       title: Ø¹ÙˆØ§Ù…Ù„ Ø§Ù„ØªØµÙÙŠØ©
@@ -492,25 +622,34 @@ ar:
     followers_count: Ø¹Ø¯Ø¯ Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ†
     lock_link: Ù‚Ù… Ø¨ØªØ¬Ù…ÙŠØ¯ ØØ³Ø§Ø¨Ùƒ
     purge: ØªÙ†ØÙŠØ© Ù…Ù† Ø¨ÙŠÙ† Ù…ØªØ§Ø¨Ø¹ÙŠÙƒ
-    success:
-      one: Ø¬Ø§Ø±ÙŠØ© Ø¹Ù…Ù„ÙŠØ© ØØ¸Ø± Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ø¨Ø³Ù„Ø§Ø³Ø© Ù…Ù† Ù†Ø·Ø§Ù‚ Ø¢Ø®Ø± ...
-      other: Ø¬Ø§Ø±ÙŠØ© Ø¹Ù…Ù„ÙŠØ© ØØ¸Ø± Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ø¨Ø³Ù„Ø§Ø³Ø© Ù…Ù† %{count} Ù†Ø·Ø§Ù‚Ø§Øª Ø£Ø®Ø±Ù‰ ...
+    success: Ø¬Ø§Ø±ÙŠØ© Ø¹Ù…Ù„ÙŠØ© ØØ¸Ø± Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ø¨Ø³Ù„Ø§Ø³Ø© Ù…Ù† %{count} Ù†Ø·Ø§Ù‚Ø§Øª Ø£Ø®Ø±Ù‰ ...
+    true_privacy_html: ØªØ°ÙƒØ± Ø¯Ø§Ø¦Ù…Ù‹Ø§ Ø£Ù†Ù‘ <strong>Ø§Ù„Ø®ØµÙˆØµÙŠØ© Ø§Ù„ØªØ§Ù…Ø© Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø¨Ù„ÙˆØºÙ‡Ø§ Ø¥Ù„Ù‘Ø§ Ø¨Ø§Ù„ØªØ¹Ù…ÙŠØ© Ùˆ Ø§Ù„ØªØ´ÙÙŠØ± Ù…Ù† Ø·Ø±Ù Ø¥Ù„Ù‰ Ø¢Ø®ÙŽØ±</strong>.
+    unlocked_warning_html: ÙŠÙ…ÙƒÙ† Ù„Ø£ÙŠ ÙƒØ§Ù† Ù…ØªØ§Ø¨Ø¹Ø© ØØ³Ø§Ø¨Ùƒ Ùˆ Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ù…Ø¨Ø§Ø´Ø±Ø© Ø¹Ù„Ù‰ ØªØ¨ÙˆÙŠÙ‚Ø§ØªÙƒ. Ø¥Ø³ØªØ®Ø¯ÙÙ… %{lock_link} Ù„Ù…ÙØ¹Ø§ÙŠÙ†Ø© Ø£Ùˆ Ø±ÙØ¶ Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ø§Ù„Ø¬ÙØ¯ÙØ¯.
     unlocked_warning_title: Ø¥Ù†Ù‘ ØØ³Ø§Ø¨Ùƒ ØºÙŠØ± Ù…Ù‚ÙÙ„
+  footer:
+    developers: Ø§Ù„Ù…Ø·ÙˆØ±ÙˆÙ†
+    more: Ø§Ù„Ù…Ø²ÙŠØ¯ â€¦
+    resources: Ø§Ù„Ù…ÙˆØ§Ø±Ø¯
   generic:
     changes_saved_msg: ØªÙ… ØÙØ¸ Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª Ø¨Ù†Ø¬Ø§Ø !
-    powered_by: Ù…Ø¯Ø¹ÙˆÙ… Ø¨Ù€ %{link}
+    copy: Ù†Ø³Ø®
     save_changes: ØÙØ¸ Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª
     validation_errors:
-      one: Ù„Ø§ ÙŠØ²Ø§Ù„ Ù‡Ù†Ø§Ùƒ Ø®Ù„Ù„ Ù…Ø§ Ø¥Ù„Ù‰ ØØ¯ Ø§Ù„Ø¢Ù†. ÙŠÙØ±Ø¬Ù‰ Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù†Ø¸Ø± ÙÙŠ Ø§Ù„Ø®Ø·Ø£ Ø£Ø³ÙÙ„Ù‡
-      other: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù… ! Ø±Ø¬Ø§Ø¡Ù‹Ø§ ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ù€ %{count} Ø£Ø³ÙÙ„Ù‡
+      few: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù…Ø§ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù…! ÙŠÙØ±Ø¬Ù‰ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ù€ %{count} Ø£Ø¯Ù†Ø§Ù‡
+      many: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù…Ø§ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù…! ÙŠÙØ±Ø¬Ù‰ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ù€ %{count} Ø£Ø¯Ù†Ø§Ù‡
+      one: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù…Ø§ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù…! ÙŠÙØ±Ø¬Ù‰ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø®Ø·Ø£ Ø£Ø¯Ù†Ø§Ù‡
+      other: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù…Ø§ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù…! ÙŠÙØ±Ø¬Ù‰ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ù€ %{count} Ø£Ø¯Ù†Ø§Ù‡
+      two: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù…Ø§ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù…! ÙŠÙØ±Ø¬Ù‰ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ù€ %{count} Ø£Ø¯Ù†Ø§Ù‡
+      zero: Ù‡Ù†Ø§Ùƒ Ø´ÙŠØ¡ Ù…Ø§ Ù„ÙŠØ³ Ø¹Ù„Ù‰ Ù…Ø§ ÙŠØ±Ø§Ù…! ÙŠÙØ±Ø¬Ù‰ Ù…Ø±Ø§Ø¬Ø¹Ø© Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ Ø§Ù„Ù€ %{count} Ø£Ø¯Ù†Ø§Ù‡
   imports:
-    preface: You can import certain data like all the people you are following or blocking into your account on this instance, from files created by an export on another instance.
+    preface: Ø¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ø§Ø³ØªÙŠØ±Ø§Ø¯ Ø¨ÙŠØ§Ù†Ø§Øª Ù‚Ø¯ Ù‚ÙÙ…ØªÙŽ Ø¨ØªØµØ¯ÙŠØ±Ù‡Ø§ Ù…ÙÙ† Ù…Ø«ÙŠÙ„ Ø®Ø§Ø¯ÙˆÙ… Ø¢Ø®ÙŽØ±ØŒ ÙƒÙ‚ÙˆØ§Ø¦Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ…ÙŠÙ† Ø§Ù„Ø°ÙŠÙ† ÙƒÙ†ØªÙŽ ØªØªØ§Ø¨ÙØ¹Ù‡Ù… Ø£Ùˆ Ù‚ÙÙ…ØªÙŽ Ø¨ØØ¸Ø±Ù‡Ù….
     success: ØªÙ… ØªØÙ…ÙŠÙ„ Ø¨ÙŠØ§Ù†Ø§ØªÙƒ Ø¨Ù†Ø¬Ø§Ø ÙˆØ³ÙŠØªÙ… Ù…Ø¹Ø§Ù„Ø¬ØªÙ‡Ø§ ÙÙŠ Ø§Ù„ÙˆÙ‚Øª Ø§Ù„Ù…Ù†Ø§Ø³Ø¨
     types:
       blocking: Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…ØØ¸ÙˆØ±ÙŠÙ†
       following: Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† Ø§Ù„Ù…ØªØ¨ÙˆØ¹ÙŠÙ†
       muting: Ù‚Ø§Ø¦Ù…Ø© Ø§Ù„ÙƒØªÙ…
     upload: ØªØÙ…ÙŠÙ„
+  in_memoriam_html: ÙÙŠ Ø°ÙƒØ±Ù‰.
   invites:
     delete: ØªØ¹Ø·ÙŠÙ„
     expired: Ø¥Ù†ØªÙ‡Øª ØµÙ„Ø§ØÙŠØªÙ‡Ø§
@@ -525,16 +664,18 @@ ar:
     generate: ØªÙˆÙ„ÙŠØ¯
     invited_by: 'ØªÙ…Øª Ø¯Ø¹ÙˆØªÙƒ Ù…Ù† Ø·Ø±Ù :'
     max_uses:
-      one: Ø¥Ø³ØªØ¹Ù…Ø§Ù„ ÙˆØ§ØØ¯
+      few: "%{count} Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª"
+      many: "%{count} Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª"
+      one: Ø§Ø³ØªØ®Ø¯Ø§Ù… ÙˆØ§ØØ¯
       other: "%{count} Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª"
+      two: Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª
+      zero: Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª
     max_uses_prompt: Ø¨Ù„Ø§ ØØ¯ÙˆØ¯
     prompt: ØªÙˆÙ„ÙŠØ¯ Ùˆ Ù…Ø´Ø§Ø±ÙƒØ© Ø±ÙˆØ§Ø¨Ø· Ù„Ù„Ø³Ù…Ø§Ø Ù„Ù„Ø¢Ø®ÙŽØ±ÙŠÙ† Ø¨Ø§Ù„Ù†ÙØ§Ø° Ø¥Ù„Ù‰ Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ù‡Ø°Ø§
     table:
       expires_at: ØªÙ†ØªÙ‡ÙŠ Ù…Ø¯Ø© ØµÙ„Ø§ØÙŠØªÙ‡Ø§ ÙÙŠ
-      uses: ÙŠØ³ØªØ®Ø¯ÙÙ…
+      uses: Ø¹Ø¯Ø¯ Ø§Ù„Ø§Ø³ØªØ®Ø¯Ø§Ù…Ø§Øª
     title: Ø¯Ø¹ÙˆØ© Ø£Ø´Ø®Ø§Øµ
-  landing_strip_html: "<strong>%{name}</strong> Ù‡Ùˆ Ø£ØØ¯ Ù…ÙØ³ØªØ®Ø¯ÙÙ…ÙŠ %{link_to_root_path}. Ø¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ù…ØªØ§Ø¨Ø¹ØªÙ‡ Ø£Ùˆ Ø§Ù„ØªÙˆØ§ØµÙ„ Ù…Ø¹Ù‡ Ø¥Ù† ÙƒÙ†Øª ØªÙ…Ù„Ùƒ ØØ³Ø§Ø¨Ù‹Ø§ Ø£ÙŠØ§ ÙƒØ§Ù† Ø¹Ù„Ù‰ Ø§Ù„Ø¨ÙŠØ¦Ø© Ø§Ù„Ù…ÙˆØÙ‘ÙŽØ¯Ø© ÙÙŠØ¯ÙŠÙØ±Ø³."
-  landing_strip_signup_html: Ø¥Ù† ÙƒÙ†Øª Ù„Ø§ ØªÙ…Ù„Ùƒ ÙˆØ§ØØ¯Ø§ØŒ ÙŠÙ…ÙƒÙ†Ùƒ <a href="%{sign_up_path}">Ø§Ù„ØªØ³Ø¬ÙŠÙ„ Ù…ÙÙ† Ù‡Ù†Ø§</a>.
   lists:
     errors:
       limit: Ù„Ù‚Ø¯ Ø¨Ù„ØºØª Ø§Ù„ØØ¯ Ø§Ù„Ø£Ù‚ØµÙ‰ Ù„Ù„Ù‚ÙˆØ§Ø¦Ù…
@@ -555,11 +696,19 @@ ar:
       body: Ù‡Ø°Ø§ Ù‡Ùˆ Ù…ÙÙ„ÙŽØ®Ù‘ÙŽØµ Ø§Ù„Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„ØªÙŠ ÙØ§ØªØªÙƒ ÙˆØ°Ù„Ùƒ Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ ÙÙŠ  %{since}
       mention: "%{name} Ø£Ø´Ø§Ø± Ø¥Ù„ÙŠÙƒ ÙÙŠ :"
       new_followers_summary:
-        one: Ùˆ Ù„Ù‚Ø¯ ØØµÙ„Øª Ø¹Ù„Ù‰ Ù…ØªØ§Ø¨Ø¹ Ø¬Ø¯ÙŠØ¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ ! Ù…Ø±ØÙ‰ !
-        other: Ùˆ Ù„Ù‚Ø¯ ØªØØµÙ„Øª Ø¹Ù„Ù‰ %{count} Ù…ØªØªØ¨Ø¹ÙŠÙ† Ø¬Ø¯Ø¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ ! Ø±Ø§Ø¦Ø¹ !
+        few: Ø±Ø§Ø¦Ø¹ØŒ Ù„Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ %{count} Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ† Ø¬ÙØ¯Ø¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ Ø¹Ù† Ù…Ø§Ø³ØªØ¯ÙˆÙ†!
+        many: Ø±Ø§Ø¦Ø¹ØŒ Ù„Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ %{count} Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ† Ø¬ÙØ¯Ø¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ Ø¹Ù† Ù…Ø§Ø³ØªØ¯ÙˆÙ†!
+        one: Ùˆ Ù„Ù‚Ø¯ ØªØØµÙ‘Ù„ØªÙŽ ÙƒØ°Ù„Ùƒ Ø¹Ù„Ù‰ Ù…ÙØªØ§Ø¨ÙØ¹ Ø¢Ø®ÙŽØ± Ø¨ÙŠÙ†Ù…Ø§ ÙƒÙ†ØªÙŽ ØºØ§Ø¦Ø¨Ù‹Ø§! Ù‡Ø°Ø§ Ø´ÙŠØ¡ Ø±Ø§Ø¦Ø¹!
+        other: Ø±Ø§Ø¦Ø¹ØŒ Ù„Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ %{count} Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ† Ø¬ÙØ¯Ø¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ Ø¹Ù† Ù…Ø§Ø³ØªØ¯ÙˆÙ†!
+        two: Ø±Ø§Ø¦Ø¹ØŒ Ù„Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ %{count} Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ† Ø¬ÙØ¯Ø¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ Ø¹Ù† Ù…Ø§Ø³ØªØ¯ÙˆÙ†!
+        zero: Ø±Ø§Ø¦Ø¹ØŒ Ù„Ù‚Ø¯ Ù‚Ø§Ù… Ø¨Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ %{count} Ù…ÙØªØ§Ø¨ÙØ¹ÙˆÙ† Ø¬ÙØ¯Ø¯ Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ Ø¹Ù† Ù…Ø§Ø³ØªØ¯ÙˆÙ†!
       subject:
-        one: "Ø¥Ø´Ø¹Ø§Ø± ÙˆØ§ØØ¯ Ù…Ù†Ø° Ø²ÙŠØ§Ø±ØªÙƒ Ø§Ù„Ø£Ø®ÙŠØ±Ø© \U0001F418"
-        other: "%{count} Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù†Ø° Ø²ÙŠØ§Ø±ØªÙƒ Ø§Ù„Ø£Ø®ÙŠØ±Ø© \U0001F418"
+        few: "%{count} Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ Ø¥Ù„Ù‰ \U0001F418"
+        many: "%{count} Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ Ø¥Ù„Ù‰ \U0001F418"
+        one: "Ø¥Ø´Ø¹Ø§Ø± ÙˆØ§ØØ¯ 1 Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ Ù„Ù€ \U0001F418"
+        other: "%{count} Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ Ø¥Ù„Ù‰ \U0001F418"
+        two: "Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ Ø¥Ù„Ù‰ \U0001F418"
+        zero: "Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙŠØ¯Ø© Ù…Ù†Ø° Ø¢Ø®Ø± Ø²ÙŠØ§Ø±Ø© Ù„Ùƒ Ø¥Ù„Ù‰ \U0001F418"
       title: Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ â€¦
     favourite:
       body: 'Ø£ÙØ¹Ø¬Ø¨ %{name} Ø¨Ù…Ù†Ø´ÙˆØ±Ùƒ :'
@@ -590,8 +739,8 @@ ar:
         units:
           billion: B
           million: M
-          quadrillion: Q
-          thousand: K
+          quadrillion: ÙƒÙˆØ§Ø¯
+          thousand: Ø£Ù„Ù
           trillion: T
           unit: ''
   pagination:
@@ -606,7 +755,7 @@ ar:
     publishing: Ø§Ù„Ù†Ø´Ø±
     web: Ø§Ù„ÙˆÙŠØ¨
   remote_follow:
-    acct: Ù‚Ù… Ø¨Ø¥Ø¯Ø®Ø§Ù„ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø¨Ùƒ username@domain Ø§Ù„Ø°ÙŠ Ù…Ù† Ø®Ù„Ø§Ù„Ù‡ ØªÙˆØ¯ Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©
+    acct: Ù‚Ù… Ø¨Ø¥Ø¯Ø®Ø§Ù„ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø¨Ùƒ username@domain Ø§Ù„Ø°ÙŠ Ù…Ù† Ø®Ù„Ø§Ù„Ù‡ ØªÙˆØ¯ Ø§Ù„Ù†Ø´Ø§Ø·
     missing_resource: ØªØ¹Ø°Ø± Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø±Ø§Ø¨Ø· Ø§Ù„ØªØÙˆÙŠÙ„ Ø§Ù„Ù…Ø·Ù„ÙˆØ¨ Ø§Ù„Ø®Ø§Øµ Ø¨ØØ³Ø§Ø¨Ùƒ
     no_account_html: Ø£Ù„ÙŠØ³ Ø¹Ù†Ø¯Ùƒ ØØ³Ø§Ø¨ Ø¨Ø¹Ø¯Ù ØŸ ÙŠÙÙ…Ù’ÙƒÙ†Ùƒ <a href='%{sign_up_path}' target='_blank'>Ø§Ù„ØªØ³Ø¬ÙŠÙ„ Ù…ÙÙ† Ù‡Ù†Ø§</a>
     proceed: Ø£ÙƒÙ…Ù„ Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©
@@ -675,24 +824,38 @@ ar:
     attached:
       description: 'Ù…ÙØ±ÙÙŽÙ‚ : %{attached}'
       image:
-        one: "%{count} ØµÙˆØ±Ø©"
+        few: "%{count} ØµÙˆØ±"
+        many: "%{count} ØµÙˆØ±"
+        one: ØµÙˆØ±Ø© %{count}
         other: "%{count} ØµÙˆØ±"
+        two: ØµÙˆØ±
+        zero: ØµÙˆØ±
       video:
-        one: "%{count} ÙÙŠØ¯ÙŠÙˆ"
+        few: "%{count} ÙÙŠØ¯ÙŠÙˆÙ‡Ø§Øª"
+        many: "%{count} ÙÙŠØ¯ÙŠÙˆÙ‡Ø§Øª"
+        one: ÙÙŠØ¯ÙŠÙˆ %{count}
         other: "%{count} ÙÙŠØ¯ÙŠÙˆÙ‡Ø§Øª"
+        two: ÙÙŠØ¯ÙŠÙˆÙ‡Ø§Øª
+        zero: ÙÙŠØ¯ÙŠÙˆÙ‡Ø§Øª
+    boosted_from_html: ØªÙ… Ø¥Ø¹Ø§Ø¯Ø© ØªØ±Ù‚ÙŠØªÙ‡ Ù…ÙÙ† %{acct_link}
     content_warning: 'ØªØØ°ÙŠØ± Ø¹Ù† Ø§Ù„Ù…ØØªÙˆÙ‰ : %{warning}'
     disallowed_hashtags:
-      one: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³Ù… Ù…Ù…Ù†ÙˆØ¹ : %{tags}'
-      other: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³ÙˆÙ… Ù…Ù…Ù†ÙˆØ¹Ø© : %{tags}'
+      few: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³ÙˆÙ… ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§: %{tags}'
+      many: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³ÙˆÙ… ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§: %{tags}'
+      one: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³Ù… ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡: %{tags}'
+      other: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³ÙˆÙ… ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§: %{tags}'
+      two: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³ÙˆÙ… ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§: %{tags}'
+      zero: 'ÙŠØØªÙˆÙŠ Ø¹Ù„Ù‰ ÙˆØ³ÙˆÙ… ØºÙŠØ± Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§: %{tags}'
     language_detection: Ø§ÙƒØªØ´Ø§Ù Ø§Ù„Ù„ØºØ© ØªÙ„Ù‚Ø§Ø¦ÙŠØ§
     open_in_web: Ø¥ÙØªØ ÙÙŠ Ø§Ù„ÙˆÙŠØ¨
     over_character_limit: ØªÙ… ØªØ¬Ø§ÙˆØ² ØØ¯ Ø§Ù„Ù€ %{max} ØØ±Ù Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§
     pin_errors:
       limit: Ù„Ù‚Ø¯ Ø¨Ù„ØºØª Ø§Ù„ØØ¯ Ø§Ù„Ø£Ù‚ØµÙ‰ Ù„Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„Ù…Ø¯Ø¨Ø³Ø©
       ownership: Ù„Ø§ ÙŠÙ…ÙƒÙ† ØªØ¯Ø¨ÙŠØ³ ØªØ¨ÙˆÙŠÙ‚ Ù†Ø´Ø±Ù‡ Ø´Ø®Øµ Ø¢Ø®Ø±
-      private: Ù„Ø§ ÙŠÙ…ÙƒÙ† ØªØ«Ø¨ÙŠØª ØªØ¨ÙˆÙŠÙ‚ Ù„Ù… ÙŠÙÙ†Ø´Ø± Ù„Ù„Ø¹Ø§Ù…Ø©
+      private: Ù„Ø§ ÙŠÙ…ÙƒÙ† ØªØ¯Ø¨ÙŠØ³ ØªØ¨ÙˆÙŠÙ‚ Ù„Ù… ÙŠÙÙ†Ø´Ø± Ù„Ù„Ø¹Ø§Ù…Ø©
       reblog: Ù„Ø§ ÙŠÙ…ÙƒÙ† ØªØ«Ø¨ÙŠØª ØªØ±Ù‚ÙŠØ©
     show_more: Ø£Ø¸Ù‡Ø± Ø§Ù„Ù…Ø²ÙŠØ¯
+    sign_in_to_participate: Ù‚Ù… Ø¨ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ Ù„Ù„Ù…Ø´Ø§Ø±ÙƒØ© ÙÙŠ Ù‡Ø°Ù‡ Ø§Ù„Ù…ØØ§Ø¯Ø«Ø©
     title: '%{name} : "%{quote}"'
     visibilities:
       private: Ø¥Ø¹Ø±Ø¶ ÙÙ‚Ø· Ù„Ù…ØªØªØ¨Ø¹ÙŠÙƒ
@@ -702,9 +865,8 @@ ar:
       unlisted: ØºÙŠØ± Ù…ÙØ¯Ø±ÙŽØ¬
       unlisted_long: ÙŠÙÙ…ÙƒÙ† Ù„Ø£ÙŠÙ ÙƒØ§Ù† Ø±ÙØ¤ÙŠØªÙŽÙ‡ Ùˆ Ù„ÙƒÙ† Ù„Ù† ÙŠÙØ¹Ø±ÙŽØ¶ Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠÙˆØ· Ø§Ù„Ø¹Ø§Ù…Ø©
   stream_entries:
-    click_to_show: Ø¥Ø¶ØºØ· Ù„Ù„Ø¹Ø±Ø¶
     pinned: ØªØ¨ÙˆÙŠÙ‚ Ù…Ø«Ø¨Ù‘Øª
-    reblogged: Ø±Ù‚Ù‰
+    reblogged: Ø±Ù‚Ù‘Ø§Ù‡
     sensitive_content: Ù…ØØªÙˆÙ‰ ØØ³Ø§Ø³
   terms:
     title: Ø´Ø±ÙˆØ· Ø§Ù„Ø®Ø¯Ù…Ø© ÙˆØ³ÙŠØ§Ø³Ø© Ø§Ù„Ø®ØµÙˆØµÙŠØ© Ø¹Ù„Ù‰ %{instance}
@@ -715,6 +877,7 @@ ar:
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Ù‚Ù… Ø¨Ø¥Ø¯Ø®Ø§Ù„ Ø§Ù„Ø±Ù…Ø² Ø§Ù„Ù…ÙÙˆÙŽÙ„Ù‘Ø¯ Ø¹Ø¨Ø± ØªØ·Ø¨ÙŠÙ‚ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ù„Ù„ØªØ£ÙƒÙŠØ¯
     description_html: ÙÙŠ ØØ§Ù„ ØªÙØ¹ÙŠÙ„ <strong>Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† </strong>ØŒ ÙØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ ÙŠØªØ·Ù„Ø¨ Ù…Ù†Ùƒ Ø£Ù† ÙŠÙƒÙˆÙ† Ø¨ØÙˆØ²ØªÙƒ Ù‡Ø§ØªÙÙƒ Ø§Ù„Ù†Ù‚Ø§Ù„ Ù‚ØµØ¯ ØªÙˆÙ„ÙŠØ¯ Ø§Ù„Ø±Ù…Ø² Ø§Ù„Ø°ÙŠ Ø³ÙŠØªÙ… Ø¥Ø¯Ø®Ø§Ù„Ù‡.
@@ -724,6 +887,7 @@ ar:
     enabled_success: ØªÙ… ØªÙØ¹ÙŠÙ„ Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† Ø¨Ù†Ø¬Ø§Ø
     generate_recovery_codes: ØªÙˆÙ„ÙŠØ¯ Ø±Ù…ÙˆØ² Ø§Ù„Ø¥Ø³ØªØ±Ø¬Ø§Ø¹
     instructions_html: "<strong>Ù‚Ù… Ø¨Ù…Ø³Ø Ø±Ù…Ø² Ø§Ù„ÙƒÙŠÙˆ Ø¢Ø± Ø¹Ø¨Ø± Google Authenticator Ø£Ùˆ Ø£ÙŠ ØªØ·Ø¨ÙŠÙ‚ TOTP Ø¹Ù„Ù‰ Ø¬Ù‡Ø§Ø²Ùƒ</strong>. Ù…Ù† Ø§Ù„Ø¢Ù† ÙØµØ§Ø¹Ø¯Ø§ Ø³ÙˆÙ ÙŠÙ‚ÙˆÙ… Ø°Ø§Ùƒ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ Ø¨ØªÙˆÙ„ÙŠØ¯ Ø±Ù…ÙˆØ² ÙŠØ¬Ø¨ Ø¹Ù„ÙŠÙƒ Ø¥Ø¯Ø®Ø§Ù„Ù‡Ø§ Ø¹Ù†Ø¯ ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„."
+    lost_recovery_codes: ØªÙÙ…ÙƒÙ‘Ù†Ùƒ Ø±Ù…ÙˆØ² Ø§Ù„Ø¥Ø³ØªØ±Ø¬Ø§Ø¹ Ø§Ù„Ø¥ØØªØ§Ø·ÙŠØ© Ù…ÙÙ† Ø§Ø³ØªØ±Ø¬Ø§Ø¹ Ø§Ù„Ù†ÙØ§Ø° Ø¥Ù„Ù‰ ØØ³Ø§Ø¨Ùƒ ÙÙŠ ØØ§Ù„Ø© ÙÙ‚Ø¯Ø§Ù† Ø¬Ù‡Ø§Ø²Ùƒ Ø§Ù„Ù…ØÙ…ÙˆÙ„. Ø¥Ù† Ø¶Ø§Ø¹Øª Ù…Ù†Ùƒ Ù‡Ø°Ù‡ Ø§Ù„Ø±Ù…ÙˆØ² ÙØ¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ø¥Ø¹Ø§Ø¯Ø© ØªÙˆÙ„ÙŠØ¯Ù‡Ø§ Ù…ÙÙ† Ù‡Ù†Ø§ Ùˆ Ø¥Ø¨Ø·Ø§Ù„ Ø§Ù„Ø±Ù…ÙˆØ² Ø§Ù„Ù‚Ø¯ÙŠÙ…Ø©.
     manual_instructions: 'ÙÙŠ ØØ§Ù„Ø© ØªØ¹Ø°Ù‘Ø± Ù…Ø³Ø Ø±Ù…Ø² Ø§Ù„ÙƒÙŠÙˆ Ø¢Ø± Ø£Ùˆ Ø·ÙÙ„Ø¨ Ù…Ù†Ùƒ Ø¥Ø¯Ø®Ø§Ù„ ÙŠØ¯ÙˆÙŠØŒ ÙŠÙÙ…Ù’ÙƒÙÙ†Ùƒ Ø¥Ø¯Ø®Ø§Ù„ Ù‡Ø°Ø§ Ø§Ù„Ù†Øµ Ø§Ù„Ø³Ø±ÙŠ Ø¹Ù„Ù‰ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ :'
     recovery_codes: Ø§Ù„Ù†Ø³Ø® Ø§Ù„Ø¥ØØªÙŠØ§Ø·ÙŠ Ù„Ø±Ù…ÙˆØ² Ø§Ù„Ø¥Ø³ØªØ±Ø¬Ø§Ø¹
     recovery_codes_regenerated: ØªÙ… Ø¥Ø¹Ø§Ø¯Ø© ØªÙˆÙ„ÙŠØ¯ Ø±Ù…ÙˆØ² Ø§Ù„Ø¥Ø³ØªØ±Ø¬Ø§Ø¹ Ø§Ù„Ø¥ØØªÙŠØ§Ø·ÙŠØ© Ø¨Ù†Ø¬Ø§Ø
@@ -731,21 +895,40 @@ ar:
     wrong_code: Ø§Ù„Ø±Ù…Ø² Ø§Ù„Ø°ÙŠ Ø£Ø¯Ø®Ù„ØªÙ‡ ØºÙŠØ± ØµØ§Ù„Ø ! ØªØÙ‚Ù‚ Ù…Ù† ØµØØ© Ø§Ù„ÙˆÙ‚Øª Ø¹Ù„Ù‰ Ø§Ù„Ø®Ø§Ø¯Ù… Ùˆ Ø§Ù„Ø¬Ù‡Ø§Ø² ØŸ
   user_mailer:
     backup_ready:
-      explanation: ''
+      explanation: Ù„Ù‚Ø¯ Ù‚Ù…Øª Ø¨Ø·Ù„Ø¨ Ù†Ø³Ø®Ø© ÙƒØ§Ù…Ù„Ø© Ù„ØØ³Ø§Ø¨Ùƒ Ø¹Ù„Ù‰ Ù…Ø§Ø³ØªØ¯ÙˆÙ†. Ø¥Ù†Ù‡Ø§ Ù…ØªÙˆÙØ±Ø© Ø§Ù„Ø¢Ù† Ù„Ù„ØªÙ†Ø²ÙŠÙ„ !
       subject: Ù†Ø³Ø®Ø© Ø¨ÙŠØ§Ù†Ø§Øª ØØ³Ø§Ø¨Ùƒ Ø¬Ø§Ù‡Ø²Ø© Ù„Ù„ØªÙ†Ø²ÙŠÙ„
       title: Ø§Ù„Ù…ØºØ§Ø¯Ø±Ø© Ø¨Ø£Ø±Ø´ÙŠÙ Ø§Ù„ØØ³Ø§Ø¨
+    warning:
+      review_server_policies: Ù…Ø±Ø§Ø¬Ø¹Ø© Ø´Ø±ÙˆØ· Ø§Ù„Ø³ÙŠØ±ÙØ±
+      subject:
+        disable: ØªÙ… ØªØ¬Ù…ÙŠØ¯ ØØ³Ø§Ø¨Ùƒ %{acct}
+      title:
+        disable: Ø§Ù„ØØ³Ø§Ø¨ Ù…ÙØ¬Ù…Ù‘ÙŽØ¯
+        none: ØªØØ°ÙŠØ±
+        suspend: Ø§Ù„ØØ³Ø§Ø¨ Ù…ÙØ¹Ù„Ù‘ÙŽÙ‚
     welcome:
       edit_profile_action: ØªÙ‡ÙŠØ¦Ø© Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ
+      edit_profile_step: ÙŠÙÙ…ÙƒÙ†ÙƒÂ·ÙƒÙŠ ØªØ®ØµÙŠØµ Ù…Ù„ÙÙƒ Ø§Ù„Ø´Ø®ØµÙŠ Ø¹Ù† Ø·Ø±ÙŠÙ‚ ØªØÙ…ÙŠÙ„ ØµÙˆØ±Ø© Ø±Ù…Ø²ÙŠØ© ÙˆØ±Ø£Ø³ÙŠØ© Ùˆ Ø¨ØªØ¹Ø¯ÙŠÙ„  Ø¥Ø³Ù…ÙƒÂ·ÙƒÙŠ Ø§Ù„Ø¹Ù„Ù†ÙŠ ÙˆØ£ÙƒØ«Ø±. Ùˆ Ø¥Ù† Ø£Ø±Ø¯ØªÂ·ØªÙŠ Ù…Ø¹Ø§ÙŠÙ†Ø© Ø§Ù„Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ùˆ Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø§Øª Ø§Ù„Ø¬ÙØ¯Ø¯ Ù‚Ø¨ÙŠÙ„ Ø§Ù„Ø³Ù…Ø§Ø Ù„Ù‡Ù…Â·Ù† Ø¨Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ ÙÙŠÙ…ÙƒÙ†ÙƒÂ·ÙƒÙŠ ØªØ£Ù…ÙŠÙ† ØØ³Ø§Ø¨ÙƒÂ·ÙƒÙŠ.
       explanation: Ù‡Ø§ Ù‡ÙŠ Ø¨Ø¹Ø¶ Ø§Ù„Ù†ØµØ§Ø¦Ø Ù‚Ø¨Ù„ Ø¨Ø¯Ø§ÙŠØ© Ø§Ù„Ø¥Ø³ØªØ®Ø¯Ø§Ù…
       final_action: Ø§Ø´Ø±ÙŽØ¹ ÙÙŠ Ø§Ù„Ù†Ø´Ø±
+      final_step: |-
+        ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø´Ø±ÙˆØ¹ ÙÙŠ Ø§Ù„Ù†Ø´Ø± ÙÙŠ Ø§Ù„ØÙŠÙ† ! ØØªÙ‰ Ùˆ Ø¥Ù† Ù„Ù… ÙƒÙ†Øª Ù„Ø§ ØªÙ…ØªÙ„Ùƒ Ù…ØªØ§Ø¨ÙØ¹ÙŠÙ† Ø¨Ø¹Ø¯ÙØŒ ÙŠÙ…ÙƒÙ† Ù„Ù„Ø¢Ø®Ø±ÙŠÙ† Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ø¹Ù„Ù‰ Ù…Ù†Ø´ÙˆØ±Ø§ØªÙƒ Ø§Ù„Ù…ÙˆØ¬Ù‡Ø© Ù„Ù„Ø¬Ù…Ù‡ÙˆØ± Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ù…ØÙ„ÙŠ Ø£Ùˆ Ø¥Ù† Ù‚Ù…Øª Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… ÙˆØ³ÙˆÙ….
+        Ø¥Ø¨Ø¯Ø£ Ø¨ØªÙ‚Ø¯ÙŠÙ… Ù†ÙØ³Ùƒ Ø¨Ø§Ø³ØªØ¹Ù…Ø§Ù„ ÙˆØ³Ù… #introductions.
       full_handle: Ø¹Ù†ÙˆØ§Ù†Ùƒ Ø§Ù„ÙƒØ§Ù…Ù„
+      full_handle_hint: Ù‡Ø°Ø§ Ù‡Ùˆ Ù…Ø§ ÙŠØ¬Ø¨ ØªÙ‚Ø¯ÙŠÙ…Ù‡ Ù„Ø£ØµØ¯Ù‚Ø§Ø¦Ùƒ Ù‚ØµØ¯ Ø£Ù† ÙŠÙƒÙˆÙ† Ø¨Ø¥Ù…ÙƒØ§Ù†Ù‡Ù… Ù…ØªØ§Ø¨ÙŽØ¹ØªÙƒ Ø£Ùˆ Ù…ÙØ±Ø§Ø³ÙŽÙ„ØªÙƒ ØØªÙ‰ Ùˆ Ø¥Ù† ÙƒØ§Ù†Øª ØØ³Ø§Ø¨Ø§ØªÙ‡Ù… Ø¹Ù„Ù‰ Ø®ÙˆØ§Ø¯Ù… Ø£Ø®Ø±Ù‰.
       review_preferences_action: ØªØ¹Ø¯ÙŠÙ„ Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª
       subject: Ø£Ù‡Ù„Ù‹Ø§ Ø¨Ùƒ Ø¹Ù„Ù‰ Ù…Ø§Ø³ØªØ¯ÙˆÙ†
+      tip_federated_timeline: Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„ÙØ¯ÙŠØ±Ø§Ù„ÙŠ Ù‡Ùˆ Ø¨Ù…Ø«Ø§Ø¨Ø© Ø´Ø¨Ù‡ Ù†Ø¸Ø±Ø© Ø´Ø§Ù…Ù„Ø© Ø¹Ù„Ù‰ Ø´Ø¨ÙƒØ© Ù…Ø§Ø³ØªØ¯ÙˆÙ†. ØºÙŠØ± Ø£Ù†Ù‡ Ù„Ø§ ÙŠØ´Ù…Ù„ Ø¥Ù„Ø§ Ø¹Ù„Ù‰ Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ù…ØªØ§Ø¨ÙŽØ¹ÙŠÙ† Ù…ÙÙ† Ø·Ø±Ù Ø¬ÙŠØ±Ø§Ù†Ùƒ Ùˆ Ø¬Ø§Ø±Ø§ØªÙƒØŒ Ù„Ø°Ø§ ÙÙ‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ· Ù„Ø§ ÙŠØ¹ÙƒØ³ ÙƒØ§ÙØ© Ø§Ù„Ø´Ø¨ÙƒØ© Ø¨Ø±ÙÙ…Ù‘ØªÙ‡Ø§.
+      tip_following: Ø£Ù†Øª ØªØªØ¨Ø¹ ØªÙ„Ù‚Ø§Ø¦ÙŠØ§ Ù…Ø¯ÙŠØ±ÙŠ Ùˆ Ù…Ø¯ÙŠØ±Ø§Øª Ø§Ù„Ø®Ø§Ø¯Ù…. Ù„Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£Ø´Ø®Ø§Øµ Ù…Ù…ÙŠØ²ÙŠÙ† Ø£Ùˆ Ù‚Ø¯ ØªÙ‡Ù…Ùƒ ØØ³Ø§Ø¨Ø§ØªÙ‡Ù… Ø¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ø¹Ù„Ù‰ Ø§Ù„Ø®ÙŠÙˆØ· Ø§Ù„Ù…ØÙ„ÙŠØ© Ùˆ ÙƒØ°Ø§ Ø§Ù„ÙØ¯Ø±Ø§Ù„ÙŠØ©.
+      tip_local_timeline: Ø§Ù„Ø®ÙŠØ· Ø§Ù„Ø²Ù…Ù†ÙŠ Ø§Ù„Ù…ØÙ„ÙŠ Ù‡Ùˆ Ø¨Ù…Ø«Ø§Ø¨Ø© Ù†Ø¸Ø±Ø© Ø³Ø±ÙŠØ¹Ø© Ø¹Ù„Ù‰ Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ù…ØªÙˆØ§Ø¬Ø¯ÙŠÙ† Ø¹Ù„Ù‰ %{instance} ÙŠÙ…ÙƒÙ† Ø§Ø¹ØªØ¨Ø§Ø±Ù‡Ù… ÙƒØ¬ÙŠØ±Ø§Ù†Ùƒ ÙˆØ¬Ø§Ø±Ø§ØªÙƒ Ø§Ù„Ø£Ù‚Ø±Ø¨ Ø¥Ù„ÙŠÙƒ!
       tips: Ù†ØµØ§Ø¦Ø
       title: Ø£Ù‡Ù„Ø§Ù‹ Ø¨ÙƒØŒ %{name} !
   users:
+    follow_limit_reached: Ù„Ø§ ÙŠÙ…ÙƒÙ†Ùƒ Ù…ØªØ§Ø¨Ø¹Ø© Ø£ÙƒØ«Ø± Ù…ÙÙ† %{limit} Ø£Ø´Ø®Ø§Øµ
     invalid_email: Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ ØºÙŠØ± ØµØ§Ù„Ø
     invalid_otp_token: Ø±Ù…Ø² Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ† ØºÙŠØ± ØµØ§Ù„Ø
     otp_lost_help_html: Ø¥Ù† ÙÙ‚Ø¯ØªÙŽÙ‡ÙÙ…Ø§ ØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø¥ØªØµØ§Ù„ Ø¨Ù€ %{email}
     seamless_external_login: Ù„Ù‚Ø¯ Ù‚Ù…Øª Ø¨ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø¹Ø¨Ø± Ø®Ø¯Ù…Ø© Ø®Ø§Ø±Ø¬ÙŠØ©ØŒ Ø¥Ù†Ù‘ Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§Ù„ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±ÙŠØ© Ùˆ Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ ØºÙŠØ± Ù…ØªÙˆÙØ±Ø©.
     signed_in_as: 'ØªÙ… ØªØ³Ø¬ÙŠÙ„ Ø¯Ø®ÙˆÙ„Ùƒ Ø¨ØµÙØ© :'
+  verification:
+    verification: Ø§Ù„ØªØÙ‚Ù‚
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
new file mode 100644
index 0000000000000000000000000000000000000000..78ad796a00de762fb3d46587924d5d852e875a83
--- /dev/null
+++ b/config/locales/ast.yml
@@ -0,0 +1,361 @@
+---
+ast:
+  about:
+    about_mastodon_html: Mastodon ye una rede social basada en protocolos abiertos y software de cÃ³digu llibre. Ye descentralizada, como'l corrÃ©u electrÃ³nicu.
+    about_this: Tocante a
+    administered_by: 'AlministrÃ¡u por:'
+    api: API
+    contact: Contautu
+    contact_missing: Nun s'afitÃ³
+    contact_unavailable: N/D
+    documentation: DocumentaciÃ³n
+    extended_description_html: |
+      <h3>Un llugar bonu pa les regles</h3>
+      <p>EntÃ¡ nun se configurÃ³ la descripciÃ³n estendida.</p>
+    features:
+      humane_approach_title: Una visiÃ³n mÃ¡s humana
+      not_a_product_body: Mastodon nun ye una rede comercial, nun hai anuncios, nun recueye datos o nun pon muries a xardinos. Nin siquier tien una autoridÃ¡ central.
+      not_a_product_title: Yes una persona, non un productu
+      real_conversation_title: Fechu pa conversaciones de verdÃ¡
+      within_reach_title: Siempres al algame
+    hosted_on: Mastodon ta agospiÃ¡u en %{domain}
+    learn_more: Deprendi mÃ¡s
+    source_code: CÃ³digu fonte
+    status_count_after: estaos
+    status_count_before: Que crearon
+    terms: TÃ©rminos del serviciu
+    user_count_after:
+      one: usuariu
+      other: usuarios
+    user_count_before: Ye'l llar de
+    what_is_mastodon: "Â¿QuÃ© ye Mastodon?"
+  accounts:
+    followers:
+      one: Xente que te sigue
+      other: Siguidores
+    joined: XuniÃ³se en %{date}
+    moved_html: "%{name} mudÃ³se a %{new_profile_link}:"
+    network_hidden: Esta informaciÃ³n nun ta disponible
+    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: Toot
+      other: Toots
+    posts_tab_heading: Toots
+    posts_with_replies: Toots y rempuestes
+    reserved_username: El nome d'usuariu ta acutÃ¡u
+    roles:
+      bot: RobÃ³
+  admin:
+    accounts:
+      are_you_sure: "Â¿De xuru?"
+      avatar: Avatar
+      by_domain: Dominiu
+      domain: Dominiu
+      email: CorrÃ©u
+      followers: Siguidores
+      ip: IP
+      location:
+        local: Llocal
+        title: Allugamientu
+      protocol: Protocolu
+      resend_confirmation:
+        already_confirmed: Esti usuariu yÃ¡ ta confirmÃ¡u
+      role: Permisos
+      roles:
+        admin: Alministrador
+        moderator: Llendador
+        user: Usuariu
+      statuses: Estaos
+      title: Cuentes
+      username: Nome d'usuariu
+      web: Web
+    action_logs:
+      actions:
+        create_domain_block: "%{name} bloquiÃ³'l dominiu %{target}"
+        disable_custom_emoji: "%{name} desactivÃ³'l fustaxe %{target}"
+        disable_user: "%{name} desactivÃ³ l'aniciu de sesiÃ³n del usuariu %{target}"
+    custom_emojis:
+      by_domain: Dominiu
+      copy_failed_msg: Nun pudo facese una copia llocal d'esi fustaxe
+      emoji: Fustaxe
+      update_failed_msg: Nun pudo anovase esi fustaxe
+    dashboard:
+      config: ConfiguraciÃ³n
+      feature_registrations: Rexistros
+      features: CarauterÃstiques
+      hidden_service: FederaciÃ³n con servicios anubrÃos
+      recent_users: Usuarios recientes
+      software: Software
+      total_users: usuarios en total
+      week_interactions: interaiciones d'esta selmana
+      week_users_new: usuarios d'esta selmana
+    domain_blocks:
+      domain: Dominiu
+    email_domain_blocks:
+      domain: Dominiu
+    instances:
+      title: Instancies conocÃes
+    invites:
+      filter:
+        available: Disponible
+        expired: CaducÃ³
+      title: Invitaciones
+    relays:
+      save_and_enable: Guardar y activar
+    reports:
+      are_you_sure: "Â¿De xuru?"
+      status: EstÃ¡u
+    settings:
+      registrations:
+        min_invite_role:
+          disabled: Naide
+      site_description:
+        title: DescipciÃ³n de la instancia
+      site_title: Nome de la instancia
+      title: Axustes del sitiu
+    statuses:
+      failed_to_execute: Fallu al executar
+    subscriptions:
+      title: WebSub
+    title: AlministraciÃ³n
+  admin_mailer:
+    new_report:
+      body_remote: DaquiÃ©n dende %{domain} informÃ³ de %{target}
+  application_mailer:
+    salutation: "%{name},"
+  applications:
+    invalid_url: La URL apurrida nun ye vÃ¡lida
+    warning: Ten curiÃ¡u con estos datos, Â¡enxamÃ¡s nun los compartas con naide!
+  auth:
+    agreement_html: Faciendo clic en Â«Aniciar sesiÃ³nÂ» aceutes siguir <a href="%{rules_path}"> les regles de la instancia</a> y <a href="%{terms_path}">los nuesos tÃ©rminos del serviciu</a>.
+    change_password: ContraseÃ±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.
+    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>.
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Rexistrase
+    register_elsewhere: Rexistrase n'otru sirvidor
+    security: Seguranza
+  authorize_follow:
+    already_following: YÃ¡ tas siguiendo a esta cuenta
+    error: Desafortunadamente, hebo un fallu guetando 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
+      web: Dir a la web
+  datetime:
+    distance_in_words:
+      half_a_minute: PÃºramente agora
+      less_than_x_seconds: PÃºramente agora
+  deletes:
+    bad_password_msg: "Â¡Bon intentu, crackers! ContraseÃ±a incorreuta"
+    confirm_password: Introduz la contraseÃ±a pa verificar la to identidÃ¡
+  directories:
+    people:
+      one: "%{count} persona"
+      other: "%{count} persones"
+  errors:
+    '403': Nun tienes permisu pa ver esta pÃ¡xina.
+    '404': La pÃ¡xina que tabes guetando nun esiste.
+    '410': La pÃ¡xina que tabes guetando yÃ¡ nun esiste.
+    '422':
+      content: FallÃ³ la verificaciÃ³n de seguranza. Â¿Tas bloquiando les cookies?
+      title: FallÃ³ la verificaciÃ³n de seguranza
+    '429': FiciÃ©ronse milenta solicitÃºes
+  exports:
+    archive_takeout:
+      date: Data
+      hint_html: Pues solicitar un archivu colos tos <strong>toots 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.
+      request: Solicitar l'archivu
+      size: TamaÃ±u
+    blocks: Xente que bloquiesti
+    csv: CSV
+    follows: Xente que sigues
+    mutes: Xente que silenciesti
+  filters:
+    contexts:
+      notifications: Avisos
+      public: Llinies temporales pÃºbliques
+      thread: Conversaciones
+    index:
+      title: PeÃ±eres
+    new:
+      title: Amestar una peÃ±era nueva
+  followers:
+    domain: Dominiu
+    followers_count: NÃºmberu de siguidores
+    purge: Desaniciar de los siguidores
+  generic:
+    changes_saved_msg: "Â¡Los cambeos guardÃ¡ronse con Ã©situ!"
+    save_changes: Guardar cambeos
+  imports:
+    preface: Pues importar los datos qu'esportares dende otra instancia, como por exemplu la llista de persones que bloquiares o tubieres siguiendo.
+    types:
+      blocking: Llista de xente bloquiao
+      following: Llista de siguidores
+      muting: Llista de xente silenciao
+    upload: Xubir
+  invites:
+    delete: Desactivar
+    expired: CaducÃ³
+    expires_in:
+      '1800': 30 minutos
+      '21600': 6 hores
+      '3600': 1 hora
+      '43200': 12 hores
+      '604800': 1 selmana
+      '86400': 1 dÃa
+    expires_in_prompt: EnxamÃ¡s
+    invited_by: 'ConvidÃ³te:'
+    max_uses:
+      one: 1 usu
+      other: "%{count} usos"
+    table:
+      expires_at: Data de caducidÃ¡
+      uses: Usos
+  lists:
+    errors:
+      limit: Algamesti la cantidÃ¡ mÃ¡xima de llistes
+  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
+  migrations:
+    acct: nome_usuariu@dominiu de la cuenta nueva
+    proceed: Guardar
+  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:"
+      subject:
+        other: "%{count} avisos nuevos dende la Ãºltima visita \U0001F418"
+    follow:
+      body: "Â¡Agora %{name} ta siguiÃ©ndote!"
+      title: Siguidor nuevu
+    follow_request:
+      body: "%{name} solicitÃ³ siguite"
+      title: PeticiÃ³n nueva de siguimientu
+    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 toot
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+  pagination:
+    next: Siguiente
+  preferences:
+    languages: LlingÃ¼es
+    publishing: EspublizaciÃ³n
+    web: Web
+  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:'
+  remote_unfollow:
+    error: Fallu
+  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
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: SesiÃ³n actual
+    description: "%{browser} en %{platform}"
+    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 desconocida
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: Sesiones
+  settings:
+    authorized_apps: Aplicaciones autorizaes
+    back: Volver a Mastodon
+    edit_profile: EdiciÃ³n del perfil
+    export: EsportaciÃ³n de datos
+    followers: Siguidores autorizaos
+    import: ImportaciÃ³n
+    notifications: Avisos
+    preferences: Preferencies
+    settings: Axustes
+    two_factor_authentication: AutenticaciÃ³n en dos pasos
+  statuses:
+    attached:
+      image:
+        one: "%{count} imaxe"
+        other: "%{count} imÃ¡xenes"
+      video:
+        one: "%{count} videu"
+        other: "%{count} vÃdeos"
+    boosted_from_html: CompartiÃ³se'l toot dende %{acct_link}
+    language_detection: Deteutala automÃ¡ticamente
+    pin_errors:
+      limit: YÃ¡ fixesti'l nÃºmberu mÃ¡xiumu de toots
+      ownership: Nun pue fixase'l toot d'otra persona
+      private: Nun puen fixase los toots que nun seyan pÃºblicos
+      reblog: Nun pue fixase un toot compartÃu
+    show_more: Amosar mÃ¡s
+    title: "%{name}: Â«%{quote}Â»"
+    visibilities:
+      private: NamÃ¡i siguidores
+  stream_entries:
+    reblogged: compartiÃ³se
+    sensitive_content: ContenÃu sensible
+  themes:
+    default: Mastodon
+  two_factor_authentication:
+    code_hint: Introduz el cÃ³digu xenerÃ¡u pola aplicaciÃ³n autenticadora pa confirmar
+    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 esos cÃ³digos, pues xeneralos de nueves equÃ. Los cÃ³digos de recuperaciÃ³n vieyos van invalidase.
+    manual_instructions: 'Si nun pues escaniar el cÃ³digu QR y precises introducilu a mano, equÃ ta''l secretu en testu planu:'
+    recovery_codes: CÃ³digos de recuperaciÃ³n
+    recovery_codes_regenerated: Los cÃ³digos de recuperaciÃ³n rexenerÃ¡ronse con Ã©situ
+  user_mailer:
+    welcome:
+      full_handle_hint: Esto ye lo que-yos dirÃes a los collacios pa que puean unviate mensaxes o siguite dende otra instancia.
+      subject: AfÃ¡yate en Mastodon
+      tips: Conseyos
+  users:
+    invalid_email: La direiciÃ³n de corrÃ©u nun ye vÃ¡lida
+    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.
+  verification:
+    verification: VerificaciÃ³n
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index cb3ed22449c7447e69ff4a52a5c3f78f66900ac4..4de5b1e22a34866ceb7a2e44094971ed8b4bcaea 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -5,9 +5,6 @@ bg:
     about_this: Ð—Ð° Ñ‚Ð°Ð·Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ
     closed_registrations: Ð’ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸Ñ‚Ðµ Ð·Ð° Ñ‚Ð°Ð·Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ ÑÐ° Ð·Ð°Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸.
     contact: Ð—Ð° ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð¸
-    description_headline: ÐšÐ°ÐºÐ²Ð¾ Ðµ %{domain}?
-    domain_count_after: Ð´Ñ€ÑƒÐ³Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸
-    domain_count_before: Ð¡Ð²ÑŠÑ€Ð·Ð°Ð½Ð¸ ÐºÑŠÐ¼
     other_instances: Ð”Ñ€ÑƒÐ³Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ð¸
     source_code: ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ÐµÐ½ ÐºÐ¾Ð´
     status_count_after: Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸
@@ -22,7 +19,6 @@ bg:
     people_followed_by: Ð¥Ð¾Ñ€Ð°, ÐºÐ¾Ð¸Ñ‚Ð¾ %{name} ÑÐ»ÐµÐ´Ð²Ð°
     people_who_follow: Ð¥Ð¾Ñ€Ð°, ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐ»ÐµÐ´Ð²Ð°Ñ‚ %{name}
     posts: ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸
-    remote_follow: ÐŸÐ¾ÑÐ»ÐµÐ´Ð²Ð°Ð¹
     unfollow: ÐÐµ ÑÐ»ÐµÐ´Ð²Ð°Ð¹
   application_mailer:
     settings: 'ÐŸÑ€Ð¾Ð¼ÑÐ½Ð° Ð½Ð° Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ð¸Ñ‚Ð°Ð½Ð¸ÑÑ‚Ð° Ð·Ð° e-mail: %{link}'
@@ -52,11 +48,11 @@ bg:
       half_a_minute: Ð¢Ð¾ÐºÑƒ-Ñ‰Ð¾
       less_than_x_minutes: "%{count} Ð¼Ð¸Ð½."
       less_than_x_seconds: Ð¢Ð¾ÐºÑƒ-Ñ‰Ð¾
-      over_x_years: "%{count} Ð³."
+      over_x_years: "%{count} Ð³"
       x_days: "%{count} Ð´Ð½Ð¸"
-      x_minutes: "%{count} Ð¼Ð¸Ð½."
-      x_months: "%{count} Ð¼."
-      x_seconds: "%{count} ÑÐµÐº."
+      x_minutes: "%{count} Ð¼Ð¸Ð½"
+      x_months: "%{count} Ð¼"
+      x_seconds: "%{count} ÑÐµÐº"
   exports:
     blocks: Ð’Ð°ÑˆÐ¸Ñ‚Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸Ñ
     csv: CSV
@@ -64,27 +60,22 @@ bg:
     storage: Ð¡ÑŠÑ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ
   generic:
     changes_saved_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ!
-    powered_by: Ð¿Ð¾Ð´Ð´ÑŠÑ€Ð¶Ð°Ð½Ð¾ Ð¾Ñ‚ %{link}
     save_changes: Ð—Ð°Ð¿Ð°Ð·Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ
-    validation_errors:
-      one: ÐÐµÑ‰Ð¾ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ Ð½Ð°Ñ€ÐµÐ´! ÐœÐ¾Ð»Ñ, Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ð¹ Ð³Ñ€ÐµÑˆÐºÐ°Ñ‚Ð° Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ
-      other: ÐÐµÑ‰Ð¾ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ Ð½Ð°Ñ€ÐµÐ´! ÐœÐ¾Ð»Ñ, Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ð¹ Ð³Ñ€ÐµÑˆÐºÐ¸Ñ‚Ðµ Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ
+    validation_errors: ÐÐµÑ‰Ð¾ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ Ð½Ð°Ñ€ÐµÐ´! ÐœÐ¾Ð»Ñ, Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ð¹ Ð³Ñ€ÐµÑˆÐºÐ¸Ñ‚Ðµ Ð¿Ð¾-Ð´Ð¾Ð»Ñƒ
   imports:
     preface: ÐœÐ¾Ð¶ÐµÑˆ Ð´Ð° Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð°Ñˆ Ð½ÑÐºÐ¾Ð¸ Ð´Ð°Ð½Ð½Ð¸, ÐºÐ°Ñ‚Ð¾ Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€ Ð²ÑÐ¸Ñ‡ÐºÐ¸ Ñ…Ð¾Ñ€Ð°, ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐ»ÐµÐ´Ð²Ð°Ñˆ Ð¸Ð»Ð¸ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñˆ Ð² Ð°ÐºÐ°ÑƒÐ½Ñ‚Ð° ÑÐ¸ Ð½Ð° Ñ‚Ð°Ð·Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ, Ð¾Ñ‚ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ, ÑÑŠÐ·Ð´Ð°Ð´ÐµÐ½Ð¸ Ñ‡Ñ€ÐµÐ· ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚ Ð² Ð´Ñ€ÑƒÐ³Ð° Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ.
-    success: Ð¢Ð²Ð¾Ð¸Ñ‚Ðµ Ð´Ð°Ð½Ð½Ð¸ Ð±ÑÑ…Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÐºÐ°Ñ‡ÐµÐ½Ð¸ Ð¸ Ñ‰Ðµ Ð±ÑŠÐ´Ð°Ñ‚ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½Ð¸ Ð²Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑ‚Ð²Ð¸Ðµ.
+    success: Ð¢Ð²Ð¾Ð¸Ñ‚Ðµ Ð´Ð°Ð½Ð½Ð¸ Ð±ÑÑ…Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÐºÐ°Ñ‡ÐµÐ½Ð¸ Ð¸ Ñ‰Ðµ Ð±ÑŠÐ´Ð°Ñ‚ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐµÐ½Ð¸ Ð²Ð¿Ð¾ÑÐ»ÐµÐ´ÑÑ‚Ð²Ð¸Ðµ
     types:
       blocking: Ð¡Ð¿Ð¸ÑÑŠÐº Ð½Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¸Ñ‚Ðµ
       following: Ð¡Ð¿Ð¸ÑÑŠÐº Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ
     upload: ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ
-  landing_strip_html: "<strong>%{name}</strong> Ðµ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ» Ð¾Ñ‚ %{link_to_root_path}. ÐœÐ¾Ð¶ÐµÑˆ Ð´Ð° Ð³Ð¸ ÑÐ»ÐµÐ´Ð²Ð°Ñˆ, Ð¸Ð»Ð¸ Ð´Ð° ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚ÑƒÐ²Ð°Ñˆ Ñ Ñ‚ÑÑ…, Ð°ÐºÐ¾ Ð¸Ð¼Ð°Ñˆ Ð°ÐºÐ°ÑƒÐ½Ñ‚ ÐºÑŠÐ´ÐµÑ‚Ð¾ Ð¸ Ð´Ð° Ðµ Ð¸Ð· Ñ„ÐµÐ´ÐµÑ€Ð¸Ñ€Ð°Ð½Ð°Ñ‚Ð° Ð²ÑÐµÐ»ÐµÐ½Ð° Ð½Ð° Mastodon."
-  landing_strip_signup_html: ÐÐºÐ¾ Ð½ÑÐ¼Ð°Ñˆ Ð°ÐºÐ°ÑƒÐ½Ñ‚, Ð¼Ð¾Ð¶ÐµÑˆ Ð´Ð° ÑÐ¸ <a href="%{sign_up_path}">ÑÑŠÐ·Ð´Ð°Ð´ÐµÑˆ ÐµÑ‚Ð¾ Ñ‚ÑƒÐº</a>.
   media_attachments:
     validations:
       images_and_video: ÐÐµ Ð¼Ð¾Ð³Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ð° Ð²Ð¸Ð´ÐµÐ¾ÐºÐ»Ð¸Ð¿ ÐºÑŠÐ¼ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ, ÐºÐ¾ÑÑ‚Ð¾ Ð²ÐµÑ‡Ðµ ÑÑŠÐ´ÑŠÑ€Ð¶Ð° Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ
       too_many: ÐÐµ Ð¼Ð¾Ð³Ð° Ð´Ð° Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ð° Ð¿Ð¾Ð²ÐµÑ‡Ðµ Ð¾Ñ‚ 4 Ñ„Ð°Ð¹Ð»Ð°
   notification_mailer:
     digest:
-      body: 'Ð•Ñ‚Ð¾ ÐºÑ€Ð°Ñ‚ÐºÐ¾ Ñ€ÐµÐ·ÑŽÐ¼Ðµ Ð½Ð° Ð½ÐµÑ‰Ð°Ñ‚Ð°, ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐµ ÑÐ»ÑƒÑ‡Ð¸Ñ…Ð° Ð¾Ñ‚ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¾Ñ‚Ð¾ Ñ‚Ð¸ Ð¿Ð¾ÑÐµÑ‰ÐµÐ½Ð¸Ðµ Ð² %{instance} Ð½Ð° %{since}:'
+      body: Ð•Ñ‚Ð¾ ÐºÑ€Ð°Ñ‚ÐºÐ¾ Ñ€ÐµÐ·ÑŽÐ¼Ðµ Ð½Ð° Ð½ÐµÑ‰Ð°Ñ‚Ð°, ÐºÐ¾Ð¸Ñ‚Ð¾ ÑÐµ ÑÐ»ÑƒÑ‡Ð¸Ñ…Ð° Ð¾Ñ‚ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¾Ñ‚Ð¾ Ñ‚Ð¸ Ð¿Ð¾ÑÐµÑ‰ÐµÐ½Ð¸Ðµ Ð½Ð° %{since}
       mention: "%{name} Ñ‚Ðµ ÑÐ¿Ð¾Ð¼ÐµÐ½Ð° Ð²:"
       new_followers_summary:
         one: Ð˜Ð¼Ð°Ñˆ ÐµÐ´Ð¸Ð½ Ð½Ð¾Ð² Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»! Ð£Ñ€Ð°!
@@ -144,7 +135,6 @@ bg:
       public: ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾
       unlisted: ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾, Ð½Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ð¹ Ð² Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¸Ñ ÐºÐ°Ð½Ð°Ð»
   stream_entries:
-    click_to_show: ÐŸÐ¾ÐºÐ°Ð¶Ð¸
     reblogged: ÑÐ¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾
     sensitive_content: Ð”ÐµÐ»Ð¸ÐºÐ°Ñ‚Ð½Ð¾ ÑÑŠÐ´ÑŠÑ€Ð¶Ð°Ð½Ð¸Ðµ
   time:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ecf28f26c5f7fec9c11a27f1c22c03a72031b262..9b76d184b8fb2ef4c37aa9b942d5da27c20bdbeb 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -5,13 +5,13 @@ ca:
     about_mastodon_html: Mastodon Ã©s una xarxa social basada en protocols web oberts i en programari lliure i de codi obert. EstÃ  descentralitzat com el correu electrÃ²nic.
     about_this: Quant a
     administered_by: 'Administrat per:'
+    api: API
+    apps: Apps mÃ²bil
     closed_registrations: Actualment, el registre estÃ  tancat en aquesta instÃ ncia. Malgrat aixÃ²! Pots trobar una altra instÃ ncia per fer-te un compte i obtenir accÃ©s a la mateixa xarxa des d'allÃ .
     contact: Contacte
     contact_missing: No configurat
     contact_unavailable: N/D
-    description_headline: QuÃ¨ es %{domain}?
-    domain_count_after: altres instÃ ncies
-    domain_count_before: Connectada a
+    documentation: DocumentaciÃ³
     extended_description_html: |
       <h3>Un bon lloc per les regles</h3>
       <p>Encara no s'ha configurat la descripciÃ³ ampliada.</p>
@@ -28,25 +28,41 @@ ca:
     hosted_on: Mastodon allotjat a %{domain}
     learn_more: MÃ©s informaciÃ³
     other_instances: Altres instÃ ncies
+    privacy_policy: PolÃtica de privacitat
     source_code: Codi font
-    status_count_after: estats
+    status_count_after:
+      one: estat
+      other: estats
     status_count_before: Que han escrit
-    user_count_after: usuaris registrats
+    terms: Termes del servei
+    user_count_after:
+      one: usuari
+      other: usuaris
     user_count_before: Tenim
     what_is_mastodon: QuÃ¨ Ã©s Mastodon?
   accounts:
+    choices_html: 'Eleccions de %{name}:'
     follow: Segueix
-    followers: Seguidors
+    followers:
+      one: Seguidor
+      other: Seguidors
     following: Seguint
+    joined: Unit des de %{date}
+    last_active: darrer actiu
+    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
     nothing_here: No hi ha res aquÃ!
     people_followed_by: Usuaris seguits per %{name}
     people_who_follow: Usuaris que segueixen %{name}
-    posts: Toots
+    pin_errors:
+      following: Has d'estar seguint la persona que vulguis avalar
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
     posts_with_replies: Toots i respostes
-    remote_follow: Seguiment remot
     reserved_username: El nom d'usuari estÃ  reservat
     roles:
       admin: Administrador
@@ -54,6 +70,9 @@ ca:
       moderator: Moderador
     unfollow: Deixa de seguir
   admin:
+    account_actions:
+      action: Realitzar 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!
@@ -67,12 +86,13 @@ ca:
         changed_msg: El correu electrÃ²nic del compte s'ha canviat correctament!
         current_email: Correu electrÃ²nic actual
         label: Canviar l'adreÃ§a de correu
-        new_email: Nou correu
+        new_email: Nova adreÃ§a de correu
         submit: Canviar adreÃ§a de correu
         title: Canviar adreÃ§a de correu de %{username}
       confirm: Confirma
       confirmed: Confirmat
       confirming: Confirmant
+      deleted: Esborrats
       demote: Degrada
       disable: Inhabilita
       disable_two_factor_authentication: Desactiva 2FA
@@ -88,8 +108,11 @@ ca:
       followers: Seguidors
       followers_url: URL dels seguidors
       follows: Segueix
+      header: CapÃ§alera
       inbox_url: URL de la safata d'entrada
+      invited_by: Convidat per
       ip: IP
+      joined: Unit
       location:
         all: Tot
         local: Local
@@ -99,6 +122,7 @@ ca:
       media_attachments: Adjunts multimÃ¨dia
       memorialize: Converteix-lo en memorial
       moderation:
+        active: Actiu
         all: Tot
         silenced: Silenciat
         suspended: SuspÃ¨s
@@ -106,20 +130,18 @@ ca:
       moderation_notes: Notes de moderaciÃ³
       most_recent_activity: Activitat mÃ©s recent
       most_recent_ip: IP mÃ©s recent
+      no_limits_imposed: Sense lÃmits imposats
       not_subscribed: No subscrit
-      order:
-        alphabetic: AlfabÃ¨tic
-        most_recent: MÃ©s recent
-        title: Ordre
       outbox_url: URL de la bÃºstia de sortida
-      perform_full_suspension: Aplica una suspensiÃ³ completa
+      perform_full_suspension: SuspÃ¨n
       profile_url: URL del perfil
       promote: Promociona
       protocol: Protocol
       public: PÃºblic
       push_subscription_expires: La subscripciÃ³ PuSH expira
-      redownload: Actualitza l'avatar
+      redownload: Actualitza el perfil
       remove_avatar: Eliminar avatar
+      remove_header: Treu la capÃ§alera
       resend_confirmation:
         already_confirmed: Este usuario ya estÃ¡ confirmado
         send: Reenviar el correu electrÃ²nic de confirmaciÃ³
@@ -137,28 +159,32 @@ ca:
       search: Cerca
       shared_inbox_url: URL de la safata d'entrada compartida
       show:
-        created_reports: Informes creats per aquest compte
-        report: informe
-        targeted_reports: Informes realitzats sobre aquest compte
+        created_reports: Informes creats
+        targeted_reports: Informes realitzats per altres
       silence: Silenci
+      silenced: Silenciat
       statuses: Estats
       subscribe: Subscriu
+      suspended: SuspÃ¨s
       title: Comptes
       unconfirmed_email: Correu electrÃ²nic sense confirmar
       undo_silenced: Deixa de silenciar
       undo_suspension: DesfÃ©s la suspensiÃ³
       unsubscribe: CancelÂ·la la subscripciÃ³
       username: Nom d'usuari
+      warn: AvÃs
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} han assignat l'informe %{target} a ells mateixos"
         change_email_user: "%{name} ha canviat l'adreÃ§a de correu electrÃ²nic del usuari %{target}"
         confirm_user: "%{name} ha confirmat l'adreÃ§a de correu electrÃ²nic de l'usuari %{target}"
+        create_account_warning: "%{name} ha enviat un avÃs a %{target}"
         create_custom_emoji: "%{name} ha pujat un nou emoji %{target}"
         create_domain_block: "%{name} ha blocat el domini %{target}"
         create_email_domain_block: "%{name} ha afegit a la llista negra el domini del correu electrÃ²nic %{target}"
         demote_user: "%{name} ha degradat l'usuari %{target}"
+        destroy_custom_emoji: "%{name} ha destruÃ¯t l'emoji %{target}"
         destroy_domain_block: "%{name} ha desblocat el domini %{target}"
         destroy_email_domain_block: "%{name} ha afegit a la llista negra el domini de correu electrÃ²nic %{target}"
         destroy_status: "%{name} eliminat l'estat per %{target}"
@@ -180,6 +206,7 @@ ca:
         unsuspend_account: "%{name} ha llevat la suspensiÃ³ del compte de %{target}"
         update_custom_emoji: "%{name} ha actualitzat l'emoji %{target}"
         update_status: "%{name} estat actualitzat per %{target}"
+      deleted_status: "(toot suprimit)"
       title: Registre d'auditoria
     custom_emojis:
       by_domain: Domini
@@ -206,8 +233,30 @@ ca:
       update_failed_msg: No s'ha pogut actualitzar aquest emoji
       updated_msg: Emoji s'ha actualitzat correctament!
       upload: Carrega
+    dashboard:
+      backlog: treballs en espera
+      config: ConfiguraciÃ³
+      feature_deletions: Supressions del compte
+      feature_invites: EnllaÃ§os de convits
+      feature_profile_directory: Directori de perfils
+      feature_registrations: Registres
+      feature_relay: Relay de la FederaciÃ³
+      features: CaracterÃstiques
+      hidden_service: FederaciÃ³ amb serveis ocults
+      open_reports: informes oberts
+      recent_users: Usuaris recents
+      search: Cerca de text complet
+      single_user_mode: Mode d'usuari Ãºnic
+      software: Programari
+      space: Ãšs dâ€™espai
+      title: Panell
+      total_users: usuaris en total
+      trends: TendÃ¨ncies
+      week_interactions: interaccions d'aquesta setmana
+      week_users_active: usuaris actius aquesta setmana
+      week_users_new: nous usuaris aquest setmana
     domain_blocks:
-      add_new: Afegeix
+      add_new: Afegir nou bloqueig de domini
       created_msg: El bloqueig de domini ara s'estÃ  processant
       destroyed_msg: El bloqueig de domini s'ha desfet
       domain: Domini
@@ -222,11 +271,13 @@ ca:
         title: Bloqueig de domini nou
       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
-      severities:
-        noop: Cap
-        silence: Silenci
-        suspend: SuspensiÃ³
-      severity: Severitat
+      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
@@ -236,8 +287,7 @@ ca:
           suspend: DesfÃ©s la suspensiÃ³ de tots els comptes d'aquest domini
         title: DesfÃ©s el bloqueig de domini de %{domain}
         undo: DesfÃ©s
-      title: Bloquejos de domini
-      undo: DesfÃ©s
+      undo: DesfÃ©s el bloqueig del domini
     email_domain_blocks:
       add_new: Afegeix
       created_msg: S'ha creat el bloc de domini de correu electrÃ²nic
@@ -248,19 +298,47 @@ ca:
         create: Afegeix un domini
         title: Nova adreÃ§a de correu en la llista negra
       title: Llista negra de correus electrÃ²nics
+    followers:
+      back_to_account: Tornar al compte
+      title: Seguidors de %{acct}
     instances:
-      account_count: Comptes coneguts
-      domain_name: Domini
-      reset: Restableix
-      search: Cerca
-      title: InstÃ ncies conegudes
+      delivery_available: El lliurament estÃ  disponible
+      known_accounts:
+        one: "%{count} compte conegut"
+        other: "%{count} comptes coneguts"
+      moderation:
+        all: Totes
+        limited: Limitades
+        title: ModeraciÃ³
+      title: FederaciÃ³
+      total_blocked_by_us: Bloquejades per nosaltres
+      total_followed_by_them: Seguides per ells
+      total_followed_by_us: Seguides per nosaltres
+      total_reported: Informes sobre elles
+      total_storage: Adjunts multimÃ¨dia
     invites:
+      deactivate_all: Desactiva-ho tot
       filter:
         all: Totes
         available: Disponible
         expired: Caducat
         title: Filtre
       title: Convida
+    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 toots 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.
+      disable: Inhabilita
+      disabled: Desactivat
+      enable: Activat
+      enable_hint: Una vegada habilitat, el teu servidor es subscriurÃ  a tots els toots pÃºblics d'aquest relay i comenÃ§arÃ  a enviar-hi tots els toots pÃºblics d'aquest servidor.
+      enabled: Activat
+      inbox_url: URL del Relay
+      pending: S'estÃ  esperant l'aprovaciÃ³ del relay
+      save_and_enable: Desa i activa
+      setup: Configura una connexiÃ³ de relay
+      status: Estat
+      title: Relays
     report_notes:
       created_msg: La nota del informe s'ha creat correctament!
       destroyed_msg: La nota del informe s'ha esborrat correctament!
@@ -275,7 +353,6 @@ ca:
       comment:
         none: Cap
       created_at: Reportat
-      id: ID
       mark_as_resolved: Marca com a resolt
       mark_as_unresolved: Marcar sense resoldre
       notes:
@@ -286,20 +363,15 @@ ca:
         placeholder: Descriu les accions que s'han pres o qualsevol altra actualitzaciÃ³ relacionadaâ€¦
       reopen: Reobrir informe
       report: 'Informe #%{id}'
-      report_contents: Contingut
       reported_account: Compte reportat
       reported_by: Reportat per
       resolved: Resolt
       resolved_msg: Informe resolt amb Ã¨xit!
-      silence_account: Silencia el compte
       status: Estat
-      suspend_account: SuspÃ¨n el compte
-      target: Objectiu
       title: Informes
       unassign: Treure assignaciÃ³
       unresolved: No resolt
       updated_at: Actualitzat
-      view: VisualitzaciÃ³
     settings:
       activity_api_enabled:
         desc_html: Compte d'estatus publicats localment, usuaris actius i registres nous en perÃodes setmanals
@@ -310,12 +382,24 @@ ca:
       contact_information:
         email: Introdueix una adreÃ§a de correu electrÃ²nic pÃblica
         username: Nom d'usuari del contacte
+      custom_css:
+        desc_html: Modifica l'aspecte amb CSS carregat a cada pÃ gina
+        title: CSS personalitzat
       hero:
         desc_html: Es mostra en pÃ gina frontal. Recomanat 600x100px al menys. Si no es configura es mostrarÃ  el de la instÃ ncia
         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 ha trobat aquesta instÃ ncia al fediverse
         title: Publica la llista d'instÃ ncies descobertes
+      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
@@ -341,6 +425,9 @@ ca:
       site_description_extended:
         desc_html: Un bon lloc per al codi de conducta, regles, directrius i altres coses que distingeixen la vostra instÃ ncia. 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. Si estÃ  buit, s'estableix per defecte la descripciÃ³ de la instÃ ncia.
+        title: DescripciÃ³ curta de lâ€™instÃ ncia
       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
@@ -362,6 +449,7 @@ ca:
       media:
         title: Contingut multimÃ¨dia
       no_media: Sense contingut multimÃ¨dia
+      no_status_selected: No sâ€™han canviat els estatus perquÃ¨ cap no ha estat seleccionat
       title: Estats del compte
       with_media: Amb contingut multimÃ¨dia
     subscriptions:
@@ -371,7 +459,21 @@ ca:
       last_delivery: Ãšltim lliurament
       title: WebSub
       topic: Tema
+    tags:
+      accounts: Comptes
+      hidden: Amagat
+      hide: Ocult del directori
+      name: Etiqueta
+      title: Etiquetes
+      unhide: Mostra en el directori
+      visible: Visible
     title: AdministraciÃ³
+    warning_presets:
+      add_new: Afegir nou
+      delete: Esborra
+      edit: Edita
+      edit_preset: Edita l'avÃs predeterminat
+      title: Gestiona les configuracions predefinides dels avisos
   admin_mailer:
     new_report:
       body: "%{reporter} ha informat de %{target}"
@@ -393,7 +495,7 @@ ca:
     warning: Aneu amb compte amb aquestes dades. No les compartiu mai amb ningÃº!
     your_token: El teu identificador d'accÃ©s
   auth:
-    agreement_html: En inscriure't, acceptes seguir <a href="%{rules_path}">els nostres termes del servei</a> i <a href="%{terms_path}">la nostra polÃtica de privadesa</a>.
+    agreement_html: Al fer clic en "Registre" acceptes respectar <a href="%{rules_path}">els nostres termes del servei</a> i <a href="%{terms_path}">la nostra polÃtica de privadesa</a>.
     change_password: Contrasenya
     confirm_email: Confirmar correu electrÃ²nic
     delete_account: Suprimeix el compte
@@ -449,6 +551,16 @@ ca:
     success_msg: El compte s'ha eliminat correctament
     warning_html: NomÃ©s Ã©s garantida l'eliminaciÃ³ d'aquesta particular instÃ ncia. El contingut que s'ha compartit Ã mpliament deixa petjades. Els servidors fora de lÃnia i els que ja no estan subscrits no actualitzaran les seves bases de dades.
     warning_title: Disponibilitat de contingut disseminat
+  directories:
+    directory: Directori de perfils
+    enabled: Actualment estÃ s inclÃ²s al directori.
+    enabled_but_waiting: Has optat per aparÃ¨ixer al directori perÃ² encara no tens el nombre mÃnim de seguidors (%{min_followers}) per ser-hi.
+    explanation: Descobreix usuaris segons els seus interessos
+    explore_mastodon: Explora %{title}
+    how_to_enable: Actualment no tens activat ser al directori. Pots optar-hi a continuaciÃ³. Utilitza etiquetes en el teu text bio per incloure't sota etiquetes especifiques!
+    people:
+      one: "%{count} persona"
+      other: "%{count} gent"
   errors:
     '403': No tens permÃs per a veure aquesta pÃ gina.
     '404': La pÃ gina que estÃ s cercant no existeix.
@@ -460,7 +572,7 @@ ca:
     '500':
       content: Ho sentim, perÃ² alguna cosa ha fallat a la nostra banda.
       title: Aquesta pÃ gina no es correcta
-    noscript_html: Per a utilitzar Mastodon, activa el JavaScript. TambÃ© pots provar una de les <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md"> aplicacions natives</a> de Mastodon per a la vostra plataforma.
+    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 vostra plataforma.
   exports:
     archive_takeout:
       date: Data
@@ -471,7 +583,9 @@ ca:
       size: Tamany
     blocks: Persones que has blocat
     csv: CSV
+    domain_blocks: Bloquejos de dominis
     follows: Persones que segueixes
+    lists: Llistes
     mutes: Persones silenciades
     storage: Emmagatzematge
   filters:
@@ -502,9 +616,13 @@ ca:
     true_privacy_html: Considera que <strong>la autÃ¨ntica privacitat nomÃ©s es pot aconseguir amb xifratge d'extrem a extrem</strong>.
     unlocked_warning_html: Tothom pot seguir-te per a veure inmediatament les teves publicacions privades. %{lock_link} per poder revisar i rebutjar seguidors.
     unlocked_warning_title: El teu compte no estÃ  blocat
+  footer:
+    developers: Desenvolupadors
+    more: MÃ©sâ€¦
+    resources: Recursos
   generic:
     changes_saved_msg: Els canvis s'han desat correctament!
-    powered_by: amb tecnologia %{link}
+    copy: Copia
     save_changes: Desa els canvis
     validation_errors:
       one: Alguna cosa no va bÃ©! Si us plau, revisa l'error
@@ -540,8 +658,6 @@ ca:
       expires_at: Caduca
       uses: Usos
     title: Convida persones
-  landing_strip_html: "<strong>%{name}</strong> Ã©s un usuari/a de %{link_to_root_path}. Pots seguir-lo/la o interactuar amb ell/a si tens un compte a qualsevol node del fediverse."
-  landing_strip_signup_html: Si no en tens, pots <a href="%{sign_up_path}">registrar-te aquÃ</a>.
   lists:
     errors:
       limit: Has assolit la quantitat mÃ xima de llistes
@@ -559,7 +675,7 @@ ca:
   notification_mailer:
     digest:
       action: Veure totes les notificacions
-      body: Un resum del que et vas perdre en %{instance} desde la darrera visita el %{since}
+      body: Un resum del que et vas perdre desde 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!
@@ -588,7 +704,7 @@ ca:
       title: MenciÃ³ nova
     reblog:
       body: "%{name} ha impulsat el teu estat:"
-      subject: "%{name} ha retootejat el teu estat"
+      subject: "%{name} ha impulsat el teu estat"
       title: Nou impuls
   number:
     human:
@@ -618,10 +734,25 @@ ca:
     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 toot:'
+    reblog:
+      proceed: Procedir a impulsar
+      prompt: 'Vols impulsar aquest toot:'
+    reply:
+      proceed: Procedir a respondre
+      prompt: 'Vols respondre a aquest toot:'
   remote_unfollow:
     error: Error
     title: TÃtol
     unfollowed: Sense seguir
+  scheduled_statuses:
+    over_daily_limit: Has superat el lÃmit de %{limit} toots programats per a aquell dia
+    over_total_limit: Has superat el limit de %{limit} toots programats
+    too_soon: La data programada ha de ser futura
   sessions:
     activity: Ãšltima activitat
     browser: Navegador
@@ -701,6 +832,7 @@ ca:
       private: No es pot fixar el toot no pÃºblic
       reblog: No es pot fixar un impuls
     show_more: Mostrar mÃ©s
+    sign_in_to_participate: Inicia la sessiÃ³ per participar a la conversa
     title: '%{name}: "%{quote}"'
     visibilities:
       private: NomÃ©s seguidors
@@ -710,7 +842,6 @@ ca:
       unlisted: No llistat
       unlisted_long: Tothom ho pot veure, perÃ² no es mostra en la histÃ²ria federada
   stream_entries:
-    click_to_show: Clic per mostrar
     pinned: Toot fixat
     reblogged: ha impulsat
     sensitive_content: Contingut sensible
@@ -804,6 +935,7 @@ ca:
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Introdueix el codi generat per l'aplicaciÃ³ autenticadora per a confirmar
     description_html: Si habilites l'<strong>autenticaciÃ³ de dos factors</strong>, et caldrÃ  tenir el teu telÃ¨fon, que generarÃ  tokens per a que puguis iniciar sessiÃ³.
@@ -825,6 +957,22 @@ ca:
       explanation: Has solÂ·licitat una copia completa del teu compte Mastodon. Ara ja estÃ  a punt per descÃ rrega!
       subject: El teu arxiu estÃ  preparat per a descÃ rrega
       title: Recollida del arxiu
+    warning:
+      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.
+        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 toots i fitxers multimÃ¨dia penjats s'han eliminat irreversiblement d'aquest servidor i dels servidors on tenies seguidors.
+      review_server_policies: Revisa les polÃtiques del servidor
+      subject:
+        disable: S'ha congelat el teu compte %{acct}
+        none: AvÃs per a %{acct}
+        silence: El teu compte %{acct} ha estat limitat
+        suspend: S'ha suspÃ¨s el teu compte %{acct}
+      title:
+        disable: Compte congelat
+        none: AvÃs
+        silence: Compte limitat
+        suspend: Compte suspÃ¨s
     welcome:
       edit_profile_action: Configurar 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.
@@ -836,7 +984,6 @@ ca:
       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: Benvingut/da a Mastodon
-      tip_bridge_html: Si vens de Twitter, pots trobar els teus amics a Mastodon mitjanÃ§ant l'aplicaciÃ³ <a href="%{bridge_url}"> bridge </a>. NomÃ©s funciona si tambÃ© ells usen aquesta aplicaciÃ³ pont!
       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Ã  complet.
       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!
@@ -844,8 +991,12 @@ ca:
       tips: Consells
       title: Benvingut a bord, %{name}!
   users:
+    follow_limit_reached: No pots seguir mÃ©s de %{limit} persones
     invalid_email: L'adreÃ§a de correu no Ã©s correcta
     invalid_otp_token: El codi de dos factors no Ã©s correcte
     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:'
+  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/co.yml b/config/locales/co.yml
index eba483215653fb747dc77712dcefcbf2dfa76a65..d27875d91ff1a90f35900337afe23d364316bc48 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -5,13 +5,13 @@ co:
     about_mastodon_html: Mastodon ghjÃ¨ una rete suciale custruita incÃ¹ prutucolli web aperti Ã¨ lugiziali liberi. HÃ¨ decentralizatu cumu lâ€™e-mail.
     about_this: Ã€ prupositu
     administered_by: 'Amministratu da:'
+    api: API
+    apps: Applicazione per u telefuninu
     closed_registrations: PÃ¨ avÃ , lâ€™arregistramenti sÃ² chjosi nantâ€™Ã  stâ€™istanza. MÃ  pudete truvÃ  unâ€™altrâ€™istanza per fÃ  un contu Ã¨ avÃ¨ accessu Ã  listessa reta da quallÃ .
     contact: Cuntattu
     contact_missing: Mancante
     contact_unavailable: Micca dispunibule
-    description_headline: Quale hÃ¨ %{domain} ?
-    domain_count_after: altre istanze
-    domain_count_before: Cunnettati Ã 
+    documentation: Ducumentazione
     extended_description_html: |
       <h3>Una bona piazza per e regule</h3>
       <p>A descrizzione stesa Ã¹n hÃ¨ micca stata riempiuta.</p>
@@ -28,25 +28,41 @@ co:
     hosted_on: Mastodon allughjatu nantâ€™Ã  %{domain}
     learn_more: AmparÃ  di piÃ¹
     other_instances: Lista di lâ€™istanze
+    privacy_policy: Pulitica di vita privata
     source_code: Codice di fonte
-    status_count_after: statuti
+    status_count_after:
+      one: statutu
+      other: statuti
     status_count_before: chÃ¬ anu pubblicatu
-    user_count_after: parsone quÃ¬
+    terms: Cundizione di u serviziu
+    user_count_after:
+      one: utilizatore
+      other: utilizatori
     user_count_before: Ci sÃ²
     what_is_mastodon: Quale hÃ¨ Mastodon?
   accounts:
+    choices_html: "%{name} ricumanda:"
     follow: SiguitÃ 
-    followers: Abbunati
+    followers:
+      one: AbbunatuÂ·a
+      other: Abbunati
     following: Abbunamenti
+    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
     nothing_here: Ã™n câ€™hÃ¨ nunda quÃ¬!
     people_followed_by: Seguitati da %{name}
     people_who_follow: Seguitanu %{name}
-    posts: Statuti
+    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
-    remote_follow: SiguitÃ  dâ€™altrÃ²
     reserved_username: Stu cugnome hÃ¨ riservatu
     roles:
       admin: Amministratore
@@ -54,6 +70,9 @@ co:
       moderator: Muderatore
     unfollow: Ã™n siguitÃ  piÃ¹
   admin:
+    account_actions:
+      action: RealizÃ  un'azzione
+      title: RealizÃ  un'azzione di muderazione nant'Ã  %{acct}
     account_moderation_notes:
       create: CreÃ 
       created_msg: Nota di muderazione creata!
@@ -65,14 +84,15 @@ co:
       by_domain: Duminiu
       change_email:
         changed_msg: Email di u contu cambiatu!
-        current_email: Email attuale
-        label: MudificÃ  lâ€™Email
-        new_email: Novu Email
-        submit: CambiÃ  Email
-        title: MudificÃ  lâ€™Email di %{username}
+        current_email: E-mail attuale
+        label: MudificÃ  lâ€™e-mail
+        new_email: Novu e-mail
+        submit: CambiÃ  l'e-mail
+        title: MudificÃ  lâ€™e-mail di %{username}
       confirm: CunfirmÃ 
       confirmed: Cunfirmata
       confirming: Cunfirmazione
+      deleted: Sguassatu
       demote: RitrugradÃ 
       disable: DisattivÃ 
       disable_two_factor_authentication: DisattivÃ  lâ€™identificazione Ã  2 fattori
@@ -81,15 +101,18 @@ co:
       domain: Duminiu
       edit: MudificÃ 
       email: E-mail
-      email_status: Statu di lâ€™e-mail
+      email_status: Statutu di lâ€™e-mail
       enable: AttivÃ 
       enabled: Attivatu
       feed_url: URL di u flussu
       followers: Abbunati
       followers_url: URL di lâ€™abbunati
       follows: Abbunamenti
+      header: Intistatura
       inbox_url: URL di lâ€™inbox
+      invited_by: Invitatu da
       ip: IP
+      joined: Ghjuntu
       location:
         all: Tutti
         local: Lucale
@@ -99,6 +122,7 @@ co:
       media_attachments: Media aghjunti
       memorialize: TrasfurmÃ  in mimuriale
       moderation:
+        active: Attivu
         all: Tutti
         silenced: Silenzati
         suspended: Suspesi
@@ -106,20 +130,18 @@ co:
       moderation_notes: Note di muderazione
       most_recent_activity: AttivitÃ  piÃ¹ ricente
       most_recent_ip: IP piÃ¹ ricente
+      no_limits_imposed: Nisuna limita imposta
       not_subscribed: Micca abbunatu
-      order:
-        alphabetic: Alfabeticu
-        most_recent: PiÃ¹ ricente
-        title: Urdine
       outbox_url: URL di lâ€™outbox
-      perform_full_suspension: FÃ  una suspensione cumpleta
+      perform_full_suspension: Suspende
       profile_url: URL di u prufile
       promote: Prumove
       protocol: Prutucollu
       public: Pubblicu
       push_subscription_expires: Spirata di lâ€™abbunamentu PuSH
-      redownload: Mette Ã  ghjornu i ritratti
+      redownload: Mette Ã  ghjornu u prufile
       remove_avatar: Toglie lâ€™avatar
+      remove_header: Toglie l'intistatura
       resend_confirmation:
         already_confirmed: Stâ€™utilizatore hÃ¨ digiÃ  cunfirmatu
         send: RimandÃ  unâ€™e-mail di cunfirmazione
@@ -137,28 +159,32 @@ co:
       search: CercÃ 
       shared_inbox_url: URL di lâ€™inbox spartuta
       show:
-        created_reports: Signalamenti creati da stu contu
-        report: Signalamentu
-        targeted_reports: Signalamenti creati contrâ€™Ã  stu contu
+        created_reports: Signalamenti fatti
+        targeted_reports: Signalatu da l'altri
       silence: SilenzÃ 
+      silenced: Silenzatu
       statuses: Statuti
       subscribe: Abbunassi
+      suspended: Suspesu
       title: Conti
       unconfirmed_email: E-mail micca cunfirmatu
       undo_silenced: Ã™n silenzÃ  piÃ¹
       undo_suspension: Ã™n suspende piÃ¹
       unsubscribe: Disabbunassi
       username: Cugnome
+      warn: Averte
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} sâ€™hÃ¨ assignatu u signalamentu %{target}"
         change_email_user: "%{name} hÃ  cambiatu lâ€™indirizzu e-mail di %{target}"
         confirm_user: "%{name} hÃ  cunfirmatu lâ€™indirizzu e-mail di %{target}"
+        create_account_warning: "%{name} hÃ  mandatu un'avertimentu Ã  %{target}"
         create_custom_emoji: "%{name} hÃ  caricatu una novâ€™emoji %{target}"
         create_domain_block: "%{name} hÃ  bluccatu u duminiu %{target}"
         create_email_domain_block: "%{name} hÃ  messu u duminiu e-mail %{target} nantâ€™a lista nera"
         demote_user: "%{name} hÃ  ritrugradatu lâ€™utilizatore %{target}"
+        destroy_custom_emoji: "%{name} hÃ  sguassatu l'emoji %{target}"
         destroy_domain_block: "%{name} hÃ  sbluccatu u duminiu %{target}"
         destroy_email_domain_block: "%{name} hÃ  messu u duminiu e-mail %{target} nantâ€™a lista bianca"
         destroy_status: "%{name} hÃ  toltu u statutu di %{target}"
@@ -180,6 +206,7 @@ co:
         unsuspend_account: "%{name} hÃ  fattu che u contu di %{target} Ã¹n hÃ¨ piÃ¹ suspesu"
         update_custom_emoji: "%{name} hÃ  messu Ã  ghjornu lâ€™emoji %{target}"
         update_status: "%{name} hÃ  cambiatu u statutu di %{target}"
+      deleted_status: "(statutu sguassatu)"
       title: Ghjurnale dâ€™audit
     custom_emojis:
       by_domain: Duminiu
@@ -206,8 +233,30 @@ co:
       update_failed_msg: Ã™n sâ€™hÃ¨ micca pussutu mette Ã  ghjornu lâ€™emoji
       updated_msg: Lâ€™emoji hÃ¨ stata messa Ã  ghjornu!
       upload: CaricÃ 
+    dashboard:
+      backlog: travagli in attesa
+      config: Cunfigurazione
+      feature_deletions: Sguassamenti di conti
+      feature_invites: Ligami d'invitazione
+      feature_profile_directory: Annuariu di i prufili
+      feature_registrations: Arregistramenti
+      feature_relay: Ripetitore di federazione
+      features: FunziunalitÃ 
+      hidden_service: Federazione cÃ¹ servizii piattati
+      open_reports: signalamenti aperti
+      recent_users: Utilizatori ricenti
+      search: Ricerca di testu sanu
+      single_user_mode: Modu utilizatore unicu
+      software: Lugiziale
+      space: Usu di u spaziu
+      title: Dashboard
+      total_users: utilizatori in tutale
+      trends: Tindenze
+      week_interactions: interazzione sta settimana
+      week_users_active: attivi sta settimana
+      week_users_new: utilizatori sta settimana
     domain_blocks:
-      add_new: AghjustÃ 
+      add_new: AghjustÃ  novu blucchime di duminiu
       created_msg: U blucchime di u duminiu hÃ¨ attivu
       destroyed_msg: U blucchime di u duminiu Ã¹n hÃ¨ piÃ¹ attivu
       domain: Duminiu
@@ -215,18 +264,20 @@ 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.
+          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
       reject_media: RighjittÃ  i fugliali media
       reject_media_hint: Sguassa tutti i media caricati Ã¨ ricusa caricamenti futuri. Inutile per una suspensione
-      severities:
-        noop: Nisuna
-        silence: SilenzÃ 
-        suspend: Suspende
-      severity: SeveritÃ 
+      reject_reports: RighjittÃ  i rapporti
+      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
@@ -236,8 +287,7 @@ co:
           suspend: Ã™n suspende piÃ¹ i conti nantâ€™Ã  stu duminiu
         title: Ã™n bluccÃ  piÃ¹ u duminiu %{domain}
         undo: AnnullÃ 
-      title: Blucchimi di duminiu
-      undo: AnnullÃ 
+      undo: AnnullÃ  u blucchime di duminiu
     email_domain_blocks:
       add_new: AghjustÃ 
       created_msg: U blucchime di u duminiu dâ€™e-mail hÃ¨ attivu
@@ -248,19 +298,47 @@ co:
         create: CreÃ  un blucchime
         title: Nova iscrizzione nantâ€™a lista nera e-mail
       title: Lista nera e-mail
+    followers:
+      back_to_account: Rivene Ã  u Contu
+      title: Abbunati Ã  %{acct}
     instances:
-      account_count: Conti cunnisciuti
-      domain_name: Duminiu
-      reset: RiinizializÃ 
-      search: CercÃ 
-      title: Istanze cunnisciute
+      delivery_available: Rimessa dispunibule
+      known_accounts:
+        one: "%{count} contu cunnisciutu"
+        other: "%{count} conti cunnisciuti"
+      moderation:
+        all: Tuttu
+        limited: Limitatu
+        title: Muderazione
+      title: Federazione
+      total_blocked_by_us: Bluccati da noi
+      total_followed_by_them: Siguitati da elli
+      total_followed_by_us: Siguitati da noi
+      total_reported: Rapporti nant'Ã  elli
+      total_storage: Media aghjunti
     invites:
+      deactivate_all: DisattivÃ  tuttu
       filter:
         all: Tuttu
         available: Dispunibuli
         expired: Spirati
         title: FiltrÃ 
       title: Invitazione
+    relays:
+      add_new: AghjustÃ  un ripetitore
+      delete: SguassÃ 
+      description_html: Un <strong>ripetitore di federazione</strong> ghjÃ¨ un servore intermediariu chÃ¬ manda statuti pubblichi trÃ  l'istanze abbunate. <strong>PÃ² aiutÃ  l'istanze chjuche Ã¨ mezane Ã  scuprÃ¬ u cuntinutu di u fediverse</strong> senza chÃ¬ l'utilizatori appianu bisognu di seguitÃ  tutti i conti di l'altri servori.
+      disable: DisattivÃ 
+      disabled: Disattivatu
+      enable: AttivÃ 
+      enable_hint: Quandu sarÃ  attivatu, u vostru servore hÃ  da seguitÃ  i statuti pubblichi di u ripetitore, Ã¨ mandarÃ  i so statuti pubblichi quallÃ .
+      enabled: Attivatu
+      inbox_url: URL di u ripetitore
+      pending: In attesa di l'apprubazione di u ripetitore
+      save_and_enable: SalvÃ  Ã¨ attivÃ 
+      setup: CreÃ  una cunnessione cÃ¹ un ripetitore
+      status: Statutu
+      title: Ripetitori
     report_notes:
       created_msg: Nota di signalamentu creata!
       destroyed_msg: Nota di signalamentu sguassata!
@@ -275,7 +353,6 @@ co:
       comment:
         none: Nisunu
       created_at: Palisatu
-      id: ID
       mark_as_resolved: IndicÃ  cumâ€™Ã¨ chjosu
       mark_as_unresolved: IndicÃ  cumâ€™Ã¨ sempre apertu
       notes:
@@ -286,20 +363,15 @@ co:
         placeholder: Per parlÃ  di lâ€™azzione pigliate, o altre messe Ã  ghjornu nantâ€™Ã  u signalamentuâ€¦
       reopen: Riapre u signalamentu
       report: 'Signalamente #%{id}'
-      report_contents: Cuntenuti
       reported_account: Contu palisatu
       reported_by: Palisatu da
       resolved: Scioltu Ã¨ chjosu
       resolved_msg: Signalamentu scioltu!
-      silence_account: SilenzÃ  u contu
       status: Statutu
-      suspend_account: Suspende u contu
-      target: Oggettu
       title: Signalamenti
       unassign: DisassignÃ 
       unresolved: Micca sciolti
       updated_at: Messi Ã  ghjornu
-      view: Vede
     settings:
       activity_api_enabled:
         desc_html: Numeri di statuti creati quÃ¬, utilizatori attivi, Ã¨ arregistramenti novi tutte e settimane
@@ -310,18 +382,30 @@ co:
       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
       hero:
         desc_html: Affissatu nantâ€™a pagina dâ€™accolta. Ricumandemu almenu 600x100px. Sâ€™ellu Ã¹n hÃ¨ micca definiti, a vignetta di lâ€™istanza 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 stâ€™istanza hÃ  vistu indÃ¨ u fediverse
         title: PubblicÃ  a lista dâ€™istanza cunnisciute
+      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 di sguassÃ  u so propiu contu
+          desc_html: AuturizÃ  tuttu u mondu Ã  sguassÃ  u so propiu contu
           title: AuturizÃ  Ã  sguassÃ  i conti
         min_invite_role:
           disabled: Nisunu
@@ -336,11 +420,14 @@ co:
         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 Ã¨ i marchi meta. Pudete fÃ  usu di marchi HTML, in particulare <code>&lt;a&gt;</code> Ã¨ <code>&lt;em&gt;</code>.
+        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 lâ€™istanza
       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 l'istanza sarÃ  utilizata.
+        title: Descrizzione corta di l'istanza
       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
@@ -362,6 +449,7 @@ co:
       media:
         title: Media
       no_media: Nisun media
+      no_status_selected: I statuti Ã¹n sÃ² micca stati mudificati perchÃ¨ manc'unu era selezziunatu
       title: Statutu di u contu
       with_media: CÃ¹ media
     subscriptions:
@@ -371,7 +459,21 @@ co:
       last_delivery: Ultima arricata
       title: WebSub
       topic: Sughjettu
+    tags:
+      accounts: Conti
+      hidden: Piattatu
+      hide: PiattÃ  di l'annuariu
+      name: Hashtag
+      title: Hashtag
+      unhide: MustrÃ  in l'annuariu
+      visible: Visibile
     title: Amministrazione
+    warning_presets:
+      add_new: AghjustÃ  nova
+      delete: SguassÃ 
+      edit: CambiÃ 
+      edit_preset: CambiÃ  a preselezzione d'avertimentu
+      title: AmministrÃ  e preselezzione d'avertimentu
   admin_mailer:
     new_report:
       body: "%{reporter} hÃ  palisatu %{target}"
@@ -393,7 +495,7 @@ co:
     warning: Abbadate Ã  quessi dati. Ã™n i date Ã  nisunu!
     your_token: RigenerÃ  a fiscia dâ€™accessu
   auth:
-    agreement_html: Arregistrassi vole dÃ¬ chÃ¬ site dâ€™accunsentu per siguitÃ  <a href="%{rules_path}">e regule di lâ€™istanza</a> Ã¨ <a href="%{terms_path}">e cundizione dâ€™usu</a>.
+    agreement_html: CliccÃ  "Arregistrassi" quÃ¬ sottu vole dÃ¬ chÃ¬ site dâ€™accunsentu per siguitÃ  <a href="%{rules_path}">e regule di lâ€™istanza</a> Ã¨ <a href="%{terms_path}">e cundizione dâ€™usu</a>.
     change_password: Chjave dâ€™accessu
     confirm_email: CunfirmÃ  lâ€™e-mail
     delete_account: SguassÃ  u contu
@@ -424,7 +526,7 @@ co:
     following: 'Eccu! AvÃ  seguitate:'
     post_follow:
       close: O pudete ancu chjude sta finestra.
-      return: RivultÃ  Ã  u prufile di lâ€™utilizatore
+      return: Vede u prufile di lâ€™utilizatore
       web: AndÃ  Ã  lâ€™interfaccia web
     title: SiguitÃ  %{acct}
   datetime:
@@ -449,6 +551,13 @@ co:
     success_msg: U vostru contu hÃ¨ statu sguassatu
     warning_html: Pudete esse sicuruÂ·a solu chÃ¬ u cuntenutu sarÃ  sguassatu di stâ€™istanza. Sâ€™ellu hÃ¨ statu spartutu in altrÃ², sarÃ  forse sempre quallÃ .
     warning_title: DispunibilitÃ  di i cuntenuti sparsi
+  directories:
+    directory: Annuariu di i prufili
+    explanation: Scopre utilizatori Ã  partesi di i so centri d'interessu
+    explore_mastodon: Scopre Ã  %{title}
+    people:
+      one: "%{count} persona"
+      other: "%{count} persone"
   errors:
     '403': Ã™n site micca auturizatuÂ·a Ã  vede sta pagina.
     '404': Sta pagina Ã¹n esiste micca.
@@ -460,7 +569,7 @@ co:
     '500':
       content: Scusate, mÃ  câ€™hÃ¨ statu un prublemu cÃ¹ u nostru servore.
       title: Sta pagina Ã¹n hÃ¨ curretta
-    noscript_html: Mastodon nantâ€™Ã  u web hÃ  bisognu di JavaScript per funziunÃ . Pudete ancu pruvÃ  <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">lâ€™applicazione native</a> per a vostra piattaforma.
+    noscript_html: Mastodon nantâ€™Ã  u web hÃ  bisognu di JavaScript per funziunÃ . Pudete ancu pruvÃ  <a href="%{apps_path}">lâ€™applicazione native</a> per a vostra piattaforma.
   exports:
     archive_takeout:
       date: Data
@@ -471,9 +580,27 @@ co:
       size: Pesu
     blocks: Bluccate
     csv: CSV
+    domain_blocks: Blucchime di duminiu
     follows: Seguitate
+    lists: Liste
     mutes: Piattate
     storage: I vostri media
+  filters:
+    contexts:
+      home: Accolta
+      notifications: Nutificazione
+      public: Linee pubbliche
+      thread: Cunversazione
+    edit:
+      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
+      title: Filtri
+    new:
+      title: AghjustÃ  un novu filtru
   followers:
     domain: Duminiu
     explanation_html: Per assicuravi di a cunfidenzialitÃ  di i vostri statuti, duvete avÃ¨ primura di quale vi seguita. <strong>I vostri statuti privati sÃ² mandati Ã  tutte lâ€™istanze induve avete abbunati</strong>. Pensate Ã  u vostru livellu di cunfidenza in i so amministratori.
@@ -486,9 +613,13 @@ co:
     true_privacy_html: Ã™n vi scurdate chÃ¬ <strong>una vera cunfidenzialitÃ  pÃ² solu esse ottenuta cÃ¹ crittografia da un capu Ã  lâ€™altru</strong>.
     unlocked_warning_html: Tuttu u mondu pÃ² seguitavi Ã¨ vede i vostri statuti privati. %{lock_link}  per pudÃ¨ cunfirmÃ  o righjittÃ  abbunamenti.
     unlocked_warning_title: U vostru contu hÃ¨ pubblicu
+  footer:
+    developers: Sviluppatori
+    more: Di piÃ¹â€¦
+    resources: Risorze
   generic:
     changes_saved_msg: Cambiamenti salvati!
-    powered_by: mossu da %{link}
+    copy: CupiÃ 
     save_changes: SalvÃ  e mudificazione
     validation_errors:
       one: Qualcosa Ã¹n vÃ  bÃ¨! Verificate u prublemu quÃ¬ sottu
@@ -514,6 +645,7 @@ co:
       '86400': 1 ghjornu
     expires_in_prompt: Mai
     generate: CreÃ 
+    invited_by: 'Site statuÂ·a invitatuÂ·a da:'
     max_uses:
       one: 1 usu
       other: "%{count} usi"
@@ -523,8 +655,6 @@ co:
       expires_at: Spira
       uses: Utiliza
     title: InvitÃ  ghjente
-  landing_strip_html: "<strong>%{name}</strong> hÃ¨ nantâ€™Ã  %{link_to_root_path}. Pudete seguitalluÂ·a o cumunicÃ  cÃ¹ elluÂ·a cÃ¹ un contu in qualche parte di u fediverse."
-  landing_strip_signup_html: Pudete ancu <a href="%{sign_up_path}">arrigistravi quÃ¬</a>.
   lists:
     errors:
       limit: Ã™n pudete piÃ¹ creÃ  altre liste
@@ -598,12 +728,28 @@ co:
   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 aghjustÃ  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:'
   remote_unfollow:
     error: Errore
     title: Titulu
     unfollowed: Disabbunatu
+  scheduled_statuses:
+    over_daily_limit: Avete trapassatu a limita di %{limit} statuti planificati per stu ghjornu
+    over_total_limit: Avete trapassatu a limita di %{limit} statuti planificati
+    too_soon: A data deve esse indÃ¨ u futuru
   sessions:
     activity: Ultima attivitÃ 
     browser: Navigatore
@@ -674,6 +820,7 @@ co:
     disallowed_hashtags:
       one: 'cuntene lâ€™hashtag disattivatu: %{tags}'
       other: 'cuntene lâ€™hashtag disattivati: %{tags}'
+    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:
@@ -682,6 +829,7 @@ co:
       private: Ã™n pudete micca puntarulÃ  un statutu châ€™Ã¹n hÃ¨ micca pubblicu
       reblog: Ã™n pudete micca puntarulÃ  una spartera
     show_more: Vede di piÃ¹
+    sign_in_to_participate: Cunnettatevi per participÃ  Ã  a cunversazione
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Solu per lâ€™abbunati
@@ -691,11 +839,91 @@ co:
       unlisted: Micca listatu
       unlisted_long: Tuttu u mondu pÃ² vede, mÃ  micca indÃ¨ e linee pubbliche
   stream_entries:
-    click_to_show: CliccÃ  per vede
     pinned: Statutu puntarulatu
-    reblogged: spartutu
+    reblogged: hÃ  spartutu
     sensitive_content: Cuntenutu sensibile
   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: Cuntrastu altu
@@ -704,6 +932,7 @@ co:
   time:
     formats:
       default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Entrate u codice generatu da lâ€™applicazione per cunfirmÃ 
     description_html: Sâ€™ella hÃ¨ attivata <strong>lâ€™identificazione Ã  dui fattori</strong>, duvete avÃ¨ u vostru telefuninu pÃ¨ ottene un codice di cunnezzione.
@@ -725,6 +954,22 @@ 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
+    warning:
+      explanation:
+        disable: Quandu u vostru contu hÃ¨ ghjacciatu, i vostri dati stannu intatti, mÃ  Ã¹n pudete fÃ  nunda fin'Ã  ch'ellu sia sbluccatu.
+        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.
+      review_server_policies: Leghje e pulitiche di u servore
+      subject:
+        disable: U vostru contu %{acct} hÃ¨ statu ghjacciatu
+        none: Avertimentu pÃ¨ %{acct}
+        silence: U vostru contu %{acct} hÃ¨ statu limitatu
+        suspend: U vostru contu %{acct} hÃ¨ statu suspesu
+      title:
+        disable: Contu ghjacciatu
+        none: Avertimentu
+        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.
@@ -736,7 +981,6 @@ co:
       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_bridge_html: Sâ€™Ã¨ voi venite di Twitter, pudete truvÃ  i vostri amichi da quallÃ  chÃ¬ sÃ² nantâ€™Ã  Mastodon cÃ¹ a <a href="%{bridge_url}">bridge app</a>. MÃ  Ã¹n marchja chÃ¨ sâ€™elli lâ€™anu ancu usata!
       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!
@@ -744,8 +988,12 @@ co:
       tips: Cunsiglii
       title: BenvenutuÂ·a, %{name}!
   users:
+    follow_limit_reached: Ã™n pidete seguitÃ  piÃ¹ di %{limit} conti
     invalid_email: Lâ€™indirizzu e-mail Ã¹n hÃ¨ currettu
     invalid_otp_token: U codice dâ€™identificazione Ã¹n hÃ¨ currettu
     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â€™Ã¨:'
+  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 7b6021f13c61904ceffc8bf0ccb570753ea4f8e9..424ec3dab65fa0a4f14bf76b68506dfb7e34a3ca 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1,44 +1,1016 @@
 ---
 cs:
   about:
-    about_hashtag_html: Toto jsou veÅ™ejnÃ© pÅ™ÃspÄ›vky typu oznaÄenÃ© jako <strong>#%{hashtag}</strong>. Pokud mÃ¡te ÃºÄet kdekoliv na fediverse, mÅ¯Å¾ete s nimi interagovat.
-    about_mastodon_html: Mastodon je sociÃ¡lnÃ sÃÅ¥ zaloÅ¾enÃ¡ na otevÅ™enÃ½ch webovÃ½ch protokolech a svobodnÃ©m, otevÅ™enÃ©m softwaru. Je decentrovalizovanÃ¡ jako e-mail.
+    about_hashtag_html: Tohle jsou veÅ™ejnÃ© tooty oznaÄenÃ© hashtagem <strong>#%{hashtag}</strong>. Pokud mÃ¡te ÃºÄet kdekoliv na fediverse, mÅ¯Å¾ete s nimi interagovat.
+    about_mastodon_html: Mastodon je sociÃ¡lnÃ sÃÅ¥ zaloÅ¾enÃ¡ na otevÅ™enÃ½ch webovÃ½ch protokolech a svobodnÃ©m, otevÅ™enÃ©m softwaru. Je decentralizovanÃ¡ jako e-mail.
     about_this: O tÃ©to instanci
-    administered_by: 'Server spravuje:'
-    closed_registrations: Registrace na tÃ©to instanci jsou momentÃ¡lnÄ› uzavÅ™enÃ©. MÅ¯Å¾ete si vÅ¡ak najÃt jinou instanci, vytvoÅ™it si na nÃ ÃºÄet a zÃskat z nÃ pÅ™Ãstup do naprosto stejnÃ© sÃtÄ›.
+    administered_by: 'Instanci spravuje:'
+    api: API
+    apps: MobilnÃ aplikace
+    closed_registrations: Registrace na tÃ©to instanci jsou momentÃ¡lnÄ› uzavÅ™enÃ©. Ale pozor! MÅ¯Å¾ete si najÃt jinou instanci, vytvoÅ™it si na nÃ ÃºÄet a zÃskat z nÃ pÅ™Ãstup do naprosto stejnÃ© sÃtÄ›.
     contact: Kontakt
     contact_missing: Nenastaveno
     contact_unavailable: Neuvedeno
-    description_headline: Co je %{domain}?
-    domain_count_after: dalÅ¡Ãm instancÃm
-    domain_count_before: PÅ™ipojeno k
+    documentation: Dokumentace
     extended_description_html: |
       <h3>DobrÃ© mÃsto pro pravidla</h3>
       <p>RozÅ¡ÃÅ™enÃ½ popis jeÅ¡tÄ› nebyl nastaven.</p>
     features:
-      humane_approach_body: Mastodon, pouÄen z chyb jinÃ½ch sociÃ¡lnÃch sÃtÃ, se snaÅ¾Ã bojovat se zneuÅ¾ÃvÃ¡nÃm sociÃ¡lnÃch sÃtÃ vytvÃ¡Å™enÃm etickÃ½ch moÅ¾nostÃ.
+      humane_approach_body: Mastodon se uÄÃ z chyb jinÃ½ch sociÃ¡lnÃch sÃtÃ a volenÃm etickÃ½ch rozhodnutÃ pÅ™i designu se snaÅ¾Ã bojovat s jejich zneuÅ¾ÃvÃ¡nÃm.
       humane_approach_title: LidÅ¡tÄ›jÅ¡Ã pÅ™Ãstup
-      not_a_product_title: Jste osoba, ne produkt.
-    generic_description: "%{domain} je jednÃm serverem v sÃti"
+      not_a_product_body: Mastodon nenÃ komerÄnÃ sÃÅ¥. Å½Ã¡dnÃ© reklamy, Å¾Ã¡dnÃ© dolovÃ¡nÃ dat, Å¾Ã¡dnÃ© hranice. Å½Ã¡dnÃ¡ centrÃ¡lnÃ autorita.
+      not_a_product_title: Jste osoba, ne produkt
+      real_conversation_body: S 500 znaky k vaÅ¡Ã dispozici a podporou pro varovÃ¡nÃ o obsahu a mÃ©diÃch se mÅ¯Å¾ete vyjadÅ™ovat tak, jak chcete.
+      real_conversation_title: VytvoÅ™en pro opravdovou konverzaci
+      within_reach_body: NÄ›kolik aplikacÃ pro iOS, Android a jinÃ© platformy vÃ¡m dÃky jednoduchÃ©mu API ekosystÃ©mu dovolujÃ drÅ¾et krok s vaÅ¡imi pÅ™Ã¡teli, aÅ¥ uÅ¾ jste kdekoliv.
+      within_reach_title: VÅ¾dy v dosahu
+    generic_description: "%{domain} je jednÃm ze serverÅ¯ v sÃti"
+    hosted_on: Instance Mastodon na adrese %{domain}
     learn_more: Zjistit vÃce
+    other_instances: Seznam instancÃ
+    privacy_policy: ZÃ¡sady soukromÃ
     source_code: ZdrojovÃ½ kÃ³d
-    status_count_after: pÅ™ÃspÄ›vkÅ¯
-    status_count_before: Kdo je autorem
-    user_count_after: uÅ¾ivatelÅ¯
-    user_count_before: Domov pro
+    status_count_after:
+      few: pÅ™ÃspÄ›vky
+      one: pÅ™ÃspÄ›vek
+      other: pÅ™ÃspÄ›vkÅ¯
+    status_count_before: KteÅ™Ã napsali
+    terms: PodmÃnky pouÅ¾ÃvÃ¡nÃ
+    user_count_after:
+      few: uÅ¾ivatelÅ¯
+      one: uÅ¾ivatele
+      other: uÅ¾ivatelÅ¯
+    user_count_before: Domov
     what_is_mastodon: Co je Mastodon?
   accounts:
+    choices_html: 'Volby uÅ¾ivatele %{name}:'
     follow: Sledovat
-    followers: SledovatelÃ©
-    following: Sleduje
+    followers:
+      few: SledovatelÃ©
+      one: Sledovatel
+      other: SledovatelÅ¯
+    following: SledovanÃ½ch
+    joined: PÅ™ipojil/a se v %{date}
+    last_active: naposledy aktivnÃ
+    link_verified_on: VlastnictvÃ tohoto odkazu bylo zkontrolovÃ¡no %{date}
     media: MÃ©dia
     moved_html: 'ÃšÄet %{name} byl pÅ™esunut na %{new_profile_link}:'
     network_hidden: Tato informace nenÃ k dispozici
     nothing_here: Tady nic nenÃ!
+    people_followed_by: LidÃ©, kterÃ© sleduje %{name}
+    people_who_follow: LidÃ©, kteÅ™Ã sledujÃ uÅ¾ivatele %{name}
+    pin_errors:
+      following: MusÃte jiÅ¾ sledovat osobu, kterou chcete podpoÅ™it
+    posts:
+      few: Tooty
+      one: Toot
+      other: TootÅ¯
+    posts_tab_heading: Tooty
+    posts_with_replies: Tooty a odpovÄ›di
+    reserved_username: Toto uÅ¾ivatelskÃ© jmÃ©no je rezervovÃ¡no
+    roles:
+      admin: AdministrÃ¡tor
+      bot: Robot
+      moderator: ModerÃ¡tor
+    unfollow: PÅ™estat sledovat
+  admin:
+    account_actions:
+      action: Vykonat akci
+      title: Vykonat moderaÄnÃ akci pro ÃºÄet %{acct}
+    account_moderation_notes:
+      create: Zanechat poznÃ¡mku
+      created_msg: PoznÃ¡mka moderÃ¡tora byla ÃºspÄ›Å¡nÄ› vytvoÅ™ena!
+      delete: Smazat
+      destroyed_msg: PoznÃ¡mka moderÃ¡tora byla ÃºspÄ›Å¡nÄ› zniÄena!
+    accounts:
+      are_you_sure: Jste si jistÃ½/Ã¡?
+      avatar: Avatar
+      by_domain: DomÃ©na
+      change_email:
+        changed_msg: E-mail k tomuto ÃºÄtu byl Ãº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}
+      confirm: Potvrdit
+      confirmed: Potvrzeno
+      confirming: Potvrzuji
+      deleted: SmazÃ¡no
+      demote: Degradovat
+      disable: Zablokovat
+      disable_two_factor_authentication: ZakÃ¡zat 2FA
+      disabled: BlokovÃ¡no
+      display_name: ZobrazovanÃ© jmÃ©no
+      domain: DomÃ©na
+      edit: Upravit
+      email: E-mail
+      email_status: Stav e-mailu
+      enable: Povolit
+      enabled: Povoleno
+      feed_url: URL proudu
+      followers: SledovatelÃ©
+      followers_url: URL sledovatelÅ¯
+      follows: SledovanÃ
+      header: HlaviÄka
+      inbox_url: URL pÅ™ijatÃ½ch zprÃ¡v
+      invited_by: PozvÃ¡n/a uÅ¾ivatelem
+      ip: IP
+      joined: PÅ™ipojil/a se
+      location:
+        all: VÅ¡e
+        local: MÃstnÃ
+        remote: VzdÃ¡lenÃ©
+        title: UmÃstÄ›nÃ
+      login_status: Stav pÅ™ihlÃ¡Å¡enÃ
+      media_attachments: MediÃ¡lnÃ pÅ™Ãlohy
+      memorialize: ZmÄ›nit na â€žin memoriamâ€œ
+      moderation:
+        active: AktivnÃ
+        all: VÅ¡e
+        silenced: UtiÅ¡en/a
+        suspended: Pozastaven/a
+        title: Moderace
+      moderation_notes: ModeraÄnÃ poznÃ¡mky
+      most_recent_activity: NejnovÄ›jÅ¡Ã aktivita
+      most_recent_ip: NejnovÄ›jÅ¡Ã IP
+      no_limits_imposed: Nejsou nastavena Å¾Ã¡dnÃ¡ omezenÃ
+      not_subscribed: NeodebÃrÃ¡
+      outbox_url: URL odchozÃch zprÃ¡v
+      perform_full_suspension: Pozastavit
+      profile_url: URL profilu
+      promote: PovÃ½Å¡it
+      protocol: Protokol
+      public: VeÅ™ejnÃ½
+      push_subscription_expires: OdebÃrÃ¡nÃ PuSH expiruje
+      redownload: Obnovit profil
+      remove_avatar: Odstranit avatar
+      remove_header: Odstranit hlaviÄku
+      resend_confirmation:
+        already_confirmed: Tento uÅ¾ivatel je jiÅ¾ potvrzen
+        send: Znovu odeslat potvrzovacÃ e-mail
+        success: PotvrzovacÃ e-mail byl ÃºspÄ›Å¡nÄ› odeslÃ¡n!
+      reset: Resetovat
+      reset_password: Obnovit heslo
+      resubscribe: Znovu odebÃrat
+      role: OprÃ¡vnÄ›nÃ
+      roles:
+        admin: AdministrÃ¡tor
+        moderator: ModerÃ¡tor
+        staff: PersonÃ¡l
+        user: UÅ¾ivatel
+      salmon_url: URL Salmon
+      search: Hledat
+      shared_inbox_url: URL sdÃlenÃ½ch pÅ™ijatÃ½ch zprÃ¡v
+      show:
+        created_reports: VytvoÅ™enÃ¡ nahlÃ¡Å¡enÃ
+        targeted_reports: NahlÃ¡Å¡eni ostatnÃmi
+      silence: UtiÅ¡it
+      silenced: UtiÅ¡en/a
+      statuses: PÅ™ÃspÄ›vky
+      subscribe: OdebÃrat
+      suspended: Pozastaven/a
+      title: ÃšÄty
+      unconfirmed_email: NepotvrzenÃ½ e-mail
+      undo_silenced: ZruÅ¡it utiÅ¡enÃ
+      undo_suspension: ZruÅ¡it pozastavenÃ
+      unsubscribe: PÅ™estat odebÃrat
+      username: UÅ¾ivatelskÃ© jmÃ©no
+      warn: Varovat
+      web: Web
+    action_logs:
+      actions:
+        assigned_to_self_report: "%{name} pÅ™idÄ›lil/a hlÃ¡Å¡enÃ %{target} sobÄ›"
+        change_email_user: "%{name} zmÄ›nil/a e-mailovou adresu uÅ¾ivatele %{target}"
+        confirm_user: "%{name} potvrdil/a e-mailovou adresu uÅ¾ivatele %{target}"
+        create_account_warning: "%{name} poslal/a varovÃ¡nÃ uÅ¾ivateli %{target}"
+        create_custom_emoji: "%{name} nahrÃ¡l/a novÃ© emoji %{target}"
+        create_domain_block: "%{name} zablokoval/a domÃ©nu %{target}"
+        create_email_domain_block: "%{name} pÅ™idal/a e-mailovou domÃ©nu %{target} na Äernou listinu"
+        demote_user: "%{name} degradoval/a uÅ¾ivatele %{target}"
+        destroy_custom_emoji: "%{name} zniÄil/a emoji %{target}"
+        destroy_domain_block: "%{name} odblokoval/a domÃ©nu %{target}"
+        destroy_email_domain_block: "%{name} odebral/a e-mailovou domÃ©nu %{target} z ÄernÃ© listiny"
+        destroy_status: "%{name} odstranil/a pÅ™ÃspÄ›vek uÅ¾ivatele %{target}"
+        disable_2fa_user: "%{name} vypnul/a poÅ¾adavek pro dvoufaktorovou autentikaci pro uÅ¾ivatele %{target}"
+        disable_custom_emoji: "%{name} zakÃ¡zal/a emoji %{target}"
+        disable_user: "%{name} zakÃ¡zal/a pÅ™ihlaÅ¡ovÃ¡nÃ pro uÅ¾ivatele %{target}"
+        enable_custom_emoji: "%{name} povolil/a emoji %{target}"
+        enable_user: "%{name} povolil/a pÅ™ihlaÅ¡ovÃ¡nÃ pro uÅ¾ivatele %{target}"
+        memorialize_account: "%{name} zmÄ›nil/a ÃºÄet %{target} na strÃ¡nku â€žin memoriamâ€œ"
+        promote_user: "%{name} povÃ½Å¡il/a uÅ¾ivatele %{target}"
+        remove_avatar_user: "%{name} odstranil/a avatar uÅ¾ivatele %{target}"
+        reopen_report: "%{name} znovuotevÅ™el/a nahlÃ¡Å¡enÃ %{target}"
+        reset_password_user: "%{name} resetoval/a heslo uÅ¾ivatele %{target}"
+        resolve_report: "%{name} vyÅ™eÅ¡il/a nahlÃ¡Å¡enÃ %{target}"
+        silence_account: "%{name} utiÅ¡il/a ÃºÄet uÅ¾ivatele %{target}"
+        suspend_account: "%{name} pozastavil/a ÃºÄet uÅ¾ivatele %{target}"
+        unassigned_report: "%{name} odebral/a nahlÃ¡Å¡enÃ %{target}"
+        unsilence_account: "%{name} odtiÅ¡il/a ÃºÄet uÅ¾ivatele %{target}"
+        unsuspend_account: "%{name} zruÅ¡il/a pozastavenÃ ÃºÄtu uÅ¾ivatele %{target}"
+        update_custom_emoji: "%{name} aktualizoval/a emoji %{target}"
+        update_status: "%{name} aktualizoval/a pÅ™ÃspÄ›vek uÅ¾ivatele %{target}"
+      deleted_status: "(smazanÃ½ pÅ™ÃspÄ›vek)"
+      title: ZÃ¡znam auditu
+    custom_emojis:
+      by_domain: DomÃ©na
+      copied_msg: MÃstnÃ kopie emoji byla ÃºspÄ›Å¡nÄ› vytvoÅ™ena
+      copy: KopÃrovat
+      copy_failed_msg: Nebylo moÅ¾nÃ© vytvoÅ™it mÃstnÃ kopii tohoto emoji
+      created_msg: Emoji ÃºspÄ›Å¡nÄ› vytvoÅ™eno!
+      delete: Smazat
+      destroyed_msg: Emoji ÃºspÄ›Å¡nÄ› zniÄeno!
+      disable: ZakÃ¡zat
+      disabled_msg: Emoji bylo ÃºspÄ›Å¡nÄ› zakÃ¡zÃ¡no
+      emoji: Emoji
+      enable: Povolit
+      enabled_msg: Emoji bylo ÃºspÄ›Å¡nÄ› povoleno
+      image_hint: PNG aÅ¾ do 50KB
+      listed: UvedenÃ©
+      new:
+        title: PÅ™idat novÃ© vlastnÃ emoji
+      overwrite: PÅ™epsat
+      shortcode: Zkratka
+      shortcode_hint: AlespoÅˆ 2 znaky, pouze alfanumerickÃ© znaky a podtrÅ¾Ãtka
+      title: VlastnÃ emoji
+      unlisted: NeuvedenÃ©
+      update_failed_msg: Nebylo moÅ¾nÃ© aktualizovat toto emoji
+      updated_msg: Emoji ÃºspÄ›Å¡nÄ› aktualizovÃ¡no!
+      upload: NahrÃ¡t
+    dashboard:
+      backlog: opoÅ¾dÄ›nÃ© Ãºlohy
+      config: Konfigurace
+      feature_deletions: SmazÃ¡nÃ ÃºÄtÅ¯
+      feature_invites: Odkazy pozvÃ¡nek
+      feature_profile_directory: AdresÃ¡Å™ profilÅ¯
+      feature_registrations: Registrace
+      feature_relay: FederovacÃ most
+      features: Vlastnosti
+      hidden_service: Federace se skrytÃ½mi sluÅ¾bami
+      open_reports: otevÅ™enÃ¡ hlÃ¡Å¡enÃ
+      recent_users: NedÃ¡vnÃ uÅ¾ivatelÃ©
+      search: FulltextovÃ© vyhledÃ¡vÃ¡nÃ
+      single_user_mode: ReÅ¾im jednoho uÅ¾ivatele
+      software: Software
+      space: VyuÅ¾itÃ prostoru
+      title: PÅ™ehled
+      total_users: uÅ¾ivatelÅ¯ celkem
+      trends: Trendy
+      week_interactions: interakcÃ tento tÃ½den
+      week_users_active: aktivnÃch tento tÃ½den
+      week_users_new: uÅ¾ivatelÅ¯ tento tÃ½den
+    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
+      domain: DomÃ©na
+      new:
+        create: VytvoÅ™it blokaci
+        hint: Blokace domÃ©ny nezakÃ¡Å¾e vytvÃ¡Å™enÃ ÃºÄtovÃ½ch zÃ¡znamÅ¯ v databÃ¡zi, ale bude na tyto ÃºÄty zpÄ›tnÄ› a automaticky aplikovat specifickÃ© metody moderace.
+        severity:
+          desc_html: Funkce <strong>UtiÅ¡it</strong> zneviditelnÃ pÅ™ÃspÄ›vky z ÃºÄtu komukoliv, kdo jej nesleduje. Funkce <strong>Pozastavit</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>.
+          noop: Å½Ã¡dnÃ©
+          silence: UtiÅ¡it
+          suspend: Pozastavit
+        title: NovÃ¡ domÃ©novÃ¡ blokace
+      reject_media: OdmÃtat mediÃ¡lnÃ soubory
+      reject_media_hint: OdstranÃ lokÃ¡lnÄ› uloÅ¾enÃ© soubory a odmÃtne jejich staÅ¾enÃ v budoucnosti. NepodstatnÃ© pro pozastavenÃ
+      reject_reports: OdmÃtat nahlÃ¡Å¡enÃ
+      reject_reports_hint: Ignorovat vÅ¡echna nahlÃ¡Å¡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 nahlÃ¡Å¡enÃ
+      severity:
+        silence: utiÅ¡enÃ©
+        suspend: pozastavenÃ©
+      show:
+        affected_accounts:
+          few: "%{count} ÃºÄty v databÃ¡zi byly ovlivnÄ›ny"
+          one: Jeden ÃºÄet v databÃ¡zi byl ovlivnÄ›n
+          other: "%{count} ÃºÄtÅ¯ v databÃ¡zi bylo ovlivnÄ›no"
+        retroactive:
+          silence: OdtiÅ¡it vÅ¡echny existujÃcÃ ÃºÄty z tÃ©to domÃ©ny
+          suspend: ZruÅ¡it pozastavenÃ vÅ¡ech existujÃcÃch ÃºÄtÅ¯ z tÃ©to domÃ©ny
+        title: ZruÅ¡it blokaci domÃ©ny %{domain}
+        undo: Odvolat
+      undo: Odvolat blokaci domÃ©ny
+    email_domain_blocks:
+      add_new: PÅ™idat novÃ½
+      created_msg: E-mailovÃ¡ domÃ©na ÃºspÄ›Å¡nÄ› pÅ™idÃ¡na na Äernou listinu
+      delete: Smazat
+      destroyed_msg: E-mailovÃ¡ domÃ©na ÃºspÄ›Å¡nÄ› odstranÄ›na z ÄernÃ© listiny
+      domain: DomÃ©na
+      new:
+        create: PÅ™idat domÃ©nu
+        title: NovÃ½ e-mail pro zablokovÃ¡nÃ
+      title: ÄŒernÃ¡ listina e-mailÅ¯
+    followers:
+      back_to_account: ZpÄ›t na ÃºÄet
+      title: SledovatelÃ© uÅ¾ivatele %{acct}
+    instances:
+      delivery_available: DoruÄenÃ je k dispozici
+      known_accounts:
+        few: "%{count} znÃ¡mÃ© ÃºÄty"
+        one: "%{count} znÃ¡mÃ½ ÃºÄet"
+        other: "%{count} znÃ¡mÃ½ch ÃºÄtÅ¯"
+      moderation:
+        all: VÅ¡e
+        limited: OmezenÃ©
+        title: Moderace
+      title: Federace
+      total_blocked_by_us: BlokovanÃ© nÃ¡mi
+      total_followed_by_them: SledovanÃ© jÃm
+      total_followed_by_us: SledovanÃ© nÃ¡mi
+      total_reported: NahlÃ¡Å¡enÃ o nÄ›m
+      total_storage: MediÃ¡lnÃ pÅ™Ãlohy
+    invites:
+      deactivate_all: Deaktivovat vÅ¡e
+      filter:
+        all: VÅ¡e
+        available: DostupnÃ©
+        expired: VyprÅ¡elÃ©
+        title: Filtrovat
+      title: PozvÃ¡nky
+    relays:
+      add_new: PÅ™idat novÃ½ most
+      delete: Smazat
+      description_html: "<strong>FederovacÃ most</strong> je pÅ™echodnÃ½ server, kterÃ½ vymÄ›Åˆuje velkÃ¡ mnoÅ¾stvÃ veÅ™ejnÃ½ch tootÅ¯ mezi servery, kterÃ© z nÄ›j odebÃrajÃ a poblikujÃ na nÄ›j. <strong>MÅ¯Å¾e pomoci malÃ½m a stÅ™ednÄ› velkÃ½m serverÅ¯m objevovat obsah z fediverse</strong>, coÅ¾ by jinak vyÅ¾adovalo, aby mÃstnÃ uÅ¾ivatelÃ© manuÃ¡lnÄ› sledovali jinÃ© lidi na vzdÃ¡lenÃ½ch serverech."
+      disable: ZakÃ¡zat
+      disabled: ZakÃ¡zÃ¡no
+      enable: Povolit
+      enable_hint: Je-li tohle povoleno, zaÄne vÃ¡Å¡ server odebÃrat vÅ¡echny veÅ™ejnÃ© tooty z tohoto mostu a odesÃlat na nÄ›j svÃ© vlastnÃ veÅ™ejnÃ© tooty.
+      enabled: Povoleno
+      inbox_url: URL mostu
+      pending: ÄŒekÃ¡m na souhlas mostu
+      save_and_enable: UloÅ¾it a povolit
+      setup: Nastavit pÅ™ipojenÃ k mostu
+      status: Stav
+      title: Mosty
+    report_notes:
+      created_msg: PoznÃ¡mka o nahlÃ¡Å¡enÃ ÃºspÄ›Å¡nÄ› vytvoÅ™ena!
+      destroyed_msg: PoznÃ¡mka o nahlÃ¡Å¡enÃ ÃºspÄ›Å¡nÄ› smazÃ¡na!
+    reports:
+      account:
+        note: poznÃ¡mka
+        report: nahlÃ¡Å¡enÃ
+      action_taken_by: Akci vykonal/a
+      are_you_sure: Jste si jistÃ½/Ã¡?
+      assign_to_self: PÅ™idÄ›lit ke mnÄ›
+      assigned: PÅ™iÅ™azenÃ½ moderÃ¡tor
+      comment:
+        none: Å½Ã¡dnÃ©
+      created_at: NahlÃ¡Å¡enÃ©
+      mark_as_resolved: OznaÄit jako vyÅ™eÅ¡enÃ©
+      mark_as_unresolved: OznaÄit jako nevyÅ™eÅ¡enÃ©
+      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...
+      reopen: Znovu otevÅ™Ãt nahlÃ¡Å¡enÃ
+      report: 'NahlÃ¡sit #%{id}'
+      reported_account: NahlÃ¡Å¡enÃ½ ÃºÄet
+      reported_by: NahlÃ¡Å¡eno uÅ¾ivatelem
+      resolved: VyÅ™eÅ¡eno
+      resolved_msg: NahlÃ¡Å¡enÃ ÃºspÄ›Å¡nÄ› vyÅ™eÅ¡eno!
+      status: Stav
+      title: NahlÃ¡Å¡enÃ
+      unassign: Odebrat
+      unresolved: NevyÅ™eÅ¡eno
+      updated_at: AktualizovÃ¡no
+    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Ä›
+      bootstrap_timeline_accounts:
+        desc_html: Je-li uÅ¾ivatelskch jmen vÃce, oddÄ›lujte je ÄÃ¡rkami. Lze zadat pouze mÃstnÃ a odemknutÃ© ÃºÄty. Je-li tohle prÃ¡zdnÃ©, jsou vÃ½chozÃ hodnotou vÅ¡ichni mÃstnÃ administrÃ¡toÅ™i.
+        title: VÃ½chozÃ sledovanÃ pro novÃ© uÅ¾ivatele
+      contact_information:
+        email: PracovnÃ e-mail
+        username: UÅ¾ivatelskÃ© jmÃ©no kontaktu
+      custom_css:
+        desc_html: PozmÄ›nit vzhled pomocÃ Å¡ablony CSS naÄtenÃ© na kaÅ¾dÃ© strÃ¡nce
+        title: VlastnÃ CSS
+      hero:
+        desc_html: Zobrazuje se na hlavnÃ strÃ¡nce. DoporuÄuje se rozliÅ¡enÃ alespoÅˆ 600x100 px. Pokud toto nenÃ nastaveno, bude zobrazena miniatura instance
+        title: HlavnÃ obrÃ¡zek
+      mascot:
+        desc_html: Zobrazuje se na hlavnÃ strÃ¡nce. DoporuÄuje se 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Ã© tato instance narazila ve fediverse
+        title: ZveÅ™ejnit seznam objevenÃ½ch instancÃ
+      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: Dovolit kaÅ¾dÃ©mu smazÃ¡nÃ svÃ©ho ÃºÄtu
+          title: ZpÅ™Ãstupnit smazÃ¡nÃ ÃºÄtu
+        min_invite_role:
+          disabled: Nikdo
+          title: Povolit pozvÃ¡nky od
+        open:
+          desc_html: Dovolit kaÅ¾dÃ©mu vytvoÅ™it si ÃºÄet
+          title: ZpÅ™Ãstupnit registraci
+      show_known_fediverse_at_about_page:
+        desc_html: Je-li toto zapnuto, zobrazÃ se v nÃ¡hledu tooty ze vÅ¡ech znÃ¡mÃ½ch serverÅ¯ na fediverse. Jinak budou zobrazeny pouze mÃstnÃ tooty.
+        title: Zobrazit celou znÃ¡mou fediverse na nÃ¡hledu Ä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 na hlavnÃ stranÄ›. PopiÅ¡te, dÃky Äemu je tento server Mastodon zvlÃ¡Å¡tnÃ, 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 instance
+      site_description_extended:
+        desc_html: DobrÃ© mÃsto pro vaÅ¡e pravidla, pokyny a jinÃ© vÄ›ci, kterÃ© vaÅ¡i instanci odliÅ¡ujÃ od ostatnÃch. Lze pouÅ¾Ãt HTML znaÄky
+        title: VlastnÃ doplÅˆujÃcÃ informace
+      site_short_description:
+        desc_html: Zobrazen v postrannÃm panelu a meta znaÄkÃ¡ch. PopiÅ¡te, co je Mastodon a dÃky Äemu je tento server zvlÃ¡Å¡tnÃ v jedinÃ©m odstavci. Je-li tohle prÃ¡zdnÃ©, zobrazÃ se popis instance.
+        title: KrÃ¡tkÃ½ popis instance
+      site_terms:
+        desc_html: MÅ¯Å¾ete si napsat vlastnÃ zÃ¡sady soukromÃ, podmÃnky pouÅ¾ÃvÃ¡nÃ Äi jinÃ© legality. MÅ¯Å¾ete pouÅ¾Ãt HTML znaÄky
+        title: VlastnÃ podmÃnky pouÅ¾ÃvÃ¡nÃ
+      site_title: NÃ¡zev instance
+      thumbnail:
+        desc_html: PouÅ¾ÃvÃ¡no pro nÃ¡hledy pÅ™es OpenGraph a API. DoporuÄuje se rozliÅ¡enÃ 1200x630px
+        title: Miniatura instance
+      timeline_preview:
+        desc_html: Zobrazit na hlavnÃ stranÄ› veÅ™ejnou Äasovou osu
+        title: NÃ¡hled ÄasovÃ© osy
+      title: NastavenÃ strÃ¡nky
+    statuses:
+      back_to_account: ZpÄ›t na strÃ¡nku ÃºÄtu
+      batch:
+        delete: Vymazat
+        nsfw_off: OznaÄit, Å¾e nenÃ citlivÃ½
+        nsfw_on: OznaÄit jako citlivÃ½
+      failed_to_execute: NepodaÅ™ilo se vykonat
+      media:
+        title: MÃ©dia
+      no_media: Å½Ã¡dnÃ¡ mÃ©dia
+      no_status_selected: Nebyly zmÄ›nÄ›ny Å¾Ã¡dnÃ© pÅ™ÃspÄ›vky, neboÅ¥ Å¾Ã¡dnÃ© nebyly vybrÃ¡ny
+      title: PÅ™ÃspÄ›vky ÃºÄtu
+      with_media: S mÃ©dii
+    subscriptions:
+      callback_url: ZpÃ¡teÄnÃ URL
+      confirmed: Potvrzeno
+      expires_in: VyprÅ¡Ã v
+      last_delivery: PoslednÃ doruÄenÃ
+      title: WebSub
+      topic: TÃ©ma
+    tags:
+      accounts: ÃšÄty
+      hidden: SkrytÃ©
+      hide: SkrÃ½t z adresÃ¡Å™e
+      name: Hashtag
+      title: Hashtagy
+      unhide: Zobrazit v adresÃ¡Å™i
+      visible: ViditelnÃ©
+    title: Administrace
+    warning_presets:
+      add_new: PÅ™idat novÃ©
+      delete: Smazat
+      edit: Upravit
+      edit_preset: Upravit pÅ™ednastavenÃ pro varovÃ¡nÃ
+      title: Spravovat pÅ™ednastavenÃ pro varovÃ¡nÃ
+  admin_mailer:
+    new_report:
+      body: "%{reporter} nahlÃ¡sil/a uÅ¾ivatele %{target}"
+      body_remote: NÄ›kdo z %{domain} nahlÃ¡sil uÅ¾ivatele %{target}
+      subject: NovÃ© nahlÃ¡Å¡enÃ pro %{instance} (#%{id})
+  application_mailer:
+    notification_preferences: ZmÄ›nit volby e-mailu
+    salutation: "%{name},"
+    settings: 'ZmÄ›nit volby e-mailu: %{link}'
+    view: 'Zobrazit:'
+    view_profile: Zobrazit profil
+    view_status: Zobrazit pÅ™ÃspÄ›vek
+  applications:
+    created: Aplikace ÃºspÄ›Å¡nÄ› vytvoÅ™ena
+    destroyed: Aplikace ÃºspÄ›Å¡nÄ› smazÃ¡na
+    invalid_url: ZadanÃ¡ adresa URL je neplatnÃ¡
+    regenerate_token: Znovu vygenerovat pÅ™ÃstupovÃ½ token
+    token_regenerated: PÅ™ÃstupovÃ½ token byl ÃºspÄ›Å¡nÄ› vygenerovÃ¡n
+    warning: BuÄte s tÄ›mito daty velmi opatrnÃ. Nikdy je s nikÃ½m nesdÃlejte!
+    your_token: VÃ¡Å¡ pÅ™ÃstupovÃ½ token
+  auth:
+    agreement_html: KliknutÃm na tlaÄÃtko â€žRegistrovatâ€œ souhlasÃte s nÃ¡sledovÃ¡nÃm <a href="%{rules_path}">pravidel tÃ©to instance</a> a <a href="%{terms_path}">naÅ¡ich podmÃnek pouÅ¾ÃvÃ¡nÃ</a>.
+    change_password: Heslo
+    confirm_email: Potvrdit e-mail
+    delete_account: Odstranit ÃºÄet
+    delete_account_html: Chcete-li odstranit svÅ¯j ÃºÄet, <a href="%{path}">pokraÄujte zde</a>. Budete poÅ¾Ã¡dÃ¡n/a o potvrzenÃ.
+    didnt_get_confirmation: NeobdrÅ¾el/a jste pokyny pro potvrzenÃ?
+    forgot_password: ZapomnÄ›l/a jste heslo?
+    invalid_reset_password_token: Token na obnovu hesla je buÄ neplatnÃ½, nebo vyprÅ¡el. ProsÃm vyÅ¾Ã¡dejte si novÃ½.
+    login: PÅ™ihlÃ¡sit
+    logout: OdhlÃ¡sit
+    migrate_account: PÅ™esunout se na jinÃ½ ÃºÄet
+    migrate_account_html: Chcete-li pÅ™esmÄ›rovat tento ÃºÄet na jinÃ½, mÅ¯Å¾ete to <a href="%{path}">nastavit zde</a>.
+    or: nebo
+    or_log_in_with: Nebo se pÅ™ihlaste pomocÃ
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Registrovat
+    register_elsewhere: Registrovat na jinÃ©m serveru
+    resend_confirmation: Znovu odeslat pokyny pro potvrzenÃ
+    reset_password: Obnovit heslo
+    security: ZabezpeÄenÃ
+    set_new_password: Nastavit novÃ© heslo
+  authorize_follow:
+    already_following: Tento ÃºÄet jiÅ¾ sledujete
+    error: PÅ™i hledÃ¡nÃ vzdÃ¡lenÃ©ho ÃºÄtu bohuÅ¾el nastala chyba
+    follow: Sledovat
+    follow_request: 'Poslal/a jste poÅ¾adavek o sledovÃ¡nÃ uÅ¾ivateli:'
+    following: 'PodaÅ™ilo se! NynÃ sledujete uÅ¾ivatele:'
+    post_follow:
+      close: Nebo mÅ¯Å¾ete toto okno klidnÄ› zavÅ™Ãt.
+      return: Zobrazit profil uÅ¾ivatele
+      web: PÅ™ejÃt na web
+    title: Sledovat uÅ¾ivatele %{acct}
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count} hod"
+      about_x_months: "%{count} mÄ›sÃcÅ¯"
+      about_x_years: "%{count} let"
+      almost_x_years: "%{count} let"
+      half_a_minute: PrÃ¡vÄ› teÄ
+      less_than_x_minutes: "%{count} min"
+      less_than_x_seconds: PrÃ¡vÄ› teÄ
+      over_x_years: "%{count} let"
+      x_days: "%{count} dnÃ"
+      x_minutes: "%{count} min"
+      x_months: "%{count} mesÃcÅ¯"
+      x_seconds: "%{count} s"
+  deletes:
+    bad_password_msg: DobrÃ½ pokus, hackeÅ™i! NesprÃ¡vnÃ© heslo
+    confirm_password: Zadejte svoje souÄasnÃ© heslo pro ovÄ›Å™enÃ vaÅ¡Ã identity
+    description_html: TÃmto <strong>trvale a nenÃ¡vratnÄ›</strong> odstranÃte obsah z vaÅ¡eho ÃºÄtu a deaktivujete ho. VaÅ¡e uÅ¾ivatelskÃ© jmÃ©no zÅ¯stane rezervovanÃ© pro zabrÃ¡nÄ›nÃ budoucÃm napodobovÃ¡nÃm.
+    proceed: Odstranit ÃºÄet
+    success_msg: VÃ¡Å¡ ÃºÄet byl ÃºspÄ›Å¡nÄ› odstranÄ›n
+    warning_html: Pouze vymazÃ¡nÃ obsahu z tÃ©to konkrÃ©tnÃ instance je zaruÄeno. Obsah, kterÃ½ byl Å¡iroce sdÃlen, po sobÄ› pravdÄ›podobnÄ› zanechÃ¡ stopy. U offline serverÅ¯ a serverÅ¯, kterÃ© vaÅ¡e aktualizace jiÅ¾ neodebÃrajÃ, nebudou databÃ¡ze aktualizovÃ¡ny.
+    warning_title: Dostupnost rozÅ¡ÃÅ™enÃ©ho obsahu
+  directories:
+    directory: AdresÃ¡Å™ profilÅ¯
+    enabled: AktuÃ¡lnÄ› jste v adresÃ¡Å™i uveden/a.
+    enabled_but_waiting: PÅ™ihlÃ¡sil/a jste se k uvedenÃ v adresÃ¡Å™i, ale jeÅ¡tÄ› nemÃ¡te minimÃ¡lnÃ poÄet sledovatelÅ¯ (%{min_followers}) pro uvedenÃ.
+    explanation: Objevujte uÅ¾ivatele podle jejich zÃ¡jmÅ¯
+    explore_mastodon: Prozkoumejte %{title}
+    how_to_enable: AktuÃ¡lnÄ› nejste pÅ™ihlÃ¡Å¡en/a do adresÃ¡Å™e. PÅ™ihlÃ¡sit se mÅ¯Å¾ete nÃÅ¾e. PouÅ¾ijte ve svÃ©m popisu profilu hashtagy, abyste mohl/a bÃ½t uveden/a pod konkrÃ©tnÃmi hashtagy!
+    people:
+      few: "%{count} lidÃ©"
+      one: "%{count} ÄlovÄ›k"
+      other: "%{count} lidÃ"
+  errors:
+    '403': NemÃ¡te povolenÃ zobrazit tuto strÃ¡nku.
+    '404': StrÃ¡nka, kterou hledÃ¡te, neexistuje.
+    '410': StrÃ¡nka, kterou hledÃ¡te, jiÅ¾ neexistuje.
+    '422':
+      content: BezpeÄnostnÃ ovÄ›Å™enÃ selhalo. Neblokujete cookoes?
+      title: BezpeÄnostnÃ ovÄ›Å™enÃ selhalo
+    '429': PÅ™ÃliÅ¡ mnoho poÅ¾adavkÅ¯
+    '500':
+      content: OmlouvÃ¡me se, ale nÄ›co se pokazilo u nÃ¡s.
+      title: Tato strÃ¡nka nenÃ sprÃ¡vnÃ¡
+    noscript_html: Pro pouÅ¾itÃ webovÃ© aplikace Mastodon prosÃm povolte JavaScript. Nebo zkuste jednu z <a href="%{apps_path}">nativnÃch aplikacÃ</a> pro Mastodon pro vaÅ¡i platformu.
+  exports:
+    archive_takeout:
+      date: Datum
+      download: StÃ¡hnout svÅ¯j archiv
+      hint_html: MÅ¯Å¾ete si vyÅ¾Ã¡dat archiv vaÅ¡ich <strong>tootÅ¯ a nahranÃ½ch mÃ©diÃ</strong>. ExportovanÃ¡ data budou ve formÃ¡tu ActivityPub a budou ÄitelnÃ© kterÃ½mkoliv kompatibilnÃm softwarem. Archiv si mÅ¯Å¾ete vyÅ¾Ã¡dat kaÅ¾dÃ½ch 7 dnÃ.
+      in_progress: Kompiluji vÃ¡Å¡ archiv...
+      request: VyÅ¾Ã¡dat svÅ¯j archiv
+      size: Velikost
+    blocks: Blokujete
+    csv: CSV
+    domain_blocks: Blokace domÃ©n
+    follows: Sledujete
+    lists: Seznamy
+    mutes: Ignorujete
+    storage: PamÄ›Å¥ mÃ©diÃ
+  filters:
+    contexts:
+      home: DomovskÃ¡ ÄasovÃ¡ osa
+      notifications: OznÃ¡menÃ
+      public: VeÅ™ejnÃ½ ÄasovÃ© osy
+      thread: Konverzace
+    edit:
+      title: Upravit filtr
+    errors:
+      invalid_context: Nebylo poskytnuto nic, nebo mÃ¡ neplatnÃ½ kontext
+      invalid_irreversible: NezvratnÃ© filtrovÃ¡nÃ funguje pouze v souvislosti s domovskou osou Äi oznÃ¡menÃmi
+    index:
+      delete: Smazat
+      title: Filtry
+    new:
+      title: PÅ™idat novÃ½ filtr
+  followers:
+    domain: DomÃ©na
+    explanation_html: Chcete-li zaruÄit soukromÃ vaÅ¡ich pÅ™ÃspÄ›vkÅ¯, musÃte mÃt na vÄ›domÃ, kdo vÃ¡s sleduje. <strong>VaÅ¡e soukromÃ© pÅ™ÃspÄ›vky jsou doruÄeny na vÅ¡echny instance, kde mÃ¡te sledovatele</strong>. NejspÃÅ¡ si je budete chtÃt zkontrolovat a odstranit sledovatele na instancÃch, jejichÅ¾ personÃ¡lu Äi softwaru nedÅ¯vÄ›Å™ujete s respektovÃ¡nÃm vaÅ¡eho soukromÃ.
+    followers_count: PoÄet sledovatelÅ¯
+    lock_link: ZamknÄ›te svÅ¯j ÃºÄet
+    purge: Odstranit ze sledovatelÅ¯
+    success:
+      few: V prÅ¯bÄ›hu blokovÃ¡nÃ sledovatelÅ¯ ze %{count} domÃ©n...
+      one: V prÅ¯bÄ›hu blokovÃ¡nÃ sledovatelÅ¯ z jednÃ© domÃ©ny...
+      other: V prÅ¯bÄ›hu blokovÃ¡nÃ sledovatelÅ¯ z %{count} domÃ©n...
+    true_privacy_html: Berte prosÃm na vÄ›domÃ, Å¾e <strong>skuteÄnÃ©ho soukromÃ se dÃ¡ dosÃ¡hnout pouze za pomoci end-to-end Å¡ifrovÃ¡nÃ</strong>.
+    unlocked_warning_html: Kdokoliv vÃ¡s mÅ¯Å¾e sledovat a okamÅ¾itÄ› vidÄ›t vaÅ¡e soukromÃ© pÅ™ÃspÄ›vky. %{lock_link}, abyste mohl/a zkontrolovat a odmÃtnout sledovatele.
+    unlocked_warning_title: VÃ¡Å¡ ÃºÄet nenÃ zamknutÃ½
+  footer:
+    developers: VÃ½vojÃ¡Å™i
+    more: VÃceâ€¦
+    resources: Zdroje
+  generic:
+    changes_saved_msg: ZmÄ›ny byly ÃºspÄ›Å¡nÄ› uloÅ¾eny!
+    copy: KopÃrovat
+    save_changes: UloÅ¾it zmÄ›ny
+    validation_errors:
+      few: NÄ›co jeÅ¡tÄ› nenÃ ÃºplnÄ› v poÅ™Ã¡dku! ProsÃm zkontrolujte %{count} chyby nÃÅ¾e
+      one: NÄ›co jeÅ¡tÄ› nenÃ ÃºplnÄ› v poÅ™Ã¡dku! ProsÃm zkontrolujte chybu nÃÅ¾e
+      other: NÄ›co jeÅ¡tÄ› nenÃ ÃºplnÄ› v poÅ™Ã¡dku! ProsÃm zkontrolujte %{count} chyb nÃÅ¾e
+  imports:
+    preface: MÅ¯Å¾ete importovat data, kterÃ¡ jste exportoval/a z jinÃ© instance, jako napÅ™Ãklad seznam lidÃ, kterÃ© sledujete Äi blokujete.
+    success: VaÅ¡e data byla ÃºspÄ›Å¡nÄ› nahrÃ¡na a nynÃ budou zpracovÃ¡na v danÃ½ Äas
+    types:
+      blocking: Seznam blokovanÃ½ch
+      following: Seznam sledovanÃ½ch
+      muting: Seznam ignorovanÃ½ch
+    upload: NahrÃ¡t
+  in_memoriam_html: NavÅ¾dy budeme vzpomÃnat.
+  invites:
+    delete: Deaktivovat
+    expired: VyprÅ¡elÃ©
+    expires_in:
+      '1800': 30 minut
+      '21600': 6 hodin
+      '3600': 1 hodina
+      '43200': 12 hodin
+      '604800': 1 tÃ½den
+      '86400': 1 den
+    expires_in_prompt: Nikdy
+    generate: Vygenerovat
+    invited_by: 'Byl/a jste pozvÃ¡n/a uÅ¾ivatelem:'
+    max_uses:
+      few: "%{count} pouÅ¾itÃ"
+      one: 1 pouÅ¾itÃ
+      other: "%{count} pouÅ¾itÃ"
+    max_uses_prompt: Bez limitu
+    prompt: Vygenerujte a sdÃlejte s ostatnÃmi odkazy a umoÅ¾nÄ›te jim pÅ™Ãstup na tuto instanci
+    table:
+      expires_at: VyprÅ¡Ã
+      uses: PouÅ¾itÃ
+    title: PozvÄ›te lidi
+  lists:
+    errors:
+      limit: DosÃ¡hl/a jste maximÃ¡lnÃho poÄtu seznamÅ¯
+  media_attachments:
+    validations:
+      images_and_video: K pÅ™ÃspÄ›vku, kterÃ½ jiÅ¾ obsahuje obrÃ¡zky, nelze pÅ™ipojit video
+      too_many: Nelze pÅ™ipojit vÃce neÅ¾ 4 soubory
+  migrations:
+    acct: pÅ™ezdÃvka@domÃ©na novÃ©ho ÃºÄtu
+    currently_redirecting: 'VÃ¡Å¡ profil mÃ¡ nastaveno pÅ™esmÄ›rovÃ¡nÃ na:'
+    proceed: UloÅ¾it
+    updated_msg: VaÅ¡e nastavenÃ migrace ÃºÄtu bylo ÃºspÄ›Å¡nÄ› aktualizovÃ¡no!
+  moderation:
+    title: Moderace
+  notification_mailer:
+    digest:
+      action: Zobrazit vÅ¡echna oznÃ¡menÃ
+      body: Zde najdete struÄnÃ½ souhrn zprÃ¡v, kterÃ© jste zmeÅ¡kal/a od vaÅ¡Ã poslednÃ nÃ¡vÅ¡tÄ›vy %{since}
+      mention: "%{name} vÃ¡s zmÃnil/a v:"
+      new_followers_summary:
+        few: NavÃc jste zÃskal/a %{count} novÃ© sledovatele, zatÃmco jste byl/a pryÄ! SkvÄ›lÃ©!
+        one: NavÃc jste zÃskal/a jednoho novÃ©ho sledovatele, zatÃmco jste byl/a pryÄ! HurÃ¡!
+        other: NavÃc jste zÃskal/a %{count} novÃ½ch sledovatelÅ¯, zatÃmco jste byl/a pryÄ! ÃšÅ¾asnÃ©!
+      subject:
+        few: "%{count} novÃ¡ 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...
+    favourite:
+      body: 'VÃ¡Å¡ pÅ™ÃspÄ›vek si oblÃbil/a %{name}:'
+      subject: "%{name} si oblÃbil/a vÃ¡Å¡ pÅ™ÃspÄ›vek"
+      title: NovÃ© oblÃbenÃ
+    follow:
+      body: "%{name} vÃ¡s nynÃ sleduje!"
+      subject: "%{name} vÃ¡s nynÃ sleduje"
+      title: NovÃ½ sledovatel
+    follow_request:
+      action: Spravovat poÅ¾adavky o sledovÃ¡nÃ
+      body: "%{name} poÅ¾Ã¡dal/a o povolenÃ vÃ¡s sledovat"
+      subject: 'ÄŒekajÃcÃ sledovatel: %{name}'
+      title: NovÃ½ poÅ¾adavek o sledovÃ¡nÃ
+    mention:
+      action: OdpovÄ›dÄ›t
+      body: 'Byl/a jste zmÃnÄ›n/a uÅ¾ivatelem %{name} v:'
+      subject: Byl/a jste zmÃnÄ›n/a uÅ¾ivatelem %{name}
+      title: NovÃ¡ zmÃnka
+    reblog:
+      body: 'VÃ¡Å¡ pÅ™ÃspÄ›vek byl boostnutÃ½ uÅ¾ivatelem %{name}:'
+      subject: "%{name} boostnul/a vÃ¡Å¡ pÅ™ÃspÄ›vek"
+      title: NovÃ© boostnutÃ
+  number:
+    human:
+      decimal_units:
+        format: "%n %u"
+        units:
+          billion: mld
+          million: mil
+          quadrillion: bld
+          thousand: tis
+          trillion: bil
+  pagination:
+    newer: NovÄ›jÅ¡Ã
+    next: DalÅ¡Ã
+    older: StarÅ¡Ã
+    prev: PÅ™ed
+    truncate: "&hellip;"
+  preferences:
+    languages: Jazyky
+    other: OstatnÃ
+    publishing: PublikovÃ¡nÃ
+    web: Web
+  remote_follow:
+    acct: NapiÅ¡te svou pÅ™ezdÃvku@domÃ©nu, ze kterÃ© chcete jednat
+    missing_resource: NemÅ¯Å¾eme najÃt poÅ¾adovanÃ© pÅ™esmÄ›rovacÃ URL pro vÃ¡Å¡ ÃºÄet
+    no_account_html: JeÅ¡tÄ› nemÃ¡te ÃºÄet? MÅ¯Å¾ete se <a href='%{sign_up_path}' target='_blank'>registrovat zde</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Ã¡n/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 toot:'
+    reblog:
+      proceed: PokraÄovat k boostnutÃ
+      prompt: 'Chcete boostnout tento toot:'
+    reply:
+      proceed: PokraÄovat k odpovÄ›zenÃ
+      prompt: 'Chcete odpovÄ›dÄ›t na tento toot:'
+  remote_unfollow:
+    error: Chyba
+    title: Nadpis
+    unfollowed: UÅ¾ nesledujete
+  scheduled_statuses:
+    over_daily_limit: PÅ™ekroÄil/a jste limit %{limit} plÃ¡novanÃ½ch tootÅ¯ pro tento den
+    over_total_limit: PÅ™ekroÄil/a jste limit %{limit} plÃ¡novanÃ½ch tootÅ¯
+    too_soon: PlÃ¡novanÃ© datum musÃ bÃ½t v budoucnosti
+  sessions:
+    activity: NejnovÄ›jÅ¡Ã aktivita
+    browser: ProhlÃÅ¾eÄ
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: NeznÃ¡mÃ½ prohlÃÅ¾eÄ
+      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
+      weibo: Weibo
+    current_session: AktuÃ¡lnÃ relace
+    description: "%{browser} na %{platform}"
+    explanation: Toto jsou webovÃ© prohlÃÅ¾eÄe aktuÃ¡lnÄ› pÅ™ihlÃ¡Å¡enÃ© na vÃ¡Å¡ ÃºÄet 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: Mac
+      other: neznÃ¡mÃ© platformÄ›
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: ZamÃtnout
+    revoke_success: Relace ÃºspÄ›Å¡nÄ› zamÃtnuta
+    title: Relace
+  settings:
+    authorized_apps: AutorizovanÃ© aplikace
+    back: ZpÄ›t na Mastodon
+    delete: SmazÃ¡nÃ ÃºÄtu
+    development: VÃ½voj
+    edit_profile: Upravit profil
+    export: Export dat
+    followers: AutorizovanÃ sledovatelÃ©
+    import: Import
+    migrate: PÅ™esunutÃ ÃºÄtu
+    notifications: OznÃ¡menÃ
+    preferences: PÅ™edvolby
+    settings: NastavenÃ
+    two_factor_authentication: DvoufaktorovÃ© ovÄ›Å™ovÃ¡nÃ
+    your_apps: VaÅ¡e aplikace
+  statuses:
+    attached:
+      description: 'PÅ™iloÅ¾eno: %{attached}'
+      image:
+        few: "%{count} obrÃ¡zky"
+        one: "%{count} obrÃ¡zek"
+        other: "%{count} obrÃ¡zkÅ¯"
+      video:
+        few: "%{count} videa"
+        one: "%{count} video"
+        other: "%{count} videÃ"
+    boosted_from_html: Boostnuto z %{acct_link}
+    content_warning: 'VarovÃ¡nÃ o obsahu: %{warning}'
+    disallowed_hashtags:
+      few: 'obsahoval nepovolenÃ© hashtagy: %{tags}'
+      one: 'obsahoval nepovolenÃ½ hashtag: %{tags}'
+      other: 'obsahoval nepovolenÃ© hashtagy: %{tags}'
+    language_detection: Zjistit jazyk automaticky
+    open_in_web: OtevÅ™Ãt na webu
+    over_character_limit: limit %{max} znakÅ¯ byl pÅ™ekroÄen
+    pin_errors:
+      limit: UÅ¾ jste si pÅ™ipnul/a maximÃ¡lnÃ poÄet tootÅ¯
+      ownership: Nelze pÅ™ipnout toot nÄ›koho jinÃ©ho
+      private: Nelze pÅ™ipnout neveÅ™ejnÃ© tooty
+      reblog: Nelze pÅ™ipnout boostnutÃ
+    show_more: Zobrazit vÃce
+    sign_in_to_participate: Chcete-li se ÃºÄastnit tÃ©to konverzace, pÅ™ihlaste se
+    title: "%{name}: â€ž%{quote}â€œ"
+    visibilities:
+      private: Pouze pro sledovatele
+      private_long: Zobrazit pouze sledovatelÅ¯m
+      public: VeÅ™ejnÃ©
+      public_long: VÅ¡ichni mohou vidÄ›t
+      unlisted: NeuvedenÃ©
+      unlisted_long: VÅ¡ichni mohou vidÄ›t, ale nenÃ zahrnut ve veÅ™ejnÃ½ch ÄasovÃ½ch osÃ¡ch
+  stream_entries:
+    pinned: PÅ™ipnutÃ½ toot
+    reblogged: boostnul/a
+    sensitive_content: CitlivÃ½ obsah
+  terms:
+    body_html: |
+      <h2>ZÃ¡sady soukromÃ</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 a krÃ¡tkÃ½ Å¾ivotopis, a nahrÃ¡t si profilovou fotografii a hlaviÄkovÃ½ obrÃ¡zek. UÅ¾ivatelskÃ© i zobrazovanÃ© jmÃ©no, Å¾ivotopis, profilovÃ¡ fotografie a hlaviÄkovÃ½ obrÃ¡zek jsou vÅ¾dy uvedeny veÅ™ejnÄ›.</li>
+        <li><em>PÅ™ÃspÄ›vky, sledovatelÃ© a dalÅ¡Ã veÅ™ejnÃ© informace</em>: Seznam lidÃ, kterÃ© sledujete, je uveden veÅ™ejnÄ›, totÃ©Å¾ platÃ i pro vaÅ¡e sledovatele. KdyÅ¾ sem nahrajete zprÃ¡vu, bude uloÅ¾eno datum a Äas, spoleÄnÄ› s aplikacÃ, 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, je to takÃ© veÅ™ejnÄ› dostupnÃ¡ informace. VaÅ¡e pÅ™ÃspÄ›vky jsou doruÄeny vaÅ¡im sledovatelÅ¯m, coÅ¾ v nÄ›kterÃ½ch pÅ™Ãpadech znamenÃ¡, Å¾e budou doruÄeny na rÅ¯znÃ© servery, na kterÃ½ch budou uklÃ¡dÃ¡ny kopie. Pokud pÅ™ÃspÄ›vky smaÅ¾ete, bude tohle taktÃ©Å¾ doruÄeno vaÅ¡im sledovatelÅ¯m. Akce znovusdÃ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 sledovatele</em>: VÅ¡echny pÅ™ÃspÄ›vky jsou uloÅ¾eny a zpracovÃ¡ny na serveru. PÅ™ÃspÄ›vky pouze pro sledovatele jsou doruÄeny vaÅ¡im sledovatelÅ¯m a uÅ¾ivatelÅ¯m v nich zmÃnÄ›nÃ½m a pÅ™ÃmÃ© pÅ™ÃspÄ›vky jsou doruÄeny pouze uÅ¾ivatelÅ¯m v nich zmÃnÄ›nÃ½m. V nÄ›kterÃ½ch pÅ™Ãpadech tohle znamenÃ¡, Å¾e budou doruÄeny na rÅ¯znÃ© servery, na kterÃ½ch budou uklÃ¡dÃ¡ny kopie. SnaÅ¾Ãme se omezit pÅ™Ãstup k tÄ›mto pÅ™ÃspÄ›vkÅ¯m pouze na autorizovanÃ© uÅ¾ivatele, ovÅ¡em jinÃ© servery tak nemusejÃ uÄinit. Proto je dÅ¯leÅ¾itÃ© posoudit servery, ke kterÃ½m vaÅ¡i sledovatelÃ© patÅ™Ã. V nastavenÃ si mÅ¯Å¾ete zapnout volbu pro manuÃ¡lnÃ schvalovÃ¡nÃ Äi odmÃtnutÃ novÃ½ch sledovatelÅ¯. <em>ProsÃm mÄ›jte na pamÄ›ti, Å¾e operÃ¡toÅ™i 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 jakÃ©koliv nebezpeÄnÃ© informace.</em></li>
+        <li><em>IP adresy a dalÅ¡Ã metadata</em>: KdyÅ¾ se pÅ™ihlÃ¡sÃte, zaznamenÃ¡vÃ¡me IP adresu, ze kterÃ© se pÅ™ihlaÅ¡ujete, jakoÅ¾to i 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Ã. NejpozdÄ›jÅ¡Ã IP adresa pouÅ¾ita je uloÅ¾ena maximÃ¡lnÄ› do 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 pouÅ¾ÃvÃ¡me vaÅ¡e informace?</h3>
+
+      <p>JakÃ©koliv informace, kterÃ© sbÃrÃ¡me, mohou bÃ½t pouÅ¾ity nÃ¡sledujÃcÃmi zpÅ¯soby:</p>
+
+      <ul>
+        <li>K poskytnutÃ zÃ¡kladnÃch funkcÃ Mastodonu. Interagovat 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 moderaci komunity, napÅ™Ãklad porovnÃ¡nÃm vaÅ¡Ã IP adresy s dalÅ¡Ãmi znÃ¡mÃ½mi adresami pro urÄenÃ vyhÃ½bÃ¡nÃ se zÃ¡kazÅ¯m Ä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 informace chrÃ¡nÃme?</h3>
+
+      <p>Implenentujeme rÅ¯znÃ¡ bezpeÄnostnÃ opatÅ™enÃ pro udrÅ¾ovÃ¡nÃ bezpeÄnosti vaÅ¡ich osobnÃch dat, kdyÅ¾ zadÃ¡vÃ¡te, odesÃlÃ¡te, Äi pÅ™istupujete k vaÅ¡im osobnÃm datÅ¯m. 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 dvoufaktorovou autentikaci.</p>
+
+      <hr class="spacer" />
+
+      <h3 id="data-retention">JakÃ© jsou naÅ¡e zÃ¡sady o uchovÃ¡vÃ¡nÃ ÃºdajÅ¯?</h3>
+
+      <p>Budeme se snaÅ¾it:</p>
+
+      <ul>
+        <li>UchovÃ¡vat serverovÃ© zÃ¡znamy obsahujÃcÃ IP adresy vÅ¡ech poÅ¾adavkÅ¯ pro 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 vaÅ¡eho obsahu, vÄetnÄ› vaÅ¡ich pÅ™ÃspÄ›vkÅ¯, mediÃ¡lnÃch pÅ™Ãloh, profilovÃ© fotografie a hlaviÄkovÃ©ho obrÃ¡zku.</p>
+
+      <p>Kdykoliv mÅ¯Å¾ete nenÃ¡vratnÄ› smazat vÃ¡Å¡ ÃºÄ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Å¾Ã na pevnÃ½ disk 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. Do tohoto se nepoÄÃtajÃ 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Ã. MÅ¯Å¾eme takÃ© uvolnit vaÅ¡e informace, 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 sledovatele budou doruÄeny na servery vaÅ¡ich sledovatelÅ¯ a pÅ™ÃmÃ© zprÃ¡vy budou doruÄeny na servery pÅ™ÃjemcÅ¯, pokud jsou tito sledovatelÃ© nebo pÅ™Ãjemci zaregistrovÃ¡ni na jinÃ©m serveru, neÅ¾ je tento.</p>
+
+      <p>KdyÅ¾ autorizujete aplikaci, aby pouÅ¾Ãvala vÃ¡Å¡ ÃºÄet, mÅ¯Å¾e, v zÃ¡vislosti na rozsahu oprÃ¡vnÄ›nÃ, kterÃ© jÃ udÄ›lÃte, pÅ™istupovat k vaÅ¡im veÅ™ejnÃ½m profilovÃ½m informacÃm, seznamu lidÃ, kterÃ© sledujete, vaÅ¡im sledovatelÅ¯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 Äi 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 vÅ¡echny smÄ›Å™ovÃ¡ny na lidi, kterÃ½m je alespoÅˆ 16 let. Pokud je vÃ¡m mÃ©nÄ› neÅ¾ 16, 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Ä› sobnÃ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 vÅ¡echny smÄ›Å™ovÃ¡ny na lidi, kterÃ½m je alespoÅˆ 13 let. Pokud je vÃ¡m mÃ©nÄ› neÅ¾ 13, 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 soukromÃ</h3>
+
+      <p>Rozhodneme-li se naÅ¡e zÃ¡sady soukromÃ 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 soukromÃ Discourse</a>.</p>
+    title: PodmÃnky pouÅ¾ÃvÃ¡nÃ a zÃ¡sady soukromÃ %{instance}
+  themes:
+    contrast: VysokÃ½ kontrast
+    default: Mastodon
+    mastodon-light: Mastodon (svÄ›tlÃ½)
+  time:
+    formats:
+      default: "%d. %b %Y, %H:%M"
+      month: "%b %Y"
+  two_factor_authentication:
+    code_hint: Pro potvrzenÃ zadejte kÃ³d vygenerovanÃ½ vaÅ¡Ã autentikaÄnÃ aplikacÃ
+    description_html: PovolÃte-li <strong>dvoufaktorovÃ© ovÄ›Å™ovÃ¡nÃ</strong>, budete pÅ™i pÅ™ihlÃ¡Å¡enÃ potÅ™ebovat telefon, kterÃ½ vÃ¡m vygeneruje pÅ™ÃstupovÃ© tokeny, kterÃ© musÃte zadat.
+    disable: ZakÃ¡zat
+    enable: Povolit
+    enabled: DvoufaktorovÃ© ovÄ›Å™ovÃ¡nÃ je povoleno
+    enabled_success: DvoufaktorovÃ© ovÄ›Å™ovÃ¡nÃ bylo ÃºspÄ›Å¡nÄ› povoleno
+    generate_recovery_codes: Vygenerovat zÃ¡loÅ¾nÃ kÃ³dy
+    instructions_html: "<strong>Naskenujte tento QR kÃ³d Google Authenticatorem nebo jinou TOTP aplikacÃ na vaÅ¡em telefonu</strong>. Od teÄ bude tato aplikace generovat tokeny, kterÃ© budete muset zadat pÅ™i pÅ™ihlÃ¡Å¡enÃ."
+    lost_recovery_codes: ZÃ¡loÅ¾nÃ kÃ³dy vÃ¡m dovolÃ dostat se k vaÅ¡emu ÃºÄtu, pokud ztratÃte telefon. ZtratÃte-li zÃ¡loÅ¾nÃ kÃ³dy, mÅ¯Å¾ete je zde znovu vygenerovat. VaÅ¡e starÃ© zÃ¡loÅ¾nÃ kÃ³dy budou zneplatnÄ›ny.
+    manual_instructions: 'NemÅ¯Å¾ete-li oskenovat QR kÃ³d a je potÅ™eba ho zadat ruÄnÄ›, zde je tajemstvÃ v prostÃ©m textu:'
+    recovery_codes: ZÃ¡loÅ¾nÃ kÃ³dy pro obnovu
+    recovery_codes_regenerated: ZÃ¡loÅ¾nÃ kÃ³dy byly ÃºspÄ›Å¡nÄ› znovu vygenerovanÃ©
+    recovery_instructions_html: ZtratÃte-li nÄ›kdy pÅ™Ãstup k vaÅ¡emu telefonu, mÅ¯Å¾ete k zÃskÃ¡nÃ pÅ™Ãstupu k ÃºÄtu pouÅ¾Ãt jeden ze zÃ¡loÅ¾nÃch kÃ³dÅ¯. <strong>UchovÃ¡vejte tyto kÃ³dy v bezpeÄÃ</strong>. MÅ¯Å¾ete si je napÅ™Ãklad vytisknout a uloÅ¾it je mezi jinÃ© dÅ¯leÅ¾itÃ© dokumenty.
+    setup: Nastavit
+    wrong_code: ZadanÃ½ kÃ³d byl neplatnÃ½! Je serverovÃ½ Äas a Äas na zaÅ™ÃzenÃ sprÃ¡vnÃ½?
   user_mailer:
+    backup_ready:
+      explanation: VyÅ¾Ã¡dal/a 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
+    warning:
+      explanation:
+        disable: ZatÃmco je vÃ¡Å¡ ÃºÄet zmraÅ¾en, zÅ¯stÃ¡vajÃ data vaÅ¡eho ÃºÄtu nedotÄenÃ¡, ale nemÅ¯Å¾ete vykonÃ¡vat Å¾Ã¡dnÃ© akce, dokud nebude odemÄen.
+        silence: ZatÃmco je vÃ¡Å¡ ÃºÄet omezen, mohou vaÅ¡e tooty na tomto serveru vidÄ›t pouze lidÃ©, kteÅ™Ã vÃ¡Å¡ jiÅ¾ sledujÃ, a mÅ¯Å¾ete bÃ½t vylouÄen/a z rÅ¯znÃ½ch veÅ™ejnÃ½ch vÃ½pisÅ¯. OstatnÃ vÃ¡s vÅ¡ak poÅ™Ã¡d mohou manuÃ¡lnÄ› sledovat.
+        suspend: VÃ¡Å¡ ÃºÄet byl pozastaven a vÅ¡echny vaÅ¡e tooty a vaÅ¡e nahranÃ© mediÃ¡lnÃ soubory byly nenÃ¡vratnÄ› odstranÄ›ny z tohoto serveru a serverÅ¯, na kterÃ½ch jste mÄ›l/a sledovatele.
+      review_server_policies: Posoudit politiku serveru
+      subject:
+        disable: VÃ¡Å¡ ÃºÄet %{acct} byl zmraÅ¾en
+        none: VarovÃ¡nÃ pro uÅ¾ivatele %{acct}
+        silence: VÃ¡Å¡ ÃºÄet %{acct} byl omezen
+        suspend: VÃ¡Å¡ ÃºÄet %{acct} byl pozastaven
+      title:
+        disable: ÃšÄet zmraÅ¾en
+        none: VarovÃ¡nÃ
+        silence: ÃšÄet omezen
+        suspend: ÃšÄet pozastaven
     welcome:
+      edit_profile_action: Nastavit profil
+      edit_profile_step: MÅ¯Å¾ete si pÅ™izpÅ¯sobit svÅ¯j profil nahrÃ¡nÃm avataru a obrÃ¡zku na hlaviÄce, zmÄ›nou zobrazovanÃ©ho jmÃ©na a dalÅ¡Ãch. Chcete-li posoudit novÃ© sledovatele pÅ™edtÃm, neÅ¾ vÃ¡s mohou sledovat, mÅ¯Å¾ete svÅ¯j ÃºÄet uzamknout.
+      explanation: Zde je pÃ¡r tipÅ¯ na zaÄÃ¡tek
+      final_action: ZaÄnÄ›te pÅ™ispÃvat
+      final_step: 'ZaÄnÄ›te pÅ™ispÃvat! I kdyÅ¾ nemÃ¡te sledovatele, mohou vaÅ¡e zprÃ¡vy vidÄ›t jinÃ lidÃ©, napÅ™Ãklad na mÃstnÃ ÄasovÃ© ose a mezi hashtagy. MÅ¯Å¾ete se ostatnÃm pÅ™edstavit pomocÃ hashtagu #introductions.'
+      full_handle: VaÅ¡e celÃ¡ adresa profilu
+      full_handle_hint: Tohle je, co byste Å™ekl/a svÃ½m pÅ™Ã¡telÅ¯m, aby vÃ¡m mohli posÃlat zprÃ¡vy nebo vÃ¡s sledovat z jinÃ© instance.
+      review_preferences_action: ZmÄ›nit nastavenÃ
+      review_preferences_step: NezapomeÅˆte si nastavit svÃ© volby, napÅ™Ãklad jakÃ© e-maily chcete pÅ™ijÃmat Äi jak soukromÃ© majÃ bÃ½t vaÅ¡e pÅ™ÃspÄ›vky ve vÃ½chozÃm stavu. 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Ã¡tora/y serveru sledujete automaticky. Chcete-li najÃt dalÅ¡Ã zajÃmavÃ© lidi, podÃvejte se na mÃstnÃ a federovanÃ© ÄasovÃ© osy.
+      tip_local_timeline: MÃstnÃ ÄasovÃ¡ osa je nÃ¡hled lidÃ na %{instance}. Toto jsou 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Ã
     invalid_email: E-mailovÃ¡ adresa je neplatnÃ¡
+    invalid_otp_token: NeplatnÃ½ kÃ³d pro dvoufaktorovou autentikaci
+    otp_lost_help_html: Pokud jste ztratil/a pÅ™Ãstup k obÄ›ma, mÅ¯Å¾ete se spojit %{email}
+    seamless_external_login: Jste pÅ™ihlÃ¡Å¡en/a pÅ™es externÃ sluÅ¾bu, nastavenÃ hesla a e-mailu proto nejsou dostupnÃ¡.
     signed_in_as: 'PÅ™ihlÃ¡Å¡en/a jako:'
+  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
new file mode 100644
index 0000000000000000000000000000000000000000..53b474c167f62ebbdbfbefd29fe9e6e3bca8c6f1
--- /dev/null
+++ b/config/locales/cy.yml
@@ -0,0 +1,935 @@
+---
+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
+    administered_by: 'Gweinyddir gan:'
+    api: API
+    apps: Apiau symudol
+    closed_registrations: Mae cofrestru wedi cau ar yr achos hwn ar hyn o bryd. Fodd bynnag, mae modd ffeindio achos arall er mwyn creu cyfrif arno a chael mynediad at union yr un rhwydwaith o'r man hwnnw.
+    contact: Cyswllt
+    contact_missing: Heb ei osod
+    contact_unavailable: Ddim yn berthnasol
+    documentation: Dogfennaeth
+    extended_description_html: |
+      <h3>Lle da ar gyfer rheolau</h3>
+      <p>Nid yw'r disgrifiad estynedig wedi ei osod eto.</p>
+    features:
+      humane_approach_body: Gan ddysgu o fethiannau rhwydweithiau eraill, mae Mastodon yn anelu i wneud penderfyniadau dylunio moesol i ymladd camddefnydd o gyfryngau cymdeithasol.
+      humane_approach_title: Agwedd fwy dynol
+      not_a_product_body: Nid yw Mastodon yn rwydwaith masnachol. Nid oes hysbysebion, cloddio data na gerddi caeedig. Nid oes awdurdod canolog.
+      not_a_product_title: Rwyt yn berson, nid yn beth
+      real_conversation_body: Gyda'r modd i ddefnyddio hyd at 500 o nodau a chefnogaeth ar gyfer cynnwys gronynnol a rhybuddion cyfryngau, mae modd i chi fynegi'ch hun yn y ffordd yr hoffech chi.
+      real_conversation_title: Wedi ei adeiladu ar gyfer sgyrsiau go iawn
+      within_reach_body: Nifer o apiau ar gyfer iOS, Android, a nifer blatfformau eraill diolch i amgylchedd API hygyrch i ddatblygwyr sy'n caniatau i chi gadw mewn cysylltiad a'ch ffrindiau o unrhywle.
+      within_reach_title: Bob tro o fewn gafael
+    generic_description: Mae %{domain} yn un gweinydd yn y rhwydwaith
+    hosted_on: Mastodon wedi ei weinyddu ar %{domain}
+    learn_more: Dysu mwy
+    other_instances: Rhestr achosion
+    privacy_policy: Polisi preifatrwydd
+    source_code: Cod ffynhonnell
+    status_count_after:
+      few: statwsau
+      many: statwsau
+      one: statws
+      other: statwsau
+      two: statwsau
+      zero: statwsau
+    status_count_before: Ysgriffennwyd gan
+    terms: Telerau gwasanaeth
+    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?
+  accounts:
+    choices_html: 'Dewisiadau %{name}:'
+    follow: Dilynwch
+    followers:
+      few: Dilynwyr
+      many: Dilynwyr
+      one: Dilynwr
+      other: Dilynwyr
+      two: Dilynwyr
+      zero: Dilynwyr
+    following: Yn dilyn
+    joined: Ymunodd %{date}
+    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
+    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
+    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
+    reserved_username: Mae'r enw defnyddiwr ar gadw
+    roles:
+      admin: Gweinyddwr
+      bot: Bot
+      moderator: Safonwr
+    unfollow: Dad-ddilyn
+  admin:
+    account_actions:
+      action: Cyflawni gweithred
+    account_moderation_notes:
+      create: Gadael nodyn
+      created_msg: Crewyd nodyn cymedroli yn llwyddiannus!
+      delete: Dileu
+      destroyed_msg: Dinistrwyd nodyn cymedroli yn llwyddiannus!
+    accounts:
+      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}
+      confirm: Cadarnhau
+      confirmed: Cadarnhawyd
+      confirming: Cadarnhau
+      deleted: Wedi dileu
+      demote: Diraddio
+      disable: Diffodd
+      disable_two_factor_authentication: Diffodd 2FA
+      disabled: Wedi ei ddiffodd
+      display_name: Enw arddangos
+      domain: Parth
+      edit: Golygu
+      email: E-bost
+      email_status: Statws E-bost
+      enable: Galluogi
+      enabled: Wedi ei alluogi
+      feed_url: Ffrwd URL
+      followers: Dilynwyr
+      followers_url: URL Dilynwyr
+      follows: Yn dilyn
+      header: Pennawd
+      inbox_url: URL Mewnflwch
+      invited_by: Gwahoddwyd gan
+      ip: IP
+      joined: Ymunodd
+      location:
+        all: Popeth
+        local: Lleol
+        remote: Pell
+        title: Lleoliad
+      login_status: Statws mewngofnodi
+      media_attachments: Atodiadau
+      memorialize: Troi yn gofeb
+      moderation:
+        active: Yn weithredol
+        all: Popeth
+        silenced: Wedi ei dawelu
+        suspended: Wedi ei atal
+        title: Cymedroli
+      moderation_notes: Nodiadau cymedroli
+      most_recent_activity: Gweithgarwch diweddaraf
+      most_recent_ip: IP diweddaraf
+      no_limits_imposed: Dim terfynau wedi'i gosod
+      not_subscribed: Heb danysgrifio
+      outbox_url: Allflwch URL
+      perform_full_suspension: Atal
+      profile_url: URL proffil
+      promote: Hyrwyddo
+      protocol: Protocol
+      public: Cyhoeddus
+      push_subscription_expires: Tanysgrifiad PuSH yn dod i ben
+      redownload: Adnewyddu proffil
+      remove_avatar: Dileu afatar
+      resend_confirmation:
+        already_confirmed: Mae'r defnyddiwr hwn wedi ei gadarnhau yn barod
+        send: Ailanfonwch 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: Safonwr
+        staff: Staff
+        user: Defnyddiwr
+      salmon_url: URL Eog
+      search: Chwilio
+      shared_inbox_url: URL Mewnflwch wedi ei rannu
+      show:
+        created_reports: Adroddiadau a grewyd gan y cyfri hwn
+        targeted_reports: Adroddiadau am y cyfri hwn
+      silence: Tawelu
+      silenced: Tawelwyd
+      statuses: Statysau
+      subscribe: Tanysgrifio
+      suspended: Ataliwyd
+      title: Cyfrifon
+      unconfirmed_email: E-bost heb ei gadarnhau
+      undo_silenced: Dadwneud tawelu
+      undo_suspension: Dadwneud ataliad
+      unsubscribe: Dad-danysgrifio
+      username: Enw defnyddiwr
+      warn: Rhybuddio
+      web: Gwe
+    action_logs:
+      actions:
+        assigned_to_self_report: Aseiniodd %{name} adroddiad %{target} i'w hunan
+        change_email_user: Newidodd %{name} gyfeiriad e-bost y defnyddiwr %{target}
+        confirm_user: Cadarnhaodd %{name} gyfeiriad e-bost y defnyddiwr %{target}
+        create_custom_emoji: Uwchlwythodd %{name} emoji newydd %{target}
+        create_domain_block: Blociodd %{name} y parth %{target}
+        create_email_domain_block: Cosbrestrwyd parth e-bost %{target} gan %{name}
+        demote_user: Diraddiodd %{name} y defnyddiwr %{target}
+        destroy_custom_emoji: Dinistriodd %{name} emoji %{target}
+        destroy_domain_block: Dadflociodd %{name} y parth %{target}
+        destroy_email_domain_block: Gwynrestrodd %{name} parth e-bost %{target}
+        destroy_status: Cafodd %{name} wared ar statws gan %{target}
+        disable_2fa_user: Diffoddodd %{name} ar ofyniad dau gam ar gyfer y defnyddiwr %{target}
+        disable_custom_emoji: Diffoddodd %{name} emoji %{target}
+        disable_user: Diffoddodd %{name} mewngofnodi ar gyfer y defnyddiwr %{target}
+        enable_custom_emoji: Galluogodd %{name} emoji %{target}
+        enable_user: Galluogodd %{name} mewngofnodi ar gyfer y defnyddiwr %{target}
+        memorialize_account: Newidodd %{name} gyfrif %{target} i dudalen goffau
+        promote_user: Dyrchafodd %{name} y defnyddiwr %{target}
+        remove_avatar_user: Cafodd %{name} wared ar afatar %{target}
+        reopen_report: Ailagorodd %{name} adroddiad %{target}
+        reset_password_user: Ailosododd %{name} gyfrinair y defnyddiwr %{target}
+        resolve_report: Datrusodd %{name} adroddiad %{target}
+        silence_account: Tawelodd %{name} gyfrif %{target}
+        suspend_account: Ataliodd %{name} gyfrif %{target}
+        unassigned_report: Dadbenododd %{name} adroddiad %{target}
+        unsilence_account: Terfynodd %{name} dawelu cyfrif %{target}
+        unsuspend_account: Terfynodd %{name} yr ataliad ar gyfrif %{target}
+        update_custom_emoji: Diweddarodd %{name} emoji %{target}
+        update_status: Diweddarodd %{name} statws gan %{target}
+      deleted_status: "(statws wedi ei ddileu)"
+      title: Log archwilio
+    custom_emojis:
+      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
+      created_msg: Llwyddwyd i greu emoji!
+      delete: Dileu
+      destroyed_msg: Llwyddwyd i ddinistrio emojo!
+      disable: Diffodd
+      disabled_msg: Llwyddwyd i ddiffodd yr emoji hwnnw
+      emoji: Emoji
+      enable: Galluogi
+      enabled_msg: Llwyddwyd i alluogi yr emoji hwnnw
+      image_hint: PNG hyd at 50KB
+      listed: Rhestredig
+      new:
+        title: Ychwanegu emoji personol newydd
+      overwrite: Trosysgrifio
+      shortcode: Byrgod
+      shortcode_hint: O leiaf 2 nodyn, dim ond nodau alffaniwmerig a tanlinellau
+      title: Emoji unigryw
+      unlisted: Heb eu rhestru
+      update_failed_msg: Methwyd a diweddaru'r emoji hwnnw
+      updated_msg: Llwyddwyd i ddiweddaru'r emoji!
+      upload: Uwchlwytho
+    dashboard:
+      backlog: tasgau heb eu cwblhau
+      config: Cyfluniad
+      feature_deletions: Dileadau cyfrif
+      feature_invites: Dolenni gwahodd
+      feature_registrations: Cofrestriadau
+      feature_relay: RelÃ¡i ffederasiwn
+      features: Nodweddion
+      hidden_service: Ffederasiwn a gwasanaethau cudd
+      open_reports: adroddiadau agored
+      recent_users: Defnyddwyr diweddar
+      search: Chwilio testun llawn
+      single_user_mode: Modd un defnyddiwr
+      software: Meddalwedd
+      space: Defnydd o ofod
+      title: Dangosfwrdd
+      total_users: cyfanswm defnyddwyr
+      trends: Tueddiadau
+      week_interactions: ymadweithiau yr wythnos hon
+      week_users_active: gweithredol yr wythnos hon
+      week_users_new: defnyddwyr yr wythnos hon
+    domain_blocks:
+      add_new: Ychwanegu
+      created_msg: Mae'r bloc parth nawr yn cael ei brosesu
+      destroyed_msg: Mae'r bloc parth wedi ei ddadwneud
+      domain: Parth
+      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 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.
+          noop: Dim
+          silence: Tawelwch
+          suspend: Atal
+        title: Blocio parth newydd
+      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_reports: Gwrthod adroddiadau
+      reject_reports_hint: Anwybyddu'r holl adroddiadau sy'n dod o'r parth hwn. Amherthnasol i ataliadau
+      show:
+        affected_accounts: "%{count} o gyfrifoedd yn y bas data wedi eu hefeithio"
+        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
+    email_domain_blocks:
+      add_new: Ychwanegu
+      created_msg: Llwyddwyd i ychwanegu parth e-bost i'r gosbrestr
+      delete: Dileu
+      destroyed_msg: Llwyddwyd i ddileu parth e-bost o'r gosbrestr
+      domain: Parth
+      new:
+        create: Ychwanegu parth
+        title: Cofnod newydd yng nghosbrestr e-byst
+      title: Cosbrestr e-bost
+    instances:
+      moderation:
+        all: Pob
+        limited: Gyfyngedig
+      title: Ffederasiwn
+    invites:
+      deactivate_all: Diffodd pob un
+      filter:
+        all: Pob
+        available: Ar gael
+        expired: Wedi dod i ben
+        title: Hidlo
+      title: Gwahoddiadau
+    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
+      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
+      inbox_url: URL relÃ¡i
+      pending: Aros am gymeradywaeth i'r relÃ¡i
+      save_and_enable: Cadw a galluogi
+      setup: Sefydlu cysylltiad relÃ¡i
+      status: Statws
+      title: Cyfnewidwyr
+    report_notes:
+      created_msg: Llwyddwyd i greu nodyn adroddiad!
+      destroyed_msg: Llwyddwyd i ddileu nodyn adroddiad!
+    reports:
+      account:
+        note: nodyn
+        report: adroddiad
+      action_taken_by: Gwnaethpwyd hyn gan
+      are_you_sure: Ydych chi'n sicr?
+      assign_to_self: Aseinio i mi
+      assigned: Cymedrolwr wedi'i aseinio
+      comment:
+        none: Dim
+      created_at: Adroddwyd
+      mark_as_resolved: Nodi fel wedi'i ddatrys
+      mark_as_unresolved: Nodi fel heb ei ddatrys
+      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...
+      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!
+      status: Statws
+      title: Adroddiadau
+      unassign: Dadneilltuo
+      unresolved: Heb ei ddatrys
+      updated_at: Diweddarwyd
+    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
+      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
+      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
+        open:
+          desc_html: Caniatau i unrhywun greu cyfrif
+          title: Agor cofrestru
+      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
+    statuses:
+      back_to_account: Yn Ã´l i dudalen y cyfrif
+      batch:
+        delete: Dileu
+        nsfw_off: Marcio fel nad yw'n sensitif
+        nsfw_on: Marcio'n sensitif
+      failed_to_execute: Methwyd a gweithredu
+      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
+    subscriptions:
+      callback_url: URL galw-nÃ´l
+      confirmed: Wedi'i gadarnhau
+      expires_in: Dod i ben ymhen
+      last_delivery: Danfoniad diwethaf
+      title: WebSub
+      topic: Pwnc
+    tags:
+      accounts: Cyfrifon
+      hidden: Cudd
+      name: Hashnod
+    title: Gweinyddiaeth
+    warning_presets:
+      delete: Dileu
+      edit: Golygu
+  admin_mailer:
+    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}}
+  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
+  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!
+    your_token: Eich tocyn mynediad
+  auth:
+    agreement_html: Wrth glicio "Cofrestru" isod yr ydych yn cytuno i ddilyn <a href="%{rules_path}">y rheolau ar gyfer yr achos hwn</a> a <a href="%{terms_path}">ein termau gwasanaeth</a>.
+    change_password: Cyfrinair
+    confirm_email: Cadarnhau e-bost
+    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.
+    didnt_get_confirmation: Heb dderbyn cyfarwyddiadau cadarnhau?
+    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.
+    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: neu
+    or_log_in_with: Neu logiwch mewn a
+    providers:
+      cas: CAS
+      saml: SAML
+    register: Cofrestru
+    register_elsewhere: Cofrestru ar weinydd gwahanol
+    resend_confirmation: Ailanfon cyfarwyddiadau cadarnhau
+    reset_password: Ailosod cyfrinair
+    security: Diogelwch
+    set_new_password: Gosod cyfrinair newydd
+  authorize_follow:
+    already_following: Yr ydych yn dilyn y cyfrif hwn yn barod
+    error: Yn anffodus, roedd gwall tra'n edrych am y cyfrif anghysbell
+    follow: Dilyn
+    follow_request: 'Yr ydych wedi anfon cais dilyn at:'
+    following: 'Llwyddiant! Yr ydych yn awr yn dilyn:'
+    post_follow:
+      close: Neu, gallwch gau'r ffenest hon.
+      return: Dangos proffil y defnyddiwr
+      web: I'r wÃª
+    title: Dilyn %{acct}
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}awr"
+      about_x_months: "%{count}mis"
+      about_x_years: "%{count}blwyddyn"
+      almost_x_years: "%{count}blwyddyn"
+      half_a_minute: Newydd fod
+      less_than_x_minutes: "%{count}m"
+      less_than_x_seconds: Newydd fod
+      over_x_years: "%{count}blwyddyn"
+      x_days: "%{count}dydd"
+      x_minutes: "%{count}m"
+      x_months: "%{count}mis"
+      x_seconds: "%{count}eiliad"
+  deletes:
+    bad_password_msg: Go dda, hacwyr! Cyfrinair anghywir
+    confirm_password: Mewnbynnwch eich cyfrinair presennol i gadarnhau mai chi sydd yno
+    description_html: Bydd hyn yn cael gwared ar gynnwys o'ch cyfrif <strong>am byth heb fodd i'w adfer</strong> ac yn diffodd y cyfrif. Caiff eich eich enw defnyddiwr ei gadw i atal unrhyw ddynwarediadau yn y dyfodol.
+    proceed: Dileu cyfrif
+    success_msg: Llwyddwyd i ddileu eich cyfrif
+    warning_html: Dim ond dileu cynnwys o'r achos hwn ellid bod yn sicr ei fod wedi ei ddileu. Mae cynnwys sydd wedi ei rannu'n eang yn debygol o adael olion. Ni fydd gweinyddwyr all-lein a gweinyddwyr sydd wedi dad-danysgrifio o'ch diwedderiadau ddim yn diweddaru eu cronfeydd data.
+    warning_title: Argaeledd cynnwys wedi'i rannu
+  errors:
+    '403': Nid oes gennych ganiatad i weld y dudalen hon.
+    '404': Nid yw'r dudalen yr oeddech yn chwilio amdani'n bodoli.
+    '410': Nid yw'r dudalen yr oeddech yn chwilio amdani'n bodoli mwyach.
+    '422':
+      content: Methwyd i ddilysu diogelwch. A ydych chi'n blocio cwcÃ®s?
+      title: Methwyd i ddilysu diogelwch
+    '429': Wedi'i arafu
+    '500':
+      content: Mae'n ddrwg gennym ni, ond fe aeth rhywbeth o'i le ar ein rhan ni.
+      title: Nid yw'r dudalen hon yn gywir
+    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.
+  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
+      size: Maint
+    blocks: Yr ydych yn blocio
+    csv: CSV
+    follows: Yr ydych yn dilyn
+    mutes: Yr ydych yn tawelu
+    storage: Storio cyfryngau
+  filters:
+    contexts:
+      home: Ffrwd gartref
+      notifications: Hysbysiadau
+      public: Ffrwd gyhoeddus
+      thread: Sgyrsiau
+    edit:
+      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
+    index:
+      delete: Dileu
+      title: Hidlyddion
+    new:
+      title: Ychwanegu hidlydd newydd
+  followers:
+    domain: Parth
+    explanation_html: Os ydych am sicrhau preifatrwydd eich tÅµtiau, rhaid i chi fod yn ymwybodol o bwy sy'n eich dilyn. <strong>Mae eich tÅµtiau preifat yn cael eu hanfon at bob achos lle mae gennych ddilynwyr</strong>. Efallai hoffech chi i'w hadolygu o bryd i'w gilydd, a chael gwared ar ddilynwyr os nad ydych yn credu i'r staff neu'r meddalwedd ar yr achosion hynny barchu eich preifatrwydd.
+    followers_count: Nifer y dilynwyr
+    lock_link: Cloi eich cyfrif
+    purge: Dileu o dilynwyr
+    success: Yn y broses o ysgafn-flocio dilynwyr o %{count} parth...
+    true_privacy_html: Cofiwch <strong>mai ond amgryptio pen-i-ben all sicrhau gwir breifatrwydd</strong>.
+    unlocked_warning_html: Gall unrhywun eich dilyn yn syth i weld eich tÅµtiau preifat. %{lock_link} i gael adolygu a gwrthod dilynwyr.
+    unlocked_warning_title: Nid yw eich cyfrif wedi ei gloi
+  footer:
+    developers: Datblygwyr
+    more: Mwyâ€¦
+    resources: Adnoddau
+  generic:
+    changes_saved_msg: Llwyddwyd i gadw y newidiadau!
+    copy: CopÃ¯o
+    save_changes: Cadw newidiadau
+    validation_errors: Mae rhywbeth o'i le o hyd! Edrychwch ar y %{count} gwall isod os gwelwch yn dda
+  imports:
+    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
+    types:
+      blocking: Rhestr blocio
+      following: Rhestr dilyn
+      muting: Rhestr tawelu
+    upload: Uwchlwytho
+  in_memoriam_html: In Memoriam.
+  invites:
+    delete: Dadactifadu
+    expired: Wedi darfod
+    expires_in:
+      '1800': 30 munud
+      '21600': 6 awr
+      '3600': 1 awr
+      '43200': 12 awr
+      '604800': 1 wythnos
+      '86400': 1 dydd
+    expires_in_prompt: Byth
+    generate: Cynhyrchu
+    invited_by: 'Cawsoch eich gwahodd gan:'
+    max_uses: "%{count} defnydd"
+    max_uses_prompt: Dim terfyn
+    prompt: Cynhyrchwch a rhannwch ddolenni gyda eraill i ganiatau mynediad i'r achos hwn
+    table:
+      expires_at: Darfod ar
+      uses: Defnyddiau
+    title: Gwahodd pobl
+  lists:
+    errors:
+      limit: Yr ydych wedi cyrraedd uchafswm nifer y rhestrau posib
+  media_attachments:
+    validations:
+      images_and_video: Ni ellir ychwanegu fideo at statws sy'n cynnwys delweddau'n barod
+      too_many: Ni ellir ychwanegu mwy na 4 dogfen
+  migrations:
+    acct: enwdefnyddiwr@parth y cyfrif newydd
+    currently_redirecting: 'Mae eich proffil wedi ei osod i ailgyfeirio i:'
+    proceed: Cadw
+    updated_msg: Diweddarwyd gosodiad mudo eich cyfrif yn llwyddiannus!
+  moderation:
+    title: Cymedroli
+  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: Hefyd, rydych wedi ennill %{count} dilynwr newydd tra eich bod i ffwrdd! HwrÃª!
+      subject: "%{count} hysbysiad newydd ers eich ymweliad diwethaf \U0001F418"
+      title: Yn eich absenoldeb...
+    favourite:
+      body: 'Cafodd eich statws ei hoffi gan %{name}:'
+      subject: Hoffodd %{name} eich statws
+      title: Ffefryn newydd
+    follow:
+      body: Mae %{name} bellach yn eich dilyn!
+      subject: Mae %{name} bellach yn eich dilyn
+      title: Dilynwr newydd
+    follow_request:
+      action: Rheoli ceisiadau dilyn
+      body: Mae %{name} wedi gwneud cais i'ch dilyn
+      subject: 'Dilynwr yn aros: %{name}'
+      title: Cais dilynwr newydd
+    mention:
+      action: Ateb
+      body: 'Caswoch eich sÃ´n amdano gan %{name} yn:'
+      subject: Cawsoch eich sÃ´n amdano gan %{name}
+      title: Crywbylliad newydd
+    reblog:
+      body: 'Cafodd eich statws ei fÅµstio gan %{name}:'
+      subject: BÅµstiodd %{name} eich statws
+      title: Hwb newydd
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  pagination:
+    newer: Diweddarach
+    next: Nesaf
+    older: HÅ·n
+    prev: Blaenorol
+    truncate: "&hellip;"
+  preferences:
+    languages: Ieithoedd
+    other: Arall
+    publishing: Cyhoeddi
+    web: Gwe
+  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:'
+  remote_unfollow:
+    error: Gwall
+    title: Teitl
+    unfollowed: Dad-ddilynwyd
+  sessions:
+    activity: Gweithgaredd ddiwethaf
+    browser: Porwr
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      electron: Electron
+      firefox: Firefox
+      generic: Porwr anhysbys
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Porwr Nokia S40 Ovi
+      opera: Opera
+      otter: Otter
+      phantom_js: PhantomJS
+      qq: Porwr QQ
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Sesiwn cyfredol
+    description: "%{browser} ar %{platform}"
+    explanation: Dyma'r porwyr gwÃª sydd wedi mewngofnodi i'ch cyfrif Mastododon ar hyn o bryd.
+    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: platfform anhysbys
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Diddymu
+    revoke_success: Sesiwn wedi ei ddiddymu yn llwyddiannus
+    title: Sesiynau
+  settings:
+    authorized_apps: Apiau awdurdodedig
+    back: Yn Ã´l i Mastodon
+    delete: Dileu cyfrif
+    development: Datblygu
+    edit_profile: Golygu proffil
+    export: Allforio data
+    followers: Dilynwyr awdurdodedig
+    import: Mewnforio
+    migrate: Mudo cyfrif
+    notifications: Hysbysiadau
+    preferences: Dewisiadau
+    settings: Gosodiadau
+    two_factor_authentication: Awdurdodi dau-gam
+    your_apps: Eich rhaglenni
+  statuses:
+    attached:
+      description: 'Ynghlwm: %{attached}'
+      image: "%{count} o luniau"
+      video:
+        few: "%{count} fideo"
+        many: "%{count} fideo"
+        one: "%{count} fideo"
+        other: "%{count} fideo"
+        two: "%{count} fideo"
+        zero: "%{count} fideo"
+    boosted_from_html: Wedi ei fÅµstio %{acct_link}
+    content_warning: 'Rhybudd cynnwys: %{warning}'
+    disallowed_hashtags: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
+    language_detection: Canfod iaith yn awtomataidd
+    open_in_web: Agor yn y wÃª
+    over_character_limit: wedi mynd heibio'r uchafswm nodyn 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
+    show_more: Dangos mwy
+    sign_in_to_participate: Mengofnodwch i gymryd rhan yn y sgwrs
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      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
+  stream_entries:
+    pinned: TÅµt wedi'i binio
+    reblogged: hybwyd
+    sensitive_content: Cynnwys sensitif
+  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: Cyferbyniad uchel
+    default: Mastodon
+    mastodon-light: Mastodon (golau)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+  two_factor_authentication:
+    code_hint: Mewnbynwch y cÃ´d a grewyd gan eich ap dilysu i gadarnhau
+    description_html: Os ydych yn galluogi <strong>awdurdodi dau-gam</strong>, bydd mewngofnodi yn gofyn i chi fod a'ch ffÃ´n gerllaw er mwyn cynhyrchu tocyn i chi gael mewnbynnu.
+    disable: Diffodd
+    enable: Galluogi
+    enabled: Awdurdodi dau-gam wedi'i alluogi
+    enabled_success: Awdurdodi dau-gam wedi'i alluogi'n llwyddiannus
+    generate_recovery_codes: Cynhyrchu cÃ´dau adfer
+    instructions_html: "<strong>Sganiwch y cÃ´d QR yn Google Authenticator neu ap TOTP tebyg ar eich ffÃ´n</strong>. O hyn ymlaen, bydd yr ap hwnnw yn cynhyrchu tocynnau y bydd rhaid i chi fewnbynnu tra'n mewngofnodi."
+    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.
+    manual_instructions: 'Os nad ydych yn gallu sganio cÃ´d QR ac angen ei fewnbynnu a llaw, dyma''r gyfrinach testun-plaen:'
+    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.
+    setup: Sefydlu
+    wrong_code: Roedd y cod y mewnbynnwyd yn annilys! A yw'r amser gweinydd ac amser dyfais yn gywir?
+  user_mailer:
+    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
+    warning:
+      title:
+        disable: Cyfrif wedi'i rewi
+        none: Rhybudd
+        silence: Cyfrif cyfyngedig
+        suspend: Cyfrif wedi'i rewi
+    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.
+      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.'
+      full_handle: Eich enw Mastodon 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.
+      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 ch ychwanegu Mastodon i'ch sgrÃ®n gartref, mae modd i chi dderbyn hysbysiadau push. 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
+    invalid_email: Mae'r cyfeiriad e-bost hwn yn annilys
+    invalid_otp_token: CÃ´d dau-ffactor 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:'
+  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:'
+    verification: Dilysu
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 0e3da55f19001c168bd4d2856e09736e8bd72f83..ca4ff32dac53e28fdc9a478a72fa149a0be2b766 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1,17 +1,17 @@
 ---
 da:
   about:
-    about_hashtag_html: Disse er offentlige toots der indeholder tagget <strong>#%{hashtag}</strong>. Du kan interagere med dem hvis du har en konto hvor som helst i fediverset.
+    about_hashtag_html: Disse er offentlige trut der indeholder tagget <strong>#%{hashtag}</strong>. Du kan interagere med dem hvis du har en konto hvor som helst i fediverset.
     about_mastodon_html: Mastodon er et socialt netvÃ¦rk der er baseret pÃ¥ Ã¥bne web protokoller og frit, open-source source software. Der er decentraliseret ligesom e-mail tjenester.
     about_this: Om
     administered_by: 'Administreret af:'
+    api: API
+    apps: Apps til mobilen
     closed_registrations: Registreringer er pÃ¥ nuvÃ¦rrende tidspunkt lukkede for denne instans. Du kan dog finde andre instanser du kan oprette dig pÃ¥ og fÃ¥ adgang til det samme netvÃ¦rk derfra.
     contact: Kontakt
     contact_missing: Ikke sat
     contact_unavailable: Ikke tilgÃ¦ngeligt
-    description_headline: Hvad er %{domain}?
-    domain_count_after: andre instancer
-    domain_count_before: Forbundet til
+    documentation: Dokumentation
     extended_description_html: |
       <h3>Et godt sted for regler</h3>
       <p>Den udvidede beskrivelse er endnu ikke blevet opsat.</p>
@@ -20,42 +20,59 @@ da:
       humane_approach_title: En mere human tilgang
       not_a_product_body: Mastodon er ikke et kommercielt netvÃ¦rk. Ingen reklamer, ingen datamining, ingen indhegnet haver. Der er ingen central regering.
       not_a_product_title: Du er en person, ikke et produkt
-      real_conversation_body: Med 500 tegn til din rÃ¥dighed og understÃ¸ttelse af granulÃ¦rt indhold og multimedie advarsler, kan du udtrykke dig pÃ¥ en hvilken som helst mÃ¥de du Ã¸nsker.
+      real_conversation_body: Med 500 tegn til din rÃ¥dighed og understÃ¸ttelse af granulÃ¦rt indhold og medie advarsler, kan du udtrykke dig pÃ¥ en hvilken som helst mÃ¥de du Ã¸nsker.
       real_conversation_title: Bygget til rigtige samtaler
       within_reach_body: Adskillige apps for iOS, Android og andre platforme takket vÃ¦re et udviklervenligt API Ã¸kosystem tillader dig at holde kontakten med dine venner hvor som helst.
       within_reach_title: Altid indenfor rÃ¦kkevidde
     generic_description: "%{domain} er en server i netvÃ¦rket"
     hosted_on: Mostodon hostet pÃ¥ %{domain}
     learn_more: LÃ¦r mere
-    other_instances: Liste over instancer
+    other_instances: Liste over instanser
+    privacy_policy: Privatlivspolitik
     source_code: Kildekode
-    status_count_after: statusser
+    status_count_after:
+      one: status
+      other: statusser
     status_count_before: Som har skrevet
-    user_count_after: brugere
+    terms: VilkÃ¥r for service
+    user_count_after:
+      one: bruger
+      other: brugere
     user_count_before: Hjem til
     what_is_mastodon: Hvad er Mastodon?
   accounts:
+    choices_html: "%{name}s valg:"
     follow: FÃ¸lg
-    followers: FÃ¸lgere
+    followers:
+      one: FÃ¸lger
+      other: FÃ¸lgere
     following: FÃ¸lger
-    media: Multimedia
+    joined: Tilmeldt den %{date}
+    link_verified_on: Ejerskabet af dette link blev tjekket den %{date}
+    media: Medier
     moved_html: "%{name} er flyttet til %{new_profile_link}:"
     network_hidden: Denne information er ikke tilgÃ¦ngelig
     nothing_here: Der er intet her!
-    people_followed_by: Folk some %{name} fÃ¸lger
+    people_followed_by: Folk som %{name} fÃ¸lger
     people_who_follow: Folk der fÃ¸lger %{name}
-    posts: Dyt
-    posts_with_replies: Toots og svar
-    remote_follow: FÃ¸lg fra andre instancer
-    reserved_username: Brugernavnet er reserveret
+    pin_errors:
+      following: Du er nÃ¸dt til at fÃ¸lge den person du Ã¸nsker at stÃ¸tte
+    posts:
+      one: Trut
+      other: Trut
+    posts_tab_heading: Trut
+    posts_with_replies: Trut og svar
+    reserved_username: Brugernavnet er allerede taget
     roles:
       admin: Administrator
       bot: Robot
       moderator: Moderator
     unfollow: FÃ¸lg ikke lÃ¦ngere
   admin:
+    account_actions:
+      action: UdfÃ¸r handling
     account_moderation_notes:
-      create: LÃ¦g en kommentar
+      create: LÃ¦g en note
       created_msg: Moderator notat succesfuldt oprettet!
       delete: Slet
       destroyed_msg: Moderator notat succesfuldt destrueret!
@@ -96,7 +113,7 @@ da:
         remote: Fjernt
         title: Placering
       login_status: Status pÃ¥ login
-      media_attachments: Multimedie bilag
+      media_attachments: Medie bilag
       memorialize: Omdan til et memoriam
       moderation:
         all: Alle
@@ -107,12 +124,8 @@ da:
       most_recent_activity: Seneste aktivitet
       most_recent_ip: Senest IP
       not_subscribed: Ikke abonneret
-      order:
-        alphabetic: Alfabetisk
-        most_recent: Seneste
-        title: RÃ¦kkefÃ¸lge
       outbox_url: Link til udgÃ¥ende
-      perform_full_suspension: UdfÃ¸r fuld udelukkelse
+      perform_full_suspension: Udeluk
       profile_url: Link til profil
       promote: Forfrem
       protocol: Protokol
@@ -137,12 +150,13 @@ da:
       search: SÃ¸g
       shared_inbox_url: Link til delt indbakke
       show:
-        created_reports: Rapporter oprettet af denne konto
-        report: rapporter
+        created_reports: Anmeldelser oprettet af denne konto
         targeted_reports: Anmeldelser fra denne konto
       silence: DÃ¦mp
+      silenced: DÃ¦mpet
       statuses: Statusser
       subscribe: Abonner
+      suspended: Udelukket
       title: Konti
       unconfirmed_email: Ikke-bekrÃ¦ftet email
       undo_silenced: Fortryd dÃ¦mpning
@@ -180,6 +194,7 @@ da:
         unsuspend_account: "%{name} fjernede udelukkelsen fra %{target}s konto"
         update_custom_emoji: "%{name} opdaterede humÃ¸rikonet %{target}"
         update_status: "%{name} opdaterede status for %{target}"
+      deleted_status: "(slettet status)"
       title: Revisionslog
     custom_emojis:
       by_domain: DomÃ¦ne
@@ -206,6 +221,27 @@ da:
       update_failed_msg: Kunne ikke opdatere det humÃ¸rikon
       updated_msg: HumÃ¸rikon succesfuldt opdateret!
       upload: LÃ¦g op
+    dashboard:
+      backlog: ophobede jobs
+      config: Konfiguration
+      feature_deletions: Konto sletninger
+      feature_invites: Invitations links
+      feature_registrations: Registreringer
+      feature_relay: FÃ¸derations relÃ¦
+      features: Funktioner
+      hidden_service: FÃ¸deration med skjulte tjenester
+      open_reports: Ã¥bne anmeldelser
+      recent_users: Seneste brugere
+      search: SÃ¸g pÃ¥ fuld tekst
+      single_user_mode: Enkelt bruger mode
+      software: Software
+      space: Brugt lagerplads
+      title: Betjeningspanel
+      total_users: samlede antal brugere
+      trends: Tendenser
+      week_interactions: interaktioner denne uge
+      week_users_active: aktive denne uge
+      week_users_new: brugere denne uge
     domain_blocks:
       add_new: TilfÃ¸j ny
       created_msg: DomÃ¦ne blokade bliver nu behandlet
@@ -213,18 +249,16 @@ da:
       domain: DomÃ¦ne
       new:
         create: Opret blokering
+        hint: DomÃ¦ne blokeringen vil ikke forhindre oprettelse af konto opslag i databasen, men vil retroaktivt og automatisk benytte specifikke moderator metoder pÃ¥ disse konti.
         severity:
+          desc_html: "<strong>DÃ¦mp</strong> vil gÃ¸re denne kontos opslag usynlige til alle der ikke fÃ¸lger dem. <strong>Udeluk</strong> vil fjerne al kontoens indhold, medie og profildata. Brug <strong>Ingen</strong> hvis du bare Ã¸nsker at afvise medie filer."
           noop: Ingen
           silence: DÃ¦mp
           suspend: Udeluk
         title: Ny domÃ¦ne blokering
-      reject_media: Afvis multimedie filer
+      reject_media: Afvis medie filer
       reject_media_hint: Fjerner lokalt lagrede multimedie filer og nÃ¦gter at hente nogen i fremtiden. Irrelevant for udelukkelser
-      severities:
-        noop: Ingen
-        silence: DÃ¦mp
-        suspend: Udeluk
-      severity: Alvorlighed
+      reject_reports: Afvis anmeldelser
       show:
         affected_accounts:
           one: En konto i databasen pÃ¥virket
@@ -234,28 +268,47 @@ da:
           suspend: Fjern udelukkelsen af alle eksisterende konti fra dette domÃ¦ne
         title: Annuller domÃ¦ne blokeringen for domÃ¦net %{domain}
         undo: Fortryd
-      title: DomÃ¦ne blokeringer
       undo: Fortryd
     email_domain_blocks:
       add_new: TilfÃ¸j ny
+      created_msg: TilfÃ¸jede succesfuldt email domÃ¦net til sortliste
       delete: Slet
+      destroyed_msg: Fjernede succesfuldt email domÃ¦net fra sortliste
       domain: DomÃ¦ne
       new:
         create: TilfÃ¸j domÃ¦ne
+        title: Ny email blokade opslag
       title: Email sortliste
+    followers:
+      back_to_account: Tilbage til konto
     instances:
-      account_count: Kendte konti
-      domain_name: DomÃ¦ne
-      reset: Nulstil
-      search: SÃ¸g
       title: Kendte instanser
     invites:
+      deactivate_all: Deaktiver alle
       filter:
         all: Alle
         available: TilgÃ¦ngelig
         expired: UdlÃ¸bet
         title: Filtre
       title: Invitationer
+    relays:
+      add_new: TilfÃ¸j nyt relay
+      delete: Slet
+      description_html: Et <strong>federation relay</strong> er en mellemleds server der udveksler store mÃ¦ngder af offentlige trut mellem servere der abonnerer pÃ¥ og offentliggÃ¸r til det. <strong>Det kan hjÃ¦lpe smÃ¥ og mellemstore servere opdage indhold fra fediverset</strong>, hvilket der ellers ville krÃ¦ve at lokale brugere manuelt fÃ¸lger andre folk pÃ¥ fjerne servere.
+      disable: Deaktiver
+      disabled: Deaktiveret
+      enable: Aktiver
+      enable_hint: NÃ¥r dette er aktiveret, vil serveren abonnere pÃ¥ alle offentlige trut fra dette relay, og vil begynde at sende offentlige trut fra denne server dertil.
+      enabled: Aktiveret
+      inbox_url: Link til relay
+      pending: Venter pÃ¥ godkendelse fra relÃ¦et
+      save_and_enable: Gem og aktiver
+      setup: OpsÃ¦t en videresendelses forbindelse
+      status: Status
+      title: Videresendelser
+    report_notes:
+      created_msg: Anmeldelse note blev oprettet!
+      destroyed_msg: Anmeldelse note blev slettet!
     reports:
       account:
         note: notat
@@ -267,7 +320,6 @@ da:
       comment:
         none: Ingen
       created_at: Anmeldt
-      id: ID
       mark_as_resolved: Marker som vÃ¦rende lÃ¸st
       mark_as_unresolved: Marker som vÃ¦rende ulÃ¸st
       notes:
@@ -278,26 +330,41 @@ da:
         placeholder: Beskriv hvilke handlinger der er blevet udfÃ¸rt, eller andre relevante opdateringer...
       reopen: GenÃ¥ben anmeldelse
       report: 'Anmeldelse #%{id}'
-      report_contents: Indhold
       reported_account: Anmeldt konto
       reported_by: Anmeldt af
       resolved: LÃ¸st
       resolved_msg: Anmeldelse er sat til at vÃ¦re lÃ¸st!
-      silence_account: DÃ¦mp konto
       status: Status
-      suspend_account: Udeluk konto
-      target: MÃ¥l
       title: Anmeldelser
+      unassign: Utildel
       unresolved: UlÃ¸st
       updated_at: Opdateret
-      view: Se
     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Ã¸rende brugeraktivitet
+      bootstrap_timeline_accounts:
+        desc_html: Opdel flere brugernavne ved hjÃ¦lp af komma. Kun lokale og ulÃ¥ste konti vil virke. Standard hvis tom er alle lokale administratorer.
+        title: Standard fÃ¸lger for nye brugere
       contact_information:
         email: Forretnings email
         username: Kontakt brugernavn
+      custom_css:
+        desc_html: Ã†ndre udseendet med CSS indlÃ¦st pÃ¥ hver side
+        title: Brugerdefineret CSS
       hero:
+        desc_html: Vist pÃ¥ forsiden. Mindst 600x100px anbefales. Hvis ikke sat, vil dette falde tilbage til billedet for instansen
         title: Billede af helt
+      peers_api_enabled:
+        desc_html: DomÃ¦ne navne denne instans er stÃ¸dt pÃ¥ i fediverset
+        title: Udgiv liste over opdagede instanser
+      preview_sensitive_media:
+        desc_html: ForhÃ¥ndsvisninger af links pÃ¥ andre websider vil vise et miniaturebillede selv hvis mediet er markeret som fÃ¸lsomt
+        title: Vis fÃ¸lsomt medie i OpenGraph forhÃ¥ndsvisninger
       registrations:
+        closed_message:
+          desc_html: Vist pÃ¥ forsiden nÃ¥r registreringer er lukkede. Du kan bruge HTML tags
+          title: Besked for lukkede registreringer
         deletion:
           desc_html: Tillad alle at slette deres konto
           title: Ã…ben konto sletning
@@ -307,14 +374,31 @@ da:
         open:
           desc_html: Tillad alle at oprette en konto
           title: Ã…ben registrering
+      show_known_fediverse_at_about_page:
+        desc_html: NÃ¥r slÃ¥et til, vil det vise trut fra hele det kendte fedivers pÃ¥ forhÃ¥ndsvisning. Ellers vil det kun vise lokale trut.
+        title: Vis kendte fedivers pÃ¥ tidslinje forhÃ¥ndsvisning
       show_staff_badge:
         desc_html: Vis personale emblem pÃ¥ en brugerside
         title: Vis personale emblem
       site_description:
+        desc_html: Introduktions afsnit pÃ¥ forsiden. Beskriv hvad der gÃ¸r denne Mastodon server speciel og alt andet vigtigt. Du kan bruge HTML tags, isÃ¦r <code>&lt;a&gt;</code> og <code>&lt;em&gt;</code>.
         title: Beskrivelse af instans
+      site_description_extended:
+        desc_html: Et godt sted for placering af adfÃ¦rdskodes, regler, retningslinjer og andre ting der gÃ¸r din instans unik. Du kan bruge HTML tags
+        title: Brugerdefineret udvidet information
+      site_short_description:
+        desc_html: Vist pÃ¥ sidelinjen og meta tags. Beskriv hvad Mastodon er og hvad der gÃ¸r denne server speciel i et enkelt afsnit. Hvis tomt, vil standard vÃ¦re beskrivelsen af instansen.
+        title: Kort beskrivelse af instans
+      site_terms:
+        desc_html: Du kan skrive din egen privatlivpolitik, servicevilkÃ¥r, eller lignende. Du kan bruge HTML tags
+        title: Brugerdefineret servicevilkÃ¥r
       site_title: Navn pÃ¥ instans
+      thumbnail:
+        desc_html: Brugt til forhÃ¥ndsvisninger via OpenGraph og API. 1200x630px anbefales
+        title: Miniaturebillede for instans
       timeline_preview:
         desc_html: Vis offentlig tidslinje pÃ¥ landingssiden
+        title: Tidslinje forhÃ¥ndsvisning
       title: Indstillinger for side
     statuses:
       back_to_account: Tilbage til kontosiden
@@ -326,46 +410,67 @@ da:
       media:
         title: Multimedier
       no_media: Ingen multimedier
+      no_status_selected: Ingen statusser blev Ã¦ndret eller ingen blev valgt
       title: Konto statusser
       with_media: Med multimedier
     subscriptions:
+      callback_url: Callback-URL
       confirmed: BekrÃ¦ftet
       expires_in: UdlÃ¸ber om
       last_delivery: Sidste levering
+      title: Websub
       topic: Emne
+    tags:
+      accounts: Kontoer
+      hidden: Skjult
     title: Administration
   admin_mailer:
     new_report:
       body: "%{reporter} har anmeldt %{target}"
       body_remote: Nogen fra %{domain} har anmeldt %{target}
+      subject: Ny anmeldelse for %{instance} (#%{id})
   application_mailer:
-    notification_preferences: Ã†ndre email indstillinger
+    notification_preferences: Ã†ndre email prÃ¦ferencer
     salutation: "%{name},"
-    settings: 'Ã†ndre email indstillinger: %{link}'
+    settings: 'Ã†ndre email prÃ¦ferencer: %{link}'
     view: 'Se:'
     view_profile: Se profil
     view_status: Se status
   applications:
+    created: Applikation blev oprettet
+    destroyed: Applikation er blevet slettet
     invalid_url: Det angivne URL er ugyldigt
+    regenerate_token: Regenerer adgangs token
+    token_regenerated: Adgangs token blev regenereret
     warning: VÃ¦r meget forsigtig med disse data. Del dem aldrig med nogen!
+    your_token: Din adgangs token
   auth:
+    agreement_html: Ved at oprette dig erklÃ¦rer du dig enig i at fÃ¸lge <a href="%{rules_path}">instanses regler</a> og <a href="%{terms_path}">vores servicevilkÃ¥r</a>.
     change_password: Kodeord
     confirm_email: BekrÃ¦ft email
     delete_account: Slet konto
+    delete_account_html: Hvis du Ã¸nsker at slette din konto, kan du <a href="%{path}">gÃ¸re det her</a>. Du vil blive bedt om bekrÃ¦ftelse.
     didnt_get_confirmation: Har du endnu ikke modtaget instrukser for bekrÃ¦ftelse?
     forgot_password: Glemt dit kodeord?
+    invalid_reset_password_token: Adgangskode nulstillings token er ugyldig eller udlÃ¸bet. Anmod venligst om en ny.
     login: Log ind
     logout: Log ud
     migrate_account: Flyt til en anden konto
+    migrate_account_html: Hvis du Ã¸nsker at omdirigere denne konto til en anden, kan du <a href="%{path}">gÃ¸re det her</a>.
     or: eller
     or_log_in_with: Eller log in med
+    providers:
+      cas: CAS
+      saml: SAML
     register: Opret dig
     register_elsewhere: Opret dig pÃ¥ en anden server
+    resend_confirmation: Gensend bekrÃ¦ftelses instrukser
     reset_password: Nulstil kodeord
     security: Sikkerhed
     set_new_password: SÃ¦t et nyt kodeord
   authorize_follow:
     already_following: Du fÃ¸lger allerede denne konto
+    error: Der opstod desvÃ¦rre en fejl under sÃ¸gningen af denne fjerne konto
     follow: FÃ¸lg
     follow_request: 'Du har anmodet om at fÃ¸lge:'
     following: 'Succes! Du fÃ¸lger nu:'
@@ -378,31 +483,49 @@ da:
     distance_in_words:
       about_x_hours: "%{count}t"
       about_x_months: "%{count} mÃ¥neder"
+      about_x_years: "%{count}Ã¥r"
+      almost_x_years: "%{count}Ã¥r"
       half_a_minute: Lige nu
+      less_than_x_minutes: "%{count}m"
       less_than_x_seconds: Lige nu
+      over_x_years: "%{count}Ã¥r"
+      x_days: "%{count}d"
+      x_minutes: "%{count}m"
+      x_months: "%{count}md"
       x_seconds: "%{count}s"
   deletes:
     bad_password_msg: Godt forsÃ¸g, hackere! Forkert kodeord
     confirm_password: Indtast dit nuvÃ¦rende kodeord for at bekrÃ¦fte din identitet
+    description_html: Dette vil <strong>permanent, uigenkaldeligt</strong> fjerne indhold fra din konto samt deaktivere den. Dit brugernavn vil forblive reserveret for at forhindre fremtidige efterligninger.
     proceed: Slet konto
     success_msg: Din konto er nu blevet slettet
+    warning_html: Kun sletning af indhold fra denne specifikke instans er garanteret. Indhold der er blevet delt rundt omkring vil sandsynligvis efterlade spor. Offline servere og servere der ikke lÃ¦ngere abonnerer pÃ¥ dine opdateringer vil ikke opdatere deres databaser.
+    warning_title: TilgÃ¦ngelighed af delt indhold
   errors:
     '403': Du har ikke tilladelse til at se denne side.
     '404': Den side du leder efter findes ikke.
     '410': Den side du leder efter findes ikke mere.
     '422':
+      content: SikkerhedsbekrÃ¦ftelse mislykkedes. Blokerer du cookies?
       title: Sikkerheds godkendelse mislykkedes
+    '429': Droslet
     '500':
       content: Beklager men der gik noget galt i vores ende.
       title: Siden er ikke korrekt
+    noscript_html: For at bruge Mastodon web applikationen, aktiver JavaScript. Alternativt kan du prÃ¸ve en af disse <a href="%{apps_path}">apps</a> til Mastodon for din platform.
   exports:
     archive_takeout:
       date: Dato
       download: Hent dit arkiv
+      hint_html: Du kan anmode om et arkiv af dine <strong>trut og oplagt medie</strong>. Den eksporterede data vil vÃ¦re i ActivityPub formattet, lÃ¦seligt af enhvert kompatibel program. Du kan anmode om et arkiv en gang om ugen.
+      in_progress: Udarbejder dit arkiv...
+      request: Anmod om dit arkiv
       size: StÃ¸rrelse
     blocks: Du blokerer
+    csv: CSV
     follows: Du fÃ¸lger
     mutes: Du dÃ¦mper
+    storage: Medie lager
   filters:
     contexts:
       home: Hjemme tidslinje
@@ -411,6 +534,9 @@ da:
       thread: Samtaler
     edit:
       title: Rediger filter
+    errors:
+      invalid_context: Ingen eller ugyldig kontekst angivet
+      invalid_irreversible: Uigenkaldelig filtrering virker kun med hjem eller notifikations kontekst
     index:
       delete: Slet
       title: Filtrer
@@ -418,20 +544,36 @@ da:
       title: TilfÃ¸j nyt filter
   followers:
     domain: DomÃ¦ne
+    explanation_html: Hvis du vil sikre dig privatliv over dine statusser, skal du vÃ¦re klar over hvem der fÃ¸lger dig. <strong>Dine private statusser leveres til alle instanser som du har fÃ¸lger fra</strong>. Det kan vÃ¦re en ide at gennemgÃ¥ dem, og fjerne fÃ¸lgere hvis du ikke fÃ¸ler dit privatliv respekteres af personalet eller software fra disse instanser.
     followers_count: Antal fÃ¸lgere
     lock_link: LÃ¥s din konto
     purge: Fjern fra fÃ¸lgere
+    success:
+      one: I gang med at soft-blokere fÃ¸lgere fra et domÃ¦ne...
+      other: I gang med at soft-blokere fÃ¸lgere fra %{count} domÃ¦ner...
+    true_privacy_html: Husk pÃ¥, at <strong>sand privatliv kan kun opnÃ¥s via end-to-end kryptering</strong>.
+    unlocked_warning_html: Alle kan fÃ¸lge dig med det samme for at se dine private statusser. %{lock_link} for at vÃ¦re i stand til at gennemse og afvise fÃ¸lgere.
     unlocked_warning_title: Din konto er ikke lÃ¥st
+  footer:
+    developers: Udviklere
+    more: Mereâ€¦
+    resources: Ressourcer
   generic:
     changes_saved_msg: Ã†ndringerne blev gemt!
-    powered_by: drevet af %{link}
+    copy: Kopier
     save_changes: Gem Ã¦ndringer
+    validation_errors:
+      one: Der er noget der ikke er helt som det bÃ¸r vÃ¦re! Tag lige et kig pÃ¥ fÃ¸lgende fejl forneden
+      other: Der er noget der ikke er helt som det bÃ¸r vÃ¦re! Tag lige et kig pÃ¥ fÃ¸lgende %{count} fejl forneden
   imports:
+    preface: Du kan importere data du har eksporteret fra en anden instans, sÃ¥ som en liste over folk du fÃ¸lger eller blokerer.
+    success: Dine data blev succesfuldt uploaded og vil nu blive behandlet hurtigst muligt
     types:
       blocking: Blokeringsliste
       following: FÃ¸lgningsliste
       muting: Liste over dÃ¦mpninger
     upload: LÃ¦g op
+  in_memoriam_html: Til minde om.
   invites:
     delete: Deaktiver
     expired: UdlÃ¸bet
@@ -445,28 +587,54 @@ da:
     expires_in_prompt: Aldrig
     generate: Generer
     invited_by: 'Du er blevet inviteret af:'
+    max_uses:
+      one: 1 benyttelse
+      other: "%{count} benyttelser"
     max_uses_prompt: UbegrÃ¦nset
+    prompt: Generer og del links med andre for at give dem adgang til denne instans
     table:
       expires_at: UdlÃ¸ber
+      uses: Benyttelser
     title: Inviter folk
+  lists:
+    errors:
+      limit: Du har nÃ¥et det hÃ¸jeste antal lister
   media_attachments:
     validations:
+      images_and_video: Kan ikke vedhÃ¦fte en video til en status der allerede har billeder
       too_many: Kan ikke vedhÃ¦fte mere en 4 filer
   migrations:
     acct: username@domain af den nye konto
     currently_redirecting: 'Din profil er sat til at henvise til:'
     proceed: Gem
+    updated_msg: Dine konti migrÃ¦rings indstillinger blev opdateret!
   moderation:
     title: Moderatering
   notification_mailer:
     digest:
       action: Se alle notifikationer
+      body: Her er en kort gennemgang af de beskeder du gik glip af siden dit sidste besÃ¸g den %{since}
       mention: "%{name} nÃ¦vnte dig i:"
+      new_followers_summary:
+        one: Du har ogsÃ¥ fÃ¥et dig 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! Fantastisk!
+      subject:
+        one: "1 ny notifikation siden du sidst var her \U0001F418"
+        other: "%{count} nye notifikationer siden du sidst var her \U0001F418"
       title: Mens du var vÃ¦k...
+    favourite:
+      body: 'Din status blev favoriseret af %{name}:'
+      subject: "%{name} favoriserede din status"
+      title: Ny favorit
     follow:
       body: "%{name} fÃ¸lger dig nu!"
       subject: "%{name} fÃ¸lger dig nu"
       title: Ny fÃ¸lger
+    follow_request:
+      action: HÃ¥ndter fÃ¸lgeranmodninger
+      body: "%{name} har anmodet om at fÃ¸lge dig"
+      subject: 'FÃ¸lger afventer: %{name}'
+      title: Ny fÃ¸lgeranmodning
     mention:
       action: Svar
       body: 'Du blev nÃ¦vnt af %{name} i:'
@@ -479,49 +647,90 @@ da:
   number:
     human:
       decimal_units:
+        format: "%n%u"
         units:
           billion: mia.
           million: mio.
+          quadrillion: Q
+          thousand: K
+          trillion: T
+          unit: "\n"
   pagination:
     newer: Nyere
     next: NÃ¦ste
     older: Ã†ldre
     prev: Forrige
+    truncate: "...&hellip;"
   preferences:
     languages: Sprog
     other: Andet
+    publishing: OffentligÃ¸rer
     web: Web
+  remote_follow:
+    acct: Indtast dit brugernavn@domÃ¦ne du vil handle fra
+    missing_resource: Kunne ikke finde det pÃ¥krÃ¦vede omdirigerings link for din konto
+    no_account_html: Har du ikke en konto? Du kan <a href='%{sign_up_path}' target='_blank'>oprette dig her</a>
+    proceed: FortsÃ¦t for at fÃ¸lge
+    prompt: 'Du er ved at fÃ¸lge:'
   remote_unfollow:
     error: Fejl
     title: Titel
     unfollowed: FÃ¸lger ikke lÃ¦ngere
   sessions:
+    activity: Sidste aktivitet
+    browser: Browser
     browsers:
+      alipay: Ali-pay
       blackberry: Blackberry OS
       chrome: Google Chrome
+      edge: Microsoft edge
+      electron: Elektron
       firefox: Mozilla Firefox
       generic: Ukendt browser
       ie: IE
+      micro_messenger: Micromessenger
+      nokia: Nokia S40 ovi browser
+      opera: Opera browser
+      otter: Odder
+      phantom_js: FantomJS
+      qq: QQ browser
+      safari: Apple Safari
+      uc_browser: UCbrowser
+      weibo: Weibo browser
+    current_session: NuvÃ¦rrende session
     description: "%{browser} pÃ¥ %{platform}"
+    explanation: Disse er de web browsere der pÃ¥ nuvÃ¦rende tidspunkt er logget ind pÃ¥ din Mastodon konto.
     ip: IP
     platforms:
+      adobe_air: Adobe air
       android: Android
+      blackberry: Blackberry OS
+      chrome_os: Chromeos
+      firefox_os: Firefox Os
       ios: iOS
       linux: Linux
       mac: Mac.
       other: ukendt platform
+      windows: Microsoft windows
+      windows_mobile: Windows mobil
+      windows_phone: Windows fon
+    revoke: Tilbagekald
+    revoke_success: Sessionen blev tilbagekaldt
+    title: Sessioner
   settings:
     authorized_apps: Godkendte apps
     back: Tilbage til Mastodon
     delete: Sletning af konto
     development: Udvikling
     edit_profile: Rediger profil
+    export: Data eksportering
     followers: Godkendte fÃ¸lgere
     import: Importer
     migrate: Konto migrering
     notifications: Notifikationer
-    preferences: Indstillinger
+    preferences: PrÃ¦ferencer
     settings: Indstillinger
+    two_factor_authentication: To-faktor godkendelse
     your_apps: Dine applikationer
   statuses:
     attached:
@@ -532,11 +741,21 @@ da:
       video:
         one: "%{count} video"
         other: "%{count} videoer"
+    boosted_from_html: FremhÃ¦vet fra %{acct_link}
     content_warning: 'Advarsel om indhold: %{warning}'
+    disallowed_hashtags:
+      one: 'indeholdte et ikke tilladt hashtag: %{tags}'
+      other: 'indeholdte de ikke tilladte hashtags: %{tags}'
     language_detection: Opfang automatisk sprog
+    open_in_web: Ã…bn i browser
+    over_character_limit: grÃ¦nsen pÃ¥ %{max} tegn er overskredet
     pin_errors:
-      ownership: Dun kan ikke fastgÃ¸re en anden persons toot
+      limit: Du har allerede fastgjort det maksimale antal trut
+      ownership: Du kan ikke fastgÃ¸re en anden persons trut
+      private: Ikke offentlige trut kan ikke blive fastgjort
+      reblog: FremhÃ¦vede trut kan ikke fastgÃ¸res
     show_more: Vis mere
+    sign_in_to_participate: Log ind for at deltage i samtalen
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Kun-fÃ¸lgere
@@ -544,24 +763,36 @@ da:
       public: Offentlig
       public_long: Alle kan se
       unlisted: Ikke listet
+      unlisted_long: Alle kan se, men vil ikke vÃ¦re listet pÃ¥ offentlige tidslinjer
   stream_entries:
-    click_to_show: Tryk for at vise
-    pinned: Fastgjort toot
+    pinned: Fastgjort trut
+    reblogged: fremhÃ¦vede
     sensitive_content: FÃ¸lsomt indhold
+  terms:
+    body_html: "<p><h2> Privatlivspolitik </h2> \n<h3 id=\"collect\">Hvilke information indsamler vi?</h3> \n\n<ul>\nÂ Â <li><em>GrundlÃ¦ggende kontoinformation </em>: Hvis du registrerer dig pÃ¥ denne server, bliver du mÃ¥ske bedt om at indtaste et brugernavn, en e-mail-adresse og et kodeord. Du kan ogsÃ¥ indtaste yderligere profiloplysninger, sÃ¥som et visningsnavn og biografi, og uploade et profilbillede og headerbillede. Brugernavnet, visningsnavnet, biografien, profilbilledet og hovedbilledet vises altid offentligt. </li> \nÂ Â <li> <em>Stillinger, fÃ¸lgende og andre offentlige oplysninger </em>: Listen over personer du fÃ¸lger er offentliggjort, det samme gÃ¦lder for dine tilhÃ¦ngere. NÃ¥r du sender en besked, gemmes datoen og klokkeslÃ¦ttet sÃ¥vel som det program, du sendte beskeden fra. Meddelelser kan indeholde medievedhÃ¦ftninger, som f.eks. Billeder og videoer. Offentlige og unoterede indlÃ¦g er offentligt tilgÃ¦ngelige. NÃ¥r du har 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, og der gemmes kopier der. NÃ¥r du sletter indlÃ¦g, leveres det ogsÃ¥ til dine tilhÃ¦ngere. Handlingen med reblogging eller favorisering af et andet indlÃ¦g er altid offentligt. </li>\nÂ Â <li><em> Direkte og efterfÃ¸lger-kun indlÃ¦g </ em>: Alle indlÃ¦g gemmes og behandles pÃ¥ serveren. FÃ¸lgere-kun indlÃ¦g leveres til dine tilhÃ¦ngere og brugere, der er nÃ¦vnt i dem, og direkte indlÃ¦g leveres kun til brugere nÃ¦vnt i dem. I nogle tilfÃ¦lde betyder det, at de leveres til forskellige servere, og der gemmes kopier der. Vi gÃ¸r en god tro for at begrÃ¦nse adgangen til disse stillinger kun til autoriserede personer, men andre servere kan undlade at gÃ¸re det. Derfor er det vigtigt at gennemgÃ¥ de servere, dine tilhÃ¦ngere tilhÃ¸rer. Du kan skifte en mulighed for at godkende og afvise nye fÃ¸lgere manuelt i indstillingerne. <em> VÃ¦r opmÃ¦rksom pÃ¥, at operatÃ¸rerne af serveren og enhver modtagende server muligvis kan se sÃ¥danne meddelelser </em>, og at modtagere muligvis skÃ¦rmbilleder, kopierer eller pÃ¥ anden vis deler dem igen. <em> Del ikke nogen farlig information 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. Alle indloggede sessioner er tilgÃ¦ngelige til din anmeldelse og tilbagekaldelse i indstillingerne. Den seneste anvendte IP-adresse gemmes i op til 12 mÃ¥neder. Vi kan ogsÃ¥ beholde serverlogfiler, som indeholder IP-adressen til hver anmodning 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 af de oplysninger, vi indsamler fra dig, kan bruges pÃ¥ fÃ¸lgende mÃ¥der: </p>\n\n<ul>\nÂ Â <li> At levere kernen funktionalitet Mastodon. Du kan kun interagere med andres indhold og indsende dit eget indhold, 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> For at hjÃ¦lpe moderering af samfundet, f.eks. sammenligning af din IP-adresse med andre kendte, for at bestemme forbud mod unddragelse eller andre overtrÃ¦delser. </li>\nÂ Â <li> Den e-mail-adresse, du angiver, kan bruges til at sende dig oplysninger, meddelelser om andre personer, der interagerer med dit indhold eller sender dig beskeder, og for 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 opretholde sikkerheden for dine personlige oplysninger, nÃ¥r du indtaster, indsender eller har adgang til dine personlige oplysninger. Bl.a. er din browsersession samt trafikken mellem dine applikationer og API'en sikret med SSL, og din adgangskode er hashed ved hjÃ¦lp af en stÃ¦rk envejsalgoritme. Du kan muligvis aktivere tofaktors godkendelse for yderligere at sikre adgang til din konto. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"data-retention\"> Hvad er vores data retention politik? </h3>\n\n<p> Vi vil gÃ¸re en god tro indsats for at: </p>\n\n<ul>\nÂ Â <li> Behold serverlogfiler, der indeholder IP-adressen pÃ¥ alle anmodninger til denne server, for sÃ¥ vidt som sÃ¥danne logfiler holdes, ikke mere end 90 dage. </li>\nÂ Â <li> Behold de IP-adresser, der er forbundet med registrerede brugere, ikke mere end 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, profilbillede og headerbillede. </p>\n\n<p> Du kan til enhver tid slette din konto. </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 harddisk 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 til fremtidige besÃ¸g. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"disclose\"> Viser vi nogen information til eksterne parter? </h3>\n\n<p> Vi sÃ¦lger ikke, handler eller pÃ¥ anden mÃ¥de overfÃ¸rer dine personlige identificerbare oplysninger til eksterne parter. Dette omfatter ikke tillid til tredjeparter, der hjÃ¦lper os med at drive vores hjemmeside, udfÃ¸re vores forretning eller servicere dig, sÃ¥ lÃ¦nge parterne er enige om at holde disse oplysninger fortrolige. Vi kan ogsÃ¥ frigive dine oplysninger, nÃ¥r vi mener, at udgivelsen er hensigtsmÃ¦ssig for at overholde loven, hÃ¥ndhÃ¦ve vores webstedspolitikker eller beskytte vores eller andre rettigheder, ejendom eller sikkerhed. </p>\n\n<p> Dit offentlige indhold kan downloades af andre servere i netvÃ¦rket. Dine offentlige og efterfÃ¸lger-kun indlÃ¦g leveres til de servere, hvor dine tilhÃ¦ngere er bosat, og direkte meddelelser leveres til modtagerens servere, for sÃ¥ vidt som disse tilhÃ¦ngere eller modtagere opholder sig pÃ¥ en anden server end dette. </p>\n\n<p> NÃ¥r du autoriserer et program til at bruge din konto, afhÃ¦nger det af omfanget af tilladelser, du godkender, det kan fÃ¥ adgang til dine offentlige profiloplysninger, din fÃ¸lgende liste, dine tilhÃ¦ngere, dine lister, alle dine indlÃ¦g og dine favoritter. Applikationer kan aldrig fÃ¥ adgang til din e-mail-adresse eller adgangskode. </p>\n\n<hr class=\"spacer\" />\n\n<h3 id=\"children\"> Bebyggelse af bÃ¸rn </h3>\n\n<p> Hvis denne server er i EU eller EÃ˜S: Vores websted, produkter og tjenester er alle rettet mod personer, der er mindst 16 Ã¥r gamle. Hvis du er under 16 Ã¥r, skal du ikke bruge dette websted efter 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, der er mindst 13 Ã¥r. Hvis du er under 13 Ã¥r, skal du ikke bruge kravene i COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\"> BÃ¸rns online beskyttelse af personlige oplysninger </a>) dette websted. </p>\n\n<p> Lovkrav kan vÃ¦re anderledes, hvis denne server er i en anden jurisdiktion. </p>\n\n<hr class = \"spacer\" />\n\n<h3 id=\"changes\"> Ã†ndringer i vores privatlivspolitik </h3>\n\n<p> Hvis vi beslutter os for at Ã¦ndre vores privatlivspolitik, vil vi sende disse Ã¦ndringer pÃ¥ denne side. </p>\n\n<p> Dette dokument er CC-BY-SA. Det blev senest opdateret 7. marts 2018. </p>\n\n<p> Oprindelig tilpasset fra <a href=\"https://github.com/discourse/discourse\"> Discourse privacy policy </a>.</p>\n"
+    title: VilkÃ¥r og privatlivpolitik for %{instance}
   themes:
     contrast: HÃ¸j kontrast
-    default: Mastodon
+    default: Mastodont
     mastodon-light: Mastodon (lys)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Indtast koden der er genereret af din app for at bekrÃ¦fte
+    description_html: Hvis du aktiverer <strong>to-faktor godkendelse</strong>, vil du vÃ¦re nÃ¸dt til at vÃ¦re i besiddelse af din telefon, der genererer tokens som du skal indtaste, nÃ¥r du logger ind.
     disable: Deaktiver
     enable: Aktiver
     enabled: To-faktor godkendelse er aktiveret
     enabled_success: To-faktor godkendelse succesfuldt aktiveret
     generate_recovery_codes: Generer gendannelseskoder
+    instructions_html: "<strong>Scan denne QR kode i Google Autehnticator eller lignende TOTP app pÃ¥ din telefon</strong>. Fra nu af vil den app generere koder som du vil vÃ¦re nÃ¸dt til at indtaste nÃ¥r du logger ind."
+    lost_recovery_codes: Gendannelseskoder vil lade dig fÃ¥ adgang til din konto hvis du mister din telefon. Hvis du har mistet dine gendannelseskoder, kan du regenerere dem her. Dine gamle gendannelseskoder vil blive ugyldige.
     manual_instructions: 'Hvis du ikke kan scanne QR koden er er nÃ¸dt til at skrive koden ind manuelt, kan er din almindelig tekst secret:'
     recovery_codes: Reserve koder
     recovery_codes_regenerated: Reserve koder blev succesfuldt regenereret
+    recovery_instructions_html: Hvis du nogensinde mister adgang til din telefon, kan du bruge en af genoprettelses koderne forneden for at fÃ¥ adgang til din konto. <strong>Gem gendannelses koderne et sikkert sted</strong>. Foreksempel kan du printe dem ud og gemme dem sammen med andre vigtige dokumenter.
     setup: SÃ¦t op
     wrong_code: Den indtastede kode var ugyldig! Er serverens tid og enhedens tid korrekte?
   user_mailer:
@@ -571,12 +802,16 @@ da:
       title: Udpluk af arkiv
     welcome:
       edit_profile_action: OpsÃ¦t profil
+      edit_profile_step: Du kan skrÃ¦ddersy din profil ved at uploade et profilbillede, overskrift, Ã¦ndre dit visningsnavn og mere. Hvis du kunne tÃ¦nke dig at gennemse nye fÃ¸lgere fÃ¸r de mÃ¥ fÃ¸lge dig, kan du lÃ¥se din konto.
       explanation: Her er nogle rÃ¥d til at starte med
       final_action: Kom igang med at poste
+      final_step: 'Start med at skrive opslag! Selv uden fÃ¸lgere vil dine offentlige beskeder kunne ses af andre, foreksempel pÃ¥ den lokale tidslinje og i hashtags. MÃ¥ske kunne du tÃ¦nke dig at introducere dig selv pÃ¥ #introductions hashtagget.'
       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 instanser.
       review_preferences_action: Ã†ndre prÃ¦ferencer
+      review_preferences_step: VÃ¦r sikker pÃ¥ at sÃ¦tte dine prÃ¦ferencer, sÃ¥ som hvilke emails du kunne tÃ¦nke dig at modtage, eller hvilket niveau af privatliv der skal vÃ¦re standard for dine opslag. Hvis du kunne tÃ¦nke dig ikke at blive kÃ¸resyg, kan du vÃ¦lge at aktivere automatisk afspilning af GIFfer.
       subject: Velkommen til Mastodon
+      tip_federated_timeline: Den delte tidslinje er et brandslange agtigt indblik over Mastodon netvÃ¦rket. Men det inkluderer kun folk dine naboer abonnerer pÃ¥, sÃ¥ den er ikke fuldendt.
       tip_following: Du fÃ¸lger som standard administratoren(e) for den server du er pÃ¥. For at finde flere folk, tjek bÃ¥de den lokale og fÃ¦lles tidslinje.
       tip_local_timeline: Den lokale tidslinje er et have af folk i %{instance}. Disse er dine umiddelbare naboer!
       tip_mobile_webapp: Hvis din mobil browser tilbyder dig at tilfÃ¸je Mastodon til din hjemmeskÃ¦rm, kan du modtage push meddelelser. Dette opfÃ¸rer sig pÃ¥ mange mÃ¥der ligesom en almindelig app!
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5f17803f5fb166104432f5c7afa1cf5984cf381a..b9074662e228a747d8bbb960a34fbabdccee732a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,52 +1,68 @@
 ---
 de:
   about:
-    about_hashtag_html: Dies sind Ã¶ffentliche BeitrÃ¤ge, die mit <strong>#%{hashtag}</strong> getaggt wurden. Wenn du ein Konto irgendwo im Fediversum besitzt, kannst du mit ihnen interagieren.
+    about_hashtag_html: Dies 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 diese Instanz
     administered_by: 'Administriert von:'
+    api: API
+    apps: Mobile Apps
     closed_registrations: Die Registrierung auf dieser Instanz ist momentan geschlossen. Aber du kannst dein Konto auch auf einer anderen Instanz erstellen! Von dort hast du genauso Zugriff auf das Mastodon-Netzwerk.
     contact: Kontakt
     contact_missing: Nicht angegeben
     contact_unavailable: N/A
-    description_headline: Was ist %{domain}?
-    domain_count_after: anderen Instanzen
-    domain_count_before: Vernetzt mit
+    documentation: Dokumentation
     extended_description_html: |
       <h3>Ein guter Platz fÃ¼r Regeln</h3>
       <p>Die erweiterte Beschreibung wurde noch nicht aufgesetzt.</p>
     features:
-      humane_approach_body: Mastodon hat von den Fehlern anderer Netzwerke gelernt und wurde mit dem Augenmerk darauf entwickelt, den Missbrauch sozialer Medien zu bekÃ¤mpfen.
+      humane_approach_body: Aus den Fehlern anderer Netzwerke lernend, zielt Mastodon darauf ab, mit ethischen Design-Entscheidungen den Missbrauch sozialer Medien zu verhindern.
       humane_approach_title: Ein menschlicherer Ansatz
       not_a_product_body: Mastodon ist kein kommerzielles Netzwerk. Keine Werbung, kein Abgraben deiner Daten, keine geschlossene Plattform. Es gibt keine Zentrale.
       not_a_product_title: Du bist ein Mensch und keine Ware
-      real_conversation_body: Mit 65535 Zeichen pro Beitrag und der ErmÃ¶glichung prÃ¤ziser Inhalts- und Bilderwarnungen kannst du dich so ausdrÃ¼cken, wie du es mÃ¶chtest.
-      real_conversation_title: FÃ¼r das echte GesprÃ¤ch gemacht
-      within_reach_body: Verschiedene Apps fÃ¼r iOS, Android und andere Plattformen erlauben dir dank unserem blÃ¼henden API-Ã–kosystem, dich von Ã¼berall auf dem Laufenden zu halten.
+      real_conversation_body: Mit 65535 Zeichen pro Beitrag und Features wie Inhalts- und Bilderwarnungen kannst du dich so ausdrÃ¼cken, wie du es mÃ¶chtest.
+      real_conversation_title: Geschaffen fÃ¼r echte GesprÃ¤che
+      within_reach_body: Verschiedene Apps fÃ¼r iOS, Android und andere Plattformen erlauben es dir, dank unseres blÃ¼henden API-Ã–kosystems, dich von Ã¼berall auf dem Laufenden zu halten.
       within_reach_title: Immer fÃ¼r dich da
     generic_description: "%{domain} ist ein Server im Netzwerk"
     hosted_on: Mastodon, beherbergt auf %{domain}
     learn_more: Mehr erfahren
     other_instances: Andere Instanzen
+    privacy_policy: DatenschutzerklÃ¤rung
     source_code: Quellcode
-    status_count_after: BeitrÃ¤ge verfassten
-    status_count_before: die
-    user_count_after: Wesen
+    status_count_after:
+      one: Statusmeldung
+      other: Statusmeldungen
+    status_count_before: mit
+    terms: Nutzungsbedingungen
+    user_count_after:
+      one: Benutzer:in
+      other: Benutzer:innen
     user_count_before: Zuhause fÃ¼r
     what_is_mastodon: Was ist Mastodon?
   accounts:
+    choices_html: "%{name} empfiehlt:"
     follow: Folgen
-    followers: Folgende
+    followers:
+      one: Folgender
+      other: Folgende
     following: Folgt
+    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
     nothing_here: Hier gibt es nichts!
     people_followed_by: Profile, denen %{name} folgt
     people_who_follow: Profile, die %{name} folgen
-    posts: BeitrÃ¤ge
+    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
-    remote_follow: Folgen
     reserved_username: Dieser Profilname ist belegt
     roles:
       admin: Admin
@@ -54,15 +70,18 @@ de:
       moderator: Moderator
     unfollow: Entfolgen
   admin:
+    account_actions:
+      action: Aktion ausfÃ¼hren
+      title: Moderationsaktion auf %{acct} ausfÃ¼hren
     account_moderation_notes:
-      create: Notiz hinterlassen
+      create: Notiz erstellen
       created_msg: Moderationsnotiz erfolgreich erstellt!
       delete: LÃ¶schen
       destroyed_msg: Moderationsnotiz erfolgreich gelÃ¶scht!
     accounts:
       are_you_sure: Bist du sicher?
       avatar: Profilbild
-      by_domain: DomÃ¤ne
+      by_domain: Domain
       change_email:
         changed_msg: E-Mail-Adresse des Kontos erfolgreich geÃ¤ndert!
         current_email: Aktuelle E-Mail-Adresse
@@ -73,6 +92,7 @@ de:
       confirm: BestÃ¤tigen
       confirmed: BestÃ¤tigt
       confirming: BestÃ¤tigung
+      deleted: GelÃ¶scht
       demote: Degradieren
       disable: Ausschalten
       disable_two_factor_authentication: 2FA abschalten
@@ -85,11 +105,14 @@ de:
       enable: Freischalten
       enabled: Freigegeben
       feed_url: Feed-URL
-      followers: Folger
+      followers: Folgende
       followers_url: URL des Folgenden
       follows: Folgt
+      header: Header
       inbox_url: Posteingangs-URL
+      invited_by: Eingeladen von
       ip: IP-Adresse
+      joined: Beigetreten
       location:
         all: Alle
         local: Lokal
@@ -99,6 +122,7 @@ de:
       media_attachments: MedienanhÃ¤nge
       memorialize: In Gedenkmal verwandeln
       moderation:
+        active: Aktiv
         all: Alle
         silenced: Stummgeschaltet
         suspended: Gesperrt
@@ -106,22 +130,20 @@ de:
       moderation_notes: Moderationsnotizen
       most_recent_activity: Letzte AktivitÃ¤t
       most_recent_ip: Letzte IP-Adresse
+      no_limits_imposed: Keine Limits eingesetzt
       not_subscribed: Nicht abonniert
-      order:
-        alphabetic: Alphabetisch
-        most_recent: Neueste
-        title: Sortierung
       outbox_url: Postausgangs-URL
-      perform_full_suspension: VollstÃ¤ndige Sperre durchfÃ¼hren
+      perform_full_suspension: Sperren
       profile_url: Profil-URL
       promote: BefÃ¶rdern
       protocol: Protokoll
       public: Ã–ffentlich
       push_subscription_expires: PuSH-Abonnement lÃ¤uft aus
-      redownload: Avatar neu laden
+      redownload: Profil neu laden
       remove_avatar: Profilbild entfernen
+      remove_header: Header entfernen
       resend_confirmation:
-        already_confirmed: Dieser Benutzer wurde bereits bestÃ¤tigt
+        already_confirmed: Diese:r Benutzer:in wurde bereits bestÃ¤tigt
         send: BestÃ¤tigungsmail erneut senden
         success: BestÃ¤tigungs-E-Mail erfolgreich gesendet!
       reset: ZurÃ¼cksetzen
@@ -130,56 +152,61 @@ de:
       role: Berechtigungen
       roles:
         admin: Administrator
-        moderator: Moderator
+        moderator: Moderator:in
         staff: Mitarbeiter
         user: Nutzer
       salmon_url: Salmon-URL
       search: Suche
-      shared_inbox_url: Geteilter Posteingang URL
+      shared_inbox_url: Geteilte Posteingang-URL
       show:
-        created_reports: Meldungen durch dieses Konto
-        report: Meldung
-        targeted_reports: Meldungen Ã¼ber dieses Konto
+        created_reports: Erstellte Beschwerdemeldungen
+        targeted_reports: Beschwerdemeldungen von anderen
       silence: Stummschalten
+      silenced: Stummgeschaltet
       statuses: BeitrÃ¤ge
       subscribe: Abonnieren
+      suspended: Gesperrt
       title: Konten
       unconfirmed_email: UnbestÃ¤tigte E-Mail-Adresse
       undo_silenced: Stummschaltung zurÃ¼cknehmen
       undo_suspension: Sperre zurÃ¼cknehmen
       unsubscribe: Abbestellen
       username: Profilname
+      warn: Warnen
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} hat sich die Meldung %{target} selbst zugewiesen"
         change_email_user: "%{name} hat die E-Mail-Adresse des Nutzers %{target} geÃ¤ndert"
         confirm_user: "%{name} hat die E-Mail-Adresse von %{target} bestÃ¤tigt"
+        create_account_warning: "%{name} hat eine Warnung an %{target} gesendet"
         create_custom_emoji: "%{name} hat neues Emoji %{target} hochgeladen"
         create_domain_block: "%{name} hat die Domain %{target} blockiert"
         create_email_domain_block: "%{name} hat die E-Mail-Domain %{target} geblacklistet"
-        demote_user: "%{name} stufte Benutzer %{target} herunter"
+        demote_user: "%{name} stufte Benutzer:in %{target} herunter"
+        destroy_custom_emoji: "%{name} zerstÃ¶rte Emoji %{target}"
         destroy_domain_block: "%{name} hat die Domain %{target} entblockt"
         destroy_email_domain_block: "%{name} hat die E-Mail-Domain %{target} gewhitelistet"
         destroy_status: "%{name} hat Status von %{target} entfernt"
-        disable_2fa_user: "%{name} hat Zwei-Faktor-Anforderung fÃ¼r Benutzer %{target} deaktiviert"
+        disable_2fa_user: "%{name} hat Zwei-Faktor-Anforderung fÃ¼r Benutzer:in %{target} deaktiviert"
         disable_custom_emoji: "%{name} hat das %{target} Emoji deaktiviert"
-        disable_user: "%{name} hat den Login fÃ¼r Benutzer  %{target} deaktiviert"
+        disable_user: "%{name} hat den Login fÃ¼r Benutzer:in  %{target} deaktiviert"
         enable_custom_emoji: "%{name} hat das %{target} Emoji aktiviert"
-        enable_user: "%{name} hat die Anmeldung fÃ¼r den Benutzer %{target} aktiviert"
-        memorialize_account: "%{name} hat %{target}s Profil in eine Gedenkseite umgewandelt"
+        enable_user: "%{name} hat die Anmeldung fÃ¼r di:en Benutzer:in %{target} aktiviert"
+        memorialize_account: "%{name} hat %{target}s Konto in eine Gedenkseite umgewandelt"
         promote_user: "%{name} hat %{target} befÃ¶rdert"
         remove_avatar_user: "%{name} hat das Profilbild von %{target} entfernt"
         reopen_report: "%{name} hat die Meldung %{target} wieder geÃ¶ffnet"
-        reset_password_user: "%{name} hat das Passwort fÃ¼r den Benutzer %{target} zurÃ¼ckgesetzt"
+        reset_password_user: "%{name} hat das Passwort fÃ¼r di:en Benutzer:in %{target} zurÃ¼ckgesetzt"
         resolve_report: "%{name} hat die Meldung %{target} bearbeitet"
-        silence_account: "%{name} hat %{target}s Account stummgeschaltet"
-        suspend_account: "%{name} hat %{target}s Account gesperrt"
+        silence_account: "%{name} hat %{target}s Konto stummgeschaltet"
+        suspend_account: "%{name} hat %{target}s Konto gesperrt"
         unassigned_report: "%{name} hat die Zuweisung der Meldung %{target} entfernt"
-        unsilence_account: "%{name} hat die Stummschaltung von %{target}s Account aufgehoben"
-        unsuspend_account: "%{name} hat die Sperrung von %{target}s Account aufgehoben"
+        unsilence_account: "%{name} hat die Stummschaltung von %{target}s Konto aufgehoben"
+        unsuspend_account: "%{name} hat die Sperrung von %{target}s Konto aufgehoben"
         update_custom_emoji: "%{name} hat das %{target} Emoji aktualisiert"
         update_status: "%{name} hat den Status von %{target} aktualisiert"
+      deleted_status: "(gelÃ¶schter Beitrag)"
       title: ÃœberprÃ¼fungsprotokoll
     custom_emojis:
       by_domain: Domain
@@ -206,8 +233,30 @@ de:
       update_failed_msg: Konnte dieses Emoji nicht aktualisieren
       updated_msg: Emoji erfolgreich aktualisiert!
       upload: Hochladen
+    dashboard:
+      backlog: Unerledigte Jobs
+      config: Konfiguration
+      feature_deletions: KontolÃ¶schung
+      feature_invites: Einladungslinks
+      feature_profile_directory: Profilverzeichnis
+      feature_registrations: Registrierung
+      feature_relay: FÃ¶derations-Relay
+      features: Eigenschaften
+      hidden_service: FÃ¶deration mit versteckten Diensten
+      open_reports: Offene Meldungen
+      recent_users: Neueste Nutzer
+      search: Volltextsuche
+      single_user_mode: Einzelnutzermodus
+      software: Software
+      space: Speicherverbrauch
+      title: Ãœbersicht
+      total_users: Benutzer:innen insgesamt
+      trends: Trends
+      week_interactions: Interaktionen diese Woche
+      week_users_active: Aktiv diese Woche
+      week_users_new: Benutzer:innen diese Woche
     domain_blocks:
-      add_new: Neu hinzufÃ¼gen
+      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
       domain: Domain
@@ -222,11 +271,13 @@ de:
         title: Neue Domain-Blockade
       reject_media: Mediendateien ablehnen
       reject_media_hint: Entfernt lokal gespeicherte Mediendateien und verhindert deren kÃ¼nftiges Herunterladen. FÃ¼r Sperren irrelevant
-      severities:
-        noop: Kein
-        silence: Stummschaltung
-        suspend: Sperren
-      severity: Schweregrad
+      reject_reports: Meldungen ablehnen
+      reject_reports_hint: Ignoriere alle Meldungen von dieser Domain. Irrelevant fÃ¼r Sperrungen
+      rejecting_media: Mediendateien ablehnen
+      rejecting_reports: Beschwerdemeldungen ablehnen
+      severity:
+        silence: stummgeschaltet
+        suspend: gesperrt
       show:
         affected_accounts:
           one: Ein Konto in der Datenbank betroffen
@@ -236,8 +287,7 @@ de:
           suspend: Alle existierenden Konten dieser Domain entsperren
         title: Domain-Blockade fÃ¼r %{domain} zurÃ¼cknehmen
         undo: ZurÃ¼cknehmen
-      title: Domain-Blockaden
-      undo: ZurÃ¼cknehmen
+      undo: Domainblockade zurÃ¼cknehmen
     email_domain_blocks:
       add_new: Neue hinzufÃ¼gen
       created_msg: E-Mail-Domain-Blockade erfolgreich erstellt
@@ -248,19 +298,47 @@ de:
         create: Blockade erstellen
         title: Neue E-Mail-Domain-Blockade
       title: E-Mail-Domain-Blockade
+    followers:
+      back_to_account: ZurÃ¼ck zum Konto
+      title: "%{acct}'s Follower"
     instances:
-      account_count: Bekannte Konten
-      domain_name: Domain
-      reset: ZurÃ¼cksetzen
-      search: Suchen
-      title: Bekannte Instanzen
+      delivery_available: Zustellung ist verfÃ¼gbar
+      known_accounts:
+        one: "%{count} bekanntes Konto"
+        other: "%{count} bekannte Accounts"
+      moderation:
+        all: Alle
+        limited: Limitiert
+        title: Moderation
+      title: FÃ¶deration
+      total_blocked_by_us: Von uns gesperrt
+      total_followed_by_them: Gefolgt von denen
+      total_followed_by_us: Gefolgt von uns
+      total_reported: Beschwerdemeldungen Ã¼ber sie
+      total_storage: MedienanhÃ¤nge
     invites:
+      deactivate_all: Alle deaktivieren
       filter:
         all: Alle
         available: VerfÃ¼gbar
         expired: Ausgelaufen
         title: Filter
       title: Einladungen
+    relays:
+      add_new: Neues Relay hinzufÃ¼gen
+      delete: LÃ¶schen
+      description_html: Ein <strong>FÃ¶derierungsrelay</strong> ist ein vermittelnder Server, der eine groÃŸe Anzahl Ã¶ffentlicher BeitrÃ¤ge zwischen Servern austauscht, die es abonnieren und zu ihm verÃ¶ffentlichen.<strong> Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken</strong>, was andernfalls das manuelle Folgen anderer Leute auf entfernten Servern durch lokale Nutzer erfordern wÃ¼rde.
+      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.
+      enabled: Eingeschaltet
+      inbox_url: Relay-URL
+      pending: Warte auf Zustimmung des Relays
+      save_and_enable: Speichern und aktivieren
+      setup: Relayverbindung einrichten
+      status: Status
+      title: Relays
     report_notes:
       created_msg: Meldungs-Kommentar erfolgreich erstellt!
       destroyed_msg: Meldungs-Kommentar erfolgreich gelÃ¶scht!
@@ -275,7 +353,6 @@ de:
       comment:
         none: Kein
       created_at: Gemeldet
-      id: ID
       mark_as_resolved: Als gelÃ¶st markieren
       mark_as_unresolved: Als ungelÃ¶st markieren
       notes:
@@ -286,20 +363,15 @@ de:
         placeholder: Beschreibe, welche MaÃŸnahmen ergriffen wurden oder irgendwelche andere Neuigkeitenâ€¦
       reopen: Meldung wieder Ã¶ffnen
       report: 'Meldung #%{id}'
-      report_contents: Inhalt
       reported_account: Gemeldetes Konto
       reported_by: Gemeldet von
       resolved: GelÃ¶st
       resolved_msg: Meldung erfolgreich gelÃ¶st!
-      silence_account: Konto stummschalten
       status: Status
-      suspend_account: Konto sperren
-      target: Ziel
       title: Meldungen
       unassign: Zuweisung entfernen
       unresolved: UngelÃ¶st
       updated_at: Aktualisiert
-      view: Ansehen
     settings:
       activity_api_enabled:
         desc_html: Anzahl der lokal geposteten BeitrÃ¤ge, aktiven Nutzern und neuen Registrierungen in wÃ¶chentlichen Zusammenfassungen
@@ -310,12 +382,24 @@ de:
       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
       hero:
         desc_html: Wird auf der Startseite angezeigt. Mindestens 600x100px sind empfohlen. Wenn es nicht gesetzt wurde, wird das Instanz-Thumbnail dafÃ¼r verwendet
         title: Bild fÃ¼r Startseite
+      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 dieser Instanz, die im Fediverse gefunden wurden
         title: VerÃ¶ffentliche Liste von gefundenen Instanzen
+      preview_sensitive_media:
+        desc_html: Linkvorschauen auf anderen Webseiten werden ein Vorschaubild anzeigen, obwohl die Medien als heikel gekennzeichnet sind
+        title: Heikle Medien in OpenGraph-Vorschauen anzeigen
+      profile_directory:
+        desc_html: Erlaube Benutzer auffindbar zu sein
+        title: Aktiviere Profilverzeichnis
       registrations:
         closed_message:
           desc_html: Wird auf der Frontseite angezeigt, wenn die Registrierung geschlossen ist. Du kannst HTML-Tags benutzen
@@ -336,11 +420,14 @@ de:
         desc_html: Zeige Mitarbeiter-Badge auf Benutzerseite
         title: Zeige Mitarbeiter-Badge
       site_description:
-        desc_html: Wird als Absatz auf der Frontseite angezeigt und als Meta-Tag benutzt. Du kannst HTML-Tags benutzen, insbesondere <code>&lt;a&gt;</code> und <code>&lt;em&gt;</code>.
+        desc_html: Einleitungsabschnitt auf der Frontseite. Beschreibe, was diese Mastodon-Instanz ausmacht. Du kannst HTML-Tags benutzen, insbesondere <code>&lt;a&gt;</code> und <code>&lt;em&gt;</code>.
         title: Beschreibung der Instanz
       site_description_extended:
         desc_html: Bietet sich fÃ¼r Verhaltenskodizes, Regeln, Richtlinien und weiteres an, was deine Instanz auszeichnet. Du kannst HTML-Tags benutzen
         title: Erweiterte Beschreibung der Instanz
+      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 ausmacht. Falls leer, wird die Instanz-Beschreibung verwendet.
+        title: Kurze Instanz-Beschreibung
       site_terms:
         desc_html: Hier kannst du deine eigenen GeschÃ¤ftsbedingungen, DatenschutzerklÃ¤rung und anderes rechtlich Relevante eintragen. Du kannst HTML-Tags benutzen
         title: Eigene GeschÃ¤ftsbedingungen
@@ -362,6 +449,7 @@ de:
       media:
         title: Medien
       no_media: Keine Medien
+      no_status_selected: Keine BeitrÃ¤ge wurden verÃ¤ndert, weil keine ausgewÃ¤hlt wurden
       title: BeitrÃ¤ge des Kontos
       with_media: Mit Medien
     subscriptions:
@@ -371,7 +459,21 @@ de:
       last_delivery: Letzte Zustellung
       title: WebSub
       topic: Thema
+    tags:
+      accounts: Konten
+      hidden: Versteckt
+      hide: Vor Verzeichnis verstecken
+      name: Hashtag
+      title: Hashtags
+      unhide: Zeige in Verzeichnis
+      visible: Sichtbar
     title: Administration
+    warning_presets:
+      add_new: Neu hinzufÃ¼gen
+      delete: LÃ¶schen
+      edit: Bearbeiten
+      edit_preset: Warnungsvorlage bearbeiten
+      title: Warnungsvorlagen verwalten
   admin_mailer:
     new_report:
       body: "%{reporter} hat %{target} gemeldet"
@@ -393,7 +495,7 @@ de:
     warning: Sei mit diesen Daten sehr vorsichtig. Teile sie mit niemandem!
     your_token: Dein Zugangs-Token
   auth:
-    agreement_html: Indem du dich registrierst, erklÃ¤rst du dich mit den Regeln, die <a href="%{rules_path}">auf dieser Instanz gelten</a> und der <a href="%{terms_path}">DatenschutzerklÃ¤rung</a> einverstanden.
+    agreement_html: Indem du dich registrierst, erklÃ¤rst du dich mit den untenstehenden <a href="%{rules_path}">Regeln dieser Instanz</a> und der <a href="%{terms_path}">DatenschutzerklÃ¤rung</a> einverstanden.
     change_password: Passwort
     confirm_email: E-Mail bestÃ¤tigen
     delete_account: Konto lÃ¶schen
@@ -403,8 +505,8 @@ de:
     invalid_reset_password_token: Das Token zum ZurÃ¼cksetzen des Passworts ist ungÃ¼ltig oder abgelaufen. Bitte fordere ein neues an.
     login: Anmelden
     logout: Abmelden
-    migrate_account: Ziehe zu einem anderen Account um
-    migrate_account_html: Wenn du es wÃ¼nschst diesen Account zu einem anderen umzuziehen, dann kannst du <a href="%{path}">es hier einstellen</a>.
+    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>.
     or: oder
     or_log_in_with: Oder anmelden mit
     providers:
@@ -418,7 +520,7 @@ de:
     set_new_password: Neues Passwort setzen
   authorize_follow:
     already_following: Du folgst diesem Konto bereits
-    error: Das Profil konnte nicht geladen werden
+    error: Das Remote-Konto konnte nicht geladen werden
     follow: Folgen
     follow_request: 'Du hast eine Folgeanfrage gesendet an:'
     following: 'Erfolg! Du folgst nun:'
@@ -449,6 +551,16 @@ de:
     success_msg: Dein Konto wurde erfolgreich gelÃ¶scht
     warning_html: Wir kÃ¶nnen nur dafÃ¼r garantieren, dass die Inhalte auf dieser einen Instanz gelÃ¶scht werden. Bei Inhalten, die weit verbreitet wurden, ist es wahrscheinlich, dass Spuren bleiben werden. Server, die offline sind oder keine Benachrichtigungen von deinem Konto mehr empfangen, werden ihre Datenbanken nicht bereinigen.
     warning_title: VerfÃ¼gbarkeit verstreuter Inhalte
+  directories:
+    directory: Profilverzeichnis
+    enabled: Du bist gerade in dem Verzeichnis gelistet.
+    enabled_but_waiting: Du bist damit einverstanden im Verzeichnis gelistet zu werden, aber du hast nicht die minimale Anzahl an Folgenden (%{min_followers}), damit es passiert.
+    explanation: Entdecke Benutzer basierend auf deren Interessen
+    explore_mastodon: Entdecke %{title}
+    how_to_enable: Du hast dich gerade nicht dazu entschieden im Verzeichnis gelistet zu werden. Du kannst dich unten dafÃ¼r eintragen. Benutze Hashtags in deiner Profilbeschreibung, um unter spezifischen Hashtags gelistet zu werden!
+    people:
+      one: "%{count} Person"
+      other: "%{count} Leute"
   errors:
     '403': Dir fehlt die Befugnis, diese Seite sehen zu kÃ¶nnen.
     '404': Diese Seite existiert nicht.
@@ -460,18 +572,20 @@ de:
     '500':
       content: Bitte verzeih, etwas ist bei uns schief gegangen.
       title: Diese Seite ist kaputt
-    noscript_html: Bitte aktiviere JavaScript, um die Mastodon-Web-Anwendung zu verwenden. Alternativ kannst du auch eine der <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">nativen Mastodon-Anwendungen</a> fÃ¼r deine Plattform probieren.
+    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.
   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 im ActivityPub-Format gespeichert, welches mit jeder Software lesbar ist, die das Format unterstÃ¼tzt. Du kannst alle 7 Tage ein neues Archiv anfordern.
+      hint_html: Du kannst ein Archiv deiner <strong>BeitrÃ¤ge und hochgeladenen Medien</strong> anfragen. Die exportierten Daten werden im 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
       size: GrÃ¶ÃŸe
     blocks: Du hast blockiert
     csv: CSV
+    domain_blocks: Domainblockaden
     follows: Du folgst
+    lists: Listen
     mutes: Du hast stummgeschaltet
     storage: Medienspeicher
   filters:
@@ -502,9 +616,13 @@ de:
     true_privacy_html: Bitte beachte, dass <strong>wirklicher Schutz deiner PrivatsphÃ¤re nur durch Ende-zu-Ende-VerschlÃ¼sselung erreicht werden kann.</strong>.
     unlocked_warning_html: Wer dir folgen will, kann dies jederzeit ohne deine vorige EinverstÃ¤ndnis tun und erhÃ¤lt damit automatisch Zugriff auf deine privaten BeitrÃ¤ge. Wenn du %{lock_link}, kannst du vorab entscheiden, wer dir folgen darf und wer nicht.
     unlocked_warning_title: Dein Konto ist nicht gesperrt
+  footer:
+    developers: Entwickler
+    more: Mehrâ€¦
+    resources: Ressourcen
   generic:
     changes_saved_msg: Ã„nderungen gespeichert!
-    powered_by: angetrieben von %{link}
+    copy: Kopieren
     save_changes: Ã„nderungen speichern
     validation_errors:
       one: Etwas ist noch nicht ganz richtig! Bitte korrigiere den Fehler
@@ -539,9 +657,7 @@ de:
     table:
       expires_at: LÃ¤uft ab
       uses: Verwendungen
-    title: Leute Einladen
-  landing_strip_html: "<strong>%{name}</strong> hat ein Profil auf %{link_to_root_path}. Du kannst folgen oder interagieren, sofern du ein Konto irgendwo im Fediversum hast."
-  landing_strip_signup_html: Wenn nicht, kannst du dich <a href="%{sign_up_path}">hier anmelden</a>.
+    title: Leute einladen
   lists:
     errors:
       limit: Du hast die maximale Anzahl an Listen erreicht
@@ -550,10 +666,10 @@ de:
       images_and_video: Es kann kein Video an einen Beitrag, der bereits Bilder enthÃ¤lt, angehÃ¤ngt werden
       too_many: Es kÃ¶nnen nicht mehr als 4 Bilder angehÃ¤ngt werden
   migrations:
-    acct: benutzername@domain des neuen Accounts
+    acct: benutzername@domain des neuen Kontos
     currently_redirecting: 'Deine Profilweiterleitung wurde gesetzt auf:'
     proceed: Speichern
-    updated_msg: Deine Account-Migrationseinstellungen wurden erfolgreich aktualisiert!
+    updated_msg: Deine Konto-Migrationseinstellungen wurden erfolgreich aktualisiert!
   moderation:
     title: Moderation
   notification_mailer:
@@ -615,13 +731,28 @@ de:
   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 keinen Account? Du kannst dich <a href='%{sign_up_path}' target='_blank'>hier anmelden</a>
+    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:'
   remote_unfollow:
     error: Fehler
     title: Titel
     unfollowed: Entfolgt
+  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
+    too_soon: Das geplante Datum muss in der Zukunft liegen
   sessions:
     activity: Letzte AktivitÃ¤t
     browser: Browser
@@ -645,7 +776,7 @@ de:
       weibo: Weibo
     current_session: Aktuelle Sitzung
     description: "%{browser} auf %{platform}"
-    explanation: Dies sind die Webbrowser, die derzeit in dein Mastodon-Konto eingeloggt sind.
+    explanation: Dies sind die Webbrowser, die derzeit in deinem Mastodon-Konto eingeloggt sind.
     ip: IP-Adresse
     platforms:
       adobe_air: Adobe Air
@@ -672,7 +803,7 @@ de:
     export: Datenexport
     followers: Autorisierte Folgende
     import: Datenimport
-    migrate: Account-Umzug
+    migrate: Konto-Umzug
     notifications: Benachrichtigungen
     preferences: Einstellungen
     settings: Einstellungen
@@ -701,6 +832,7 @@ de:
       private: Du kannst nur Ã¶ffentliche BeitrÃ¤ge anheften
       reblog: Du kannst keine geteilten BeitrÃ¤ge anheften
     show_more: Mehr anzeigen
+    sign_in_to_participate: Melde dich an, um an der Konversation teilzuhaben
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Nur Folgende
@@ -710,11 +842,93 @@ de:
       unlisted: Nicht gelistet
       unlisted_long: FÃ¼r alle sichtbar, aber nicht in Ã¶ffentlichen Zeitleisten aufgelistet
   stream_entries:
-    click_to_show: Klicken, um zu zeigen
     pinned: Angehefteter Beitrag
     reblogged: teilte
-    sensitive_content: Heikle Inhalte
+    sensitive_content: Sensible Inhalte
   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 Benutzer:innen-Namen, 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 Benutzer:innen-Name, 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 featurest, 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:innen, die du in ihnen erwÃ¤hnst, ausgeliefert, direkte BeitrÃ¤ge nur an in ihnen erwÃ¤hnte Benutzer:innen. 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:innen 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>Du kannst dein Konto jederzeit unwiderruflich  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 befinden: 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 wird 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: Hoher Kontrast
@@ -723,6 +937,7 @@ de:
   time:
     formats:
       default: "%d.%m.%Y %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Gib zur BestÃ¤tigung den Code ein, den deine Authenticator-App generiert hat
     description_html: Wenn du <strong>Zwei-Faktor-Authentisierung (2FA)</strong> aktivierst, wirst du dein Telefon zum Anmelden benÃ¶tigen. Darauf werden Tokens erzeugt, die du bei der Anmeldung eingeben musst.
@@ -736,17 +951,33 @@ de:
     manual_instructions: 'Wenn du den QR-Code nicht einlesen kannst und ihn manuell eingeben musst, ist hier das Klartext-Geheimnis:'
     recovery_codes: Wiederherstellungs-Codes sichern
     recovery_codes_regenerated: Wiederherstellungscodes erfolgreich neu generiert
-    recovery_instructions_html: Wenn du den Zugang zu deinem Telefon verlieren solltest, kannst du einen untenstehenden Wiederherstellungscodes 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.
+    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.
     setup: Einrichten
     wrong_code: Der eingegebene Code war ungÃ¼ltig! Stimmen Serverzeit und GerÃ¤tezeit?
   user_mailer:
     backup_ready:
-      explanation: Du hast ein vollstÃ¤ndiges Backup von deinem Mastodon-Account angefragt. Es kann jetzt heruntergeladen werden!
+      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
+    warning:
+      explanation:
+        disable: Solange dein Konto eingefroren ist, sind deine Benutzerdaten intakt; aber du kannst nichts tun, bis dein Konto entsperrt wurde.
+        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.
+      review_server_policies: Serverrichtlinien ansehen
+      subject:
+        disable: Dein Konto %{acct} wurde eingefroren
+        none: Warnung fÃ¼r %{acct}
+        silence: Dein Konto %{acct} wurde limitiert
+        suspend: Dein Konto %{acct} wurde gesperrt
+      title:
+        disable: Konto eingefroren
+        none: Warnung
+        silence: Konto limitiert
+        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 Follower vorher Ã¼berprÃ¼fen mÃ¶chtest, bevor sie dir folgen kÃ¶nnen, dann kannst du dein Profil sperren.
+      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.
       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.'
@@ -755,7 +986,6 @@ de:
       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.
       subject: Willkommen bei Mastodon
-      tip_bridge_html: Wenn du gerade von Twitter kommst, dann kannst du deine Freunde auf Mastodon mithilfe der <a href="%{bridge_url}">Bridge-App</a> finden. Es funktioniert aber auch nur, wenn diese die Bridge-App vorher verwendet haben!
       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!
@@ -763,8 +993,12 @@ de:
       tips: Tipps
       title: Willkommen an Bord, %{name}!
   users:
+    follow_limit_reached: Du kannst nicht mehr als %{limit} Leuten folgen
     invalid_email: UngÃ¼ltige E-Mail-Adresse
     invalid_otp_token: UngÃ¼ltiger Zwei-Faktor-Authentisierungs-Code
-    otp_lost_help_html: Wenn Sie zu beidem keinen Zugriff mehr haben, kontaktieren sie %{email}
+    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.
     signed_in_as: 'Angemeldet als:'
+  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
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
index cadc4daa879ada6ee67f2b0faf722dbcf8bb3d68..927eeee5a10c886cc501bda5f612b289ea784956 100644
--- a/config/locales/devise.ar.yml
+++ b/config/locales/devise.ar.yml
@@ -18,6 +18,7 @@ ar:
     mailer:
       confirmation_instructions:
         action: Ù„Ù„ØªØÙ‚Ù‚ Ù…Ù† Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
+        action_with_app: ØªØ£ÙƒÙŠØ¯ Ø«Ù… Ø§Ù„Ø¹ÙˆØ¯Ø© Ø¥Ù„Ù‰ %{app}
         explanation: Ù„Ù‚Ø¯ Ù‚Ù…Øª Ø¨Ø¥Ù†Ø´Ø§Ø¡ ØØ³Ø§Ø¨ Ø¹Ù„Ù‰ %{host} Ø¨ÙˆØ§Ø³Ø·Ø© Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ Ø§Ù„ØØ§Ù„ÙŠ. Ø¥Ù†Ùƒ Ø¹Ù„Ù‰ Ø¨Ø¹Ø¯ Ø®Ø·ÙˆØ§Øª Ù‚Ù„ÙŠÙ„Ø© Ù…Ù† ØªÙØ¹Ù„ÙŠÙ‡. Ø¥Ù† Ù„Ù… ØªÙƒÙ† Ù…Ù† Ø·Ù„Ø¨ Ø°Ù„ÙƒØŒ ÙŠØ±Ø¬Ù‰ Ø£Ù„Ù‘Ø§ ØªÙˆÙ„ÙŠ Ø¥Ù‡ØªÙ…Ø§Ù…Ø§ Ø¨Ù‡Ø°Ù‡ Ø§Ù„Ø±Ø³Ø§Ù„Ø©.
         extra_html: Ù†Ø¯Ø¹ÙˆÙƒ Ø¥Ù„Ù‰ Ø§Ù„Ø¥Ø·Ù„Ø§Ø¹ Ø¹Ù„Ù‰ <a href="%{terms_path}">Ø§Ù„Ù‚ÙˆØ§Ø¹Ø¯ Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ… Ù‡Ø°Ø§</a> and <a href="%{policy_path}">Ùˆ Ø´Ø±ÙˆØ· Ø§Ù„Ø®Ø¯Ù…Ø© Ø§Ù„Ø®Ø§ØµØ© Ø¨Ù†Ø§</a>.
         subject: 'Ù…Ø§Ø³ØªØ¯ÙˆÙ† : ØªØ¹Ù„ÙŠÙ…Ø§Øª Ø§Ù„ØªØ£ÙƒÙŠØ¯ Ù„Ù…Ø«ÙŠÙ„ Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…  %{instance}'
@@ -78,5 +79,9 @@ ar:
       not_found: Ù„Ø§ ÙŠÙˆØ¬Ø¯
       not_locked: Ù„ÙŠØ³ Ù…Ù‚ÙÙ„Ø§Ù‹
       not_saved:
-        one: 'Ø®Ø·Ø£ ÙˆØ§ØØ¯ Ù…Ù†ÙŽØ¹ÙŽ %{resource} Ù…ÙÙ† Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ø§Ù„Ø¥ØØªÙØ§Ø¸ :'
-        other: "%{count} Ø£Ø®Ø·Ø§Ø¡ Ù…Ù†Ø¹Øª %{resource} Ù…ÙÙ† Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ø§Ù„Ø¥ØØªÙØ§Ø¸ :"
+        few: "%{count} Ø£Ø®Ø·Ø§Ø¡ Ù…Ù†Ø¹Øª Ù‡Ø°Ø§ %{resource} Ù…Ù† Ø§Ù„ØÙØ¸:"
+        many: "%{count} Ø£Ø®Ø·Ø§Ø¡ Ù…Ù†Ø¹Øª Ù‡Ø°Ø§ %{resource} Ù…Ù† Ø§Ù„ØÙØ¸:"
+        one: 'Ø®Ø·Ø£ ÙˆØ§ØØ¯ Ù…Ù†Ø¹ Ù‡Ø°Ø§ %{resource} Ù…Ù† Ø§Ù„ØÙØ¸:'
+        other: "%{count} Ø£Ø®Ø·Ø§Ø¡ Ù…Ù†Ø¹Øª Ù‡Ø°Ø§ %{resource} Ù…Ù† Ø§Ù„ØÙØ¸:"
+        two: 'Ø£Ø®Ø·Ø§Ø¡ Ù…Ù†Ø¹Øª Ù‡Ø°Ø§ %{resource} Ù…Ù† Ø§Ù„ØÙØ¸:'
+        zero: 'Ø£Ø®Ø·Ø§Ø¡ Ù…Ù†Ø¹Øª Ù‡Ø°Ø§ %{resource} Ù…Ù† Ø§Ù„ØÙØ¸:'
diff --git a/config/locales/devise.ast.yml b/config/locales/devise.ast.yml
new file mode 100644
index 0000000000000000000000000000000000000000..49b0c8daf4d133d9f0c3a6e2f7b5adff56308e4e
--- /dev/null
+++ b/config/locales/devise.ast.yml
@@ -0,0 +1,30 @@
+---
+ast:
+  devise:
+    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.
+      locked: La cuenta ta bloquiada.
+      timeout: La sesiÃ³n caducÃ³. Volvi aniciar sesiÃ³n pa siguir, por favor.
+      unauthenticated: Precises aniciar sesiÃ³n o rexistrate enantes de siguir.
+    mailer:
+      confirmation_instructions:
+        explanation: Creesti una cuenta en %{host} con esta direiciÃ³n de corrÃ©u. Tas a un clic d'activala. Si nun fuisti tu, inora esti corrÃ©u.
+      email_changed:
+        title: DireiciÃ³n de corrÃ©u nueva
+      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.
+    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.
+    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.
+  errors:
+    messages:
+      already_confirmed: yÃ¡ se confirmÃ³, volvi aniciar sesiÃ³n
+      not_found: nun s'alcontrÃ³
diff --git a/config/locales/devise.bg.yml b/config/locales/devise.bg.yml
index 8e1ba6eb480b5de2e06ee75b3153bb6c8211d9c7..3c04af81bbb6be9a5f018bf2c70d49aadae9c0d5 100644
--- a/config/locales/devise.bg.yml
+++ b/config/locales/devise.bg.yml
@@ -8,16 +8,16 @@ bg:
     failure:
       already_authenticated: Ð’ÐµÑ‡Ðµ ÑÐ¸ Ð²ÑŠÑ‚Ñ€Ðµ Ð² Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð° ÑÐ¸.
       inactive: ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŠÑ‚ Ñ‚Ð¸ Ð²ÑÐµ Ð¾Ñ‰Ðµ Ð½Ðµ Ðµ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°Ð½.
-      invalid: ÐÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½ Ð¸Ð¼ÐµÐ¹Ð» Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°.
+      invalid: ÐÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½ %{authentication_keys}.
       last_attempt: Ð Ð°Ð·Ð¿Ð¾Ð»Ð°Ð³Ð°Ñˆ Ñ Ð¾Ñ‰Ðµ ÐµÐ´Ð¸Ð½ Ð¾Ð¿Ð¸Ñ‚ Ð¿Ñ€ÐµÐ´Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŠÑ‚ Ñ‚Ð¸ Ð´Ð° Ð±ÑŠÐ´Ðµ Ð·Ð°ÐºÐ»ÑŽÑ‡ÐµÐ½.
       locked: ÐŸÑ€Ð¾Ñ„Ð¸Ð»ÑŠÑ‚ Ñ‚Ð¸ Ðµ Ð·Ð°ÐºÐ»ÑŽÑ‡ÐµÐ½.
-      not_found_in_database: ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¸ ÑÑ‚Ð¾Ð¹Ð½Ð¾ÑÑ‚Ð¸ Ð·Ð° %{authentication_keys} Ð¸Ð»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð°.
+      not_found_in_database: ÐÐµÐ²Ð°Ð»Ð¸Ð´ÐµÐ½ %{authentication_keys}.
       timeout: Ð¡ÐµÑÐ¸ÑÑ‚Ð° Ñ‚Ð¸ Ð¸Ð·Ñ‚ÐµÑ‡Ðµ, Ð¼Ð¾Ð»Ñ Ð²Ð»ÐµÐ· Ð¾Ñ‚Ð½Ð¾Ð²Ð¾, Ð·Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñˆ.
       unauthenticated: ÐŸÑ€ÐµÐ´Ð¸ Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñˆ, Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð²Ð»ÐµÐ·ÐµÑˆ Ð² Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð° ÑÐ¸ Ð¸Ð»Ð¸ Ð´Ð° ÑÐµ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð°Ñˆ.
       unconfirmed: ÐŸÑ€ÐµÐ´Ð¸ Ð´Ð° Ð¿Ñ€Ð¾Ð´ÑŠÐ»Ð¶Ð¸Ñˆ, Ñ‚Ñ€ÑÐ±Ð²Ð° Ð´Ð° Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ð¸Ñˆ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸ÑÑ‚Ð° ÑÐ¸.
     mailer:
       confirmation_instructions:
-        subject: 'Mastodon: Ð˜Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð·Ð° Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð¶Ð´Ð°Ð²Ð°Ð½Ðµ'
+        subject: 'Mastodon: Ð˜Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ð¸Ð¸ Ð·Ð° Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð¶Ð´Ð°Ð²Ð°Ð½Ðµ %{instance}'
       password_change:
         subject: 'Mastodon: ÐŸÐ°Ñ€Ð¾Ð»Ð°Ñ‚Ð° Ðµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð°'
       reset_password_instructions:
diff --git a/config/locales/devise.ca.yml b/config/locales/devise.ca.yml
index 808a5dd0a8ac85929966c356b6ea533cf8690c73..c41a218e14fa860852db4d90005b8c8195bf4f8d 100644
--- a/config/locales/devise.ca.yml
+++ b/config/locales/devise.ca.yml
@@ -18,9 +18,10 @@ ca:
     mailer:
       confirmation_instructions:
         action: Verifica l'adreÃ§a de correu
+        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.
         extra_html: Si us plau consulta tambÃ© <a href="%{terms_path}"> les regles de la instÃ ncia</a> i <a href="%{policy_path}"> les nostres condicions de servei</a>.
-        subject: 'Mastodon: Instruccions de confirmaciÃ³'
+        subject: 'Mastodon: Instruccions de confirmaciÃ³ %{instance}'
         title: Verifica l'adreÃ§a de correu
       email_changed:
         explanation: 'L''adreÃ§a de correu del teu compte s''estÃ  canviant a:'
diff --git a/config/locales/devise.co.yml b/config/locales/devise.co.yml
index 2471f857beb354b934b5ac09302da2339975fdbd..108a4ef11e2145eba8f578aa270ab6e944d7df4f 100644
--- a/config/locales/devise.co.yml
+++ b/config/locales/devise.co.yml
@@ -18,6 +18,7 @@ co:
     mailer:
       confirmation_instructions:
         action: VerificÃ  lâ€™indirizzu email
+        action_with_app: CunfirmÃ  Ã¨ rivene Ã  %{app}
         explanation: Avete creatu un contu nantâ€™Ã  %{host} cÃ¹ stâ€™indirizzu email. Pudete attivallu cÃ¹ un clic, o ignurÃ  quessu missaghji sâ€™ellu un era micca voi.
         extra_html: Pensate Ã  leghje <a href="%{terms_path}">e regule di lâ€™istanza</a> Ã¨ <a href="%{policy_path}">i termini dâ€™usu</a>.
         subject: 'Mastodon: Istruzzione di cunfirmazione per %{instance}'
@@ -55,7 +56,7 @@ co:
       updated: A vostra chjave dâ€™accessu hÃ¨ stata cambiata, Ã¨ site cunnettatuÂ·a.
       updated_not_active: A vostra chjave dâ€™accessu hÃ¨ stata cambiata.
     registrations:
-      destroyed: U vostru contu hÃ¨ statu sguassatu. Avvedeci!
+      destroyed: Avvedeci! U vostru contu hÃ¨ statu sguassatu. Speremu di vi rivede da prestu.
       signed_up: Benvinutu! Site cunnettatuÂ·a.
       signed_up_but_inactive: Site arregistratuÂ·a, mÃ  Ã¹n pudete micca cunnettavi perchÃ¨ u vostru contu deve esse attivatu.
       signed_up_but_locked: Site arregistratuÂ·a, mÃ  Ã¹n pudete micca cunnettavi perchÃ¨ u vostru contu hÃ¨ chjosu.
diff --git a/config/locales/devise.cs.yml b/config/locales/devise.cs.yml
index adaa40835cfff5838df111898fe72b117dbebe34..850ff1fe822f5236b775bdab4b697107df3e7b88 100644
--- a/config/locales/devise.cs.yml
+++ b/config/locales/devise.cs.yml
@@ -8,3 +8,77 @@ cs:
     failure:
       already_authenticated: JiÅ¾ jste pÅ™ihlÃ¡Å¡en/a.
       inactive: VÃ¡Å¡ ÃºÄet jeÅ¡tÄ› nenÃ aktivovÃ¡n.
+      invalid: NeplatnÃ© %{authentication_keys} nebo heslo.
+      last_attempt: MÃ¡te jeÅ¡tÄ› jeden pokus, neÅ¾ bude vÃ¡Å¡ ÃºÄet uzamÄen.
+      locked: VÃ¡Å¡ ÃºÄet je uzamÄen.
+      not_found_in_database: NeplatnÃ© %{authentication_keys} nebo heslo.
+      timeout: VaÅ¡e relace vyprÅ¡ela. Pro pokraÄovÃ¡nÃ se prosÃm pÅ™ihlaste znovu.
+      unauthenticated: PÅ™ed pokraÄovÃ¡nÃm se musÃte pÅ™ihlÃ¡sit nebo registrovat.
+      unconfirmed: PÅ™ed pokraÄovÃ¡nÃm musÃte potvrdit svÅ¯j e-mail.
+    mailer:
+      confirmation_instructions:
+        action: Potvrdit e-mailovou adresu
+        action_with_app: Potvrdit a navrÃ¡tit se do %{app}
+        explanation: S touto e-mailovou adresou jste si vytvoÅ™il/a ÃºÄet na %{host}. K jeho aktivaci vÃ¡m zbÃ½vÃ¡ jedno kliknutÃ. Pokud jste to nebyl/a vy, ignorujte tÃ©to e-mail.
+        extra_html: ProsÃm podÃvejte se takÃ© na <a href="%{terms_path}">pravidla tÃ©to instance</a> a <a href="%{policy_path}">naÅ¡e podmÃnky pouÅ¾ÃvÃ¡nÃ</a>.
+        subject: 'Mastodon: PotvrzovacÃ instrukce pro %{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-mail nezmÄ›nil/a, je pravdÄ›podobnÃ©, Å¾e nÄ›kdo jinÃ½ zÃskal pÅ™Ãstup k vaÅ¡emu ÃºÄtu. ProsÃm zmÄ›Åˆte si okamÅ¾itÄ› heslo, nebo, pokud se nemÅ¯Å¾ete na ÃºÄet pÅ™ihlÃ¡sit, kontaktujte administrÃ¡tora instance.
+        subject: 'Mastodon: E-mail byl zmÄ›nÄ›n'
+        title: NovÃ¡ e-mailovÃ¡ adresa
+      password_change:
+        explanation: Heslo k vaÅ¡emu ÃºÄtu bylo zmÄ›nÄ›no.
+        extra: Pokud jste si heslo nezmÄ›nil/a, je pravdÄ›podobnÃ©, Å¾e nÄ›kdo jinÃ½ zÃskal pÅ™Ãstup k vaÅ¡emu ÃºÄtu. ProsÃm zmÄ›Åˆte si okamÅ¾itÄ› heslo, nebo, pokud se nemÅ¯Å¾ete na ÃºÄet pÅ™ihlÃ¡sit, kontaktujte administrÃ¡tora instance.
+        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.
+        extra: Pokud jste tuto zmÄ›nu nevyÅ¾Ã¡dal/a vy, prosÃm ignorujte tento e-mail. E-mailovÃ¡ adresa nebude zmÄ›nÄ›na, dokud nepÅ™ejdete na vÃ½Å¡e uvedenou adresu.
+        subject: 'Mastodon: PotvrÄte e-mail pro %{instance}'
+        title: OvÄ›Å™it e-mailovou adresu
+      reset_password_instructions:
+        action: ZmÄ›nit heslo
+        explanation: VyÅ¾Ã¡dal/a jste si pro svÅ¯j ÃºÄet novÃ© heslo.
+        extra: Pokud jste tohle nevyÅ¾Ã¡dal/a, prosÃm ignorujte tento e-mail. VaÅ¡e heslo nebude zmÄ›nÄ›no, dokud nepÅ™ejdete na vÃ½Å¡e uvedenou adresu a nevytvoÅ™Ãte si novÃ©.
+        subject: 'Mastodon: Instrukce pro obnovu hesla'
+        title: ObnovenÃ hesla
+      unlock_instructions:
+        subject: 'Mastodon: Instrukce pro odemÄenÃ ÃºÄtu'
+    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 obnovu hesla. Pokud jste z nÄ›j pÅ™iÅ¡el/la, ujistÄ›te se, Å¾e jste pouÅ¾il/a celÃ© URL z e-mailu.
+      send_instructions: Pokud vaÅ¡e e-mailovÃ¡ adresa existuje v naÅ¡Ã databÃ¡zi, obdrÅ¾Ãte za pÃ¡r minut ve vaÅ¡em e-mailu odkaz pro obnovenÃ hesla. ProsÃm zkontrolujte si sloÅ¾ku spam, jestli jste tento e-mail neobdrÅ¾el/a.
+      send_paranoid_instructions: Pokud vaÅ¡e e-mailovÃ¡ adresa existuje v naÅ¡Ã databÃ¡zi, obdrÅ¾Ãte za pÃ¡r minut ve vaÅ¡em e-mailu odkaz pro obnovenÃ hesla. ProsÃm zkontrolujte si sloÅ¾ku spam, jestli jste tento e-mail neobdrÅ¾el/a.
+      updated: VaÅ¡e heslo bylo ÃºspÄ›Å¡nÄ› zmÄ›nÄ›no. NynÃ jste pÅ™ihlÃ¡Å¡en/a.
+      updated_not_active: VaÅ¡e heslo bylo ÃºspÄ›Å¡nÄ› zmÄ›nÄ›no.
+    registrations:
+      destroyed: Sbohem! VÃ¡Å¡ ÃºÄet byl ÃºspÄ›Å¡nÄ› zruÅ¡en. DoufÃ¡me, Å¾e vÃ¡s opÄ›t brzy uvidÃme.
+      signed_up: VÃtejte! Registroval/a jste se ÃºspÄ›Å¡nÄ›.
+      signed_up_but_inactive: Registroval/a jste se ÃºspÄ›Å¡nÄ›. Nemohli jsme vÃ¡s vÅ¡ak pÅ™ihlÃ¡sit, protoÅ¾e vÃ¡Å¡ ÃºÄet jeÅ¡tÄ› nenÃ aktivovÃ¡n.
+      signed_up_but_locked: Registroval/a jste se ÃºspÄ›Å¡nÄ›. Nemohli jsme vÃ¡s vÅ¡ak pÅ™ihlÃ¡sit, protoÅ¾e vÃ¡Å¡ ÃºÄet je uzamÄen.
+      signed_up_but_unconfirmed: Na vaÅ¡i e-mailovou adresu byla poslÃ¡na zprÃ¡va s potvrzovacÃm odkazem. Pro aktivaci ÃºÄtu pÅ™ejdÄ›te na danou adresu. ProsÃm zkontrolujte si sloÅ¾ku spam, jestli jste tento e-mail neobdrÅ¾el/a.
+      update_needs_confirmation: VÃ¡Å¡ ÃºÄet byl ÃºspÄ›Å¡nÄ› aktualizovÃ¡n, ale je potÅ™eba ovÄ›Å™it vaÅ¡i novou e-mailovou adresu. ProsÃm zkontrolujte si e-mail a kliknÄ›te na odkaz pro potvrzenÃ vaÅ¡i novÃ© e-mailovÃ© adresy. ProsÃm zkontrolujte si sloÅ¾ku spam, jestli jste tento e-mail neobdrÅ¾el/a.
+      updated: VÃ¡Å¡ ÃºÄet byl ÃºspÄ›Å¡nÄ› aktualizovÃ¡n.
+    sessions:
+      already_signed_out: OdhlÃ¡Å¡enÃ probÄ›hlo ÃºspÄ›Å¡nÄ›.
+      signed_in: PÅ™ihlÃ¡Å¡enÃ probÄ›hlo ÃºspÄ›Å¡nÄ›.
+      signed_out: OdhlÃ¡Å¡enÃ probÄ›hlo ÃºspÄ›Å¡nÄ›.
+    unlocks:
+      send_instructions: Za pÃ¡r minut obdrÅ¾Ãte e-mail s instrukcemi pro odemÄenÃ vaÅ¡eho ÃºÄtu. ProsÃm zkontrolujte si sloÅ¾ku spam, jestli jste tento e-mail neobdrÅ¾el/a.
+      send_paranoid_instructions: Pokud vÃ¡Å¡ ÃºÄet existuje, obdrÅ¾Ãte za pÃ¡r minut e-mail s instrukcemi pro odemÄenÃ vaÅ¡eho ÃºÄtu. ProsÃm zkontrolujte si sloÅ¾ku spam, jestli jste tento e-mail neobdrÅ¾el/a.
+      unlocked: VÃ¡Å¡ ÃºÄet byl ÃºspÄ›Å¡nÄ› odemÄen. Pro pokraÄovÃ¡nÃ se prosÃm pÅ™ihlaste.
+  errors:
+    messages:
+      already_confirmed: byl jiÅ¾ potvrzen, prosÃm zkuste se pÅ™ihlÃ¡sit
+      confirmation_period_expired: musÃ bÃ½t potvrzen do %{period}, prosÃm vyÅ¾Ã¡dejte si novÃ½
+      expired: vyprÅ¡el, prosÃm vyÅ¾Ã¡dejte si novÃ½
+      not_found: nenalezen
+      not_locked: nebyl uzamÄen
+      not_saved:
+        few: "%{count} chyby zabrÃ¡nily 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
new file mode 100644
index 0000000000000000000000000000000000000000..7d96e57f9b70035d6ba5d78ec85e0d18470f81c9
--- /dev/null
+++ b/config/locales/devise.cy.yml
@@ -0,0 +1,80 @@
+---
+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.
+    failure:
+      already_authenticated: Yr ydych wedi mewngofnodi yn barod.
+      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.
+      locked: Mae eich cyfrif wedi ei gloi.
+      not_found_in_database: "%{authentication_keys} neu gyfrinair annilys."
+      timeout: Mae eich sesiwn wedi dod i ben. Mewngofnodwch eto i barhau.
+      unauthenticated: Mae angen i chi fewngofnodi neu gofrestru cyn parhau.
+      unconfirmed: Mae rhaid i chi gadarnhau eich cyfeiriad e-bost cyn parhau.
+    mailer:
+      confirmation_instructions:
+        action: Gwiriwch eich cyfeiriad e-bost
+        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.
+        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}'
+        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'
+        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'
+        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}'
+        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.
+        subject: 'Mastodon: Ailosod cyfarwyddiadau cyfrinair'
+        title: Ailosod cyfrinair
+      unlock_instructions:
+        subject: 'Mastodon: Cyfarwyddiadau datgloi'
+    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.
+      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.
+      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_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.
+      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:
+      already_signed_out: Allgofnodwyd yn llwyddiannus.
+      signed_in: Mewngofnodwyd yn llwyddiannus.
+      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.
+      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
+      not_found: heb ei ganfod
+      not_locked: heb ei gloi
+      not_saved: 'Gwaharddwyd yr %{resource} rhag cael ei arbed oherwydd %{count} gwall:'
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
index 7c6ac8b195713ea78370339deaea9b65dada5a06..56ae5183bf396c29357df8125c5dc6d2e899f043 100644
--- a/config/locales/devise.da.yml
+++ b/config/locales/devise.da.yml
@@ -4,6 +4,7 @@ da:
     confirmations:
       confirmed: Din email adresse er blevet succesfuldt bekrÃ¦ftet.
       send_instructions: Du vil modtage en mail med instrukser for hvordan du bekrÃ¦fter din email adresse om fÃ¥ minutter. Tjek venligst din spam mappe hvis du ikke har modtaget denne email.
+      send_paranoid_instructions: Hvis din email adresse allerede findes i vores database, vil du modtage en email med instrukser for hvordan du bekrÃ¦fter din email adresse om fÃ¥ minutter. Tjek gerne din spam mappe hvis du ikke modtager denne email.
     failure:
       already_authenticated: Du er allerede logget ind.
       inactive: Din konto er endnu ikke aktiveret.
@@ -17,7 +18,9 @@ da:
     mailer:
       confirmation_instructions:
         action: BekrÃ¦ft email adresse
+        action_with_app: BekrÃ¦ft og vend tilbage til %{app}
         explanation: Du har oprettet en konto pÃ¥ %{host} med denne email adresse. Du er et klik fra at aktivere din konto. Hvis du ikke har oprettet dig, ignorer venligst denne email.
+        extra_html: Tjek ogsÃ¥ <a href="%{terms_path}">reglerne for instansen</a> og <a href="%{policy_path}">vores betingelser</a>.
         subject: 'Mastodon: BekrÃ¦ftelses instrukser for %{instance}'
         title: BekrÃ¦ft email adresse
       email_changed:
@@ -32,14 +35,33 @@ da:
         title: Kodeordet er blevet Ã¦ndret
       reconfirmation_instructions:
         explanation: BekrÃ¦ft den nye adresse for at Ã¦ndre din email.
+        extra: Hvis denne Ã¦ndring ikke blev foretaget af dig, ignorer denne email. Email adressen for denne Mastodon konto vil ikke blive Ã¦ndret fÃ¸r du fÃ¸lger linket foroven.
         subject: 'Mastodon: BekrÃ¦ft email for %{instance}'
         title: BekrÃ¦ft email adresse
       reset_password_instructions:
         action: Ã†ndre kodeord
-        explanation: Du anmodede om et nyt kodeord for din konto.
+        explanation: Du anmodede om en ny adgangskode for din konto.
+        extra: Hvis du ikke har anmodet om dette, ignorer denne email. Din adgangskode vil ikke blive Ã¦ndret fÃ¸r du har fulgt linket foroven og oprettet en ny.
+        subject: 'Mastodon: Instrukser for nulstilling af adgangskode'
         title: Kodeordet er blevet nulstillet
+      unlock_instructions:
+        subject: 'Mastodon: Instruktioner for oplÃ¥sning'
+    omniauth_callbacks:
+      failure: Kunne ikke godkende dig fra %{kind} fordi "%{reason}".
+      success: Godkendelse fra %{kind} konto lykkedes.
+    passwords:
+      no_token: Du kan ikke tilgÃ¥ denne side uden at komme fra en email om nulstilling af adgangskode. Hvis du kommer fra en email om nulstilling af adgangskode, tjek om du brugte det fulde link der blev angivet.
+      send_instructions: Hvis din email adresse allerede findes i vores database, vil du modtage et link til nulstilling af adgangskode til din email adresse om fÃ¥ minutter. Tjek din spam mappe hvis du ikke har modtaget denne email.
+      send_paranoid_instructions: Hvis din email adresse allerede findes i vores database, vil du modtage et link til nulstilling af adgangskode til din email adresse om fÃ¥ minutter. Tjek din spam mappe hvis du ikke har modtaget denne email.
+      updated: Din adgangskode er nu blevet Ã¦ndret. Du er nu logget ind.
+      updated_not_active: Din adgangskode blev Ã¦ndret.
     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. Vi kunne dog ikke logge dig ind da din konto endnu ikke er aktiveret.
+      signed_up_but_locked: Du har nu oprettet dig. Vi kunne dog ikke logge dig ind da din konto er lÃ¥st.
+      signed_up_but_unconfirmed: En besked med et bekrÃ¦ftelses link er nu blevet sendt til din email adresse. FÃ¸lg linket for at aktivere din konti. Tjek din spam mappe hvis du ikke har modtaget denne email.
+      update_needs_confirmation: Du har succesfuldt opdateret din konto, men vi er nÃ¸dt til at bekrÃ¦fte din email adresse. Tjek venligst din email og fÃ¸lg bekrÃ¦ftelses linket for at bekrÃ¦fte din nye email adresse. Tjek venligst din spam mappe hvis du ikke har modtaget denne email.
       updated: Din konto er nu blevet opdateret.
     sessions:
       already_signed_out: Du er nu logget ud.
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index 0d33af6f1a7622b431eed45b2e937025a10f32ec..fc41c9db51a67a178c4b0a2819c6ed90adf76185 100644
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -18,6 +18,7 @@ de:
     mailer:
       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 nun einen Klick entfernt vor der Aktivierung. Wenn du das nicht warst, kannst du diese E-Mail ignorieren.
         extra_html: Bitte lies auch die <a href="%{terms_path}">Regeln dieser Instanz</a> und <a href="%{policy_path}">unsere Nutzungsbedingungen</a>.
         subject: 'Mastodon: BestÃ¤tigung deines Kontos bei %{instance}'
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 523d1fb88bf7c06fa1fd06e09aed6bfd14a6d4ec..e9725d96b968f6c2f9e06f3e33470566c69b863e 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -18,6 +18,7 @@ el:
     mailer:
       confirmation_instructions:
         action: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎµ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email
+        action_with_app: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ· ÎºÎ±Î¹ ÎµÏ€Î¹ÏƒÏ„ÏÎ¿Ï†Î® ÏƒÏ„Î¿ %{app}
         explanation: Î”Î·Î¼Î¹Î¿ÏÏÎ³Î·ÏƒÎµÏ‚ ÎÎ½Î±Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÏ„Î¿ %{host} Î¼Îµ Î±Ï…Ï„Î® Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email. ÎœÎµ ÎÎ½Î± ÎºÎ»Î¹Îº Î¸Î± Ï„Î¿Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚. Î‘Î½ Î´ÎµÎ½ Ï„Î¿ ÎÎºÎ±Î½ÎµÏ‚ ÎµÏƒÏ, Ï€Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î±Î³Î½ÏŒÎ·ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ email.
         extra_html: Î Î±ÏÎ±ÎºÎ±Î»Î¿ÏÎ¼Îµ Î½Î± Î´Î¹Î±Î²Î¬ÏƒÎµÎ¹Ï‚ <a href="%{terms_path}">Ï„Î¿Ï… ÎºÎ±Î½ÏŒÎ½ÎµÏ‚ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï…</a> ÎºÎ±Î¹ <a href="%{policy_path}">Ï„Î¿Ï…Ï‚ ÏŒÏÎ¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ Î¼Î±Ï‚</a>.
         subject: 'Mastodon: ÎŸÎ´Î·Î³Î¯ÎµÏ‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚ Î³Î¹Î± %{instance}'
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 20938e47b6421b0b0223eadb37fdd1978f5059aa..bd0642b25169809a8ea161321bdae3869795ddeb 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -18,6 +18,7 @@ en:
     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.
         extra_html: Please also check out <a href="%{terms_path}">the rules of the instance</a> and <a href="%{policy_path}">our terms of service</a>.
         subject: 'Mastodon: Confirmation instructions for %{instance}'
diff --git a/config/locales/devise.eu.yml b/config/locales/devise.eu.yml
index 8905822a744cb1fd3068eaba594e5688bf736e91..9893f5ba32564701457fd9729f9e63dae7729ed2 100644
--- a/config/locales/devise.eu.yml
+++ b/config/locales/devise.eu.yml
@@ -18,6 +18,7 @@ eu:
     mailer:
       confirmation_instructions:
         action: Baieztatu e-mail helbidea
+        action_with_app: Berretsi eta itzuli %{app} aplikaziora
         explanation: Kontu bat sortu duzu %{host} ostalarian e-mail helbide honekin. Aktibatzeko klik bat falta zaizu. Ez baduzu zuk sortu, ez egin ezer e-mail honekin.
         extra_html: Egiaztatu <a href="%{terms_path}">instantziaren arauak</a> eta <a href="%{policy_path}">zerbitzuaren erabilera baldintzak</a>.
         subject: 'Mastodon: %{instance} instantziaren argibideak baieztapenerako'
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 7e10f83b4b257db9f9971715499919a1c2ab8dd0..718b4056e70b95eefaf459c7f8b8caa9942255b7 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -8,39 +8,40 @@ fr:
     failure:
       already_authenticated: Vous Ãªtes dÃ©jÃ  connectÃ©â‹…e.
       inactive: Votre compte nâ€™est pas encore activÃ©.
-      invalid: Courriel ou mot de passe incorrect.
+      invalid: "%{authentication_keys} invalide."
       last_attempt: Vous avez droit Ã  une tentative avant que votre compte ne soit verrouillÃ©.
       locked: Votre compte est verrouillÃ©.
-      not_found_in_database: Courriel ou mot de passe invalide.
+      not_found_in_database: "%{authentication_keys} invalide."
       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 compte pour continuer.
     mailer:
       confirmation_instructions:
-        action: VÃ©rifier l'adresse courriel
-        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, veuillez ignorer ce courriel.
-        extra_html: S'il vous plaÃ®t, consultez Ã©galement <a href="%{terms_path}"> 1les rÃ¨gles de l'instance</a> 2 et <a href="%{policy_path}">3nos termes de service</a> 4.
+        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, veuillez ignorer ce courriel.
+        extra_html: Merci de consultez Ã©galement <a href="%{terms_path}">les rÃ¨gles de lâ€™instance</a> et <a href="%{policy_path}">nos conditions dâ€™utilisation</a>.
         subject: Merci de confirmer votre inscription sur %{instance}
-        title: VÃ©rifier l'adresse courriel
+        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 de l'instance si vous Ãªtes bloquÃ© hors de votre compte.
+        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 de lâ€™instance 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 de l'instance 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 de lâ€™instance si vous Ãªtes bloquÃ©Â·e hors de votre compte.
         subject: Votre mot de passe a Ã©tÃ© modifiÃ© avec succÃ¨s
         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 : Confirmez l''email pour %{instance}'
-        title: VÃ©rifier l'adresse 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 : Confirmez lâ€™adresse pour %{instance}'
+        title: VÃ©rifier lâ€™adresse courriel
       reset_password_instructions:
         action: Modifier le mot de passe
         explanation: Vous avez demandÃ© un nouveau mot de passe pour votre compte.
-        extra: Si vous ne l'avez pas demandÃ©, veuillez ignorer ce courriel. Votre mot de passe ne changera pas tant que vous n'aurez pas cliquÃ© sur le lien ci-dessus et que vous n'en aurez pas crÃ©Ã© un nouveau.
+        extra: Si vous ne lâ€™avez pas demandÃ©, veuillez ignorer ce courriel. Votre mot de passe ne changera pas tant que vous nâ€™aurez pas cliquÃ© sur le lien ci-dessus et que vous nâ€™en aurez pas crÃ©Ã© un nouveau.
         subject: Instructions pour changer votre mot de passe
         title: RÃ©initialisation du mot de passe
       unlock_instructions:
diff --git a/config/locales/devise.gl.yml b/config/locales/devise.gl.yml
index a8fe6a2a5b8f0d1b1fcc91c35d23dc39e405aeb2..9f60747a6a1f43eed850adf5217c75d12deae063 100644
--- a/config/locales/devise.gl.yml
+++ b/config/locales/devise.gl.yml
@@ -18,6 +18,7 @@ gl:
     mailer:
       confirmation_instructions:
         action: Validar enderezo de correo-e
+        action_with_app: Confirmar e voltar a %{app}
         explanation: Creou unha conta en %{host} con este enderezo de correo. EstÃ¡ a punto de activalo, si non foi vostede quen fixo a peticiÃ³n, por favor ignore este correo.
         extra_html: Por favor, lea tamÃ©n <a href="%{terms_path}">as normas da instancia</a> e <a href="%{policy_path}">os termos do servizo</a>.
         subject: 'Mastodon: InstrucciÃ³ns de confirmaciÃ³n para %{instance}'
diff --git a/config/locales/devise.he.yml b/config/locales/devise.he.yml
index 4a2811b1fdbe901b88616be21a17e020865b0bc8..3d8f7fa59b64931bb5a781e97274831f36b5c28b 100644
--- a/config/locales/devise.he.yml
+++ b/config/locales/devise.he.yml
@@ -17,7 +17,7 @@ he:
       unconfirmed: ×™×© ×œ××ž×ª ××ª ×›×ª×•×‘×ª ×”×“×•×"×œ ×¢×œ ×ž× ×ª ×œ×”×ž×©×™×š.
     mailer:
       confirmation_instructions:
-        subject: '×ž×¡×˜×•×“×•×Ÿ: ×”×•×¨××•×ª ××™×ž×•×ª'
+        subject: '×ž×¡×˜×•×“×•×Ÿ: ×”×•×¨××•×ª ××™×ž×•×ª %{instance}'
       password_change:
         subject: '×ž×¡×˜×•×“×•×Ÿ: ×”×¡×™×¡×ž× ×©×•× ×ª×”'
       reset_password_instructions:
diff --git a/config/locales/devise.hr.yml b/config/locales/devise.hr.yml
index d578e404f6472f2481c5256c92d9acddc97ce009..2a859054a66ae19a260efc55c156c7acc523e9a4 100644
--- a/config/locales/devise.hr.yml
+++ b/config/locales/devise.hr.yml
@@ -8,7 +8,7 @@ hr:
       invalid: Nevaljan %{authentication_keys} ili lozinka.
       last_attempt: ImaÅ¡ joÅ¡ jedan pokuÅ¡aj prije no Å¡to ti se raÄun zakljuÄa.
       locked: Tvoj raÄun je zakljuÄan.
-      not_found_in_database: Nevaljani %{authentication_keys} ili lozinka.
+      not_found_in_database: Nevaljan %{authentication_keys} ili lozinka.
       send_instructions: Primit Ä‡eÅ¡ email sa uputama kako potvrditi  svoju email adresu za nekoliko minuta.
       send_paranoid_instructions: Ako tvoja email adresa postoji u naÅ¡oj bazi podataka, primit Ä‡eÅ¡ email sa uputama kako ju potvrditi za nekoliko minuta.
       timeout: Tvoja sesija je istekla. Molimo te, prijavi se ponovo kako bi nastavio.
@@ -16,7 +16,7 @@ hr:
       unconfirmed: MoraÅ¡ potvrditi svoju email adresu prije no Å¡to nastaviÅ¡.
     mailer:
       confirmation_instructions:
-        subject: 'Mastodon: Upute za potvrÄ‘ivanje'
+        subject: 'Mastodon: Upute za potvrÄ‘ivanje %{instance}'
       email_changed:
         subject: 'Mastodon: Email adresa je promijenjena'
         title: Nova email adresa
@@ -58,6 +58,4 @@ hr:
       expired: je istekao, zatraÅ¾i novu
       not_found: nije naÄ‘en
       not_locked: nije zakljuÄan
-      not_saved:
-        one: '1 greÅ¡ka je zabranila da ovaj %{resource} bude saÄuvan:'
-        other: "%{count} greÅ¡ke su zabranile da ovaj %{resource} bude saÄuvan:"
+      not_saved: "%{count} greÅ¡ke su zabranile da ovaj %{resource} bude saÄuvan:"
diff --git a/config/locales/devise.hu.yml b/config/locales/devise.hu.yml
index 79ee3b194e97cab811d186f20c9427771027ac53..67baca0167ddb826428fe4de84ed9d093be681cb 100644
--- a/config/locales/devise.hu.yml
+++ b/config/locales/devise.hu.yml
@@ -20,7 +20,7 @@ hu:
         action: ErÅ‘sÃtsd meg az e-mail cÃmedet
         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Ã³kdat aktivÃ¡ljuk. Ha a regisztrÃ¡ciÃ³t 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}">az instancia szabÃ¡lyzatÃ¡t</a> Ã©s <a href="%{policy_path}">a felhasznÃ¡lÃ¡si feltÃ©teleket</a>.
-        subject: 'Mastodon: MegerÅ‘sÃtÃ©si lÃ©pÃ©sek'
+        subject: 'Mastodon: MegerÅ‘sÃtÃ©si lÃ©pÃ©sek %{instance}'
         title: E-mail cÃm megerÅ‘sÃtÃ©se
       email_changed:
         explanation: 'A fiÃ³kodhoz tartozÃ³ e-mail cÃmet az alÃ¡bbira mÃ³dosÃtod:'
diff --git a/config/locales/devise.io.yml b/config/locales/devise.io.yml
index 6ba3038bdb00a901215506e96216b0a220e03e85..fce061a651fc9f658e98353a375a373d63b24704 100644
--- a/config/locales/devise.io.yml
+++ b/config/locales/devise.io.yml
@@ -8,16 +8,16 @@ io:
     failure:
       already_authenticated: Tu ya esas enirinta.
       inactive: Tua konto ankore ne konfirmesas.
-      invalid: Nejusta retpost-adreso o pasvorto.
+      invalid: Nejusta %{authentication_keys}.
       last_attempt: Tu ankore povas probar unfoye ante ke tua konto esos extingita.
       locked: Tua konto esas extingita.
-      not_found_in_database: Nejusta retpost-adreso o pasvorto.
+      not_found_in_database: Nejusta %{authentication_keys}.
       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:
-        subject: Instrucioni por konfirmar
+        subject: Instrucioni por konfirmar %{instance}
       password_change:
         subject: Tua pasvorto chanjesis senprobleme.
       reset_password_instructions:
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 0c5d8963c9eb0d5ebd0a03d5816a904cde43387d..30266e46bdd4abbe4db811fb9adf1ffcd2dcbcd2 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -18,6 +18,7 @@ it:
     mailer:
       confirmation_instructions:
         action: Verifica indirizzo email
+        action_with_app: Conferma e torna a %{app}
         explanation: Hai creato un account su %{host} con questo indirizzo email. Sei lonatno solo un clic dall'attivarlo. Se non sei stato tu, per favore ignora questa email.
         extra_html: Per favore controlla<a href="%{terms_path}">le regole dell'istanza</a> e <a href="%{policy_path}">i nostri termini di servizio</a>.
         subject: 'Mastodon: Istruzioni di conferma per %{instance}'
diff --git a/config/locales/devise.ja.yml b/config/locales/devise.ja.yml
index 1f6395479ac0f8835cc555b9b8dbf039cf4b3f1f..cae76d49385f5ebca38151d84522b841acf5a4c5 100644
--- a/config/locales/devise.ja.yml
+++ b/config/locales/devise.ja.yml
@@ -18,9 +18,10 @@ ja:
     mailer:
       confirmation_instructions:
         action: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç¢ºèª
+        action_with_app: ç¢ºèªã— %{app} ã«æˆ»ã‚‹
         explanation: ã“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã§%{host}ã«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ä½œæˆã—ã¾ã—ãŸã€‚æœ‰åŠ¹ã«ã™ã‚‹ã¾ã§ã‚ã¨ä¸€æ©ã§ã™ã€‚ã‚‚ã—å¿ƒå½“ãŸã‚ŠãŒãªã„å ´åˆã€ç”³ã—è¨³ã‚ã‚Šã¾ã›ã‚“ãŒã“ã®ãƒ¡ãƒ¼ãƒ«ã‚’ç„¡è¦–ã—ã¦ãã ã•ã„ã€‚
         extra_html: ã¾ãŸ <a href="%{terms_path}">ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ãƒ«ãƒ¼ãƒ«</a> ã¨ <a href="%{policy_path}">åˆ©ç”¨è¦ç´„</a> ã‚‚ãŠèªã¿ãã ã•ã„ã€‚
-        subject: 'Mastodon: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç¢ºèª'
+        subject: 'Mastodon: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç¢ºèª %{instance}'
         title: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç¢ºèª
       email_changed:
         explanation: 'ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«å¤‰æ›´ã•ã‚Œã¾ã™:'
diff --git a/config/locales/devise.ka.yml b/config/locales/devise.ka.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3267eb22ebdfdf297c2d30c823c5d779f638e635
--- /dev/null
+++ b/config/locales/devise.ka.yml
@@ -0,0 +1,82 @@
+---
+ka:
+  devise:
+    confirmations:
+      confirmed: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ“áƒ.
+      send_instructions: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ‘áƒ— áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒáƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ— áƒ—áƒ£ áƒ áƒáƒ’áƒáƒ áƒª áƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ áƒ áƒáƒ›áƒ“áƒ”áƒœáƒ˜áƒ›áƒ” áƒ¬áƒ£áƒ—áƒ¨áƒ˜. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒ®áƒ”áƒ“áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒžáƒáƒ›áƒ˜áƒ¡ áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ¡ áƒ—áƒ£ áƒáƒ  áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ‘áƒ— áƒáƒ› áƒ¬áƒ”áƒ áƒ˜áƒšáƒ¡.
+      send_paranoid_instructions: áƒ—áƒ£ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ¡ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒáƒ¨áƒ˜, áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ‘áƒ— áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒáƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ— áƒ—áƒ£ áƒ áƒáƒ’áƒáƒ áƒª áƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ áƒ áƒáƒ›áƒ“áƒ”áƒœáƒ˜áƒ›áƒ” áƒ¬áƒ£áƒ—áƒ¨áƒ˜. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒ®áƒ”áƒ“áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒžáƒáƒ›áƒ˜áƒ¡ áƒ¤áƒáƒšáƒ“áƒ”áƒ áƒ¡ áƒ—áƒ£ áƒáƒ  áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ‘áƒ— áƒáƒ› áƒ¬áƒ”áƒ áƒ˜áƒšáƒ¡.
+    failure:
+      already_authenticated: áƒ£áƒ™áƒ•áƒ” áƒ¨áƒ”áƒ¡áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—.
+      inactive: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒ¯áƒ”áƒ  áƒáƒ áƒáƒ áƒáƒ¥áƒ¢áƒ˜áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜.
+      invalid: áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ %{authentication_keys} áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜.
+      last_attempt: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ©áƒáƒ™áƒ”áƒ¢áƒ•áƒáƒ›áƒ“áƒ” áƒ“áƒáƒ’áƒ áƒ©áƒáƒ— áƒ™áƒ˜áƒ“áƒ”áƒ• áƒ”áƒ áƒ—áƒ˜ áƒ›áƒªáƒ“áƒ”áƒšáƒáƒ‘áƒ.
+      locked: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒ©áƒáƒ˜áƒ™áƒ”áƒ¢áƒ.
+      not_found_in_database: áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ %{authentication_keys} áƒáƒœ áƒžáƒáƒ áƒáƒšáƒ˜.
+      timeout: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ”áƒ¡áƒ˜áƒáƒ¡ áƒ’áƒáƒ£áƒ•áƒ˜áƒ“áƒ áƒ•áƒáƒ“áƒ. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ¨áƒ”áƒ“áƒ˜áƒ— áƒáƒ®áƒšáƒ˜áƒ“áƒáƒœ áƒ áƒáƒ› áƒ’áƒáƒáƒ’áƒ áƒ«áƒ”áƒšáƒáƒ—.
+      unauthenticated: áƒ’áƒáƒ’áƒ áƒ«áƒ”áƒšáƒ”áƒ‘áƒáƒ›áƒ“áƒ” áƒ¡áƒáƒáƒ˜áƒ áƒáƒ áƒ¨áƒ”áƒ®áƒ•áƒ˜áƒ“áƒ”áƒ— áƒáƒœ áƒ“áƒáƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ“áƒ”áƒ—.
+      unconfirmed: áƒ’áƒáƒ’áƒ áƒ«áƒ”áƒšáƒ”áƒ‘áƒáƒ›áƒ“áƒ” áƒ¡áƒáƒáƒ˜áƒ áƒáƒ áƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ.
+    mailer:
+      confirmation_instructions:
+        action: áƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ— áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜
+        explanation: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒ› áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒ¨áƒ”áƒ¥áƒ›áƒ”áƒœáƒ˜áƒ— %{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: áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ
+      unlock_instructions:
+        subject: 'áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜: áƒ©áƒáƒ™áƒ”áƒ¢áƒ•áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜'
+    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_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: "%{resource} áƒ•áƒ”áƒ  áƒ“áƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ“áƒ %{count} áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ˜áƒ¡ áƒ’áƒáƒ›áƒ:"
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index b21798debee5937ea33645612047999408e0f1c8..a768d3c1d2a4429eb87309575608c230c63f80a8 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -8,17 +8,18 @@ nl:
     failure:
       already_authenticated: Je bent al ingelogd.
       inactive: Jouw account is nog niet geactiveerd.
-      invalid: Ongeldig e-mailadres of wachtwoord.
+      invalid: "%{authentication_keys} of wachtwoord ongeldig."
       invalid_token: Ongeldige bevestigingscode.
       last_attempt: Je hebt nog Ã©Ã©n poging over voordat jouw account wordt opgeschort.
       locked: Jouw account is opgeschort.
-      not_found_in_database: Ongeldig e-mailadres of wachtwoord.
+      not_found_in_database: "%{authentication_keys} of wachtwoord ongeldig."
       timeout: Jouw sessie is verlopen, log opnieuw in.
       unauthenticated: Je dient in te loggen of te registreren.
       unconfirmed: Je dient eerst jouw account te bevestigen.
     mailer:
       confirmation_instructions:
         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.
         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}'
@@ -47,8 +48,8 @@ nl:
       unlock_instructions:
         subject: 'Mastodon: Instructies om opschorten account ongedaan te maken'
     omniauth_callbacks:
-      failure: Kon je niet aanmelden met jouw %{kind} account, omdat "%{reason}".
-      success: Successvol aangemeld met jouw %{kind} account.
+      failure: Kon je niet inloggen met jouw %{kind} account, omdat "%{reason}".
+      success: Succesvol met jouw %{kind} account ingelogd.
     passwords:
       no_token: Je kunt deze pagina niet benaderen zonder dat je een e-mail om je wachtwoord opnieuw in te stellen hebt ontvangen.
       send_instructions: Je ontvangt via e-mail instructies hoe je jouw wachtwoord opnieuw moet instellen. Kijk tussen je spam wanneer niks werd ontvangen.
diff --git a/config/locales/devise.no.yml b/config/locales/devise.no.yml
index ca16c6ba504ddbc00143502e48d5c2b647c25c27..222a91aa30ee070d1b3042e67efb83c590d44fe3 100644
--- a/config/locales/devise.no.yml
+++ b/config/locales/devise.no.yml
@@ -20,7 +20,7 @@
         action: Bekreft e-postadresse
         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.
         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'
+        subject: 'Mastodon: Instruksjoner for Ã¥ bekrefte e-postadresse %{instance}'
         title: Bekreft e-postadresse
       email_changed:
         explanation: 'E-postadressen til din konto endres til:'
diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml
index 06617af3402bc291184cd852e07b9e39cabc8a9b..99809b8585c6ce6f6b0ffd357041ce11838be492 100644
--- a/config/locales/devise.oc.yml
+++ b/config/locales/devise.oc.yml
@@ -8,16 +8,17 @@ oc:
     failure:
       already_authenticated: SÃ¨tz ja connectat.
       inactive: VÃ²stre compte es pas encara activat.
-      invalid: CorriÃ¨l o senhal invalid.
+      invalid: "%{authentication_keys} invalida."
       last_attempt: Vos demÃ²ra un ensag abans que vÃ²stre compte siasque blocat.
       locked: VÃ²stre compte es blocat.
-      not_found_in_database: CorriÃ¨l o senhal invalid.
+      not_found_in_database: "%{authentication_keys} invalida."
       timeout: VÃ²stra session a expirat. MercÃ©s de vos tornar connectar per contunhar.
       unauthenticated: Vos cal vos connectar o marcar abans de contunhar.
       unconfirmed: Vos cal confirmar vÃ²stra adreÃ§a de corriÃ¨l abans de contunhar.
     mailer:
       confirmation_instructions:
         action: Verificar lâ€™adreÃ§a de corriÃ¨l
+        action_with_app: Confirmar e tornar a %{app}
         explanation: VenÃ¨tz de crear un compte sus %{host} amb aquesta adreÃ§a de corriÃ¨l. Vos manca pas quâ€™un clic per lâ€™activar. Sâ€™Ã¨ra pas vosautre mercÃ©s de far pas cas a aqueste messatge.
         extra_html: Pensatz tanben de gaitar <a href="%{terms_path}">las rÃ¨glas de lâ€™instÃ ncia</a> e <a href="%{policy_path}">nÃ²stres tÃ¨rmes e condicions dâ€™utilizacion</a>.
         subject: 'Mastodonâ€¯: consignas de confirmacion per %{instance}'
@@ -50,8 +51,8 @@ oc:
       success: SÃ¨tz ben autentificat dempuÃ¨i lo compte %{kind}.
     passwords:
       no_token: PodÃ¨tz pas accedir a aquesta pagina sens venir dâ€™un corriel de reÃ¯nicializacion de senhal. Sâ€™es lo cas, mercÃ©s de verificar quâ€™avÃ¨tz ben utilizat lâ€™URL donada de maniÃ¨ra complÃ¨ta.
-      send_instructions: Recebretz un corriÃ¨l amb las consignas per reÄ©nicializar vÃ²stre senhal dins una estona. MercÃ©s de verificar tanben vÃ²stre dorsiÃ¨r de corriÃ¨ls indesirables.
-      send_paranoid_instructions: Se vÃ²stra adreÃ§a de corriÃ¨l existÃs dins nÃ²stra basa de donadas, recebretz un ligam per reÄ©nicializar vÃ²stre senhal dins una estona. MercÃ©s de verificar tanben vÃ²stre dorsiÃ¨r de corriÃ¨ls indesirables.
+      send_instructions: Recebretz un corriÃ¨l amb las consignas per reÃ¯nicializar vÃ²stre senhal dins una estona. MercÃ©s de verificar tanben vÃ²stre dorsiÃ¨r de corriÃ¨ls indesirables.
+      send_paranoid_instructions: Se vÃ²stra adreÃ§a de corriÃ¨l existÃs dins nÃ²stra basa de donadas, recebretz un ligam per reÃ¯nicializar vÃ²stre senhal dins una estona. MercÃ©s de verificar tanben vÃ²stre dorsiÃ¨r de corriÃ¨ls indesirables.
       updated: VÃ²stre senhal es ben estat cambiat. SÃ¨tz ara connectat.
       updated_not_active: VÃ²stre senhal es ben estat cambiat.
     registrations:
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index 53a4f4552edf80960dc73cd3b2426c0805bc9d5e..57c21437b815afa7de4ac0361c4e2668682ec591 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -6,7 +6,7 @@ pl:
       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_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/zalogowana.
+      already_authenticated: JesteÅ› juÅ¼ zalogowany(-a).
       inactive: Twoje konto nie zostaÅ‚o jeszcze aktywowane.
       invalid: NieprawidÅ‚owy %{authentication_keys} lub hasÅ‚o.
       last_attempt: Masz jeszcze jednÄ… prÃ³bÄ™; Twoje konto zostanie zablokowane jeÅ›li siÄ™ nie powiedzie.
@@ -18,28 +18,29 @@ pl:
     mailer:
       confirmation_instructions:
         action: Zweryfikuj adres e-mail
-        explanation: UtworzyÅ‚eÅ› konto na %{host} podajÄ…c ten adres e-mail. Jedno klikniÄ™cie dzieli CiÄ™ od aktywacji tego konta. JeÅ¼eli to nie Ty, zignoruj ten e-mail.
+        action_with_app: PotwierdÅº i wrÃ³Ä‡ do %{app}
+        explanation: UtworzyÅ‚eÅ›(-aÅ›) konto na %{host} podajÄ…c ten adres e-mail. Jedno klikniÄ™cie dzieli CiÄ™ od aktywacji tego konta. JeÅ¼eli to nie Ty, zignoruj ten e-mail.
         extra_html: Przeczytaj teÅ¼ <a href="%{terms_path}">regulamin instancji</a> i <a href="%{policy_path}">nasze zasady uÅ¼ytkowania</a>.
-        subject: 'Mastodon: Instrukcje weryfikacji adresu e-mail'
+        subject: 'Mastodon: Instrukcje weryfikacji adresu e-mail na %{instance}'
         title: Zweryfikuj adres e-mail
       email_changed:
         explanation: 'Adres e-mail dla Twojego konta zostanie zmieniony na:'
-        extra: JeÅ¼eli nie prÃ³bowaÅ‚eÅ› zmieniÄ‡ adresu e-mail, prawdopodobnie ktoÅ› uzyskaÅ‚ dostÄ™p do Twojego konta. ZmieÅ„ natychmiastowo hasÅ‚o lub skontaktuj siÄ™ z administratorem isntancji, jeÅ¼eli nie masz dostÄ™pu do konta.
+        extra: JeÅ¼eli nie prÃ³bowaÅ‚eÅ›(-aÅ›) zmieniÄ‡ adresu e-mail, prawdopodobnie ktoÅ› uzyskaÅ‚ dostÄ™p do Twojego konta. ZmieÅ„ natychmiastowo hasÅ‚o lub skontaktuj siÄ™ z administratorem isntancji, jeÅ¼eli nie masz dostÄ™pu do konta.
         subject: 'Mastodon: Zmieniono adres e-mail'
         title: Nowy adres e-mail
       password_change:
         explanation: HasÅ‚o do Twojego konta zostaÅ‚o zmienione.
-        extra: JeÅ¼eli nie zmieniaÅ‚eÅ› hasÅ‚a, prawdopodobnie ktoÅ› uzyskaÅ‚ dostÄ™p do Twojego konta. ZmieÅ„ hasÅ‚o natychmiastowo lub skontaktuj siÄ™ z administratorem instancji, jeÅ¼eli nie masz dostÄ™pu do konta.
+        extra: JeÅ¼eli nie zmieniaÅ‚eÅ›(-aÅ›) hasÅ‚a, prawdopodobnie ktoÅ› uzyskaÅ‚ dostÄ™p do Twojego konta. ZmieÅ„ hasÅ‚o natychmiastowo lub skontaktuj siÄ™ z administratorem instancji, jeÅ¼eli nie masz dostÄ™pu do konta.
         subject: 'Mastodon: Zmieniono hasÅ‚o'
         title: Zmieniono hasÅ‚o
       reconfirmation_instructions:
         explanation: PotwierdÅº nowy adres aby zmieniÄ‡ e-mail.
-        extra: JeÅ¼eli nie prÃ³bowaÅ‚eÅ› zmieniÄ‡ e-maila, zignoruj tÄ… wiadomoÅ›Ä‡. Adres e-mail przypisany do konta Mastodona nie ulegnie zmianie, jeÅ¼eli nie uÅ¼yjesz powyÅ¼szego odnoÅ›niku.
-        subject: 'Mastodon: PotwierdÅº adres e-mail na &{instance}'
+        extra: JeÅ¼eli nie prÃ³bowaÅ‚eÅ›(-aÅ›) zmieniÄ‡ e-maila, zignoruj tÄ… wiadomoÅ›Ä‡. Adres e-mail przypisany do konta Mastodona nie ulegnie zmianie, jeÅ¼eli nie uÅ¼yjesz powyÅ¼szego odnoÅ›niku.
+        subject: 'Mastodon: PotwierdÅº adres e-mail na %{instance}'
         title: Zweryfikuj adres e-mail
       reset_password_instructions:
         action: ZmieÅ„ hasÅ‚o
-        explanation: PrÃ³bowaÅ‚eÅ› uzyskaÄ‡ nowe hasÅ‚o do swojego konta.
+        explanation: PrÃ³bowaÅ‚eÅ›(-aÅ›) uzyskaÄ‡ nowe hasÅ‚o do swojego konta.
         extra: JeÅ¼eli to nie Ty, zignoruj tÄ… wiadomoÅ›Ä‡. Twoje hasÅ‚o nie ulegnie zmianie, jeÅ¼eli nie wykorzystasz powyÅ¼szego odnoÅ›nika i nie utworzysz nowego hasÅ‚a.
         subject: 'Mastodon: Instrukcje ustawienia nowego hasÅ‚a'
         title: Przywracanie hasÅ‚a
@@ -49,10 +50,10 @@ pl:
       failure: 'Uwierzytelnienie przez %{kind} nie powiodÅ‚o siÄ™, poniewaÅ¼: "%{reason}".'
       success: Uwierzytelnienie przez %{kind} powiodÅ‚o siÄ™.
     passwords:
-      no_token: DostÄ™p do tej strony moÅ¼liwy jest wyÅ‚Ä…cznie za pomocÄ… odnoÅ›nika z e-maila z instrukcjami ustawienia nowego hasÅ‚a. JeÅ›li skorzystaÅ‚eÅ›/aÅ› z takiego odnoÅ›nika, upewnij siÄ™, Å¼e zostaÅ‚ wykorzystany/skopiowany caÅ‚y odnoÅ›nik.
+      no_token: DostÄ™p do tej strony moÅ¼liwy jest wyÅ‚Ä…cznie za pomocÄ… odnoÅ›nika z e-maila z instrukcjami ustawienia nowego hasÅ‚a. JeÅ›li skorzystaÅ‚eÅ›(-aÅ›) z takiego odnoÅ›nika, upewnij siÄ™, Å¼e zostaÅ‚ wykorzystany/skopiowany caÅ‚y odnoÅ›nik.
       send_instructions: W ciÄ…gu kilku minut otrzymasz wiadomoÅ›Ä‡ e-mail z instrukcjÄ… ustawienia nowego hasÅ‚a. 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 zawierajÄ…cÄ… odnoÅ›nik pozwalajÄ…cy na ustawienie nowego hasÅ‚a. JeÅ¼eli nie otrzymano wiadomoÅ›ci, sprawdÅº folder ze spamem.
-      updated: Twoje hasÅ‚o zostaÅ‚o zmienione. JesteÅ› zalogowany/a.
+      updated: Twoje hasÅ‚o zostaÅ‚o zmienione. JesteÅ› zalogowany(-a).
       updated_not_active: Twoje hasÅ‚o zostaÅ‚o zmienione.
     registrations:
       destroyed: Twoje konto zostaÅ‚o zawieszone. Mamy jednak nadziejÄ™, Å¼e do nas wrÃ³cisz. Do zobaczenia!
@@ -63,9 +64,9 @@ pl:
       update_needs_confirmation: Konto zostaÅ‚o zaktualizowane, musimy jednak zweryfikowaÄ‡ TwÃ³j nowy adres e-mail. ZostaÅ‚a na niego wysÅ‚ana wiadomoÅ›Ä‡ z odnoÅ›nikiem potwierdzajÄ…cym. JeÅ¼eli nie otrzymano wiadomoÅ›ci, sprawdÅº folder ze spamem.
       updated: Konto zostaÅ‚o zaktualizowane.
     sessions:
-      already_signed_out: ZostaÅ‚eÅ›/aÅ› wylogowany/a.
-      signed_in: ZostaÅ‚eÅ›/aÅ› zalogowany/a.
-      signed_out: ZostaÅ‚eÅ›/aÅ› wylogowany/a.
+      already_signed_out: ZostaÅ‚eÅ›(-aÅ›) wylogowany(-a).
+      signed_in: ZostaÅ‚eÅ›(-aÅ›) zalogowany(-a).
+      signed_out: ZostaÅ‚eÅ›(-aÅ›) wylogowany(-a).
     unlocks:
       send_instructions: W ciÄ…gu kilku minut otrzymasz wiadomoÅ›Ä‡ e-mail z instrukcjami odblokowania konta. JeÅ¼eli nie otrzymano wiadomoÅ›ci, sprawdÅº folder ze spamem.
       send_paranoid_instructions: JeÅ›li Twoje konto istnieje, instrukcje odblokowania go otrzymasz w wiadomoÅ›ci e-mail w ciÄ…gu kilku minut. JeÅ¼eli nie otrzymano wiadomoÅ›ci, sprawdÅº folder ze spamem.
@@ -78,5 +79,7 @@ pl:
       not_found: nie znaleziono
       not_locked: byÅ‚o zablokowane
       not_saved:
-        one: '1 bÅ‚Ä…d uniemoÅ¼liwiÅ‚ zapisanie zasobu %{resource}:'
-        other: 'BÅ‚Ä™dy (%{count}) uniemoÅ¼liwiÅ‚y zapisanie zasobu %{resource}:'
+        few: 'BÅ‚Ä™dy (%{count}) uniemoÅ¼liwiÅ‚y zapisanie tego %{resource}:'
+        many: 'BÅ‚Ä™dy (%{count}) uniemoÅ¼liwiÅ‚y zapisanie tego %{resource}:'
+        one: '1 bÅ‚Ä…d nie uniemoÅ¼liwiÅ‚ zapisanie %{resource}:'
+        other: 'BÅ‚Ä™dy (%{count}) uniemoÅ¼liwiÅ‚y zapisanie tego %{resource}:'
diff --git a/config/locales/devise.pt-BR.yml b/config/locales/devise.pt-BR.yml
index 5f47bc901a8e18f7dfee3264e3185994591379de..ede0048925015711ccfaadb231ee158b85eadc1c 100644
--- a/config/locales/devise.pt-BR.yml
+++ b/config/locales/devise.pt-BR.yml
@@ -18,9 +18,10 @@ pt-BR:
     mailer:
       confirmation_instructions:
         action: Verificar endereÃ§o de e-mail
+        action_with_app: Confirmar e voltar para %{app}
         explanation: VocÃª criou uma conta em %{host} com esse endereÃ§o de e-mail. VocÃª estÃ¡ a um clique de ativÃ¡-la. Se nÃ£o foi vocÃª, por favor ignore esse e-mail.
         extra_html: Por favor confira tambÃ©m <a href="%{terms_path}">as regras da instÃ¢ncia</a> e <a href="%{policy_path}">nossos termos de serviÃ§o</a>.
-        subject: 'Mastodon: InstruÃ§Ãµes de confirmaÃ§Ã£o'
+        subject: 'Mastodon: InstruÃ§Ãµes de confirmaÃ§Ã£o para %{instance}'
         title: Verifique o endereÃ§o de e-mail
       email_changed:
         explanation: 'O e-mail associado Ã  sua conta serÃ¡ mudado para:'
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index f80f7ad0534b6ecc7a7cb86cfca54710fd347e7e..2186066c9dde3fb98f55669a188a698aae660e42 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -24,7 +24,7 @@ ru:
         title: ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ðµ e-mail Ð°Ð´Ñ€ÐµÑ
       email_changed:
         explanation: 'E-mail Ð°Ð´Ñ€ÐµÑ Ð’Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð±ÑƒÐ´ÐµÑ‚ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½ Ð½Ð°:'
-        extra: Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð½Ðµ Ð¼ÐµÐ½ÑÐ»Ð¸ Ð°Ð´Ñ€ÐµÑ e-mail, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÐºÑ‚Ð¾-Ñ‚Ð¾ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð’Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑÑ€Ð¾Ñ‡Ð½Ð¾ ÑÐ¼ÐµÐ½Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¸Ð»Ð¸ ÑÐ²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑƒÐ·Ð»Ð°, ÐµÑÐ»Ð¸ Ñƒ Ð’Ð°Ñ Ð½ÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸
+        extra: Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð½Ðµ Ð¼ÐµÐ½ÑÐ»Ð¸ Ð°Ð´Ñ€ÐµÑ e-mail, Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÐºÑ‚Ð¾-Ñ‚Ð¾ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð’Ð°ÑˆÐµÐ¹ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑÑ€Ð¾Ñ‡Ð½Ð¾ ÑÐ¼ÐµÐ½Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð¸Ð»Ð¸ ÑÐ²ÑÐ¶Ð¸Ñ‚ÐµÑÑŒ Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ ÑƒÐ·Ð»Ð°, ÐµÑÐ»Ð¸ Ñƒ Ð’Ð°Ñ Ð½ÐµÑ‚ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ðº ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸.
         subject: 'Mastodon: ÐÐ´Ñ€ÐµÑ e-mail Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½'
         title: ÐÐ¾Ð²Ñ‹Ð¹ Ð°Ð´Ñ€ÐµÑ e-mail
       password_change:
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index a32fbe03bdfd8adde1e694ae7586d49e076956d4..16cd9262e2d0c7f5c43444b15ec670f74b8f1d2a 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -18,6 +18,7 @@ sk:
     mailer:
       confirmation_instructions:
         action: PotvÅ•Ä 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.
         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 inÅ¡trukcie pre %{instance}'
@@ -29,7 +30,7 @@ sk:
         title: NovÃ¡ emailovÃ¡ adresa
       password_change:
         explanation: Heslo k tvojmu ÃºÄtu bolo zmenenÃ©.
-        extra: PokiaÄ¾ si nezmenil/a svoje heslo, je pravdepodobnÃ© Å¾e niekto inÃ½ zÃskal prÃstup k tvojmu ÃºÄtu. Naliehavo preto prosÃm zmeÅˆ svoje heslo, alebo kontaktuj administrÃ¡tora tohto serveru pokiaÄ¾ si vymknutÃ½/Ã¡ zo svojho ÃºÄtu.
+        extra: Ak si heslo nezmenil/a, je pravdepodobnÃ© Å¾e niekto inÃ½ zÃskal prÃstup k tvojmu ÃºÄtu. Naliehavo preto prosÃm zmeÅˆ svoje heslo, alebo kontaktuj administrÃ¡tora tohto serveru pokiaÄ¾ si vymknutÃ½/Ã¡ zo svojho ÃºÄtu.
         subject: 'Mastodon: Heslo bolo zmenenÃ©'
         title: Heslo bolo zmenenÃ©
       reconfirmation_instructions:
@@ -59,22 +60,22 @@ sk:
       signed_up: Vitaj! Tvoja registrÃ¡cia bola ÃºspeÅ¡nÃ¡.
       signed_up_but_inactive: RegistrÃ¡cia bola ÃºspeÅ¡nÃ¡. AvÅ¡ak, ÃºÄet eÅ¡te nebol aktivovanÃ½, takÅ¾e Å¥a nemÃ´Å¾eme prihlÃ¡siÅ¥.
       signed_up_but_locked: Prihlasovanie ÃºspeÅ¡nÃ©. AvÅ¡ak tvoj ÃºÄet je zamknutÃ½, takÅ¾e Å¥a nieje moÅ¾nÃ© prihlÃ¡siÅ¥.
-      signed_up_but_unconfirmed: SprÃ¡va s odkazom potvrdzujÃºcim registrÃ¡ciu bola poslanÃ¡ na vÃ¡Å¡ email. Pre aktvÃ¡ciu ÃºÄtu, kliknite na danÃ½ odkaz.
-      update_needs_confirmation: ÃšÄet bol ÃºspeÅ¡ne zmenenÃ½ ale eÅ¡te potrebujeme overiÅ¥ vaÅ¡u novÃº emailovÃº adresu. Pre overenie prosÃm kliknite na link v sprÃ¡ve ktorÃº sme vÃ¡m poslali na email.
-      updated: VÃ¡Å¡ ÃºÄet bol ÃºspeÅ¡ne aktualizovanÃ½.
+      signed_up_but_unconfirmed: SprÃ¡va s odkazom na potvrdenie registrÃ¡cie bola odoslanÃ¡ na tvoj email. Pre aktvÃ¡ciu ÃºÄtu, klikni prosÃm na danÃ½ odkaz. Takisto ale skontroluj aj svoju spam zloÅ¾ku, pokiaÄ¾ sa ti zdÃ¡, Å¾e si tento email nedostal/a.
+      update_needs_confirmation: ÃšÄet bol ÃºspeÅ¡ne zmenenÃ½ ale eÅ¡te potrebujeme overiÅ¥ tvoju novÃº emailovÃº adresu. Pre overenie prosÃm klikni na link v sprÃ¡ve ktorÃº si dostal/a na email. Takisto ale skontroluj aj svoju spam zloÅ¾ku, ak sa ti zdÃ¡, Å¾e si tento email nedostal/a.
+      updated: Tvoj ÃºÄet bol ÃºspeÅ¡ne aktualizovanÃ½.
     sessions:
-      already_signed_out: OdhlÃ¡senie bolo ÃºspeÅ¡nÃ©.
-      signed_in: PrihlÃ¡senie ÃºspeÅ¡nÃ©.
-      signed_out: OdhlÃ¡senie ÃºspeÅ¡nÃ©.
+      already_signed_out: OdhlÃ¡sil/a si sa ÃºspeÅ¡nÃ©.
+      signed_in: PrihlÃ¡sil/a si sa ÃºspeÅ¡nÃ©.
+      signed_out: OdhlÃ¡sil/a si sa ÃºspeÅ¡nÃ©.
     unlocks:
-      send_instructions: O niekoÄ¾ko minÃºt obdrÅ¾Ãte email s inÅ¡trukciami ako nastaviÅ¥ novÃ© heslo.
-      send_paranoid_instructions: Ak vÃ¡Å¡ ÃºÄet existuje, o niekoÄ¾ko minÃºt obdrÅ¾Ãte email s inÅ¡trukciami ako ho odomknÃºÅ¥.
-      unlocked: VÃ¡Å¡ ÃºÄet bol ÃºspeÅ¡ne odomknutÃ½. ProsÃm prihlÃ¡ste sa.
+      send_instructions: O niekoÄ¾ko minÃºt obdrÅ¾ÃÅ¡ email s pokynmi, ako nastaviÅ¥ novÃ© heslo. ProsÃm, skontroluj ale aj svoju spam zloÅ¾ku, pokiaÄ¾ sa ti zdÃ¡, Å¾e si tento email nedostal/a.
+      send_paranoid_instructions: Ak tvoj ÃºÄet existuje, o niekoÄ¾ko minÃºt obdrÅ¾ÃÅ¡ email s pokynmi ako si ho odomknÃºÅ¥. ProsÃm, skontroluj ale aj svoju spam zloÅ¾ku, pokiaÄ¾ sa ti zdÃ¡, Å¾e si tento email nedostal/a.
+      unlocked: Tvoj ÃºÄet bol ÃºspeÅ¡ne odomknutÃ½. Pre pokraÄovanie sa prosÃm prihlÃ¡s.
   errors:
     messages:
-      already_confirmed: bol uÅ¾ potvrdenÃ½, skÃºste sa prihlÃ¡siÅ¥
-      confirmation_period_expired: musÃ byÅ¥ potvrdenÃ½ do %{period}, prosÃm poÅ¾iadajte o novÃ½
-      expired: expiroval, prosÃm, vyÅ¾iadajte si novÃ½
+      already_confirmed: bol uÅ¾ potvrdenÃ½, skÃºs sa prihlÃ¡siÅ¥
+      confirmation_period_expired: musÃ byÅ¥ potvrdenÃ½ do %{period}, prosÃm poÅ¾iadaj o novÃ½
+      expired: vypÅ•Å¡al, prosÃm, vyÅ¾iadaj si novÃ½
       not_found: nenÃ¡jdenÃ½
       not_locked: nebol uzamknutÃ½
       not_saved:
diff --git a/config/locales/devise.sr.yml b/config/locales/devise.sr.yml
index 9d1359695cb10bf205bc6f229a2b5784a2af5188..475d1e2a54c842168cc768cada8dc53be1388de0 100644
--- a/config/locales/devise.sr.yml
+++ b/config/locales/devise.sr.yml
@@ -17,11 +17,33 @@ sr:
       unconfirmed: ÐŸÑ€Ðµ Ð½Ð°ÑÑ‚Ð°Ð²ÐºÐ° Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ð¸ ÑÐ²Ð¾Ñ˜ Ð½Ð°Ð»Ð¾Ð³.
     mailer:
       confirmation_instructions:
+        action: ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ Ð°Ð´Ñ€ÐµÑÑƒ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ
+        action_with_app: ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸ Ð¸ Ð²Ñ€Ð°Ñ‚Ð¸ ÑÐµ Ð½Ð° %{app}
+        explanation: ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸ ÑÑ‚Ðµ Ð½Ð°Ð»Ð¾Ð³ Ð½Ð° %{host} ÑÐ° Ð°Ð´Ñ€ÐµÑÐ¾Ð¼ Ð¾Ð²Ðµ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ. ÐÐ° Ñ˜ÐµÐ´Ð°Ð½ ÐºÐ»Ð¸Ðº ÑÑ‚Ðµ ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¸ Ð¾Ð´ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°ÑšÐ°. ÐÐºÐ¾ Ð¾Ð²Ð¾ Ð½Ð¸ÑÑ‚Ðµ Ð²Ð¸, Ð¼Ð¾Ð»Ð¸Ð¼Ð¾ Ð¸Ð³Ð½Ð¾Ñ€Ð¸ÑˆÐ¸Ñ‚Ðµ Ð¾Ð²Ñƒ Ðµ-Ð¿Ð¾ÑˆÑ‚Ñƒ.
+        extra_html: ÐœÐ¾Ð»Ð¸Ð¼Ð¾ Ð´Ð° Ñ‚Ð°ÐºÐ¾Ñ’Ðµ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚Ðµ <a href="%{terms_path}"> Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° Ð¾Ð²Ðµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ Ð¸ <a href="%{policy_path}"> Ð½Ð°ÑˆÐµ ÑƒÑÐ»Ð¾Ð²Ðµ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°.
         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: Ð›Ð¾Ð·Ð¸Ð½ÐºÐ° Ñ€ÐµÑÐµÑ‚Ð¾Ð²Ð°Ð½Ð°
       unlock_instructions:
         subject: 'ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚: Ð£Ð¿ÑƒÑ‚ÑÑ‚Ð²Ð¾ Ð·Ð° Ð¾Ñ‚ÐºÑ™ÑƒÑ‡Ð°Ð²Ð°ÑšÐµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð°'
     omniauth_callbacks:
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
deleted file mode 100644
index fb819978f1fe54b6dc3c0c4ccda71ded4f13ea41..0000000000000000000000000000000000000000
--- a/config/locales/devise.tr.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-tr:
-  simple_form:
-    hints:
-      defaults:
-        avatar: En fazla 2MB olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. 400x400px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir
-        display_name: "%{count} karakter kaldÄ±"
-        header: En fazla 2MB olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. 700x335px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir.
-        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.
-        note: "%{count} karakter kaldÄ±"
-      imports:
-        data: DiÄŸer Mastodon sunucusundan dÄ±ÅŸarÄ± aktardÄ±ÄŸÄ±nÄ±z CSV dosyasÄ±
-      sessions:
-        otp: Telefonunuzdaki two-factor kodunuzu giriniz veya kurtarma kodlarÄ±nÄ±zdan birini giriniz.
-    labels:
-      defaults:
-        avatar: Profil resmi
-        confirm_new_password: Yeni parolanÄ±z (tekrar)
-        confirm_password: ParolanÄ±z (tekrar)
-        current_password: Mevcut parolanÄ±z
-        data: Dosya
-        display_name: GÃ¶rÃ¼nen adÄ±nÄ±z
-        email: E-posta adresiniz
-        header: Kapak resmi
-        locale: Dil
-        locked: HesabÄ±mÄ± kilitle
-        new_password: Yeni parolanÄ±z
-        note: KiÅŸisel bilgiler
-        otp_attempt: Ä°ki-faktÃ¶rlÃ¼ kod
-        password: ParolanÄ±z
-        setting_auto_play_gif: GIF'leri otomatik oynatt
-        setting_boost_modal: Boost etmeden Ã¶nce onay diyaloÄŸu gÃ¶ster
-        setting_default_privacy: GÃ¶nderi gizliliÄŸi
-        severity: Zorluk
-        type: Dosya tÃ¼rÃ¼
-        username: KullanÄ±cÄ± adÄ±nÄ±z
-      interactions:
-        must_be_follower: TakipÃ§im olmayan kiÅŸilerden gelen bildirimleri engelle
-        must_be_following: Takip etmediÄŸim kiÅŸilerden gelen bildirimleri engelle
-      notification_emails:
-        digest: Ã–zet e-postalarÄ± gÃ¶nder
-        favourite: Biri durumumu favorilerine eklediginde bana e-posta gÃ¶nder
-        follow: Biri beni takip ettiÄŸinde bana e-posta gÃ¶nder
-        follow_request: Biri bana takip isteÄŸi gÃ¶nderdiÄŸinde, bana e-posta gÃ¶nder
-        mention: Biri benden bahsettiÄŸinde, bana e-posta gÃ¶nder
-        reblog: Biri durumumu paylaÅŸtÄ±ÄŸÄ±nda, bana e-posta gÃ¶nder
-    'no': HayÄ±r
-    required:
-      mark: "*"
-      text: gerekli
-    'yes': Evet
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index 70ac6e4b29e7d57c60eaceb4dababeb276e2d73c..6ec01b3d7cdd97fbebbe2339ab9e257e17b97369 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -11,13 +11,13 @@ uk:
       invalid: ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ %{authentication_keys} Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.
       last_attempt: Ð£ Ð²Ð°Ñ Ñ” Ð¾ÑÑ‚Ð°Ð½Ð½Ñ ÑÐ¿Ñ€Ð¾Ð±Ð°, Ð¿Ñ–ÑÐ»Ñ ÑÐºÐ¾Ñ— Ð²Ñ…Ñ–Ð´ Ð±ÑƒÐ´Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹.
       locked: Ð’Ð°Ñˆ Ð°ÐºÐ°ÑƒÐ½Ñ‚ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹.
-      not_found_in_database: ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ– %{authentication_keys} Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.
+      not_found_in_database: ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ %{authentication_keys} Ð°Ð±Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.
       timeout: Ð’Ð°ÑˆÐ° ÑÐµÑÑ–Ñ Ð²Ð¸Ñ‡ÐµÑ€Ð¿Ð°Ð½Ð°. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð°Ð¹Ð´Ñ–Ñ‚ÑŒ Ð·Ð½Ð¾Ð²Ñƒ, Ñ‰Ð¾Ð± Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸.
       unauthenticated: Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ð’Ð°Ð¼ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ ÑƒÐ²Ñ–Ð¹Ñ‚Ð¸ Ð°Ð±Ð¾ Ð·Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ÑÑ.
       unconfirmed: Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ Ð’Ð°Ð¼ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ð¸ Ð’Ð°ÑˆÑƒ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ñƒ ÑÐºÑ€Ð¸Ð½ÑŒÐºÑƒ.
     mailer:
       confirmation_instructions:
-        subject: 'Mastodon: Ð†Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ'
+        subject: 'Mastodon: Ð†Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ %{instance}'
       password_change:
         subject: 'Mastodon: Ð’Ð°Ñˆ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð·Ð¼Ñ–Ð½ÐµÐ½Ð¸Ð¹'
       reset_password_instructions:
diff --git a/config/locales/devise.zh-HK.yml b/config/locales/devise.zh-HK.yml
index 79e5a3d25dfe48a55a9ca9b94da193bc6517de7f..b7d88ef941abe06b2ce66068683cb020359d1eda 100644
--- a/config/locales/devise.zh-HK.yml
+++ b/config/locales/devise.zh-HK.yml
@@ -20,7 +20,7 @@ zh-HK:
         action: é©—è‰é›»åéƒµä»¶åœ°å€
         explanation: ä½ åœ¨ %{host} ä¸Šä½¿ç”¨é€™å€‹é›»åéƒµä»¶åœ°å€å»ºç«‹äº†ä¸€å€‹å¸³æˆ¶ã€‚åªéœ€é»žæ“Šä¸‹é¢çš„é€£çµï¼Œå³å¯å•Ÿç”¨å¸³æˆ¶ã€‚å¦‚æžœä½ ä¸¦æ²’æœ‰å»ºç«‹éŽå¸³æˆ¶ï¼Œè«‹å¿½ç•¥æ¤éƒµä»¶ã€‚
         extra_html: è«‹è¨˜å¾—é–±è®€æœ¬æœå‹™ç«™çš„<a href="%{terms_path}">ç›¸é—œè¦å®š</a>å’Œ<a href="%{policy_path}">ä½¿ç”¨æ¢æ¬¾</a>ã€‚
-        subject: 'Mastodon: ç¢ºèªé›»éƒµåœ°å€'
+        subject: 'Mastodon: ç¢ºèªé›»éƒµåœ°å€ %{instance}'
         title: é©—è‰é›»åéƒµä»¶åœ°å€
       email_changed:
         explanation: ä½ çš„å¸³æˆ¶çš„é›»åéƒµä»¶åœ°å€å³å°‡è®Šæ›´ç‚ºï¼š
diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml
index 571429429281206fe49e817e30221c226dfde1d2..abbe45942301c78635457a6d3d7bb0456547309a 100644
--- a/config/locales/devise.zh-TW.yml
+++ b/config/locales/devise.zh-TW.yml
@@ -20,7 +20,7 @@ zh-TW:
         action: é©—è‰ E-mail åœ°å€
         explanation: æ‚¨å·²ç¶“åœ¨ %{host} ä¸Šä»¥æ¤ E-mail åœ°å€å»ºç«‹äº†ä¸€å€‹å¸³è™Ÿã€‚æ‚¨è·é›¢å•Ÿç”¨å®ƒåªå‰©ä¸€æ¬¡é»žæ“Šä¹‹é™äº†ã€‚å¦‚æžœé€™ä¸æ˜¯ä½ ï¼Œè«‹å¿½ç•¥æ¤ E-mail ã€‚
         extra_html: åŒæ™‚ä¹Ÿè«‹çœ‹çœ‹<a href="%{terms_path}">è©²ç«™é»žçš„è¦å‰‡</a>èˆ‡<a href="%{policy_path}">æˆ‘å€‘çš„æœå‹™æ¢æ¬¾</a>ã€‚
-        subject: 'Mastodon: ä¿¡ç®±é©—è‰'
+        subject: 'Mastodon: ä¿¡ç®±é©—è‰ %{instance}'
         title: é©—è‰ E-mail åœ°å€
       email_changed:
         explanation: æ‚¨å¸³è™Ÿçš„ E-mail åœ°å€è¢«è®Šæ›´ç‚ºï¼š
@@ -78,5 +78,5 @@ zh-TW:
       not_found: æ‰¾ä¸åˆ°
       not_locked: ä¸¦æœªè¢«éŽ–å®š
       not_saved:
-        one: 1 å€‹éŒ¯èª¤ä½¿ %{resource} ç„¡æ³•è¢«å„²å˜ï¸°
-        other: "%{count} å€‹éŒ¯èª¤ä½¿ %{resource} ç„¡æ³•è¢«å„²å˜ï¸°"
+        one: æœ‰ 1 å€‹éŒ¯èª¤è®“æ¤ %{resource} ç„¡æ³•å„²å˜ï¼š
+        other: æœ‰ %{count} å€‹éŒ¯èª¤è®“æ¤ %{resource} ç„¡æ³•å„²å˜ï¼š
diff --git a/config/locales/doorkeeper.ast.yml b/config/locales/doorkeeper.ast.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ce88af797046e3690ae58b9c14d888805576183e
--- /dev/null
+++ b/config/locales/doorkeeper.ast.yml
@@ -0,0 +1,72 @@
+---
+ast:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Nome de l'aplicaciÃ³n
+        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:
+        cancel: Encaboxar
+        destroy: Destruyir
+        edit: Editar
+        submit: Unviar
+      index:
+        name: Nome
+      show:
+        actions: Aiciones
+        title: 'AplicaciÃ³n: %{name}'
+    authorizations:
+      error:
+        title: AsocediÃ³ un fallu
+      new:
+        able_to: Va ser a
+        prompt: L'aplicaciÃ³n %{client_name} solicitÃ³ l'accesu a la to cuenta
+      show:
+        title: Copia esti cÃ³digu d'autorizaciÃ³n y apÃ©galu na aplicaciÃ³n.
+    authorized_applications:
+      buttons:
+        revoke: Revocar
+      index:
+        date_format: "%H:%M:%S %d-%m-%Y"
+        title: Les aplicaciones qu'autoricesti
+    errors:
+      messages:
+        invalid_token:
+          expired: CaducÃ³'l pase d'accesu
+          revoked: RevocÃ³se'l pase d'accesu
+          unknown: El pase d'accesu nun ye vÃ¡lidu
+        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.
+    layouts:
+      admin:
+        nav:
+          applications: Aplicaciones
+          oauth2_provider: Fornidor d'OAuth2
+    scopes:
+      read:accounts: ver informaciÃ³n de cuentes
+      read:blocks: ver quiÃ©n bloquies
+      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: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:filters: crear peÃ±eres
+      write:follows: siguir a xente
+      write:lists: crear llistes
+      write:media: xubir ficheros de medios
+      write:mutes: silenciar xente y conversaciones
+      write:notifications: llimpiar los tos avisos
+      write:statuses: espublizar estaos
diff --git a/config/locales/doorkeeper.co.yml b/config/locales/doorkeeper.co.yml
index 52777eaf0feef98bf25843926480449481600b23..542ad7c5747030f656a0b4b085144d9fd9a86c0c 100644
--- a/config/locales/doorkeeper.co.yml
+++ b/config/locales/doorkeeper.co.yml
@@ -114,7 +114,29 @@ co:
       application:
         title: Auturizazione OAuth riquestata
     scopes:
-      follow: bluccÃ , sbluccÃ , Ã¨ reghje lâ€™abbunamenti
-      push: Riceve nutificazione push per u vostru contu
-      read: leghje lâ€™infurmazione di u vostru contu
-      write: mandÃ  missaghji per voi
+      follow: MudificÃ  rilazione trÃ  i conti
+      push: Riceve e vostre nutificazione push
+      read: leghje tutte lâ€™infurmazioni di u vostru contu
+      read:accounts: Vede l'infurmazione di i conti
+      read:blocks: vede i vostri blucchimi
+      read:favourites: vede i vostri favuriti
+      read:filters: vede i vostri filtri
+      read:follows: vede i vostri abbunamenti
+      read:lists: vede e vostre liste
+      read:mutes: vede i vostri piattati
+      read:notifications: vede e vostre nutificazione
+      read:reports: vede i vostri signalamenti
+      read:search: ricercÃ  per voi
+      read:statuses: vede tutti i statuti
+      write: mudificÃ  i dati di u vostru contu
+      write:accounts: mudificÃ  u prufile
+      write:blocks: bluccÃ  conti Ã¨ dumini
+      write:favourites: aghjustÃ  statuti Ã  i favuriti
+      write:filters: creÃ  filtri
+      write:follows: siguitÃ  conti
+      write:lists: creÃ  liste
+      write:media: caricÃ  fugliali media
+      write:mutes: piattÃ  persone Ã¨ cunversazione
+      write:notifications: sguassÃ  e nutificazione
+      write:reports: palisÃ  altre persone
+      write:statuses: pubblicÃ  statuti
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 876f448c755c3f95d0d89e2e88b3eed9f62358e1..b9e9bc034930dc6a0e9a342e0e4527ad01f1407e 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -4,3 +4,139 @@ cs:
     attributes:
       doorkeeper/application:
         name: NÃ¡zev aplikace
+        redirect_uri: URI pÅ™esmÄ›rovÃ¡nÃ
+        scopes: Rozsahy
+        website: StrÃ¡nka aplikace
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: nesmÃ obsahovat fragment.
+              invalid_uri: musÃ bÃ½t platnÃ© URI.
+              relative_uri: musÃ bÃ½t apsolutnÃ URI.
+              secured_uri: musÃ bÃ½t URI HTTPS/SSL.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Autorizovat
+        cancel: ZruÅ¡it
+        destroy: ZniÄit
+        edit: Upravit
+        submit: Odeslat
+      confirmations:
+        destroy: Jste si jistÃ½/Ã¡?
+      edit:
+        title: Upravit aplikaci
+      form:
+        error: A jÃ©je! Zkontrolujte svÅ¯j formulÃ¡Å™ kvÅ¯li pÅ™ÃpadnÃ½m chybÃ¡m
+      help:
+        native_redirect_uri: PouÅ¾ijte %{native_redirect_uri} pro mÃstnÃ testy
+        redirect_uri: Jedno URI na Å™Ã¡dek
+        scopes: OddÄ›lujte rozsahy mezerami. Pro pouÅ¾itÃ vÃ½chozÃch rozsahÅ¯ zanechte prÃ¡zdnÃ©.
+      index:
+        application: Aplikace
+        callback_url: ZpÃ¡teÄnÃ URL
+        delete: Smazat
+        name: NÃ¡zev
+        new: NovÃ¡ aplikace
+        scopes: Rozsahy
+        show: Zobrazit
+        title: VaÅ¡e aplikace
+      new:
+        title: NovÃ¡ aplikace
+      show:
+        actions: Akce
+        application_id: KlientskÃ½ klÃÄ
+        callback_urls: ZpÃ¡teÄnÃ URL
+        scopes: Rozsahy
+        secret: KlientskÃ© tajemstvÃ
+        title: 'Aplikace: %{name}'
+    authorizations:
+      buttons:
+        authorize: OvÄ›Å™it
+        deny: ZamÃtnout
+      error:
+        title: Vyskytla se chyba
+      new:
+        able_to: Bude moci
+        prompt: Aplikace %{client_name} vyÅ¾aduje pÅ™Ãstup k vaÅ¡emu ÃºÄtu
+        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
+      confirmations:
+        revoke: Jste si jistÃ½/Ã¡?
+      index:
+        application: Aplikace
+        created_at: AutorizovÃ¡no
+        date_format: "%d. %m. %Y %H:%M:%S"
+        scopes: Rozsahy
+        title: VaÅ¡e autorizovanÃ© aplikace
+    errors:
+      messages:
+        access_denied: VlastnÃk zdroje Äi autorizaÄnÃ server zamÃtl poÅ¾adavek.
+        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Ã© autentikaci Äi nepodporovanÃ© autentikaÄnÃ metodÄ›.
+        invalid_grant: PoskytnutÃ© oprÃ¡vnÄ›nÃ je neplatnÃ©, vyprÅ¡elÃ©, zamÃtnutÃ©, 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: PÅ™esmÄ›rovacÃ URI nenÃ platnÃ©.
+        invalid_request: PoÅ¾adavku chybÃ pÅ¾adovanÃ½ parametr, obsahuje nepodporovanou hodnotu parametru, Äi je jinak malformovanÃ½.
+        invalid_resource_owner: PoskytnutÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje vlastnÃka zdroje nejsou platnÃ©, nebo vlastnÃk zdroje nemÅ¯Å¾e bÃ½t nalezen
+        invalid_scope: PoÅ¾adovanÃ½ rozsah je neplatnÃ½, neznÃ¡mÃ½, nebo malformovanÃ½.
+        invalid_token:
+          expired: PÅ™ÃstupovÃ½ token vyprÅ¡el
+          revoked: PÅ™ÃstupovÃ½ token byl zamÃtnut
+          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.
+        temporarily_unavailable: AutorizaÄnÃ server vÃ¡s nynÃ nemÅ¯Å¾e obslouÅ¾it kvÅ¯li doÄasnÃ©mu pÅ™etÃÅ¾enÃ Äi ÃºdrÅ¾bÄ› serveru.
+        unauthorized_client: Klient nenÃ autorizovÃ¡n k vykonÃ¡nÃ tohoto poÅ¾adavku touto metodou.
+        unsupported_grant_type: Tento typ oprÃ¡vnÄ›nÃ nenÃ podporovÃ¡n autorizaÄnÃm serverem.
+        unsupported_response_type: AutorizaÄnÃ server nepodporuje tento typ odpovÄ›di.
+    flash:
+      applications:
+        create:
+          notice: Aplikace vytvoÅ™ena.
+        destroy:
+          notice: Aplikace smazÃ¡na.
+        update:
+          notice: Aplikace aktualizovÃ¡na.
+      authorized_applications:
+        destroy:
+          notice: Aplikace zamÃtnuta.
+    layouts:
+      admin:
+        nav:
+          applications: Aplikace
+          oauth2_provider: Poskytovatel OAuth2
+      application:
+        title: Je poÅ¾adovÃ¡na autorizace OAuth
+    scopes:
+      follow: upravovat vztahy mezi profily
+      push: pÅ™ijÃmat vaÅ¡e push oznÃ¡menÃ
+      read: vidÄ›t vÅ¡echna data vaÅ¡eho ÃºÄtu
+      read:accounts: vidÄ›t informace o ÃºÄtech
+      read:blocks: vidÄ›t vaÅ¡e blokace
+      read:favourites: vidÄ›t vaÅ¡e oblÃbenÃ
+      read:filters: vidÄ›t vaÅ¡e filtry
+      read:follows: vidÄ›t vaÅ¡e sledovÃ¡nÃ
+      read:lists: vidÄ›t vaÅ¡e seznamy
+      read:mutes: vidÄ›t vaÅ¡e ignorace
+      read:notifications: vidÄ›t vaÅ¡e oznÃ¡menÃ
+      read:reports: vidÄ›t vaÅ¡e nahlÃ¡Å¡enÃ
+      read:search: vyhledÃ¡vat za vÃ¡s
+      read:statuses: vidÄ›t vÅ¡echny pÅ™ÃspÄ›vky
+      write: mÄ›nit vÅ¡echna data vaÅ¡eho ÃºÄtu
+      write:accounts: mÄ›nit vÃ¡Å¡ profil
+      write:blocks: blokovat ÃºÄty a domÃ©ny
+      write:favourites: oblibovat si pÅ™ÃspÄ›vky
+      write:filters: vytvÃ¡Å™et filtry
+      write:follows: sledovat lidi
+      write:lists: vytvÃ¡Å™et seznamy
+      write:media: nahrÃ¡vat mediÃ¡lnÃ soubory
+      write:mutes: ignorovat lidi a konverzace
+      write:notifications: vymazÃ¡vat vaÅ¡e oznÃ¡menÃ
+      write:reports: nahlaÅ¡ovat jinÃ© uÅ¾ivatele
+      write:statuses: publikovat pÅ™ÃspÄ›vky
diff --git a/config/locales/doorkeeper.cy.yml b/config/locales/doorkeeper.cy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..87d7a86603123eb017426274c5293bd0b4502160
--- /dev/null
+++ b/config/locales/doorkeeper.cy.yml
@@ -0,0 +1,142 @@
+---
+cy:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Enw rhaglen
+        redirect_uri: Ailgyfeirio URI
+        scopes: Rhinweddau
+        website: Gwefan cais
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: ni all gynnwys dernyn.
+              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.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Awdurdodi
+        cancel: Diddymu
+        destroy: Dinistrio
+        edit: Golygu
+        submit: Cyflwyno
+      confirmations:
+        destroy: Ydych chi'n sicr?
+      edit:
+        title: Golygwch y 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.
+      index:
+        application: Rhaglen
+        callback_url: URL galw-nÃ´l
+        delete: Dileu
+        name: Enw
+        new: Rhaglen newydd
+        scopes: Rhinweddau
+        show: Dangoswch
+        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
+        title: 'Rhaglen: %{name}'
+    authorizations:
+      buttons:
+        authorize: Awdurdodi
+        deny: Gwrthod
+      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
+        title: Angen awdurdodi
+      show:
+        title: Copiwch y cÃ´d awdurdodi a gludiwch i'r rhaglen.
+    authorized_applications:
+      buttons:
+        revoke: Diddymu
+      confirmations:
+        revoke: Ydych chi'n sicr?
+      index:
+        application: Rhaglen
+        created_at: Awdurdodedig
+        date_format: "%Y-%m-%d %H:%M:%S"
+        scopes: Rhinweddau
+        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_request: Nid yw'r cais yn cynnwys paramedr angenrheidiol, yn cynnwys paramader paramedr nad yw'n cael ei gefnogi, neu wedi ei gamffurfio mewn rhyw fodd 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_token:
+          expired: Daeth y tocyn mynediad i ben
+          revoked: Gwrthodwyd y tocyn mynediad
+          unknown: Mae'r tocyn mynediad yn annilys
+        resource_owner_authenticator_not_configured: Methwyd canfod Perchenog Adnodd achos fod Doorkeeper.configure.resource_owner_authenticator heb ei gydffurfio.
+        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_response_type: Nid yw'r gweinydd awdurdodi yn cefnogi y math yma o ymateb.
+    flash:
+      applications:
+        create:
+          notice: Crewyd y rhaglen.
+        destroy:
+          notice: DilÃ«wyd y rhaglen.
+        update:
+          notice: Diweddarwyd y rhaglen.
+      authorized_applications:
+        destroy:
+          notice: Diddymwyd y cais.
+    layouts:
+      admin:
+        nav:
+          applications: Rhaglenni
+          oauth2_provider: Darparwr OAuth2
+      application:
+        title: Mae awdurdodiad OAuth yn ofynnol
+    scopes:
+      follow: addasu perthnasau cyfrif
+      push: derbyn eich hysbysiadau PUSH
+      read: darllen holl ddata eich cyfrif
+      read:accounts: gweld gwybodaeth y cyfrif
+      read:blocks: gweld eich blociau
+      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: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
+      write:accounts: addasu eich proffil
+      write:blocks: blocio cyfrifon a parthau
+      write:favourites: hoff dÅµtiau
+      write:filters: creu hidlwyr
+      write:follows: dilyn pobl
+      write:lists: creu rhestrau
+      write:media: uwchlwytho ffeiliau cyfryngau
+      write:mutes: tawelu pobl a sgyrsiau
+      write:notifications: clirio eich hysbysiadau
+      write:reports: adrodd pobl eraill
+      write:statuses: cyhoeddi tÅµt
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 051bfd237bcf111d8de87156c114f965b9aa95d2..df964e4b1f8228214dd5d2dba31be82a18e77b72 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -78,14 +78,22 @@ da:
     errors:
       messages:
         access_denied: Ejeren af ressourcen eller godkendelses serveren afviste anmodningen.
+        credential_flow_not_configured: Flytning af ressourceejers adgangskode mislykkedes grundet Doorkeeper.configure.resource_owner_from_credentials ikke er opsat.
+        invalid_client: Klient autentikationen mislykkedes grundet en ukendt klient, ingen klient autentikation fulgte med, eller en ikke-understÃ¸ttet metode.
+        invalid_grant: Autoriseringen er ugyldig, udlÃ¸bet, ophÃ¦vet, passer ikke med den henvisnings URI der blev brugt i autoriserings anmodningen, eller blev givet til en anden klient.
         invalid_redirect_uri: Ormdirigerings-uri'en der blev angivet er ikke gyldig.
         invalid_request: Anmodningen mangler en parametre, inkluderer en ikke understÃ¸ttet parametre vÃ¦rdi eller er pÃ¥ en eller anden mÃ¥de deformeret.
+        invalid_resource_owner: De angivne ressource ejer kredentialer er ikke gyldige, eller ressource ejeren kunne ikke blive fundet
         invalid_scope: Det anmodede omfang er ugyldigt, ukendt eller deformeret.
         invalid_token:
           expired: Adgangs-beviset er udlÃ¸bet
           revoked: Adgangs-beviset er blevet ophÃ¦vet
           unknown: Adgangs-beviset er ugyldigt
+        resource_owner_authenticator_not_configured: Ressource ejeren kunne ikke blive fundet grundet Doorkeeper.configure.resource_owner_authenticator ikke er konfigureret.
+        server_error: Autoriserings serveren blev mÃ¸dt med en uventet betingelse der forhindrede den i at fÃ¦rdiggÃ¸re anmodningen.
+        temporarily_unavailable: Autoriserings serveren er pÃ¥ nuvÃ¦rende tidspunkt ikke i stand til at hÃ¥ndtere anmodningen grundet midlertidig overlast eller serveren er ved at blive opdateret.
         unauthorized_client: Klienten er ikke godkendt til at udfÃ¸re denne anmodning ved at bruge denne metode.
+        unsupported_grant_type: Autoriserings typen understÃ¸ttes ikke af autoriserings serveren.
         unsupported_response_type: Godkendelses serveren understÃ¸tter ikke denne type respons.
     flash:
       applications:
diff --git a/config/locales/doorkeeper.de.yml b/config/locales/doorkeeper.de.yml
index 7f37641803b1fa2307b116bb3345903d43c57e1c..bf4b06e7c25909751fa8abe909fe40df12e9fd7f 100644
--- a/config/locales/doorkeeper.de.yml
+++ b/config/locales/doorkeeper.de.yml
@@ -15,7 +15,7 @@ de:
               fragment_present: darf kein Fragment enthalten.
               invalid_uri: muss ein valider URI sein.
               relative_uri: muss ein absoluter URI sein.
-              secured_uri: muss ein HTTPS/SSL-URI sein.
+              secured_uri: muss ein HTTPS-/SSL-URI sein.
   doorkeeper:
     applications:
       buttons:
@@ -59,7 +59,7 @@ de:
       error:
         title: Ein Fehler ist aufgetreten
       new:
-        able_to: Es wird in der Lage sein zu
+        able_to: 'Es wird folgende Befugnisse haben:'
         prompt: Die Anwendung %{client_name} verlangt Zugriff auf dein Konto
         title: Autorisierung erforderlich
       show:
@@ -115,13 +115,13 @@ de:
         title: OAuth-Autorisierung nÃ¶tig
     scopes:
       follow: Kontenbeziehungen verÃ¤ndern
-      push: erhalte deine Push-Benachrichtigungen
+      push: deine Push-Benachrichtigungen erhalten
       read: all deine Daten lesen
       read:accounts: deine Konteninformationen einsehen
       read:blocks: deine Blockaden einsehen
       read:favourites: deine Favoriten ansehen
       read:filters: deine Filter ansehen
-      read:follows: deine Follows sehen
+      read:follows: sehen, wem du folgst
       read:lists: deine Listen sehen
       read:mutes: deine Stummschaltungen einsehen
       read:notifications: deine Benachrichtigungen sehen
diff --git a/config/locales/doorkeeper.eo.yml b/config/locales/doorkeeper.eo.yml
index 9713c462c4ba1c1a9245359c1320eef51607a2c1..e80ba3236ae361737a0747bdd09cc9a7990ae76e 100644
--- a/config/locales/doorkeeper.eo.yml
+++ b/config/locales/doorkeeper.eo.yml
@@ -114,7 +114,29 @@ eo:
       application:
         title: OAuth-a rajtigo bezonata
     scopes:
-      follow: sekvi, bloki, malbloki kaj malsekvi kontojn
-      push: ricevi puÅ-sciigojn por via konto
-      read: legi la datumojn de via konto
-      write: mesaÄi kiel vi
+      follow: ÅanÄi rilatojn al aliaj kontoj
+      push: ricevi viajn puÅ-sciigojn
+      read: legi Ä‰iujn datumojn de via konto
+      read:accounts: vidi la informojn de la konto
+      read:blocks: vidi viajn blokojn
+      read:favourites: vidi viajn stelumojn
+      read:filters: vidi viajn filtrilojn
+      read:follows: vidi viajn sekvatojn
+      read:lists: vidi viajn listojn
+      read:mutes: vidi viajn silentigojn
+      read:notifications: vidi viajn sciigojn
+      read:reports: vidi viajn signalojn
+      read:search: serÄ‰i vianome
+      read:statuses: vidi Ä‰iujn mesaÄojn
+      write: ÅanÄi Ä‰iujn datumojn de via konto
+      write:accounts: ÅanÄi vian profilon
+      write:blocks: bloki kontojn kaj domajnojn
+      write:favourites: stelumitaj mesaÄoj
+      write:filters: krei filtrilojn
+      write:follows: sekvi homojn
+      write:lists: krei listojn
+      write:media: alÅuti aÅdovidaÄµojn
+      write:mutes: silentigi homojn kaj konversaciojn
+      write:notifications: forigi viajn sciigojn
+      write:reports: signali aliajn homojn
+      write:statuses: publikigi mesaÄojn
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index aba3166ac565bac335b6874a0e805575dc544af3..f98babae657e3d4160e2c6c65f193e5dcb4c3ee0 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -114,7 +114,29 @@ eu:
       application:
         title: OAuth autorizazioa behar da
     scopes:
-      follow: jarraitu kontuak, blokeatu, utzi jarraitzeari eta desblokeatu
-      push: jaso zure kontuaren push jakinarazpenak
-      read: irakurri zure kontuko datuak
-      write: zure izenean argitaratu
+      follow: aldatu kontuaren erlazioak
+      push: jaso push jakinarazpenak
+      read: irakurri zure kontuko datu guztiak
+      read:accounts: ikusi kontuaren informazioa
+      read:blocks: ikusi zure blokeoak
+      read:favourites: ikusi zure gogokoak
+      read:filters: ikusi zure iragazkiak
+      read:follows: ikusi zuk jarraitutakoak
+      read:lists: ikusi zure zerrendak
+      read:mutes: ikusi zuk mutututakoak
+      read:notifications: ikusi zure jakinarazpenak
+      read:reports: ikusi zure salaketak
+      read:search: bilatu zure izenean
+      read:statuses: ikusi mezu guztiak
+      write: kontuaren datu guztiak aldatzea
+      write:accounts: zure profila aldatzea
+      write:blocks: kontuak eta domeinuak blokeatzea
+      write:favourites: gogoko mezuak
+      write:filters: sortu iragazkiak
+      write:follows: jarraitu jendea
+      write:lists: sortu zerrendak
+      write:media: igo multimedia fitxategiak
+      write:mutes: mututu pertsonak eta elkarrizketak
+      write:notifications: garbitu zure jakinarazpenak
+      write:reports: salatu beste jendea
+      write:statuses: argitaratu mezuak
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 09660cb49c4305285e0530eb8147fae2a1e828fd..eae691659f5edc62b54b3233822dda663e70c8e8 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -7,7 +7,7 @@ fr:
         redirect_uri: Lâ€™URL de redirection
         scope: PortÃ©e
         scopes: Ã‰tendues
-        website: Site web de l'application
+        website: Site web de lâ€™application
     errors:
       models:
         doorkeeper/application:
@@ -64,7 +64,7 @@ fr:
         prompt: Autoriser %{client_name} Ã  utiliser votre compteâ€¯?
         title: Autorisation requise
       show:
-        title: Copiez ce code d'autorisation et collez-le dans l'application.
+        title: Copiez ce code dâ€™autorisation et collez-le dans lâ€™application.
     authorized_applications:
       buttons:
         revoke: Annuler
@@ -119,11 +119,12 @@ fr:
       push: recevoir vos notifications
       read: lire toutes les donnÃ©es de votre compte
       read:accounts: voir les informations du compte
-      read:blocks: voir vos bloquÃ©s
+      read:blocks: voir vos bloquages
       read:favourites: voir vos favoris
       read:filters: voir vos filtres
+      read:follows: voir vos suivis
       read:lists: voir vos listes
-      read:mutes: voir vos silenciÃ©s
+      read:mutes: voir vos masquages
       read:notifications: voir vos notifications
       read:reports: voir vos rapports
       read:search: rechercher en votre nom
@@ -131,10 +132,12 @@ fr:
       write: modifier toutes les donnÃ©es de votre compte
       write:accounts: modifier votre profil
       write:blocks: bloquer des comptes et des domaines
+      write:favourites: statuts favoris
       write:filters: crÃ©er des filtres
       write:follows: suivre les gens
       write:lists: crÃ©er des listes
       write:media: tÃ©lÃ©verser des fichiers-mÃ©dia
-      write:mutes: silencier des gens et des conversations
+      write:mutes: masquer des gens et des conversations
       write:notifications: nettoyer vos notifications
+      write:reports: rapporter dâ€™autres personnes
       write:statuses: publier des statuts
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
index 37b6f101333fe31630dc4ebf7d77c87a8763c76b..a76130bb94e384b5a0070b7575a3bdddd46d1049 100644
--- a/config/locales/doorkeeper.it.yml
+++ b/config/locales/doorkeeper.it.yml
@@ -138,4 +138,5 @@ it:
       write:media: caricare media
       write:mutes: silenziare persone e conversazioni
       write:notifications: cancellare le tue notifiche
+      write:reports: fare rapporto su altre persone
       write:statuses: pubblicare status
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index 76174ef797869bbd1c46cb734abf32c61f1d97e1..9bc2d9a80fcf27f6e41b046b61bac4289c10ed91 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -133,7 +133,7 @@ ja:
       write:blocks: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ–ãƒãƒƒã‚¯ã‚„ãƒ‰ãƒ¡ã‚¤ãƒ³ã®éžè¡¨ç¤º
       write:favourites: ãƒˆã‚¥ãƒ¼ãƒˆã®ãŠæ°—ã«å…¥ã‚Šç™»éŒ²
       write:filters: ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã®å¤‰æ›´
-      write:follows: ãƒ•ã‚©ãƒãƒ¼ã®å¤‰æ›´
+      write:follows: ã‚ãªãŸã®ä»£ã‚ã‚Šã«ãƒ•ã‚©ãƒãƒ¼ã€ã‚¢ãƒ³ãƒ•ã‚©ãƒãƒ¼
       write:lists: ãƒªã‚¹ãƒˆã®å¤‰æ›´
       write:media: ãƒ¡ãƒ‡ã‚£ã‚¢ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰
       write:mutes: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚„ä¼šè©±ã®ãƒŸãƒ¥ãƒ¼ãƒˆ
diff --git a/config/locales/doorkeeper.ka.yml b/config/locales/doorkeeper.ka.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e462e66f1585657bdd7486935809d8ebca166a42
--- /dev/null
+++ b/config/locales/doorkeeper.ka.yml
@@ -0,0 +1,142 @@
+---
+ka:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
+        redirect_uri: áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ áƒ˜
+        scopes: áƒ¤áƒáƒ áƒ’áƒšáƒ”áƒ‘áƒ˜
+        website: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ•áƒ”áƒ‘-áƒ¡áƒáƒ˜áƒ¢áƒ˜
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: áƒ•áƒ”áƒ  áƒ”áƒ¥áƒœáƒ”áƒ‘áƒ áƒ¤áƒ áƒáƒ’áƒ›áƒ”áƒ¢áƒ˜.
+              invalid_uri: áƒ£áƒœáƒ“áƒ áƒ˜áƒ§áƒáƒ¡ áƒ•áƒáƒšáƒ˜áƒ“áƒ£áƒ áƒ˜ áƒ£áƒ áƒ˜.
+              relative_uri: áƒ£áƒœáƒ“áƒ áƒ˜áƒ§áƒáƒ¡ áƒáƒ‘áƒ¡áƒáƒšáƒ£áƒ¢áƒ£áƒ áƒ˜ áƒ£áƒ áƒ˜.
+              secured_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: áƒ¥áƒáƒšáƒ‘áƒ”áƒ¥ áƒ£áƒ áƒš
+        delete: áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+        name: áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
+        new: áƒáƒ®áƒáƒšáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ
+        scopes: áƒ¤áƒáƒ áƒ’áƒšáƒ”áƒ‘áƒ˜
+        show: áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ
+        title: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+      new:
+        title: áƒáƒ®áƒáƒšáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ
+      show:
+        actions: áƒ›áƒáƒ¥áƒ›áƒ”áƒ“áƒ”áƒ‘áƒ”áƒ‘áƒ˜
+        application_id: áƒ™áƒšáƒ˜áƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒáƒ¦áƒ”áƒ‘áƒ˜
+        callback_urls: áƒ¥áƒáƒšáƒ‘áƒ”áƒ¥ áƒ£áƒ áƒšáƒ”áƒ‘áƒ˜
+        scopes: áƒ¤áƒáƒ áƒ’áƒšáƒ”áƒ‘áƒ˜
+        secret: áƒ™áƒšáƒ˜áƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜
+        title: 'áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ: %{name}'
+    authorizations:
+      buttons:
+        authorize: áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ
+        deny: áƒáƒ™áƒ áƒ«áƒáƒšáƒ•áƒ
+      error:
+        title: áƒ¬áƒáƒ áƒ›áƒáƒ˜áƒ¨áƒ•áƒ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ
+      new:
+        able_to: áƒ˜áƒ¡ áƒ¨áƒ”áƒ«áƒšáƒ”áƒ‘áƒ¡
+        prompt: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ %{client_name} áƒ˜áƒ—áƒ®áƒáƒ•áƒ¡ áƒ¬áƒ•áƒ“áƒáƒ›áƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ–áƒ”
+        title: áƒ¡áƒáƒáƒ˜áƒ áƒáƒ áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ
+      show:
+        title: áƒ“áƒáƒáƒ™áƒáƒžáƒ˜áƒ áƒ”áƒ— áƒ”áƒ¡ áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ™áƒáƒ“áƒ˜ áƒ“áƒ áƒ©áƒáƒ¡áƒ•áƒ˜áƒ— áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¨áƒ˜.
+    authorized_applications:
+      buttons:
+        revoke: áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+      confirmations:
+        revoke: áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ—?
+      index:
+        application: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ
+        created_at: áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒ”áƒ‘áƒ£áƒšáƒ˜
+        date_format: "%Y-%m-%d %H:%M:%S"
+        scopes: áƒ¤áƒáƒ áƒ’áƒšáƒ”áƒ‘áƒ˜
+        title: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+    errors:
+      messages:
+        access_denied: áƒ áƒ”áƒ¡áƒ£áƒ áƒ¡áƒ˜áƒ¡ áƒ›áƒ¤áƒšáƒáƒ‘áƒ”áƒšáƒ›áƒ áƒáƒœ áƒáƒ£áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ›áƒ áƒáƒ™áƒ áƒ«áƒáƒšáƒ áƒ”áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ.
+        credential_flow_not_configured: áƒ áƒ”áƒ¡áƒ£áƒ áƒ˜áƒ¡ áƒ›áƒ¤áƒšáƒáƒ‘áƒ”áƒšáƒ˜áƒ¡ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒœáƒáƒ™áƒáƒ“áƒ˜ áƒ•áƒ”áƒ  áƒ¨áƒ”áƒ¡áƒ áƒ£áƒšáƒ“áƒ áƒáƒ áƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ Doorkeeper.configure.resource_owner_from_credentials áƒ’áƒáƒ›áƒ.
+        invalid_client: áƒáƒ›áƒáƒ£áƒªáƒœáƒáƒ‘áƒ˜ áƒ™áƒšáƒ˜áƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ’áƒáƒ›áƒ áƒ™áƒšáƒ˜áƒ”áƒœáƒ¢ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ, áƒ™áƒšáƒ˜áƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒáƒ  áƒ˜áƒ§áƒ áƒ—áƒáƒœ áƒ“áƒáƒ áƒ—áƒ£áƒšáƒ˜, áƒáƒœ áƒ›áƒ®áƒáƒ áƒ“áƒáƒ£áƒáƒ”áƒ áƒ”áƒšáƒ˜ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ›áƒ”áƒ—áƒáƒ“áƒ˜.
+        invalid_grant: áƒ›áƒáƒ¬áƒáƒ“áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒ áƒáƒœáƒ¢áƒ˜ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ, áƒ•áƒáƒ“áƒáƒ’áƒáƒ¡áƒ£áƒšáƒ˜áƒ, áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ áƒáƒ  áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ áƒ˜áƒ¡, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ›áƒáƒ˜áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒáƒ¨áƒ˜, áƒáƒœ áƒ›áƒ˜áƒ”áƒªáƒ áƒ¡áƒ®áƒ•áƒ áƒ™áƒšáƒ˜áƒ”áƒœáƒ¢áƒ¡.
+        invalid_redirect_uri: áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ áƒ˜ áƒáƒ áƒáƒ áƒ•áƒáƒšáƒ˜áƒ“áƒ£áƒ áƒ˜.
+        invalid_request: áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒáƒ¡ áƒáƒ™áƒšáƒ˜áƒ áƒáƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ˜, áƒ›áƒáƒ˜áƒªáƒáƒ•áƒ¡ áƒ›áƒ®áƒáƒ áƒ“áƒáƒ£áƒáƒ”áƒ áƒ”áƒš áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ˜áƒ¡ áƒ›áƒœáƒ˜áƒ¨áƒ•áƒœáƒ”áƒšáƒáƒ‘áƒáƒ¡, áƒáƒœ áƒ¡áƒ®áƒ•áƒáƒ’áƒ•áƒáƒ áƒáƒ“ áƒáƒ áƒáƒ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ£áƒšáƒ˜.
+        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: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ˜áƒ¨áƒáƒšáƒ.
+    layouts:
+      admin:
+        nav:
+          applications: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+          oauth2_provider: áƒáƒ£-áƒáƒ£áƒ—2 áƒžáƒ áƒáƒ•áƒáƒ˜áƒ“áƒ”áƒ áƒ˜
+      application:
+        title: áƒ¡áƒáƒáƒ˜áƒ áƒáƒ áƒáƒ£-áƒáƒ£áƒ— áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ
+    scopes:
+      follow: áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ”áƒ— áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ£áƒ áƒ—áƒ˜áƒ”áƒ áƒ—áƒáƒ‘áƒ”áƒ‘áƒ˜
+      push: áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒ£áƒ¨ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      read: áƒ¬áƒáƒ˜áƒ™áƒ˜áƒ—áƒ®áƒáƒ¡ áƒ›áƒ—áƒ”áƒšáƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜
+      read:accounts: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ˜áƒœáƒ¤áƒáƒ áƒ›áƒáƒªáƒ˜áƒ
+      read:blocks: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ‘áƒšáƒáƒ™áƒ”áƒ‘áƒ˜
+      read:favourites: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ”áƒ‘áƒ˜
+      read:filters: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒ˜áƒšáƒ áƒ”áƒ‘áƒ˜
+      read:follows: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ›áƒ˜áƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      read:lists: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜
+      read:mutes: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      read:notifications: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      read:reports: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ”áƒ‘áƒ˜
+      read:search: áƒ›áƒáƒ«áƒ”áƒ‘áƒœáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ—
+      read:statuses: áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ§áƒ•áƒ”áƒšáƒ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜
+      write: áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒáƒ¡ áƒ›áƒ—áƒ”áƒšáƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜
+      write:accounts: áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜
+      write:blocks: áƒ“áƒáƒ‘áƒšáƒáƒ™áƒáƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ”áƒ‘áƒ˜ áƒ“áƒ áƒ“áƒáƒ›áƒ”áƒœáƒ”áƒ‘áƒ˜
+      write:favourites: áƒ¤áƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜
+      write:filters: áƒ¨áƒ”áƒ¥áƒ›áƒœáƒáƒ¡ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ”áƒ‘áƒ˜
+      write:follows: áƒ’áƒáƒ§áƒ•áƒ”áƒ¡ áƒ®áƒáƒšáƒ®áƒ¡
+      write:lists: áƒ¨áƒ”áƒ¥áƒ›áƒœáƒáƒ¡ áƒ¡áƒ˜áƒ”áƒ‘áƒ˜
+      write:media: áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒáƒ¡ áƒ›áƒ”áƒ“áƒ˜áƒ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜
+      write:mutes: áƒ’áƒáƒáƒ’áƒ©áƒ£áƒ›áƒáƒ¡ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ˜ áƒ“áƒ áƒ¡áƒáƒ£áƒ‘áƒ áƒ”áƒ‘áƒ˜
+      write:notifications: áƒ’áƒáƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      write:reports: áƒ“áƒáƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒáƒ¡ áƒ¡áƒ®áƒ•áƒ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ˜
+      write:statuses: áƒ’áƒáƒ›áƒáƒáƒ¥áƒ•áƒ”áƒ§áƒœáƒáƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜
diff --git a/config/locales/doorkeeper.pl.yml b/config/locales/doorkeeper.pl.yml
index 2e0254864c42b98c18f443ce485f47c43b1dd6da..de724f6c97bfa9f9c8c62e318a0727ec88ef46c9 100644
--- a/config/locales/doorkeeper.pl.yml
+++ b/config/locales/doorkeeper.pl.yml
@@ -90,7 +90,7 @@ pl:
           revoked: Token dostÄ™powy zostaÅ‚ uniewaÅ¼niony
           unknown: Token dostÄ™powy jest bÅ‚Ä™dny
         resource_owner_authenticator_not_configured: Wyszukiwanie wÅ‚aÅ›ciciela zasobu nie powiodÅ‚o siÄ™, poniewaÅ¼ Doorkeeper.configure.resource_owner_authenticator nie zostaÅ‚ skonfigurowany.
-        server_error: Serwer uwierzytelniajÄ…cy napotkaÅ‚ nieoczekiwand warunki, ktÃ³re uniemoÅ¼liwiÅ‚y obsÅ‚uÅ¼enie Å¼Ä…dania.
+        server_error: Serwer uwierzytelniajÄ…cy napotkaÅ‚ nieoczekiwane warunki, ktÃ³re uniemoÅ¼liwiÅ‚y obsÅ‚uÅ¼enie Å¼Ä…dania.
         temporarily_unavailable: Serwer uwierzytelniajÄ…cy nie jest obecnie w stanie obsÅ‚uÅ¼yÄ‡ Å¼Ä…dania z powodu tymczasowego przeciÄ…Å¼enia lub prac konserwacyjnych.
         unauthorized_client: Klient nie jest uprawniony do wykonania tego Å¼Ä…dania przy pomocy tej metody.
         unsupported_grant_type: Ten typ grantu uwierzytelniajÄ…cego nie jest wspierany przez serwer uwierzytelniajÄ…cy.
diff --git a/config/locales/doorkeeper.pt-BR.yml b/config/locales/doorkeeper.pt-BR.yml
index afacfd7f7f02927c6b4b582637f3d711de02dc2e..dfab853c64cee908143b17064cb7acb9b3ae4b08 100644
--- a/config/locales/doorkeeper.pt-BR.yml
+++ b/config/locales/doorkeeper.pt-BR.yml
@@ -114,7 +114,29 @@ pt-BR:
       application:
         title: AutorizaÃ§Ã£o OAuth obrigatÃ³ria
     scopes:
-      follow: seguir, bloquear, desbloquear e deixar de seguir outras contas
-      push: receber notificaÃ§Ãµes push na sua conta
-      read: ler os dados da sua conta
-      write: postar em seu nome
+      follow: modificar as relaÃ§Ãµes com outras contas
+      push: receber suas notificaÃ§Ãµes push
+      read: ler todos os dados da sua conta
+      read:accounts: ver as informaÃ§Ãµes da conta
+      read:blocks: ver seus bloqueios
+      read:favourites: ver seus favoritos
+      read:filters: ver seus filtros
+      read:follows: ver quem vocÃª segue
+      read:lists: ver suas listas
+      read:mutes: ver seus usuÃ¡rios silenciados
+      read:notifications: ver suas notificaÃ§Ãµes
+      read:reports: ver suas denÃºncias
+      read:search: buscar em seu nome
+      read:statuses: ver todos os status
+      write: modificar todos os dados da sua conta
+      write:accounts: modificar seu perfil
+      write:blocks: bloquear contas e domÃnios
+      write:favourites: status favoritos
+      write:filters: criar filtros
+      write:follows: seguir pessoas
+      write:lists: criar listas
+      write:media: enviar arquivos de mÃdia
+      write:mutes: silenciar pessoas e conversas
+      write:notifications: limpar suas notificaÃ§Ãµes
+      write:reports: reportar outras pessoas
+      write:statuses: publicar status
diff --git a/config/locales/doorkeeper.ro.yml b/config/locales/doorkeeper.ro.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fea4baf60dee067ea84fcf9b88fa857a86a862db
--- /dev/null
+++ b/config/locales/doorkeeper.ro.yml
@@ -0,0 +1,3 @@
+---
+ro:
+  doorkeeper: {}
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index 0a88d628e5413644ed2f2855c767f0b6139a2736..f3731755959e60f738d82ba09c461af969aa2f38 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -72,7 +72,7 @@ ru:
       index:
         application: ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ
         created_at: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¾
-        date_format: "%Y-%m-%d %H:%M:%S"
+        date_format: "%d.%m.%Y %H:%M:%S"
         scopes: Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ
         title: Ð’Ð°ÑˆÐ¸ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
     errors:
@@ -117,4 +117,26 @@ ru:
       follow: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒÑÑ, Ð¾Ñ‚Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒÑÑ, Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð¸ Ñ€Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñ‹
       push: Ð¿Ñ€Ð¸Ð½Ð¸Ð¼Ð°Ñ‚ÑŒ push-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð’Ð°ÑˆÐµÐ³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°
       read: Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð’Ð°ÑˆÐµÐ³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°
-      write: Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð·Ð° Ð’Ð°Ñ Ð¿Ð¾ÑÑ‚Ñ‹
+      read:accounts: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸ÑŽ Ð¾Ð± Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°Ñ…
+      read:blocks: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²Ð°ÑˆÐ¸Ñ… Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ…
+      read:favourites: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²Ð°ÑˆÐµ Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ
+      read:filters: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²Ð°ÑˆÐ¸ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹
+      read:follows: Ð²Ð¸Ð´ÐµÑ‚ÑŒ, Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð²Ñ‹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹
+      read:lists: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²Ð°ÑˆÐ¸ ÑÐ¿Ð¸ÑÐºÐ¸
+      read:mutes: Ð²Ð¸Ð´ÐµÑ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð·Ð°Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ‹Ñ…
+      read:notifications: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²Ð°ÑˆÐ¸ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ
+      read:reports: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²Ð°ÑˆÐ¸ Ð¶Ð°Ð»Ð¾Ð±Ñ‹
+      read:search: Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¿Ð¾Ð¸ÑÐº
+      read:statuses: Ð²Ð¸Ð´ÐµÑ‚ÑŒ Ð²ÑÐµ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹
+      write: Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ Ð²ÑÐµ Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°
+      write:accounts: Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ð°Ñˆ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŒ
+      write:blocks: Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñ‹ Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ñ‹
+      write:favourites: Ð¾Ñ‚Ð¼ÐµÑ‡Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹ ÐºÐ°Ðº Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ
+      write:filters: ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹
+      write:follows: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒÑÑ Ð½Ð° Ð»ÑŽÐ´ÐµÐ¹
+      write:lists: ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐºÐ¸
+      write:media: Ð²Ñ‹ÐºÐ»Ð°Ð´Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
+      write:mutes: Ð·Ð°Ð³Ð»ÑƒÑˆÐ°Ñ‚ÑŒ Ð»ÑŽÐ´ÐµÐ¹ Ð¸ Ð¾Ð±ÑÑƒÐ¶Ð´ÐµÐ½Ð¸Ñ
+      write:notifications: Ð¾Ñ‡Ð¸Ñ‰Ð°Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹
+      write:reports: Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¶Ð°Ð»Ð¾Ð±Ñ‹ Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¸Ñ…
+      write:statuses: Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹
diff --git a/config/locales/doorkeeper.sl.yml b/config/locales/doorkeeper.sl.yml
index 0967ef424bce6791893e9a57bb952f80fd536e93..c2745708942ac78a6796c4487181d3d938aa2d29 100644
--- a/config/locales/doorkeeper.sl.yml
+++ b/config/locales/doorkeeper.sl.yml
@@ -1 +1,6 @@
-{}
+---
+sl:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Ime programa
diff --git a/config/locales/doorkeeper.uk.yml b/config/locales/doorkeeper.uk.yml
index d80abf01a67cef75b71279d6b7ee7ab72826383e..205ad026f1e69255ff069f0ad9d086efc47182b4 100644
--- a/config/locales/doorkeeper.uk.yml
+++ b/config/locales/doorkeeper.uk.yml
@@ -5,6 +5,8 @@ uk:
       doorkeeper/application:
         name: Ð†Ð¼'Ñ
         redirect_uri: URI Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ
+        scopes: Ð Ð°Ð¼ÐºÐ¸
+        website: Ð’ÐµÐ±-ÑÐ°Ð¹Ñ‚ Ð´Ð¾Ð´Ð°Ñ‚ÐºÑƒ
     errors:
       models:
         doorkeeper/application:
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 9c4f0c2a26b77559da828a3ab16902489c165158..5930ef3e9ba21f8a5a0a902e78a8f5a53b29d944 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -4,14 +4,14 @@ el:
     about_hashtag_html: Î‘Ï…Ï„Î¬ ÎµÎ¯Î½Î±Î¹ ÎºÎ¬Ï€Î¿Î¹Î± Î±Ï€ÏŒ Ï„Î± Î´Î·Î¼ÏŒÏƒÎ¹Î± Ï„Î¿Ï…Ï„ ÏƒÎ·Î¼ÎµÎ¹Ï‰Î¼ÎÎ½Î± Î¼Îµ <strong>#%{hashtag}</strong>. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±Î»Î»Î·Î»ÎµÏ€Î¹Î´ÏÎ¬ÏƒÎµÎ¹Ï‚ Î¼Îµ Î±Ï…Ï„Î¬ Î±Î½ ÎÏ‡ÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î¿Ï€Î¿Ï…Î´Î®Ï€Î¿Ï„Îµ ÏƒÏ„Î¿ fediverse.
     about_mastodon_html: Î¤Î¿ Mastodon ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± ÎºÎ¿Î¹Î½Ï‰Î½Î¹ÎºÏŒ Î´Î¯ÎºÏ„Ï…Î¿ Ï€Î¿Ï… Î²Î±ÏƒÎ¯Î¶ÎµÏ„Î±Î¹ ÏƒÎµ Î±Î½Î¿Î¹Ï‡Ï„Î¬ Î´Î¹ÎºÏ„Ï…Î±ÎºÎ¬ Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î± ÎºÎ±Î¹ ÎµÎ»ÎµÏÎ¸ÎµÏÎ¿ Î»Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒ Î±Î½Î¿Î¹Ï‡Ï„Î¿Ï ÎºÏŽÎ´Î¹ÎºÎ±. Î•Î¯Î½Î±Î¹ Î±Ï€Î¿ÎºÎµÎ½Ï„ÏÏ‰Î¼ÎÎ½Î¿ ÏŒÏ€Ï‰Ï‚ Ï„Î¿ e-mail.
     about_this: Î£Ï‡ÎµÏ„Î¹ÎºÎ¬
-    administered_by: 'Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¯Î¶ÎµÏ„Î±Î¹ Î±Ï€ÏŒ:'
+    administered_by: 'Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚:'
+    api: API
+    apps: Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚ ÎºÎ¹Î½Î·Ï„ÏŽÎ½
     closed_registrations: Î‘Ï…Ï„Î® Ï„Î· ÏƒÏ„Î¹Î³Î¼Î® Î¿Î¹ ÎµÎ³Î³ÏÎ±Ï†ÎÏ‚ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ ÎºÏŒÎ¼Î²Î¿ ÎµÎ¯Î½Î±Î¹ ÎºÎ»ÎµÎ¹ÏƒÏ„ÎÏ‚. Î‘Î»Î»Î¬! ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î²ÏÎµÎ¹Ï‚ ÎÎ½Î±Î½ Î¬Î»Î»Î¿ ÎºÏŒÎ¼Î²Î¿ Î³Î¹Î± Î½Î± Î±Î½Î¿Î¯Î¾ÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÎºÎ±Î¹ Î½Î± ÎÏ‡ÎµÎ¹Ï‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ· Î±Ï€ÏŒ ÎµÎºÎµÎ¯ ÏƒÏ„Î¿ Î¯Î´Î¹Î¿ Î±ÎºÏÎ¹Î²ÏŽÏ‚ Î´Î¯ÎºÏ„Ï…Î¿.
     contact: Î•Ï€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¯Î±
     contact_missing: Î”ÎµÎ½ ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯
     contact_unavailable: Îœ/Î”
-    description_headline: Î¤Î¹ ÎµÎ¯Î½Î±Î¹ Ï„Î¿ %{domain};
-    domain_count_after: Î¬Î»Î»Î¿Ï…Ï‚ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÎÏ‚
-    domain_count_before: Î£Ï…Î½Î´ÎÎµÏ„Î±Î¹ Î¼Îµ
+    documentation: Î¤ÎµÎºÎ¼Î·ÏÎ¯Ï‰ÏƒÎ·
     extended_description_html: |
       <h3>ÎˆÎ½Î± ÎºÎ±Î»ÏŒ ÏƒÎ·Î¼ÎµÎ¯Î¿ Î³Î¹Î± ÎºÎ±Î½ÏŒÎ½ÎµÏ‚</h3>
       <p>Î— Î±Î½Î±Î»Ï…Ï„Î¹ÎºÎ® Ï€ÎµÏÎ¹Î³ÏÎ±Ï†Î® Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Î±ÎºÏŒÎ¼Î± Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯</p>
@@ -19,7 +19,7 @@ el:
       humane_approach_body: ÎœÎ±Î¸Î±Î¯Î½Î¿Î½Ï„Î±Ï‚ Î±Ï€ÏŒ Ï„Î¹Ï‚ Î±Ï€Î¿Ï„Ï…Ï‡Î¯ÎµÏ‚ Î¬Î»Î»Ï‰Î½ Î´Î¹ÎºÏ„ÏÏ‰Î½, Ï„Î¿ Mastodon ÏƒÏ„Î¿Ï‡ÎµÏÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹ ÏƒÏ‡ÎµÎ´Î¹Î±ÏƒÏ„Î¹ÎºÎ¬ Î·Î¸Î¹ÎºÎÏ‚ ÎµÏ€Î¹Î»Î¿Î³ÎÏ‚ Î³Î¹Î± Î½Î± ÎºÎ±Ï„Î±Ï€Î¿Î»ÎµÎ¼Î®ÏƒÎµÎ¹ Ï„Î·Î½ ÎºÎ±ÎºÏŒÎ²Î¿Ï…Î»Î· Ï‡ÏÎ®ÏƒÎ· Ï„Ï‰Î½ ÎºÎ¿Î¹Î½Ï‰Î½Î¹ÎºÏŽÎ½ Î´Î¹ÎºÏ„ÏÏ‰Î½.
       humane_approach_title: ÎœÎ¹Î± Ï€Î¹Î¿ Î±Î½Î¸ÏÏŽÏ€Î¹Î½Î· Ï€ÏÎ¿ÏƒÎÎ³Î³Î¹ÏƒÎ·
       not_a_product_body: Î¤Î¿ Mastodon Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ½Î± ÎµÎ¼Ï€Î¿ÏÎ¹ÎºÏŒ Î´Î¯ÎºÏ„Ï…Î¿. Î”ÎµÎ½ ÎÏ‡ÎµÎ¹ Î´Î¹Î±Ï†Î·Î¼Î¯ÏƒÎµÎ¹Ï‚, Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÎµÎ¾ÏŒÏÏ…Î¾Î· Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½, Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ Ï€ÎµÏÎ¹Ï†ÏÎ±Î³Î¼ÎÎ½Î¿Ï…Ï‚ ÎºÎ®Ï€Î¿Ï…Ï‚. Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ ÎºÎµÎ½Ï„ÏÎ¹ÎºÏŒ ÏƒÎ·Î¼ÎµÎ¯Î¿ ÎµÎ»ÎÎ³Ï‡Î¿Ï….
-      not_a_product_title: Î•Î¯ÏƒÎ±Î¹ ÎÎ½Î±Ï‚ Î¬Î½Î¸ÏÏ‰Ï€Î¿Ï‚, ÏŒÏ‡Î¹ ÎºÎ¬Ï€Î¿Î¹Î¿ Ï€ÏÎ¿ÏŠÏŒÎ½
+      not_a_product_title: Î•Î¯ÏƒÎ±Î¹ Î¬Î½Î¸ÏÏ‰Ï€Î¿Ï‚, ÏŒÏ‡Î¹ Ï€ÏÎ¿ÏŠÏŒÎ½
       real_conversation_body: ÎœÎµ 65,535 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚ ÏƒÏ„Î· Î´Î¹Î¬Î¸ÎµÏƒÎ® ÏƒÎ¿Ï… ÎºÎ±Î¹ Ï…Ï€Î¿ÏƒÏ„Î®ÏÎ¹Î¾Î· Î³Î¹Î± Î»ÎµÏ€Ï„Î¿Î¼ÎµÏÎ® ÎÎ»ÎµÎ³Ï‡Î¿ ÎºÎ±Î¹ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎµÎºÏ†ÏÎ±ÏƒÏ„ÎµÎ¯Ï‚ Î¼Îµ Ï„Î¿Î½ Ï„ÏÏŒÏ€Î¿ Ï€Î¿Ï… Î¸ÎÎ»ÎµÎ¹Ï‚.
       real_conversation_title: Î¦Ï„Î¹Î±Î³Î¼ÎÎ½Î¿ Î³Î¹Î± Î±Î»Î·Î¸Î¹Î½Î® ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·
       within_reach_body: ÎŸÎ¹ Ï€Î¿Î»Î»Î±Ï€Î»ÎÏ‚ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ Î³Î¹Î± Ï„Î¿ iOS, Ï„Î¿ Android ÎºÎ±Î¹ Ï„Î¹Ï‚ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€ÎµÏ‚ Ï€Î»Î±Ï„Ï†ÏŒÏÎ¼ÎµÏ‚, Ï‡Î¬ÏÎ· ÏƒÎµ ÎÎ½Î± Ï†Î¹Î»Î¹ÎºÏŒ Ï€ÏÎ¿Ï‚ Ï„Î¿Ï…Ï‚ Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¹ÏƒÏ„ÎÏ‚ Î¿Î¹ÎºÎ¿ÏƒÏÏƒÏ„Î·Î¼Î± API, ÏƒÎ¿Ï… ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Ï…Î½ Î½Î± ÎºÏÎ±Ï„Î¬Ï‚ ÎµÏ€Î±Ï†Î® Î¼Îµ Ï„Î¿Ï…Ï‚ Ï†Î¯Î»Î¿Ï…Ï‚ ÎºÎ±Î¹ Ï„Î¹Ï‚ Ï†Î¯Î»ÎµÏ‚ ÏƒÎ¿Ï… Î¿Ï€Î¿Ï…Î´Î®Ï€Î¿Ï„Îµ.
@@ -28,25 +28,41 @@ el:
     hosted_on: Î¤Î¿ Mastodon Ï†Î¹Î»Î¿Î¾ÎµÎ½ÎµÎ¯Ï„Î±Î¹ ÏƒÏ„Î¿ %{domain}
     learn_more: ÎœÎ¬Î¸Îµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±
     other_instances: Î›Î¯ÏƒÏ„Î± ÎºÏŒÎ¼Î²Ï‰Î½
+    privacy_policy: Î Î¿Î»Î¹Ï„Î¹ÎºÎ® Î±Ï€Î¿ÏÏÎ®Ï„Î¿Ï…
     source_code: Î Î·Î³Î±Î¯Î¿Ï‚ ÎºÏŽÎ´Î¹ÎºÎ±Ï‚
-    status_count_after: ÎºÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚
-    status_count_before: Î Î¿Ï… ÎÏ‡Î¿Ï…Î½ Î³ÏÎ¬ÏˆÎµÎ¹
-    user_count_after: Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚
+    status_count_after:
+      one: Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ·
+      other: Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚
+    status_count_before: Î Î¿Ï… ÎÎ³ÏÎ±ÏˆÎ±Î½
+    terms: ÎŒÏÎ¿Î¹ Ï‡ÏÎ®ÏƒÎ·Ï‚
+    user_count_after:
+      one: Ï‡ÏÎ®ÏƒÏ„Î·Ï‚
+      other: Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚
     user_count_before: Î£Ï€Î¯Ï„Î¹ Î³Î¹Î±
     what_is_mastodon: Î¤Î¹ ÎµÎ¯Î½Î±Î¹ Ï„Î¿ Mastodon;
   accounts:
+    choices_html: 'Î•Ï€Î¹Î»Î¿Î³ÎÏ‚ Ï„Î¿Ï…/Ï„Î·Ï‚ %{name}:'
     follow: Î‘ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎµ
-    followers: Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹
+    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}
-    posts: Î¤Î¿Ï…Ï„
+    pin_errors:
+      following: Î ÏÎÏ€ÎµÎ¹ Î®Î´Î· Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ Ï„Î¿ Î¬Ï„Î¿Î¼Î¿ Ï€Î¿Ï… Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± ÎµÏ€Î¹Î´Î¿ÎºÎ¹Î¼Î¬ÏƒÎµÎ¹Ï‚
+    posts:
+      one: Î¤Î¿Ï…Ï„
+      other: Î¤Î¿Ï…Ï„
+    posts_tab_heading: Î¤Î¿Ï…Ï„
     posts_with_replies: Î¤Î¿Ï…Ï„ ÎºÎ±Î¹ Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚
-    remote_follow: Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î· Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·
     reserved_username: Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎµÎ¯Î½Î±Î¹ ÎºÎ±Ï„ÎµÎ¹Î»Î·Î¼Î¼ÎÎ½Î¿
     roles:
       admin: Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚
@@ -54,6 +70,9 @@ el:
       moderator: ÎœÎµÏƒÎ¿Î»Î±Î²Î·Ï„Î®Ï‚
     unfollow: Î”Î¹Î±ÎºÎ¿Ï€Î® Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿ÏÎ¸Î·ÏƒÎ·Ï‚
   admin:
+    account_actions:
+      action: Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚
+      title: Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚ Î´Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ·Ï‚ ÏƒÏ„Î¿ %{acct}
     account_moderation_notes:
       create: Î†Ï†Î·ÏƒÎµ ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ·
       created_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÏƒÎ·Î¼ÎµÎ¹ÏŽÎ¼Î±Ï„Î¿Ï‚ Î¼ÎµÏƒÎ¿Î»Î¬Î²Î·ÏƒÎ·Ï‚!
@@ -73,6 +92,7 @@ el:
       confirm: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
       confirmed: Î•Ï€Î¹Î²ÎµÎ²Î±Î¹ÏŽÎ¸Î·ÎºÎµ
       confirming: Î ÏÎ¿Ï‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
+      deleted: Î”Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î¿Î¹
       demote: Î¥Ï€Î¿Î²Î¯Î²Î±ÏƒÎ·
       disable: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
       disable_two_factor_authentication: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2FA
@@ -88,8 +108,11 @@ el:
       followers: Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹
       followers_url: URL Î±ÎºÎ¿Î»Î¿ÏÎ¸Ï‰Î½
       follows: Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯
+      header: Î•Ï€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±
       inbox_url: URL ÎµÎ¹ÏƒÎµÏÏ‡Î¿Î¼ÎÎ½Ï‰Î½
+      invited_by: Î ÏÎ¿ÏƒÎºÎ»Î®Î¸Î·ÎºÎµ Î±Ï€ÏŒ
       ip: IP
+      joined: Î“ÏÎ¬Ï†Ï„Î·ÎºÎµ
       location:
         all: ÎŒÎ»ÎµÏ‚
         local: Î¤Î¿Ï€Î¹ÎºÎ¬
@@ -99,6 +122,7 @@ el:
       media_attachments: Î£Ï…Î½Î·Î¼Î¼ÎÎ½Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±
       memorialize: ÎœÎµÏ„Î±Ï„ÏÎ¿Ï€Î® ÏƒÎµ Î½ÎµÎºÏÎ¿Î»Î¿Î³Î¯Î±
       moderation:
+        active: Î•Î½ÎµÏÎ³ÏŒÏ‚/Î®
         all: ÎŒÎ»Î±
         silenced: Î‘Ï€Î¿ÏƒÎ¹Ï‰Ï€Î·Î¼ÎÎ½Î±
         suspended: Î£Îµ Î±Î½Î±ÏƒÏ„Î¿Î»Î®
@@ -106,13 +130,10 @@ el:
       moderation_notes: Î£Î·Î¼ÎµÎ¹ÏŽÏƒÎµÎ¹Ï‚ Î¼ÎµÏƒÎ¿Î»Î¬Î²Î·ÏƒÎ·Ï‚
       most_recent_activity: Î Î¹Î¿ Ï€ÏÏŒÏƒÏ†Î±Ï„Î· Î´ÏÎ±ÏƒÏ„Î·ÏÎ¹ÏŒÏ„Î·Ï„Î±
       most_recent_ip: Î Î¹Î¿ Ï€ÏÏŒÏƒÏ†Î±Ï„Î· IP
+      no_limits_imposed: Î§Ï‰ÏÎ¯Ï‚ ÏŒÏÎ¹Î±
       not_subscribed: Î†Î½ÎµÏ… ÏƒÏ…Î½Î´ÏÎ¿Î¼Î®Ï‚
-      order:
-        alphabetic: Î‘Î»Ï†Î±Î²Î·Ï„Î¹ÎºÎ¬
-        most_recent: Î Î¹Î¿ Ï€ÏÏŒÏƒÏ†Î±Ï„Î±
-        title: Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ·
       outbox_url: URL ÎµÎ¾ÎµÏÏ‡Î¿Î¼ÎÎ½Ï‰Î½
-      perform_full_suspension: ÎšÎ¬Î½Îµ Ï€Î»Î®ÏÎ· Î±Î½Î±ÏƒÏ„Î¿Î»Î®
+      perform_full_suspension: Î‘Î½Î±ÏƒÏ„Î¿Î»Î®
       profile_url: URL Ï€ÏÎ¿Ï†Î¯Î»
       promote: Î ÏÎ¿Î²Î¯Î²Î±ÏƒÎµ
       protocol: Î ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿
@@ -120,6 +141,7 @@ el:
       push_subscription_expires: Î— ÎµÎ³Î³ÏÎ±Ï†Î® PuSH Î»Î®Î³ÎµÎ¹
       redownload: Î‘Î½Î±Î½ÎÏ‰ÏƒÎ· Î±Î²Î±Ï„Î¬Ï
       remove_avatar: Î‘Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿ Î±Î²Î±Ï„Î¬Ï
+      remove_header: Î‘Ï†Î±Î¯ÏÎµÏƒÎ· ÎµÏ€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±Ï‚
       resend_confirmation:
         already_confirmed: Î‰Î´Î· ÎµÏ€Î¹Î²ÎµÎ²Î±Î¹Ï‰Î¼ÎÎ½Î¿Ï‚ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚
         send: Î•Ï€Î±Î½Î¬Î»Î·ÏˆÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚ email ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚
@@ -138,27 +160,31 @@ el:
       shared_inbox_url: URL ÎºÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Ï‰Î½ ÎµÎ¹ÏƒÎµÏÏ‡Î¿Î¼ÎÎ½Ï‰Î½
       show:
         created_reports: Î‘Î½Î±Ï†Î¿ÏÎÏ‚ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
-        report: ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±
         targeted_reports: Î‘Î½Î±Ï†Î¿ÏÎÏ‚ Î³Î¹Î± Î±Ï…Ï„ÏŒÎ½ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
       silence: Î‘Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎµ
+      silenced: Î‘Ï€Î¿ÏƒÎ¹Ï‰Ï€Î·Î¼ÎÎ½Î¿Î¹
       statuses: ÎšÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚
       subscribe: Î•Î³Î³ÏÎ±Ï†Î®
+      suspended: Î£Îµ Î±Î½Î±ÏƒÏ„Î¿Î»Î®
       title: Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯
       unconfirmed_email: Î‘Î½ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰Ï„Î¿ email
       undo_silenced: Î‘Î½Î±Î¯ÏÎµÏƒÎ· Î±Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·Ï‚
       undo_suspension: Î‘Î½Î±Î¯ÏÎµÏƒÎ· Ï€Î±ÏÏƒÎ·Ï‚
       unsubscribe: ÎšÎ±Ï„Î¬ÏÎ³Î·ÏƒÎ· ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚
       username: ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î·
+      warn: Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·
       web: Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿
     action_logs:
       actions:
         assigned_to_self_report: ÎŸ/Î— %{name} Î±Î½Î¬Î¸ÎµÏƒÎµ Ï„Î·Î½ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î± %{target} ÏƒÏ„Î¿Î½ ÎµÎ±Ï…Ï„ÏŒ Ï„Î¿Ï…/Ï„Î·Ï‚
         change_email_user: ÎŸ/Î— %{name} Î¬Î»Î»Î±Î¾Îµ Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· %{target}
         confirm_user: ÎŸ/Î— %{name} ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎµ Ï„Î· Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· %{target}
+        create_account_warning: ÎŸ/Î— %{name} ÎÏƒÏ„ÎµÎ¹Î»Îµ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï€ÏÎ¿Ï‚ %{target}
         create_custom_emoji: ÎŸ/Î— %{name} Î±Î½ÎÎ²Î±ÏƒÎµ Î½ÎÎ¿ emoji %{target}
         create_domain_block: ÎŸ/Î— %{name} Î¼Ï€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{target}
         create_email_domain_block: ÎŸ/Î— %{name} ÎÎ²Î±Î»Îµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± email %{target} ÏƒÎµ Î¼Î±ÏÏÎ· Î»Î¯ÏƒÏ„Î±
         demote_user: ÎŸ/Î— %{name} Ï…Ï€Î¿Î²Î¯Î²Î±ÏƒÎµ Ï„Î¿ Ï‡ÏÎ®ÏƒÏ„Î· %{target}
+        destroy_custom_emoji: ÎŸ/Î— %{name} ÎºÎ±Ï„ÎÏƒÏ„ÏÎµÏˆÎµ Ï„Î¿ emoji %{target}
         destroy_domain_block: ÎŸ/Î— %{name} Î¾ÎµÎ¼Ï€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{target}
         destroy_email_domain_block: ÎŸ/Î— %{name} ÎÎ²Î±Î»Îµ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± email %{target} ÏƒÎµ Î»ÎµÏ…ÎºÎ® Î»Î¯ÏƒÏ„Î±
         destroy_status: ÎŸ/Î— %{name} Î±Ï†Î±Î¯ÏÎµÏƒÎµ Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï…/Ï„Î·Ï‚ %{target}
@@ -180,6 +206,7 @@ el:
         unsuspend_account: ÎŸ/Î— %{name} Î®ÏÎµ Ï„Î·Î½ Ï€Î±ÏÏƒÎ· Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï Ï„Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î· %{target}
         update_custom_emoji: ÎŸ/Î— %{name} ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎµ Ï„Î¿ emoji %{target}
         update_status: ÎŸ/Î— %{name} ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎµ Ï„Î·Î½ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ· Ï„Î¿Ï…/Ï„Î·Ï‚ %{target}
+      deleted_status: "(Î´Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î· Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ·)"
       title: Î‘ÏÏ‡ÎµÎ¯Î¿ ÎµÎ»ÎÎ³Ï‡Î¿Ï…
     custom_emojis:
       by_domain: Î¤Î¿Î¼ÎÎ±Ï‚
@@ -204,8 +231,30 @@ el:
       title: Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î± emoji
       unlisted: ÎœÎ· ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î±
       update_failed_msg: Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·Ï‚ Ï„Î¿Ï… emoji
-      updated_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î¿Ï… Emoji!
+      updated_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï„Î¿Ï… emoji!
       upload: Î‘Î½ÎÎ²Î±ÏƒÎ¼Î±
+    dashboard:
+      backlog: Ï‡ÏÎ¿Î½Î¿ÎºÎ±Î¸Ï…ÏƒÏ„ÎµÏÎ·Î¼ÎÎ½ÎµÏ‚ ÎµÏÎ³Î±ÏƒÎ¯ÎµÏ‚
+      config: Î”Î¹Î±Î¼ÏŒÏÏ†Ï‰ÏƒÎ·
+      feature_deletions: Î”Î¹Î±Î³ÏÎ±Ï†Î® Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½
+      feature_invites: Î£ÏÎ½Î´ÎµÏƒÎ¼Î¿Î¹ Ï€ÏÎ¿ÏƒÎºÎ»Î®ÏƒÎµÏ‰Î½
+      feature_profile_directory: ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½
+      feature_registrations: Î•Î³Î³ÏÎ±Ï†ÎÏ‚
+      feature_relay: Î‘Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î®Ï‚ Î¿Î¼Î¿ÏƒÏ€Î¿Î½Î´Î¯Î±Ï‚
+      features: Î›ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯ÎµÏ‚
+      hidden_service: ÎŸÎ¼Î¿ÏƒÏ€Î¿Î½Î´Î¯Î± Î¼Îµ ÎºÏÏ…Î¼Î¼ÎÎ½ÎµÏ‚ Ï…Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚
+      open_reports: Î±Î½Î¿Î¹Ï‡Ï„ÎÏ‚ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯ÎµÏ‚
+      recent_users: Î ÏÏŒÏƒÏ†Î±Ï„Î¿Î¹ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚
+      search: Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ· Ï€Î»Î®ÏÎ¿Ï…Ï‚ ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…
+      single_user_mode: Î›ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¯Î± Î¼Î¿Î½Î±Î´Î¹Î±Î¯Î¿Ï… Ï‡ÏÎ®ÏƒÏ„Î·
+      software: Î›Î¿Î³Î¹ÏƒÎ¼Î¹ÎºÏŒ
+      space: ÎšÎ±Ï„Î±Î½Î¬Î»Ï‰ÏƒÎ· Ï‡ÏŽÏÎ¿Ï…
+      title: Î¤Î±Î¼Ï€Î»ÏŒ
+      total_users: Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ ÏƒÏ…Î½Î¿Î»Î¹ÎºÎ¬
+      trends: Î¤Î¬ÏƒÎµÎ¹Ï‚
+      week_interactions: Î±Î»Î»Î·Î»ÎµÏ€Î¹Î´ÏÎ¬ÏƒÎµÎ¹Ï‚ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ²Î´Î¿Î¼Î¬Î´Î±
+      week_users_active: ÎµÎ½ÎµÏÎ³Î¿Î¯ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ²Î´Î¿Î¼Î¬Î´Î±
+      week_users_new: Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÎ²Î´Î¿Î¼Î¬Î´Î±
     domain_blocks:
       add_new: Î ÏÎ¿ÏƒÎ¸Î®ÎºÎ· Î½ÎÎ¿Ï…
       created_msg: ÎŸ Î±Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Î¼ÎÎ± ÎµÎ¯Î½Î±Î¹ Ï…Ï€ÏŒ ÎµÏ€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±
@@ -222,11 +271,13 @@ el:
         title: Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÏŒÏ‚ Î½ÎÎ¿Ï… Ï„Î¿Î¼ÎÎ±
       reject_media: Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
       reject_media_hint: Î‘Ï†Î±Î¹ÏÎµÎ¯ Ï„Î± Ï„Î¿Ï€Î¹ÎºÎ¬ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½ ÎºÎ±Î¹ Î±Ï€Î¿Ï„ÏÎÏ€ÎµÎ¹ Ï„Î· Î»Î®ÏˆÎ· Î¬Î»Î»Ï‰Î½ ÏƒÏ„Î¿ Î¼ÎÎ»Î»Î¿Î½. Î”ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÎ·Î¼Î±ÏƒÎ¯Î± Î³Î¹Î± Ï„Î¹Ï‚ Î±Î½Î±ÏƒÏ„Î¿Î»ÎÏ‚
-      severities:
-        noop: ÎšÎ±Î½ÎÎ½Î±
-        silence: Î‘Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·
-        suspend: Î‘Î½Î±ÏƒÏ„Î¿Î»Î®
-      severity: Î‘Ï…ÏƒÏ„Î·ÏÏŒÏ„Î·Ï„Î±
+      reject_reports: Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¹ÏŽÎ½
+      reject_reports_hint: Î‘Î³Î½ÏŒÎ·ÏƒÎ· ÏŒÏƒÏ‰Î½ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¹ÏŽÎ½ Ï€ÏÎ¿ÎÏÏ‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ±. Î”ÎµÎ½ ÏƒÏ‡ÎµÏ„Î¯Î¶ÎµÏ„Î±Î¹ Î¼Îµ Ï„Î¹Ï‚ Ï€Î±ÏÏƒÎµÎ¹Ï‚
+      rejecting_media: Î±Ï€Î¿ÏÏÎ¯Ï€Ï„Î¿Ï…Î½ Î±ÏÏ‡ÎµÎ¯Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
+      rejecting_reports: Î±Ï€Î¿ÏÏÎ¯Ï€Ï„Î¿Ï…Î½ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯ÎµÏ‚
+      severity:
+        silence: Î±Ï€Î¿ÏƒÎ¹Ï‰Ï€Î·Î¼ÎÎ½Î¿Î¹
+        suspend: Î±Î½ÎµÏƒÏ„Î±Î»Î¼ÎÎ½Î¿Î¹
       show:
         affected_accounts:
           one: Î•Ï€Î·ÏÎµÎ¬Î¶ÎµÏ„Î±Î¹ ÎÎ½Î±Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÏ„Î· Î²Î¬ÏƒÎ· Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½
@@ -236,7 +287,6 @@ el:
           suspend: Î‘Î½Î±Î¯ÏÎµÏƒÎ· Î±Î½Î±ÏƒÏ„Î¿Î»Î®Ï‚ ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½ Ï„Î¿Ï… Ï„Î¿Î¼ÎÎ±
         title: Î‘Î½Î±Î¯ÏÎµÏƒÎ· Î±Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼Î¿Ï Î³Î¹Î± Ï„Î¿Î½ Ï„Î¿Î¼ÎÎ± %{domain}
         undo: Î‘Î½Î±Î¯ÏÎµÏƒÎ·
-      title: Î‘Ï€Î¿ÎºÎ»ÎµÎ¹ÏƒÎ¼ÎÎ½Î¿Î¹ Ï„Î¿Î¼ÎµÎ¯Ï‚
       undo: Î‘Î½Î±Î¯ÏÎµÏƒÎ·
     email_domain_blocks:
       add_new: Î ÏÏŒÏƒÎ¸ÎµÏƒÎ· Î½ÎÎ¿Ï…
@@ -248,19 +298,47 @@ el:
         create: Î ÏÏŒÏƒÎ¸ÎµÏƒÎ· Ï„Î¿Î¼ÎÎ±
         title: ÎÎÎ± ÎµÎ³Î³ÏÎ±Ï†Î® email ÏƒÏ„Î· Î¼Î±ÏÏÎ· Î»Î¯ÏƒÏ„Î±
       title: ÎœÎ±ÏÏÎ· Î»Î¯ÏƒÏ„Î± email
+    followers:
+      back_to_account: Î•Ï€Î¹ÏƒÏ„ÏÎ¿Ï†Î® ÏƒÏ„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
+      title: Î‘ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹ Ï„Î¿Ï…/Ï„Î·Ï‚ %{acct}
     instances:
-      account_count: Î“Î½Ï‰ÏƒÏ„Î¿Î¯ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯
-      domain_name: Î¤Î¿Î¼ÎÎ±Ï‚
-      reset: Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬
-      search: Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·
+      delivery_available: Î”Î¹Î±Î¸ÎÏƒÎ¹Î¼Î· Ï€Î±ÏÎ¬Î´Î¿ÏƒÎ·
+      known_accounts:
+        one: "%{count} Î³Î½Ï‰ÏƒÏ„ÏŒÏ‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚"
+        other: "%{count} Î³Î½Ï‰ÏƒÏ„Î¿Î¯ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯"
+      moderation:
+        all: ÎŒÎ»Î±
+        limited: Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î±
+        title: Î”Î¹Î±Î¼ÎµÏƒÎ¿Î»Î¬Î²Î·ÏƒÎ·
       title: Î“Î½Ï‰ÏƒÏ„Î¿Î¯ ÎºÏŒÎ¼Î²Î¿Î¹
+      total_blocked_by_us: ÎœÏ€Î»Î¿ÎºÎ¬ÏÎ¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ ÎµÎ¼Î¬Ï‚
+      total_followed_by_them: Î‘ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½Ï„Î±Î¹ Î±Ï€ÏŒ ÎµÎºÎµÎ¯Î½Î¿Ï…Ï‚
+      total_followed_by_us: Î‘ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½Ï„Î±Î¹ Î±Ï€ÏŒ ÎµÎ¼Î¬Ï‚
+      total_reported: ÎšÎ±Ï„Î±Î³Î³ÎµÎ»Î¯ÎµÏ‚ Ï€ÏÎ¿Ï‚ ÎµÎºÎµÎ¯Î½Î¿Ï…Ï‚
+      total_storage: Î£Ï…Î½Î·Î¼Î¼ÎÎ½Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±
     invites:
+      deactivate_all: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÏŒÎ»Ï‰Î½
       filter:
         all: ÎŒÎ»ÎµÏ‚
         available: Î”Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚
         expired: Î›Î·Î³Î¼ÎÎ½ÎµÏ‚
         title: Î¦Î¯Î»Ï„ÏÎ¿
       title: Î ÏÎ¿ÏƒÎºÎ»Î®ÏƒÎµÎ¹Ï‚
+    relays:
+      add_new: Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ Î½ÎÎ¿ Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î® (relay)
+      delete: Î”Î¹Î±Î³ÏÎ±Ï†Î®
+      description_html: ÎŸ <strong>Î¿Î¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÏŒÏ‚ Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î®Ï‚</strong> ÎµÎ¯Î½Î±Î¹ ÎÎ½Î±Ï‚ ÎµÎ½Î´Î¹Î¬Î¼ÎµÏƒÎ¿Ï‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ (server) Ï€Î¿Ï… Î±Î½Ï„Î±Î»Î»Î¬ÏƒÏƒÎµÎ¹ Î¼ÎµÎ³Î¬Î»Î¿Ï…Ï‚ ÏŒÎ³ÎºÎ¿Ï…Ï‚ Î´Î·Î¼ÏŒÏƒÎ¹Ï‰Î½ Ï„Î¿Ï…Ï„ Î¼ÎµÏ„Î±Î¾Ï ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÏŽÎ½ Ï€Î¿Ï… ÎµÎ³Î³ÏÎ¬Ï†Î¿Î½Ï„Î±Î¹ ÎºÎ±Î¹ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÎ¿Ï…Î½ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½. <strong>Î’Î¿Î·Î¸Î¬ÎµÎ¹ Î¼Î¹ÎºÏÎ¿ÏÏ‚ ÎºÎ±Î¹ Î¼ÎµÏƒÎ±Î¯Î¿Ï…Ï‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚ Î½Î± Î±Î½Î±ÎºÎ±Î»ÏÏˆÎ¿Ï…Î½ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿ ÏƒÏ„Î¿ fediverse</strong>, Ï€Î¿Ï… Ï…Ï€ÏŒ Î¬Î»Î»ÎµÏ‚ ÏƒÏ…Î½Î¸Î®ÎºÎµÏ‚ Î¸Î± Ï‡ÏÎµÎ¹Î±Î¶ÏŒÏ„Î±Î½ ÎºÎ¬Ï€Î¿Î¹Î¿Ï…Ï‚ Ï„Î¿Ï€Î¹ÎºÎ¿ÏÏ‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Ï€Î¿Ï… Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ ÏƒÎµ Î±Ï€Î¿Î¼Î±ÎºÏÏ…ÏƒÎ¼ÎÎ½Î¿Ï…Ï‚ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚.
+      disable: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+      disabled: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿
+      enable: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+      enable_hint: ÎœÏŒÎ»Î¹Ï‚ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯, Î¿ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î®Ï‚ (server) ÏƒÎ¿Ï… Î¸Î± ÎµÎ³Î³ÏÎ±Ï†ÎµÎ¯ ÏƒÎµ ÏŒÎ»Î± Ï„Î± Î´Î·Î¼ÏŒÏƒÎ¹Î± Ï„Î¿Ï…Ï„ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î® (relay) ÎºÎ±Î¹ Î¸Î± Î±ÏÏ‡Î¯ÏƒÎµÎ¹ Î½Î± Ï€ÏÎ¿Ï‰Î¸ÎµÎ¯ Ï„Î± Î´Î¹ÎºÎ¬ Ï„Î¿Ï… Î´Î·Î¼ÏŒÏƒÎ¹Î± Ï„Î¿Ï…Ï„ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½.
+      enabled: Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½Î¿
+      inbox_url: URL Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î®
+      pending: Î ÎµÏÎ¹Î¼ÎÎ½Î¿Î½Ï„Î±Ï‚ Ï„Î·Î½ ÎÎ³ÎºÏÎ¹ÏƒÎ· Ï„Î¿Ï… Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î®
+      save_and_enable: Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· ÎºÎ±Î¹ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+      setup: ÎŒÏÎ¹ÏƒÎµ Î¼Î¹Î± ÏƒÏÎ½Î´ÎµÏƒÎ· Î±Î½Ï„Î±Ï€ÏŒÎºÏÎ¹ÏƒÎ·Ï‚
+      status: ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·
+      title: Î‘Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„ÎÏ‚
     report_notes:
       created_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ·Ï‚ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±Ï‚!
       destroyed_msg: Î•Ï€Î¹Ï„Ï…Ï‡Î®Ï‚ Î´Î¹Î±Î³ÏÎ±Ï†Î® ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ·Ï‚ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±Ï‚!
@@ -274,32 +352,26 @@ el:
       assigned: Î‘ÏÎ¼ÏŒÎ´Î¹Î¿Ï‚ ÏƒÏ…Î½Ï„Î¿Î½Î¹ÏƒÏ„Î®Ï‚
       comment:
         none: ÎšÎ±Î½ÎÎ½Î±
-      created_at: Î‘Î½Î±Ï†ÎÏÎ¸Î·ÎºÎµ
-      id: ID
+      created_at: ÎšÎ±Ï„Î±Î³Î³ÎÎ»Î¸Î·ÎºÎµ
       mark_as_resolved: Î£Î·Î¼ÎµÎ¹Ï‰Î¼ÎÎ½Î¿ Ï‰Ï‚ ÎµÏ€Î¹Î»Ï…Î¼ÎÎ½Î¿
       mark_as_unresolved: Î£Î·Î¼ÎµÎ¹Ï‰Î¼ÎÎ½Î¿ Ï‰Ï‚ Î±Î½ÎµÏ€Î¯Î»Ï…Ï„Î¿
       notes:
         create: Î ÏÏŒÏƒÎ¸ÎµÏƒÎµ ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ·
         create_and_resolve: Î•Ï€Î¯Î»Ï…ÏƒÎµ Î¼Îµ ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ·
         create_and_unresolve: ÎžÎ±Î½Î¬Î½Î¿Î¹Î¾Îµ Î¼Îµ ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ·
-        delete: Î”Î¹ÎÎ³ÏÎ±ÏˆÎµ
+        delete: Î”Î¹Î±Î³ÏÎ±Ï†Î®
         placeholder: Î ÎµÏÎ¹ÎÎ³ÏÎ±ÏˆÎµ Ï„Î¹Ï‚ ÎµÎ½ÎÏÎ³ÎµÎ¹ÎµÏ‚ Ï€Î¿Ï… ÎÎ³Î¹Î½Î±Î½, Î® Î¿Ï€Î¿Î¹Î±Î´Î®Ï€Î¿Ï„Îµ Î¬Î»Î»Î· ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·...
       reopen: ÎžÎ±Î½Î¬Î½Î¿Î¹Î¾Îµ Ï„Î·Î½ ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±
       report: 'ÎšÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î± #%{id}'
-      report_contents: Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î±
       reported_account: Î‘Î½Î±Ï†ÎµÏÏŒÎ¼ÎµÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚
       reported_by: Î‘Î½Î±Ï†ÎÏÎ¸Î·ÎºÎµ Î±Ï€ÏŒ
       resolved: Î•Ï€Î¹Î»ÏÎ¸Î·ÎºÎµ
       resolved_msg: Î— ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î± ÎµÏ€Î¹Î»ÏÎ¸Î·ÎºÎµ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚!
-      silence_account: Î‘Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ· Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
       status: ÎšÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·
-      suspend_account: Î‘Î½ÎÏƒÏ„ÎµÎ¹Î»Îµ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ
-      target: Î‘Ï€Î¿Î´ÎÎºÏ„Î·Ï‚
       title: Î‘Î½Î±Ï†Î¿ÏÎÏ‚
       unassign: Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·
       unresolved: Î†Î»Ï…Ï„Î·
       updated_at: Î•Î½Î·Î¼ÎµÏÏ‰Î¼ÎÎ½Î·
-      view: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ·
     settings:
       activity_api_enabled:
         desc_html: ÎšÎ±Ï„Î±Î¼ÎÏ„ÏÎ·ÏƒÎ· Ï„Î¿Ï€Î¹ÎºÏŽÎ½ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÏ‰Î½, ÎµÎ½ÎµÏÎ³ÏŽÎ½ Ï‡ÏÎ·ÏƒÏ„ÏŽÎ½ ÎºÎ±Î¹ Î½ÎÏ‰Î½ ÎµÎ³Î³ÏÎ±Ï†ÏŽÎ½ ÏƒÎµ ÎµÎ²Î´Î¿Î¼Î±Î´Î¹Î±Î¯ÎµÏ‚ Î¿Î¼Î±Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚
@@ -310,12 +382,24 @@ el:
       contact_information:
         email: Î•Ï€Î±Î³Î³ÎµÎ»Î¼Î±Ï„Î¹ÎºÏŒ email
         username: ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¯Î±Ï‚
+      custom_css:
+        desc_html: Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î·Ï‚ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ Î¼ÎÏƒÏ‰ CSS Ï€Î¿Ï… Ï†Î¿ÏÏ„ÏŽÎ½ÎµÏ„Î±Î¹ ÏƒÎµ ÎºÎ¬Î¸Îµ ÏƒÎµÎ»Î¯Î´Î±
+        title: Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿ CSS
       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
@@ -336,11 +420,14 @@ el:
         desc_html: Î”ÎµÎ¯Î¾Îµ ÎÎ½Î± ÏƒÎ®Î¼Î± Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï ÏƒÏ„Î· ÏƒÎµÎ»Î¯Î´Î± ÎµÎ½ÏŒÏ‚ Ï‡ÏÎ®ÏƒÏ„Î·
         title: Î”ÎµÎ¯Î¾Îµ Î´Î¹Î±ÎºÏÎ¹Ï„Î¹ÎºÏŒ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¿Ï
       site_description:
-        desc_html: Î•Î¹ÏƒÎ±Î³Ï‰Î³Î¹ÎºÎ® Ï€Î±ÏÎ¬Î³ÏÎ±Ï†Î¿Ï‚ ÏƒÏ„Î·Î½ Î±ÏÏ‡Î¹ÎºÎ® ÏƒÎµÎ»Î¯Î´Î± ÎºÎ±Î¹ ÏƒÏ„Î± meta tags. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ HTML tags, ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î± <code>&lt; a&gt;</code> ÎºÎ±Î¹ <code> &lt; em&gt;</code>.
+        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: Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î¿Î¹ ÏŒÏÎ¿Î¹ Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚
@@ -362,6 +449,7 @@ el:
       media:
         title: Î Î¿Î»Ï…Î¼ÎÏƒÎ±
       no_media: Î§Ï‰ÏÎ¯Ï‚ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±
+      no_status_selected: ÎšÎ±Î¼Î¯Î± Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ· Î´ÎµÎ½ Î¬Î»Î»Î±Î¾Îµ Î±Ï†Î¿Ï ÎºÎ±Î¼Î¯Î± Î´ÎµÎ½ Î®Ï„Î±Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î·
       title: ÎšÎ±Ï„Î±ÏƒÏ„Î¬ÏƒÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
       with_media: ÎœÎµ Ï€Î¿Î»Ï…Î¼ÎÏƒÎ±
     subscriptions:
@@ -371,7 +459,21 @@ el:
       last_delivery: Î¤ÎµÎ»ÎµÏ…Ï„Î±Î¯Î± Ï€Î±ÏÎ¬Î´Î¿ÏƒÎ·
       title: WebSub
       topic: Î˜ÎÎ¼Î±
+    tags:
+      accounts: Î›Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Î¯
+      hidden: ÎšÏÏ…Î¼Î¼ÎÎ½ÎµÏ‚
+      hide: Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· Î±Ï€ÏŒ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿
+      name: Î¤Î±Î¼Ï€ÎÎ»Î±
+      title: Î¤Î±Î¼Ï€ÎÎ»ÎµÏ‚
+      unhide: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÏƒÎµ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿
+      visible: Î•Î¼Ï†Î±Î½ÎµÎ¯Ï‚
     title: Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ·
+    warning_presets:
+      add_new: Î ÏÏŒÏƒÎ¸ÎµÏƒÎ· Î½ÎÎ¿Ï…
+      delete: Î”Î¹Î±Î³ÏÎ±Ï†Î®
+      edit: Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ·
+      edit_preset: Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î·Ï‚ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚
+      title: Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Ï‰Î½ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½
   admin_mailer:
     new_report:
       body: ÎŸ/Î— %{reporter} ÎºÎ±Ï„Î®Î³Î³ÎµÎ¹Î»Îµ Ï„Î¿Î½/Ï„Î·Î½ %{target}
@@ -393,7 +495,7 @@ el:
     warning: ÎœÎµÎ³Î¬Î»Î· Ï€ÏÎ¿ÏƒÎ¿Ï‡Î® Î¼Îµ Î±Ï…Ï„Î¬ Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î±. ÎœÎ·Î½ Ï„Î± Î¼Î¿Î¹ÏÎ±ÏƒÏ„ÎµÎ¯Ï‚ Ï€Î¿Ï„Î Î¼Îµ ÎºÎ±Î½ÎÎ½Î±Î½!
     your_token: Î¤Î¿ Î´Î¹Î±ÎºÏÎ¹Ï„Î¹ÎºÏŒ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ®Ï‚ ÏƒÎ¿Ï… (access token)
   auth:
-    agreement_html: ÎœÎµ Ï„Î·Î½ ÎµÎ³Î³ÏÎ±Ï†Î® ÏƒÎ¿Ï…, ÏƒÏ…Î¼Ï†Ï‰Î½ÎµÎ¯Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ <a href="%{rules_path}">Ï„Î¿Ï…Ï‚ ÎºÎ±Î½ÏŒÎ½ÎµÏ‚ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï…</a> ÎºÎ±Î¹ <a href="%{terms_path}">Ï„Î¿Ï…Ï‚ ÏŒÏÎ¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î¿Ï…</a>.
+    agreement_html: Î•Ï€Î¹Î»ÎÎ³Î¿Î½Ï„Î±Ï‚ Ï„Î¿ "Î•Î³Î³ÏÎ±Ï†Î®", ÏƒÏ…Î¼Ï†Ï‰Î½ÎµÎ¯Ï‚ Ï€Ï‰Ï‚ Î´ÎÏ‡ÎµÏƒÎ±Î¹ <a href="%{rules_path}">Ï„Î¿Ï…Ï‚ ÎºÎ±Î½ÏŒÎ½ÎµÏ‚ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï…</a> ÎºÎ±Î¹ <a href="%{terms_path}">Ï„Î¿Ï…Ï‚ ÏŒÏÎ¿Ï…Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚ Ï„Î¿Ï…</a>.
     change_password: Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ
     confirm_email: Î•Ï€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ· email
     delete_account: Î”Î¹Î±Î³ÏÎ±Ï†Î® email
@@ -430,7 +532,7 @@ el:
   datetime:
     distance_in_words:
       about_x_hours: "%{count}Ï‰"
-      about_x_months: "%{count}Î¼Î·"
+      about_x_months: "%{count}Î¼"
       about_x_years: "%{count}Îµ"
       almost_x_years: "%{count}Îµ"
       half_a_minute: ÎœÏŒÎ»Î¹Ï‚ Ï„ÏŽÏÎ±
@@ -449,6 +551,16 @@ el:
     success_msg: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… Î´Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎµ Î¼Îµ ÎµÏ€Î¹Ï„Ï…Ï‡Î¯Î±
     warning_html: ÎœÏŒÎ½Î¿ Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï… Î±Ï€ÏŒ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½Î¿ ÎºÏŒÎ¼Î²Î¿ ÎµÎ¯Î½Î±Î¹ ÎµÎ³Î³Ï…Î·Î¼ÎÎ½Î·. Î¤Î¿ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿ Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÏ„ÎµÎ¯ ÎµÏ…ÏÎÏ‰Ï‚ ÎµÎ¯Î½Î±Î¹ Ï€Î¹Î¸Î±Î½ÏŒ Î½Î± Î±Ï†Î®ÏƒÎµÎ¹ Î¯Ï‡Î½Î·. ÎŒÏƒÎ¿Î¹ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„ÎÏ‚ ÎµÎ¯Î½Î±Î¹ ÎµÎºÏ„ÏŒÏ‚ ÏƒÏÎ½Î´ÎµÏƒÎ·Ï‚ ÎºÎ±Î¹ ÏŒÏƒÎ¿Î¹ ÎÏ‡Î¿Ï…Î½ Î´Î¹Î±ÎºÏŒÏˆÎµÎ¹ Ï„Î· Î»Î®ÏˆÎ· Ï„Ï‰Î½ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÏ‰Î½ Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï… ÏƒÎ¿Ï…, Î´Îµ Î¸Î± ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎ¿Ï…Î½ Ï„Î¹Ï‚ Î²Î¬ÏƒÎµÎ¹Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Ï„Î¿Ï…Ï‚.
     warning_title: Î”Î¹Î±Î¸ÎµÏƒÎ¹Î¼ÏŒÏ„Î·Ï„Î± Î®Î´Î· Î´Î¹Î±Î½ÎµÎ¼Î·Î¼ÎÎ½Î¿Ï… Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï…
+  directories:
+    directory: ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŽÎ½
+    enabled: Î ÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÏƒÎ±Î¹ ÏƒÏ„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿.
+    enabled_but_waiting: ÎˆÏ‡ÎµÎ¹Ï‚ ÎµÏ€Î¹Î»ÎÎ¾ÎµÎ¹ Î½Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÏƒÎ±Î¹ ÏƒÏ„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿ Î¼ÎµÎ½, Î±Î»Î»Î¬ Î±ÎºÏŒÎ¼Î± Î´ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Ï„Î¿Î½ ÎµÎ»Î¬Ï‡Î¹ÏƒÏ„Î¿ Î±ÏÎ¹Î¸Î¼ÏŒ Î±ÎºÏŒÎ»Î¿Ï…Î¸Ï‰Î½ (%{min_followers}) Ï€Î¿Ï… Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Î½Î± ÏƒÏ…Î¼Ï€ÎµÏÎ¹Î»Î·Ï†Î¸ÎµÎ¯Ï‚.
+    explanation: Î’ÏÎµÏ‚ Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ Î²Î¬ÏƒÎµÎ¹ Ï„Ï‰Î½ ÎµÎ½Î´Î¹Î±Ï†ÎµÏÏŒÎ½Ï„Ï‰Î½ Ï„Î¿Ï…Ï‚
+    explore_mastodon: Î•Î¾ÎµÏÎµÏÎ½Î·ÏƒÎµ %{title}
+    how_to_enable: Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ ÎµÏ€Î¹Î»ÎÎ¾ÎµÎ¹ Î½Î± ÏƒÏ…Î¼Ï€ÎµÏÎ¹Î»Î·Ï†Î¸ÎµÎ¯Ï‚ ÏƒÏ„Î¿Î½ ÎºÎ±Ï„Î±Î»Î¿Î³Î¿. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎµÏ€Î¹Î»ÎÎ¾ÎµÎ¹Ï‚ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰. Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚ ÏƒÏ„Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Ï„Î¿Ï… Î²Î¹Î¿Î³ÏÎ±Ï†Î¹ÎºÎ¿Ï ÏƒÎ¿Ï… Î³Î¹Î± Î½Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÏƒÎ±Î¹ ÎºÎ¬Ï„Ï‰ Î±Ï€ÏŒ ÏƒÏ…Î³ÎºÎµÎºÏÎ¹Î¼ÎÎ½ÎµÏ‚ Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚!
+    people:
+      one: "%{count} Î¬Ï„Î¿Î¼Î¿"
+      other: "%{count} Î¬Ï„Î¿Î¼Î±"
   errors:
     '403': Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Î´Î¹ÎºÎ±Î¯Ï‰Î¼Î± Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ ÏƒÎµ Î±Ï…Ï„Î® Ï„Î· ÏƒÎµÎ»Î¯Î´Î±.
     '404': Î— ÏƒÎµÎ»Î¯Î´Î± Ï€Î¿Ï… ÏˆÎ¬Ï‡Î½ÎµÎ¹Ï‚ Î´ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹.
@@ -460,7 +572,7 @@ el:
     '500':
       content: Î›Ï…Ï€Î¿ÏÎ¼Î±ÏƒÏ„Îµ, ÎºÎ¬Ï„Î¹ Ï€Î®Î³Îµ ÏƒÏ„ÏÎ±Î²Î¬ Î±Ï€ÏŒ Ï„Î· Î´Î¹ÎºÎ® Î¼Î±Ï‚ Î¼ÎµÏÎ¹Î¬.
       title: Î— ÏƒÎµÎ»Î¯Î´Î± Î±Ï…Ï„Î® Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‰ÏƒÏ„Î®
-    noscript_html: Î“Î¹Î± Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î· Î´Î¹ÎºÏ„Ï…Î±ÎºÎ® ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Ï„Î¿Ï… Mastodon, ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î·Î½ Javascript. Î•Î½Î±Î»Î»Î±ÎºÏ„Î¹ÎºÎ¬, Î´Î¿ÎºÎ¯Î¼Î±ÏƒÎµ Î¼Î¹Î± Î±Ï€ÏŒ Ï„Î¹Ï‚ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚</a> Î³Î¹Î± Ï„Î¿ Mastodon ÏƒÏ„Î·Î½ Ï€Î»Î±Ï„Ï†ÏŒÏÎ¼Î± ÏƒÎ¿Ï….
+    noscript_html: Î“Î¹Î± Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Ï„Î· Î´Î¹ÎºÏ„Ï…Î±ÎºÎ® ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Ï„Î¿Ï… Mastodon, ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î·Î½ Javascript. Î•Î½Î±Î»Î»Î±ÎºÏ„Î¹ÎºÎ¬, Î´Î¿ÎºÎ¯Î¼Î±ÏƒÎµ Î¼Î¹Î± Î±Ï€ÏŒ Ï„Î¹Ï‚ <a href="%{apps_path}">ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚</a> Î³Î¹Î± Ï„Î¿ Mastodon ÏƒÏ„Î·Î½ Ï€Î»Î±Ï„Ï†ÏŒÏÎ¼Î± ÏƒÎ¿Ï….
   exports:
     archive_takeout:
       date: Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î±
@@ -471,7 +583,9 @@ el:
       size: ÎœÎÎ³ÎµÎ¸Î¿Ï‚
     blocks: ÎœÏ€Î»Î¿ÎºÎ¬ÏÎµÎ¹Ï‚
     csv: CSV
+    domain_blocks: ÎœÏ€Î»Î¿ÎºÎ±ÏÎ¯ÏƒÎ¼Î±Ï„Î± ÎºÏŒÎ¼Î²Ï‰Î½
     follows: Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚
+    lists: Î›Î¯ÏƒÏ„ÎµÏ‚
     mutes: Î‘Ï€Î¿ÏƒÎ¹Ï‰Ï€Î¬Ï‚
     storage: Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
   filters:
@@ -502,10 +616,14 @@ el:
     true_privacy_html: ÎˆÏ‡Îµ Ï…Ï€' ÏŒÏˆÎ¹Î½ ÏƒÎ¿Ï… Ï€Ï‰Ï‚ <strong>Î· Ï€ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÎ® Î¹Î´Î¹Ï‰Ï„Î¹ÎºÏŒÏ„Î·Ï„Î± ÎµÏ€Î¹Ï„Ï…Î³Ï‡Î¬Î½ÎµÏ„Î±Î¹ Î¼ÏŒÎ½Î¿ Î¼Îµ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ· Î±Ï€ÏŒ Î¬ÎºÏÎ· ÏƒÎµ Î¬ÎºÏÎ·</strong>.
     unlocked_warning_html: ÎœÏ€Î¿ÏÎµÎ¯ Î¿ Î¿Ï€Î¿Î¹Î¿ÏƒÎ´Î®Ï€Î¿Ï„Îµ Î½Î± ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹ ÎºÎ±Î¹ Î½Î± Î²Î»ÎÏ€ÎµÎ¹ ÎºÎ±Ï„ÎµÏ…Î¸ÎµÎ¯Î±Î½ Ï„Î¹Ï‚ Î¹Î´Î¹Ï‰Ï„Î¹ÎºÎÏ‚ ÎµÎ½Î·Î¼ÎµÏÏŽÏƒÎµÎ¹Ï‚ ÏƒÎ¿Ï…. %{lock_link} Î³Î¹Î± Î½Î± Î±Î½Î±Î¸ÎµÏ‰ÏÎ®ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Î±Ï€Î¿ÏÏÎ¯ÏˆÎµÎ¹Ï‚ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Ï…Ï‚.
     unlocked_warning_title: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎºÎ»ÎµÎ¹Î´Ï‰Î¼ÎÎ½Î¿Ï‚
+  footer:
+    developers: Î‘Î½Î¬Ï€Ï„Ï…Î¾Î·
+    more: Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±â€¦
+    resources: Î ÏŒÏÎ¿Î¹
   generic:
     changes_saved_msg: ÎŸÎ¹ Î±Î»Î»Î±Î³ÎÏ‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏÏ„Î·ÎºÎ±Î½!
-    powered_by: Ï€Î±ÏÎÏ‡ÎµÏ„Î±Î¹ Î±Ï€ÏŒ %{link}
-    save_changes: Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎµ Î±Î»Î»Î±Î³ÎÏ‚
+    copy: Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î®
+    save_changes: Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎµ Ï„Î¹Ï‚ Î±Î»Î»Î±Î³ÎÏ‚
     validation_errors:
       one: ÎšÎ¬Ï„Î¹ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ½Ï„Î¬Î¾ÎµÎ¹ Î±ÎºÏŒÎ¼Î±! Î“Î¹Î± ÎºÎ¿Î¯Ï„Î±Î¾Îµ Ï„Î¿ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ ÏƒÏ†Î¬Î»Î¼Î±
       other: ÎšÎ¬Ï„Î¹ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ½Ï„Î¬Î¾ÎµÎ¹ Î±ÎºÏŒÎ¼Î±! Î“Î¹Î± ÎºÎ¿Î¯Ï„Î±Î¾Îµ Ï„Î± Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ %{count} ÏƒÏ†Î¬Î»Î¼Î±Ï„Î±
@@ -540,8 +658,6 @@ el:
       expires_at: Î›Î®Î³ÎµÎ¹
       uses: Î§ÏÎ®ÏƒÎµÎ¹Ï‚
     title: Î ÏÎ¿ÏƒÎºÎ¬Î»ÎµÏƒÎµ Î¬Ï„Î¿Î¼Î±
-  landing_strip_html: ÎŸ/Î— <strong>%{name}</strong> ÎµÎ¯Î½Î±Î¹ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ ÏƒÏ„Î¿ %{link_to_root_path}. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚ Î® Î½Î± Î±Î»Î»Î·Î»ÎµÏ€Î¹Î´ÏÎ¬ÏƒÎµÎ¹Ï‚ Î¼Î±Î¶Î¯ Ï„Î¿Ï…Ï‚ Î±Î½ ÎÏ‡ÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Î¿Ï€Î¿Ï…Î´Î®Ï€Î¿Ï„Îµ ÏƒÏ„Î¿ fediverse.
-  landing_strip_signup_html: Î‘Î½ ÏŒÏ‡Î¹, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± <a href="%{sign_up_path}">Î³ÏÎ±Ï†Ï„ÎµÎ¯Ï‚ ÎµÎ´ÏŽ</a>.
   lists:
     errors:
       limit: ÎˆÏ‡ÎµÎ¹Ï‚ Ï†Ï„Î¬ÏƒÎµÎ¹ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Ï€Î»Î®Î¸Î¿Ï‚ ÎµÏ€Î¹Ï„ÏÎµÏ€Ï„ÏŽÎ½ Î»Î¹ÏƒÏ„ÏŽÎ½
@@ -595,11 +711,11 @@ el:
       decimal_units:
         format: "%n%u"
         units:
-          billion: Î”Î¹Ï‚.
-          million: Î•Îº.
-          quadrillion: Î¤ÎµÏ„Ï.
-          thousand: Î§.
-          trillion: Î¤ÏÎ¹Ï‚.
+          billion: Î´Î¹Ï‚.
+          million: ÎµÎº.
+          quadrillion: Ï„ÎµÏ„ÏÎ¬ÎºÎ¹Ï‚.
+          thousand: Ï‡.
+          trillion: Ï„ÏÎ¹Ï‚.
   pagination:
     newer: ÎÎµÏŒÏ„ÎµÏÎ¿
     next: Î•Ï€ÏŒÎ¼ÎµÎ½Î¿
@@ -612,15 +728,30 @@ el:
     publishing: Î”Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ·
     web: Î”Î¹Î±Î´Î¯ÎºÏ„Ï…Î¿
   remote_follow:
-    acct: Î“ÏÎ¬ÏˆÎµ Ï„Î¿ ÎŒÎ½Î¿Î¼Î±Î§ÏÎ®ÏƒÏ„Î·@Ï„Î¿Î¼ÎÎ±Ï‚ Î±Ï€ÏŒ ÏŒÏ€Î¿Ï… Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚
+    acct: Î“ÏÎ¬ÏˆÎµ Ï„Î¿ ÎŒÎ½Î¿Î¼Î±Î§ÏÎ®ÏƒÏ„Î·@Ï„Î¿Î¼ÎÎ± Î±Ï€ÏŒ ÏŒÏ€Î¿Ï… Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± ÎµÎºÏ„ÎµÎ»ÎÏƒÎµÎ¹Ï‚ Ï„Î·Î½ ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î±Ï…Ï„Î®
     missing_resource: Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Ï„Î¿ Î±Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î¿ URL Î±Î½Î±ÎºÎ±Ï„ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ Î³Î¹Î± Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…
     no_account_html: Î”ÎµÎ½ ÎÏ‡ÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ; ÎœÏ€Î¿ÏÎµÎ¯Ï‚ <a href='%{sign_up_path}' target='_blank'>Î½Î± Î³ÏÎ±Ï†Ï„ÎµÎ¯Ï‚ ÎµÎ´ÏŽ</a>
     proceed: Î£Ï…Î½ÎÏ‡Î¹ÏƒÎµ Î³Î¹Î± Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚
-    prompt: 'Î˜Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚:'
+    prompt: 'Î•Ï„Î¿Î¹Î¼Î¬Î¶ÎµÏƒÎ±Î¹ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚:'
+    reason_html: "<strong>Î“Î¹Î±Ï„Î¯ Ï‡ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î±Ï…Ï„ÏŒ Ï„Î¿ Î²Î®Î¼Î±;</strong> Î¤Î¿ <code>%{instance}</code> Ï€Î¿ÏÎµÎ¯Î± Î½Î± Î¼Î·Î½ ÎµÎ¯Î½Î±Î¹ Î¿ ÎºÏŒÎ¼Î²Î¿Ï‚ Ï€Î¿Ï… ÎµÎ¯ÏƒÎ±Î¹ Î³ÏÎ±Î¼Î¼ÎÎ½Î¿Ï‚, ÎÏ„ÏƒÎ¹ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÏƒÎµ Î±Î½Î±ÎºÎ±Ï„ÎµÏ…Î¸ÏÎ½Î¿Ï…Î¼Îµ ÏƒÏ„Î¿ Î´Î¹ÎºÏŒ ÏƒÎ¿Ï…."
+  remote_interaction:
+    favourite:
+      proceed: Î£Ï…Î½ÎÏ‡Î¹ÏƒÎµ Î³Î¹Î± ÏƒÎ·Î¼ÎµÎ¯Ï‰ÏƒÎ· Ï‰Ï‚ Î±Î³Î±Ï€Î·Î¼ÎÎ½Î¿Ï…
+      prompt: 'Î˜ÎÎ»ÎµÎ¹Ï‚ Î½Î± ÏƒÎ·Î¼ÎµÎ¹ÏŽÏƒÎµÎ¹Ï‚ Ï‰Ï‚ Î±Î³Î±Ï€Î·Î¼ÎÎ½Î¿ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„:'
+    reblog:
+      proceed: Î£Ï…Î½ÎÏ‡Î¹ÏƒÎµ Î³Î¹Î± Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·
+      prompt: 'Î˜ÎÎ»ÎµÎ¹Ï‚ Î½Î± Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„:'
+    reply:
+      proceed: Î£Ï…Î½ÎÏ‡Î¹ÏƒÎµ Î³Î¹Î± Î½Î± Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚
+      prompt: 'Î˜ÎÎ»ÎµÎ¹Ï‚ Î½Î± Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï„Î¿Ï…Ï„:'
   remote_unfollow:
     error: Î£Ï†Î¬Î»Î¼Î±
     title: Î¤Î¯Ï„Î»Î¿Ï‚
     unfollowed: Î£Ï„Î±Î¼Î¬Ï„Î·ÏƒÎµÏ‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚
+  scheduled_statuses:
+    over_daily_limit: ÎˆÏ‡ÎµÎ¹Ï‚ Ï…Ï€ÎµÏÎ²ÎµÎ¯ Ï„Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ %{limit} Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¹ÏƒÎ¼ÎÎ½Ï‰Î½ Ï„Î¿Ï…Ï„ Î³Î¹Î± ÎµÎºÎµÎ¯Î½Î· Ï„Î· Î¼ÎÏÎ±
+    over_total_limit: ÎˆÏ‡ÎµÎ¹Ï‚ Ï…Ï€ÎµÏÎ²ÎµÎ¯ Ï„Î¿ ÏŒÏÎ¹Î¿ Ï„Ï‰Î½ %{limit} Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¹ÏƒÎ¼ÎÎ½Ï‰Î½ Ï„Î¿Ï…Ï„
+    too_soon: Î— Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î±Ï„Î¹ÏƒÎ¼ÎÎ½Î· Î·Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÏƒÏ„Î¿ Î¼ÎÎ»Î»Î¿Î½
   sessions:
     activity: Î¤ÎµÎ»ÎµÏ…Ï„Î±Î¯Î± Î´ÏÎ±ÏƒÏ„Î·ÏÎ¹ÏŒÏ„Î·Ï„Î±
     browser: Î¦Ï…Î»Î»Î¿Î¼ÎµÏ„ÏÎ·Ï„Î®Ï‚ (Browser)
@@ -700,16 +831,16 @@ el:
       private: Î¤Î± Î¼Î· Î´Î·Î¼ÏŒÏƒÎ¹Î± Ï„Î¿Ï…Ï„ Î´ÎµÎ½ ÎºÎ±ÏÏ†Î¹Ï„ÏƒÏŽÎ½Î¿Î½Ï„Î±Î¹
       reblog: ÎŸÎ¹ Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚ Î´ÎµÎ½ ÎºÎ±ÏÏ†Î¹Ï„ÏƒÏŽÎ½Î¿Î½Ï„Î±Î¹
     show_more: Î”ÎµÎ¯Î¾Îµ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ±
+    sign_in_to_participate: Î•Î³Î³ÏÎ¬Ï†Î¿Ï… Î³Î¹Î± Î½Î± ÏƒÏ…Î¼Î¼ÎµÏ„Î¬ÏƒÏ‡ÎµÎ¹Ï‚ ÏƒÏ„Î· ÏƒÏ…Î¶Î®Ï„Î·ÏƒÎ·
     title: '%{name}: "%{quote}"'
     visibilities:
       private: ÎœÏŒÎ½Î¿ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Î¹
       private_long: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î¼ÏŒÎ½Î¿ ÏƒÎµ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Ï…Ï‚
       public: Î”Î·Î¼ÏŒÏƒÎ¹Î¿
       public_long: Î’Î»ÎÏ€ÎµÎ¹ Î¿Ï€Î¿Î¹Î¿ÏƒÎ´Î®Ï€Î¿Ï„Îµ
-      unlisted: Î‘ÎºÎ±Ï„Î±Ï‡ÏŽÏÎ¹ÏƒÏ„Î¿
+      unlisted: ÎœÎ· ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎ·Î¼ÎÎ½Î¿
       unlisted_long: Î’Î»ÎÏ€ÎµÎ¹ Î¿Ï€Î¿Î¹Î¿ÏƒÎ´Î®Ï€Î¿Ï„Îµ, Î±Î»Î»Î¬ Î´ÎµÎ½ ÎºÎ±Ï„Î±Ï‡Ï‰ÏÎµÎ¯Ï„Î±Î¹ ÏƒÏ„Î¹Ï‚ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ ÏÎ¿ÎÏ‚
   stream_entries:
-    click_to_show: ÎšÎ»Î¹Îº Î³Î¹Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·
     pinned: ÎšÎ±ÏÏ†Î¹Ï„ÏƒÏ‰Î¼ÎÎ½Î¿ Ï„Î¿Ï…Ï„
     reblogged: Ï€ÏÎ¿Ï‰Î¸Î·Î¼ÎÎ½Î¿
     sensitive_content: Î•Ï…Î±Î¯ÏƒÎ¸Î·Ï„Î¿ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿
@@ -803,6 +934,7 @@ el:
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Î’Î¬Î»Îµ Ï„Î¿Î½ ÎºÏ‰Î´Î¹ÎºÏŒ Ï€Î¿Ï… Î´Î·Î¼Î¹Î¿ÏÏÎ³Î·ÏƒÎµ Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ®Ï‚ ÏƒÎ¿Ï… Î³Î¹Î± ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·
     description_html: Î‘Î½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î·Î½ <strong>Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ· 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA)</strong>, Î³Î¹Î± Î½Î± ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯Ï‚ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎÏ‡ÎµÎ¹Ï‚ Ï„Î¿ Ï„Î·Î»ÎÏ†Ï‰Î½ÏŒ ÏƒÎ¿Ï…, Ï€Î¿Ï… Î¸Î± ÏƒÎ¿Ï… Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹ ÎºÎ»ÎµÎ¹Î´Î¹Î¬ ÎµÎ¹ÏƒÏŒÎ´Î¿Ï….
@@ -824,6 +956,22 @@ el:
       explanation: Î–Î®Ï„Î·ÏƒÎµÏ‚ ÎÎ½Î± ÎµÏ†ÎµÎ´ÏÎ¹ÎºÏŒ Î±Î½Ï„Î¯Î³ÏÎ±Ï†Î¿ Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï… ÏƒÏ„Î¿ Mastodon. Î•Î¯Î½Î±Î¹ ÎÏ„Î¿Î¹Î¼Î¿ Î³Î¹Î± ÎºÎ±Ï„ÎÎ²Î±ÏƒÎ¼Î±!
       subject: Î¤Î¿ ÎµÏ†ÎµÎ´ÏÎ¹ÎºÏŒ Î±Î½Ï„Î¯Î³ÏÎ±Ï†ÏŒ ÏƒÎ¿Ï… ÎµÎ¯Î½Î±Î¹ ÎÏ„Î¿Î¹Î¼Î¿ Î³Î¹Î± ÎºÎ±Ï„ÎÎ²Î±ÏƒÎ¼Î±
       title: Î›Î®ÏˆÎ· ÎµÏ†ÎµÎ´ÏÎ¹ÎºÎ¿Ï Î±ÏÏ‡ÎµÎ¯Î¿Ï…
+    warning:
+      explanation:
+        disable: ÎŒÏƒÎ¿ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… ÎµÎ¯Î½Î±Î¹ Ï€Î±Î³Ï‰Î¼ÎÎ½Î¿Ï‚, Ï„Î± ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Î± Ï„Î¿Ï… Ï€Î±ÏÎ±Î¼ÎÎ½Î¿Ï…Î½ Î¬Î¸Î¹ÎºÏ„Î± Î±Î»Î»Î¬ Î´ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎºÎ±Î½ÎµÎ¯Ï‚ ÎºÎ±Î¼Î¯Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î± Î¼ÎÏ‡ÏÎ¹ Î½Î± Î¾ÎµÎºÎ»ÎµÎ¹Î´Ï‰Î¸ÎµÎ¯Ï‚.
+        silence: ÎŒÏƒÎ¿ Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… ÎµÎ¯Î½Î±Î¹ Ï€ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚, Î¼ÏŒÎ½Î¿ ÏŒÏƒÎ¿Î¹ ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Î®Î´Î· Î¸Î± Î²Î»ÎÏ€Î¿Ï…Î½ Ï„Î± Ï„Î¿Ï…Ï„ ÏƒÎ¿Ï… ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿Î½ ÎºÏŒÎ¼Î²Î¿ ÎµÎ½ÏŽ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÎ¾Î±Î¹ÏÎµÎ¸ÎµÎ¯Ï‚ Î±Ï€ÏŒ Î´Î¹Î¬Ï†Î¿ÏÎµÏ‚ Î´Î·Î¼ÏŒÏƒÎ¹ÎµÏ‚ Î±Ï€Î±ÏÎ¹Î¸Î¼Î®ÏƒÎµÎ¹Ï‚. Î Î¬Î½Ï„Ï‰Ï‚, Î¸Î± Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎ¿Ï…Î½ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î±.
+        suspend: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… Î±Î½Î±ÏƒÏ„Î¬Î»Î¸Î·ÎºÎµ Î¼ÏŒÎ½Î¹Î¼Î±, ÏŒÎ»Î± Ï„Î± Ï„Î¿Ï…Ï„ ÎºÎ±Î¹ Ï„Î± Î±Î½ÎµÎ²Î±ÏƒÎ¼ÎÎ½Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÎ± ÏƒÎ¿Ï… Î´Î¹Î±Î³ÏÎ¬Ï†Î·ÎºÎ±Î½ Î±Î¼ÎµÏ„Î¬ÎºÎ»Î·Ï„Î± Î±Ï€ÏŒ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ ÎºÏŒÎ¼Î²Î¿ ÎºÎ±Î¹ ÏƒÎµ ÏŒÏƒÎ¿Ï…Ï‚ Î¬Î»Î»Î¿Ï…Ï‚ ÎµÎ¯Ï‡ÎµÏ‚ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Ï…Ï‚.
+      review_server_policies: Î‘Î½Î±Î¸ÎµÏŽÏÎ·ÏƒÎ· Ï€Î¿Î»Î¹Ï„Î¹ÎºÎ®Ï‚ Ï„Î¿Ï… ÎºÏŒÎ¼Î²Î¿Ï…
+      subject:
+        disable: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… %{acct} ÎÏ‡ÎµÎ¹ Ï€Î±Î³ÏŽÏƒÎµÎ¹
+        none: Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï€ÏÎ¿Ï‚ %{acct}
+        silence: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… %{acct} ÎÏ‡ÎµÎ¹ Ï€ÎµÏÎ¹Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯
+        suspend: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ ÏƒÎ¿Ï… %{acct} ÎÏ‡ÎµÎ¹ Î±Î½Î±ÏƒÏ„Î±Î»ÎµÎ¯
+      title:
+        disable: Î Î±Î³Ï‰Î¼ÎÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚
+        none: Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+        silence: Î ÎµÏÎ¹Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚
+        suspend: Î‘Î½Î±ÏƒÏ„Î±Î»Î¼ÎÎ½Î¿Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚
     welcome:
       edit_profile_action: Î£Ï„Î®ÏƒÎ¹Î¼Î¿ Ï€ÏÎ¿Ï†Î¯Î»
       edit_profile_step: ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï€ÏÎ¿ÏƒÎ±ÏÎ¼ÏŒÏƒÎµÎ¹Ï‚ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï… Î±Î½ÎµÎ²Î¬Î¶Î¿Î½Ï„Î±Ï‚ Î¼Î¹Î± ÎµÎ¹ÎºÏŒÎ½Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚ & ÎµÏ€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±Ï‚, Î±Î»Î»Î¬Î¶Î¿Î½Ï„Î±Ï‚ Ï„Î¿ ÎµÎ¼Ï†Î±Î½Î¹Î¶ÏŒÎ¼ÎµÎ½Î¿ ÏŒÎ½Î¿Î¼Î¬ ÏƒÎ¿Ï… ÎºÎ±Î¹ Î¬Î»Î»Î±. Î‘Î½ Î¸ÎµÏ‚ Î½Î± ÎµÎ»ÎÎ³Ï‡ÎµÎ¹Ï‚ Ï„Î¿Ï…Ï‚ Î½ÎÎ¿Ï… ÏƒÎ¿Ï… Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Ï…Ï‚ Ï€ÏÎ¹Î½ Î±Ï…Ï„Î¿Î¯ ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎ¿Ï…Î½, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎºÎ»ÎµÎ¹Î´ÏŽÏƒÎµÎ¹Ï‚ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï….
@@ -835,7 +983,6 @@ el:
       review_preferences_action: Î‘Î»Î»Î±Î³Î® Ï€ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÏ‰Î½
       review_preferences_step: Î£Î¹Î³Î¿Ï…ÏÎÏˆÎ¿Ï… Ï€Ï‰Ï‚ ÎÏ‡ÎµÎ¹Ï‚ Î¿ÏÎ¯ÏƒÎµÎ¹ Ï„Î¹Ï‚ Ï€ÏÎ¿Ï„Î¹Î¼Î®ÏƒÎµÎ¹Ï‚ ÏƒÎ¿Ï…, ÏŒÏ€Ï‰Ï‚ Ï„Î¿ Ï€Î¿Î¹Î± email Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± Î»Î±Î¼Î²Î¬Î½ÎµÎ¹Ï‚, Î® Ï€Î¿Î¹Î¿ ÎµÏ€Î¯Ï€ÎµÎ´Î¿ Î¹Î´Î¹Ï‰Ï„Î¹ÎºÏŒÏ„Î·Ï„Î±Ï‚ Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± ÎÏ‡Î¿Ï…Î½ Î¿Î¹ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÏƒÎ¿Ï…. Î‘Î½ Î´ÎµÎ½ ÏƒÎµ Ï€Î¹Î¬Î½ÎµÎ¹ Î½Î±Ï…Ï„Î¯Î±, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î·Î½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î· Î±Î½Î±Ï€Î±ÏÎ±Î³Ï‰Î³Î® Ï„Ï‰Î½ GIF.
       subject: ÎšÎ±Î»ÏŽÏ‚ Î®ÏÎ¸ÎµÏ‚ ÏƒÏ„Î¿ Mastodon
-      tip_bridge_html: Î‘Î½ ÎÏ‡ÎµÎ¹Ï‚ ÎÏÎ¸ÎµÎ¹ Î±Ï€ÏŒ Ï„Î¿ Twitter, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î²ÏÎµÎ¹Ï‚ Ï„Î¿Ï…Ï‚ Ï†Î¯Î»Î¿Ï…Ï‚ ÎºÎ±Î¹ Ï„Î¹Ï‚ Ï†Î¯Î»ÎµÏ‚ ÏƒÎ¿Ï… ÏƒÏ„Î¿ Mastodon Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÏŽÎ½Ï„Î±Ï‚ Ï„Î·Î½ <a href="%{bridge_url}">Î²Î¿Î·Î¸Î·Ï„Î¹ÎºÎ® ÎµÏ†Î±ÏÎ¼Î¿Î³Î®</a>. Î¥Ï€ÏŒÏˆÎ¹Î½ Ï€Ï‰Ï‚ Î´Î¿Ï…Î»ÎµÏÎµÎ¹ Î¼ÏŒÎ½Î¿ Î±Î½ Ï„Î·Î½ ÎÏ‡Î¿Ï…Î½ Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹ ÎºÎ±Î¹ ÎµÎºÎµÎ¯Î½Î¿Î¹!
       tip_federated_timeline: Î— Î¿Î¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÎ® ÏÎ¿Î® ÎµÎ¯Î½Î±Î¹ Î¼Î¹Î± ÏŒÏˆÎ· Ï€ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÎ¿Ï Ï‡ÏÏŒÎ½Î¿Ï… ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿ Ï„Î¿Ï… Mastodon. Î Î±ÏÏŒÎ»Î± Î±Ï…Ï„Î¬, Ï€ÎµÏÎ¹Î»Î±Î¼Î²Î¬Î½ÎµÎ¹ Î¼ÏŒÎ½Î¿ ÏŒÏƒÎ¿Ï…Ï‚ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Î¿Î¹ Î³ÎµÎ¯Ï„Î¿Î½ÎÏ‚ ÏƒÎ¿Ï…, Î¬ÏÎ± Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Ï€Î»Î®ÏÎ·Ï‚.
       tip_following: Î‘ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ Ï„Î¿ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® Ï„Î¿Ï… Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î® ÏƒÎ¿Ï… Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±. Î“Î¹Î± Î½Î± Î²ÏÎµÎ¹Ï‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ¿Ï…Ï‚ ÎµÎ½Î´Î¹Î±Ï†ÎÏÎ¿Î½Ï„ÎµÏ‚ Î±Î½Î¸ÏÏŽÏ€Î¿Ï…Ï‚, ÎÎ»ÎµÎ³Î¾Îµ Ï„Î·Î½ Ï„Î¿Ï€Î¹ÎºÎ® ÎºÎ±Î¹ Ï„Î·Î½ Î¿Î¼Î¿ÏƒÏ€Î¿Î½Î´Î¹Î±ÎºÎ® ÏÎ¿Î®.
       tip_local_timeline: Î— Ï„Î¿Ï€Î¹ÎºÎ® ÏÎ¿Î® ÎµÎ¯Î½Î±Î¹ Î· ÏŒÏˆÎ· Ï€ÏÎ±Î³Î¼Î±Ï„Î¹ÎºÎ¿Ï Ï‡ÏÏŒÎ½Î¿Ï… Ï„Ï‰Î½ Î±Î½Î¸ÏÏŽÏ€Ï‰Î½ ÏƒÏ„Î¿Î½ ÎºÏŒÎ¼Î²Î¿ %{instance}. Î‘Ï…Ï„Î¿Î¯ ÎµÎ¯Î½Î±Î¹ Î¿Î¹ Î¬Î¼ÎµÏƒÎ¿Î¹ Î³ÎµÎ¯Ï„Î¿Î½ÎÏ‚ ÏƒÎ¿Ï…!
@@ -843,8 +990,12 @@ el:
       tips: Î£Ï…Î¼Î²Î¿Ï…Î»ÎÏ‚
       title: ÎšÎ±Î»ÏŽÏ‚ ÏŒÏÎ¹ÏƒÎµÏ‚, %{name}!
   users:
+    follow_limit_reached: Î”ÎµÎ½ Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹Ï‚ Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Î±Ï€ÏŒ %{limit} Î¬Ï„Î¿Î¼Î±
     invalid_email: Î— Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email ÎµÎ¯Î½Î±Î¹ Î¬ÎºÏ…ÏÎ·
     invalid_otp_token: Î†ÎºÏ…ÏÎ¿Ï‚ ÎºÏ‰Î´Î¹ÎºÏŒÏ‚ Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ 2 Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½ (2FA)
     otp_lost_help_html: Î‘Î½ Ï‡Î¬ÏƒÎµÎ¹Ï‚ ÎºÎ±Î¹ Ï„Î± Î´ÏÎ¿, Î¼Ï€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î®ÏƒÎµÎ¹Ï‚ Î¼Îµ Ï„Î¿Î½/Ï„Î·Î½ %{email}
     seamless_external_login: Î•Ï€ÎµÎ¹Î´Î® ÎÏ‡ÎµÎ¹Ï‚ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯ Î¼ÎÏƒÏ‰ Ï„ÏÎ¯Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚, Î¿Î¹ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎºÎ±Î¹ email Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼ÎµÏ‚.
     signed_in_as: 'ÎˆÏ‡ÎµÎ¹Ï‚ ÏƒÏ…Î½Î´ÎµÎ¸ÎµÎ¯ Ï‰Ï‚:'
+  verification:
+    explanation_html: 'ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± <strong>Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï„Î¿Î½ ÎµÎ±Ï…Ï„ÏŒ ÏƒÎ¿Ï… Ï‰Ï‚ Î¹Î´Î¹Î¿ÎºÏ„Î®Ï„Î· Ï„Ï‰Î½ ÏƒÏ…Î½Î´ÎÏƒÎ¼Ï‰Î½ Ï€Î¿Ï… ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÎ¹Ï‚ ÏƒÏ„Î± Î¼ÎµÏ„Î±Î´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï„Î¿Ï… Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï…</strong>. Î“Î¹Î± Î½Î± ÏƒÏ…Î¼Î²ÎµÎ¯ Î±Ï…Ï„ÏŒ, Î¿ ÏƒÏ…Î½Î´ÎµÎ´ÎµÎ¼ÎÎ½Î¿Ï‚ Î¹ÏƒÏ„ÏŒÏ„Î¿Ï€Î¿Ï‚ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ ÎÎ½Î± ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿ Ï€Î¿Ï… Î½Î± ÎµÏ€Î¹ÏƒÏ„ÏÎÏ†ÎµÎ¹ Ï€ÏÎ¿Ï‚ Ï„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï… ÏƒÏ„Î¿ Mastodon. ÎŸ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿Ï‚ ÎµÏ€Î¹ÏƒÏ„ÏÎ¿Ï†Î®Ï‚ <strong>Ï€ÏÎÏ€ÎµÎ¹</strong> Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Ï„Î·Î½ Î¹Î´Î¹ÏŒÏ„Î·Ï„Î± (attribute) <code>rel="me"</code>. Î¤Î¿ Ï€ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿ Ï„Î¿Ï… ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï… Î´ÎµÎ½ ÎÏ‡ÎµÎ¹ ÏƒÎ·Î¼Î±ÏƒÎ¯Î±. Î“Î¹Î± Ï€Î±ÏÎ¬Î´ÎµÎ¹Î³Î¼Î±:'
+    verification: Î Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b9fbca892091b11a38d4dcfae1ef34a2fa821ef..078c5b20f5bfd29f67e17ecb2a8a56a7c14f6f3c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,13 +5,13 @@ en:
     about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail.
     about_this: About
     administered_by: 'Administered by:'
+    api: API
+    apps: Mobile apps
     closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there.
     contact: Contact
     contact_missing: Not set
     contact_unavailable: N/A
-    description_headline: What is %{domain}?
-    domain_count_after: other instances
-    domain_count_before: Connected to
+    documentation: Documentation
     extended_description_html: |
       <h3>A good place for rules</h3>
       <p>The extended description has not been set up yet.</p>
@@ -28,25 +28,41 @@ en:
     hosted_on: Mastodon hosted on %{domain}
     learn_more: Learn more
     other_instances: Instance list
+    privacy_policy: Privacy policy
     source_code: Source code
-    status_count_after: statuses
+    status_count_after:
+      one: status
+      other: statuses
     status_count_before: Who authored
-    user_count_after: users
+    terms: Terms of service
+    user_count_after:
+      one: user
+      other: users
     user_count_before: Home to
     what_is_mastodon: What is Mastodon?
   accounts:
+    choices_html: "%{name}'s choices:"
     follow: Follow
-    followers: Followers
+    followers:
+      one: Follower
+      other: Followers
     following: Following
+    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
     nothing_here: There is nothing here!
     people_followed_by: People whom %{name} follows
     people_who_follow: People who follow %{name}
-    posts: Toots
+    pin_errors:
+      following: You must be already following the person you want to endorse
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
     posts_with_replies: Toots and replies
-    remote_follow: Remote follow
     reserved_username: The username is reserved
     roles:
       admin: Admin
@@ -54,6 +70,9 @@ en:
       moderator: Mod
     unfollow: Unfollow
   admin:
+    account_actions:
+      action: Perform action
+      title: Perform moderation action on %{acct}
     account_moderation_notes:
       create: Leave note
       created_msg: Moderation note successfully created!
@@ -65,14 +84,15 @@ en:
       by_domain: Domain
       change_email:
         changed_msg: Account email successfully changed!
-        current_email: Current Email
-        label: Change Email
-        new_email: New Email
-        submit: Change Email
-        title: Change Email for %{username}
+        current_email: Current email
+        label: Change email
+        new_email: New email
+        submit: Change email
+        title: Change email for %{username}
       confirm: Confirm
       confirmed: Confirmed
       confirming: Confirming
+      deleted: Deleted
       demote: Demote
       disable: Disable
       disable_two_factor_authentication: Disable 2FA
@@ -80,16 +100,19 @@ en:
       display_name: Display name
       domain: Domain
       edit: Edit
-      email: E-mail
-      email_status: E-mail Status
+      email: Email
+      email_status: Email status
       enable: Enable
       enabled: Enabled
       feed_url: Feed URL
       followers: Followers
       followers_url: Followers URL
       follows: Follows
+      header: Header
       inbox_url: Inbox URL
+      invited_by: Invited by
       ip: IP
+      joined: Joined
       location:
         all: All
         local: Local
@@ -99,6 +122,7 @@ en:
       media_attachments: Media attachments
       memorialize: Turn into memoriam
       moderation:
+        active: Active
         all: All
         silenced: Silenced
         suspended: Suspended
@@ -106,20 +130,18 @@ en:
       moderation_notes: Moderation notes
       most_recent_activity: Most recent activity
       most_recent_ip: Most recent IP
+      no_limits_imposed: No limits imposed
       not_subscribed: Not subscribed
-      order:
-        alphabetic: Alphabetic
-        most_recent: Most recent
-        title: Order
       outbox_url: Outbox URL
-      perform_full_suspension: Perform full suspension
+      perform_full_suspension: Suspend
       profile_url: Profile URL
       promote: Promote
       protocol: Protocol
       public: Public
       push_subscription_expires: PuSH subscription expires
-      redownload: Refresh avatar
+      redownload: Refresh profile
       remove_avatar: Remove avatar
+      remove_header: Remove header
       resend_confirmation:
         already_confirmed: This user is already confirmed
         send: Resend confirmation email
@@ -135,30 +157,34 @@ en:
         user: User
       salmon_url: Salmon URL
       search: Search
-      shared_inbox_url: Shared Inbox URL
+      shared_inbox_url: Shared inbox URL
       show:
-        created_reports: Reports created by this account
-        report: report
-        targeted_reports: Reports made about this account
+        created_reports: Made reports
+        targeted_reports: Reported by others
       silence: Silence
+      silenced: Silenced
       statuses: Statuses
       subscribe: Subscribe
+      suspended: Suspended
       title: Accounts
-      unconfirmed_email: Unconfirmed E-mail
+      unconfirmed_email: Unconfirmed email
       undo_silenced: Undo silence
       undo_suspension: Undo suspension
       unsubscribe: Unsubscribe
       username: Username
+      warn: Warn
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
         change_email_user: "%{name} changed the e-mail address of user %{target}"
         confirm_user: "%{name} confirmed e-mail address of user %{target}"
+        create_account_warning: "%{name} sent a warning to %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
         demote_user: "%{name} demoted user %{target}"
+        destroy_custom_emoji: "%{name} destroyed emoji %{target}"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
         destroy_status: "%{name} removed status by %{target}"
@@ -180,6 +206,7 @@ en:
         unsuspend_account: "%{name} unsuspended %{target}'s account"
         update_custom_emoji: "%{name} updated emoji %{target}"
         update_status: "%{name} updated status by %{target}"
+      deleted_status: "(deleted status)"
       title: Audit log
     custom_emojis:
       by_domain: Domain
@@ -206,8 +233,30 @@ en:
       update_failed_msg: Could not update that emoji
       updated_msg: Emoji successfully updated!
       upload: Upload
+    dashboard:
+      backlog: backlogged jobs
+      config: Configuration
+      feature_deletions: Account deletions
+      feature_invites: Invite links
+      feature_profile_directory: Profile directory
+      feature_registrations: Registrations
+      feature_relay: Federation relay
+      features: Features
+      hidden_service: Federation with hidden services
+      open_reports: open reports
+      recent_users: Recent users
+      search: Full-text search
+      single_user_mode: Single user mode
+      software: Software
+      space: Space usage
+      title: Dashboard
+      total_users: users in total
+      trends: Trends
+      week_interactions: interactions this week
+      week_users_active: active this week
+      week_users_new: users this week
     domain_blocks:
-      add_new: Add new
+      add_new: Add new domain block
       created_msg: Domain block is now being processed
       destroyed_msg: Domain block has been undone
       domain: Domain
@@ -222,11 +271,13 @@ en:
         title: New domain block
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
-      severities:
-        noop: None
-        silence: Silence
-        suspend: Suspend
-      severity: Severity
+      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: silenced
+        suspend: suspended
       show:
         affected_accounts:
           one: One account in the database affected
@@ -236,8 +287,7 @@ en:
           suspend: Unsuspend all existing accounts from this domain
         title: Undo domain block for %{domain}
         undo: Undo
-      title: Domain blocks
-      undo: Undo
+      undo: Undo domain block
     email_domain_blocks:
       add_new: Add new
       created_msg: Successfully added e-mail domain to blacklist
@@ -248,19 +298,47 @@ en:
         create: Add domain
         title: New e-mail blacklist entry
       title: E-mail blacklist
+    followers:
+      back_to_account: Back To Account
+      title: "%{acct}'s Followers"
     instances:
-      account_count: Known accounts
-      domain_name: Domain
-      reset: Reset
-      search: Search
-      title: Known instances
+      delivery_available: Delivery is available
+      known_accounts:
+        one: "%{count} known account"
+        other: "%{count} known accounts"
+      moderation:
+        all: All
+        limited: Limited
+        title: Moderation
+      title: Federation
+      total_blocked_by_us: Blocked by us
+      total_followed_by_them: Followed by them
+      total_followed_by_us: Followed by us
+      total_reported: Reports about them
+      total_storage: Media attachments
     invites:
+      deactivate_all: Deactivate all
       filter:
         all: All
         available: Available
         expired: Expired
         title: Filter
       title: Invites
+    relays:
+      add_new: Add new relay
+      delete: Delete
+      description_html: A <strong>federation relay</strong> is an intermediary server that exchanges large volumes of public toots between servers that subscribe and publish to it. <strong>It can help small and medium servers discover content from the fediverse</strong>, which would otherwise require local users manually following other people on remote servers.
+      disable: Disable
+      disabled: Disabled
+      enable: Enable
+      enable_hint: Once enabled, your server will subscribe to all public toots from this relay, and will begin sending this server's public toots to it.
+      enabled: Enabled
+      inbox_url: Relay URL
+      pending: Waiting for relay's approval
+      save_and_enable: Save and enable
+      setup: Setup a relay connection
+      status: Status
+      title: Relays
     report_notes:
       created_msg: Report note successfully created!
       destroyed_msg: Report note successfully deleted!
@@ -275,7 +353,6 @@ en:
       comment:
         none: None
       created_at: Reported
-      id: ID
       mark_as_resolved: Mark as resolved
       mark_as_unresolved: Mark as unresolved
       notes:
@@ -286,20 +363,15 @@ en:
         placeholder: Describe what actions have been taken, or any other related updates...
       reopen: Reopen report
       report: 'Report #%{id}'
-      report_contents: Contents
       reported_account: Reported account
       reported_by: Reported by
       resolved: Resolved
       resolved_msg: Report successfully resolved!
-      silence_account: Silence account
       status: Status
-      suspend_account: Suspend account
-      target: Target
       title: Reports
       unassign: Unassign
       unresolved: Unresolved
       updated_at: Updated
-      view: View
     settings:
       activity_api_enabled:
         desc_html: Counts of locally posted statuses, active users, and new registrations in weekly buckets
@@ -310,15 +382,24 @@ en:
       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
       hero:
         desc_html: Displayed on the frontpage. At least 600x100px recommended. When not set, falls back to instance 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 instance has encountered in the fediverse
         title: Publish list of discovered instances
       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
@@ -339,11 +420,14 @@ en:
         desc_html: Show a staff badge on a user page
         title: Show staff badge
       site_description:
-        desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
+        desc_html: Introductory paragraph on the frontpage. 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: Instance description
       site_description_extended:
         desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance 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. If empty, defaults to instance description.
+        title: Short instance 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
@@ -365,6 +449,7 @@ en:
       media:
         title: Media
       no_media: No media
+      no_status_selected: No statuses were changed as none were selected
       title: Account statuses
       with_media: With media
     subscriptions:
@@ -374,7 +459,21 @@ en:
       last_delivery: Last delivery
       title: WebSub
       topic: Topic
+    tags:
+      accounts: Accounts
+      hidden: Hidden
+      hide: Hide from directory
+      name: Hashtag
+      title: Hashtags
+      unhide: Show in directory
+      visible: Visible
     title: Administration
+    warning_presets:
+      add_new: Add new
+      delete: Delete
+      edit: Edit
+      edit_preset: Edit warning preset
+      title: Manage warning presets
   admin_mailer:
     new_report:
       body: "%{reporter} has reported %{target}"
@@ -396,7 +495,7 @@ en:
     warning: Be very careful with this data. Never share it with anyone!
     your_token: Your access token
   auth:
-    agreement_html: By signing up you agree to follow <a href="%{rules_path}">the rules of the instance</a> and <a href="%{terms_path}">our terms of service</a>.
+    agreement_html: By clicking "Sign up" below you agree to follow <a href="%{rules_path}">the rules of the instance</a> and <a href="%{terms_path}">our terms of service</a>.
     change_password: Password
     confirm_email: Confirm email
     delete_account: Delete account
@@ -452,6 +551,16 @@ en:
     success_msg: Your account was successfully deleted
     warning_html: Only deletion of content from this particular instance is guaranteed. Content that has been widely shared is likely to leave traces. Offline servers and servers that have unsubscribed from your updates will not update their databases.
     warning_title: Disseminated content availability
+  directories:
+    directory: Profile directory
+    enabled: You are currently listed in the directory.
+    enabled_but_waiting: You have opted-in to be listed in the directory, but you do not have the minimum number of followers (%{min_followers}) to be listed yet.
+    explanation: Discover users based on their interests
+    explore_mastodon: Explore %{title}
+    how_to_enable: You are not currently opted-in to the directory. You can opt-in below. Use hashtags in your bio text to be listed under specific hashtags!
+    people:
+      one: "%{count} person"
+      other: "%{count} people"
   errors:
     '403': You don't have permission to view this page.
     '404': The page you were looking for doesn't exist.
@@ -463,7 +572,7 @@ en:
     '500':
       content: We're sorry, but something went wrong on our end.
       title: This page is not correct
-    noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">native apps</a> for Mastodon for your platform.
+    noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the <a href="%{apps_path}">native apps</a> for Mastodon for your platform.
   exports:
     archive_takeout:
       date: Date
@@ -474,7 +583,9 @@ en:
       size: Size
     blocks: You block
     csv: CSV
+    domain_blocks: Domain blocks
     follows: You follow
+    lists: Lists
     mutes: You mute
     storage: Media storage
   filters:
@@ -505,9 +616,13 @@ en:
     true_privacy_html: Please mind that <strong>true privacy can only be achieved with end-to-end encryption</strong>.
     unlocked_warning_html: Anyone can follow you to immediately view your private statuses. %{lock_link} to be able to review and reject followers.
     unlocked_warning_title: Your account is not locked
+  footer:
+    developers: Developers
+    more: Moreâ€¦
+    resources: Resources
   generic:
     changes_saved_msg: Changes successfully saved!
-    powered_by: powered by %{link}
+    copy: Copy
     save_changes: Save changes
     validation_errors:
       one: Something isn't quite right yet! Please review the error below
@@ -543,8 +658,6 @@ en:
       expires_at: Expires
       uses: Uses
     title: Invite people
-  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
-  landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   lists:
     errors:
       limit: You have reached the maximum amount of lists
@@ -616,15 +729,30 @@ en:
     publishing: Publishing
     web: Web
   remote_follow:
-    acct: Enter your username@domain you want to follow from
+    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 toot:'
+    reblog:
+      proceed: Proceed to boost
+      prompt: 'You want to boost this toot:'
+    reply:
+      proceed: Proceed to reply
+      prompt: 'You want to reply to this toot:'
   remote_unfollow:
     error: Error
     title: Title
     unfollowed: Unfollowed
+  scheduled_statuses:
+    over_daily_limit: You have exceeded the limit of %{limit} scheduled toots for that day
+    over_total_limit: You have exceeded the limit of %{limit} scheduled toots
+    too_soon: The scheduled date must be in the future
   sessions:
     activity: Last activity
     browser: Browser
@@ -704,6 +832,7 @@ en:
       private: Non-public toot cannot be pinned
       reblog: A boost cannot be pinned
     show_more: Show more
+    sign_in_to_participate: Sign in to participate in the conversation
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Followers-only
@@ -713,7 +842,6 @@ en:
       unlisted: Unlisted
       unlisted_long: Everyone can see, but not listed on public timelines
   stream_entries:
-    click_to_show: Click to show
     pinned: Pinned toot
     reblogged: boosted
     sensitive_content: Sensitive content
@@ -814,6 +942,7 @@ en:
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Enter the code generated by your authenticator app to confirm
     description_html: If you enable <strong>two-factor authentication</strong>, logging in will require you to be in possession of your phone, which will generate tokens for you to enter.
@@ -835,6 +964,22 @@ en:
       explanation: You requested a full backup of your Mastodon account. It's now ready for download!
       subject: Your archive is ready for download
       title: Archive takeout
+    warning:
+      explanation:
+        disable: While your account is frozen, your account data remains intact, but you cannot perform any actions until it is unlocked.
+        silence: While your account is limited, only people who are already following you will see your toots on this server, and you may be excluded from various public listings. However, others may still manually follow you.
+        suspend: Your account has been suspended, and all of your toots and your uploaded media files have been irreversibly removed from this server, and servers where you had followers.
+      review_server_policies: Review server policies
+      subject:
+        disable: Your account %{acct} has been frozen
+        none: Warning for %{acct}
+        silence: Your account %{acct} has been limited
+        suspend: Your account %{acct} has been suspended
+      title:
+        disable: Account frozen
+        none: Warning
+        silence: Account limited
+        suspend: Account suspended
     welcome:
       edit_profile_action: Setup profile
       edit_profile_step: You can customize your profile by uploading an avatar, header, changing your display name and more. If youâ€™d like to review new followers before theyâ€™re allowed to follow you, you can lock your account.
@@ -846,7 +991,6 @@ en:
       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_bridge_html: If you are coming from Twitter, you can find your friends on Mastodon by using the <a href="%{bridge_url}">bridge app</a>. It only works if they also used the bridge app though!
       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!
@@ -854,8 +998,12 @@ en:
       tips: Tips
       title: Welcome aboard, %{name}!
   users:
+    follow_limit_reached: You cannot follow more than %{limit} people
     invalid_email: The e-mail address is invalid
     invalid_otp_token: Invalid two-factor 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:'
+  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
new file mode 100644
index 0000000000000000000000000000000000000000..d9e1a256f6c9a5842d1647e5207699a27c1afc83
--- /dev/null
+++ b/config/locales/en_GB.yml
@@ -0,0 +1,2 @@
+---
+{}
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 2f479bff64f0cada272e9323358c7faeeff2babf..aaa943185659d2eb925fd91afa38712e1375b8f5 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -5,13 +5,13 @@ eo:
     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
     administered_by: 'Administrata de:'
+    api: API
+    apps: PoÅtelefonaj aplikaÄµoj
     closed_registrations: RegistriÄoj estas nuntempe fermitaj en Ä‰i tiu nodo. Tamen, vi povas trovi alian nodon por fari konton kaj aliri al la sama reto de tie.
     contact: Kontakti
     contact_missing: Ne elektita
     contact_unavailable: Ne disponebla
-    description_headline: Kio estas %{domain}?
-    domain_count_after: aliaj nodoj
-    domain_count_before: Konektita al
+    documentation: Dokumentado
     extended_description_html: |
       <h3>Bona loko por reguloj</h3>
       <p>La detala priskribo ne estis elektita.</p>
@@ -28,25 +28,41 @@ eo:
     hosted_on: "%{domain} estas nodo de Mastodon"
     learn_more: Lerni pli
     other_instances: Listo de nodoj
+    privacy_policy: Privateca politiko
     source_code: Fontkodo
-    status_count_after: mesaÄoj
+    status_count_after:
+      one: mesaÄo
+      other: mesaÄoj
     status_count_before: Kie skribiÄis
-    user_count_after: uzantoj
+    terms: UzkondiÄ‰oj
+    user_count_after:
+      one: uzanto
+      other: uzantoj
     user_count_before: Hejmo de
     what_is_mastodon: Kio estas Mastodon?
   accounts:
+    choices_html: 'Proponoj de %{name}:'
     follow: Sekvi
-    followers: Sekvantoj
+    followers:
+      one: Sekvanto
+      other: Sekvantoj
     following: Sekvatoj
+    joined: AliÄis je %{date}
+    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
     nothing_here: Estas nenio Ä‰i tie!
     people_followed_by: Sekvatoj de %{name}
     people_who_follow: Sekvantoj de %{name}
-    posts: MesaÄoj
+    pin_errors:
+      following: Vi devas sekvi la homon, kiun vi volas proponi
+    posts:
+      one: MesaÄo
+      other: MesaÄoj
+    posts_tab_heading: MesaÄoj
     posts_with_replies: MesaÄoj kaj respondoj
-    remote_follow: Fore sekvi
     reserved_username: La uzantnomo estas rezervita
     roles:
       admin: Administranto
@@ -99,6 +115,7 @@ eo:
       media_attachments: Ligitaj aÅdovidaÄµoj
       memorialize: ÅœanÄi al memoro
       moderation:
+        active: Aktiva
         all: Äˆio
         silenced: Silentigitaj
         suspended: Haltigitaj
@@ -106,13 +123,10 @@ eo:
       moderation_notes: Kontrolaj notoj
       most_recent_activity: Lasta ago
       most_recent_ip: Lasta IP
+      no_limits_imposed: Neniu limito trudita
       not_subscribed: Ne abonita
-      order:
-        alphabetic: LaÅalfabete
-        most_recent: Plej lastatempa
-        title: Ordo
       outbox_url: Elira URL
-      perform_full_suspension: Tute haltigi
+      perform_full_suspension: Haltigi
       profile_url: Profila URL
       promote: Plirangigi
       protocol: Protokolo
@@ -138,11 +152,12 @@ eo:
       shared_inbox_url: URL de kunhavigita leterkesto
       show:
         created_reports: Signaloj kreitaj de Ä‰i tiu konto
-        report: signalo
         targeted_reports: Signaloj kreitaj de Ä‰i tiu konto
       silence: KaÅi
+      silenced: Silentigita
       statuses: MesaÄoj
       subscribe: Aboni
+      suspended: Haltigita
       title: Kontoj
       unconfirmed_email: Nekonfirmita retadreso
       undo_silenced: Malfari kaÅon
@@ -159,6 +174,7 @@ eo:
         create_domain_block: "%{name} blokis domajnon %{target}"
         create_email_domain_block: "%{name} metis en nigran liston domajnon %{target}"
         demote_user: "%{name} degradis uzanton %{target}"
+        destroy_custom_emoji: "%{name} neniigis la emoÄion %{target}"
         destroy_domain_block: "%{name} malblokis domajnon %{target}"
         destroy_email_domain_block: "%{name} metis en blankan liston domajnon %{target}"
         destroy_status: "%{name} forigis mesaÄojn de %{target}"
@@ -180,6 +196,7 @@ eo:
         unsuspend_account: "%{name} malhaltigis la konton de %{target}"
         update_custom_emoji: "%{name} Äisdatigis emoÄion %{target}"
         update_status: "%{name} Äisdatigis mesaÄon de %{target}"
+      deleted_status: "(forigita mesaÄo)"
       title: Kontrola protokolo
     custom_emojis:
       by_domain: Domajno
@@ -206,6 +223,28 @@ eo:
       update_failed_msg: Äœisdatigi tiun emoÄion ne eblis
       updated_msg: EmoÄio sukcese Äisdatigita!
       upload: AlÅuti
+    dashboard:
+      backlog: postigitaj taskoj
+      config: Agordado
+      feature_deletions: Forigo de kontoj
+      feature_invites: Invitaj ligiloj
+      feature_profile_directory: Profilujo
+      feature_registrations: RegistriÄoj
+      feature_relay: Federacia ripetilo
+      features: Funkcioj
+      hidden_service: Federacio kun kaÅitaj servoj
+      open_reports: nefermitaj raportoj
+      recent_users: Lastatempaj uzantoj
+      search: Tutteksta serÄ‰ado
+      single_user_mode: Unuuzanta reÄimo
+      software: Programo
+      space: Memorspaca uzado
+      title: Kontrolpanelo
+      total_users: uzantoj sume
+      trends: Furoroj
+      week_interactions: interagoj tiusemajne
+      week_users_active: aktivaj tiusemajne
+      week_users_new: uzantoj tiusemajne
     domain_blocks:
       add_new: Aldoni novan
       created_msg: Domajna blokado en traktado
@@ -222,11 +261,6 @@ eo:
         title: Nova domajna blokado
       reject_media: Malakcepti aÅdovidajn dosierojn
       reject_media_hint: Forigas aÅdovidaÄµojn loke konservitajn kaj rifuzas alÅuti ajnan estonte. Senzorge pri haltigoj
-      severities:
-        noop: Nenio
-        silence: KaÅi
-        suspend: Haltigi
-      severity: Severeco
       show:
         affected_accounts:
           one: Unu konto en la datumbazo esta influita
@@ -236,7 +270,6 @@ eo:
           suspend: Malhaltigi Ä‰iujn kontojn, kiuj ekzistas en Ä‰i tiu domajno
         title: Malfari domajnan blokadon por %{domain}
         undo: Malfari
-      title: Domajnaj blokadoj
       undo: Malfari
     email_domain_blocks:
       add_new: Aldoni novan
@@ -249,18 +282,29 @@ eo:
         title: Nova blokado de retadresa domajno
       title: Nigra listo de retadresaj domajnoj
     instances:
-      account_count: Konataj kontoj
-      domain_name: Domajno
-      reset: Restarigi
-      search: SerÄ‰i
       title: Konataj nodoj
     invites:
+      deactivate_all: Malaktivigi Ä‰ion
       filter:
         all: Äˆio
         available: Disponebla
         expired: Eksvalida
         title: Filtri
       title: Invitoj
+    relays:
+      add_new: Aldoni novan ripetilon
+      delete: Forigi
+      description_html: "<strong>Fratara ripetilo</strong> estas survoja servilo, kiu interÅanÄas grandan kvanton de publikaj mesaÄoj inter serviloj, kiuj abonas kaj publikigas al Äi. <strong>Äœi povas helpi etajn kaj mezgrandajn servilojn malkovri enhavon de la fediverse</strong>, kio normale postulus al lokaj uzantoj mane sekvi homojn de foraj serviloj."
+      disable: Malebligi
+      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
+      inbox_url: URL de la ripetilo
+      save_and_enable: Konservi kaj ebligi
+      setup: Agordi konekton al ripetilo
+      status: Stato
+      title: Ripetiloj
     report_notes:
       created_msg: Signala noto sukcese kreita!
       destroyed_msg: Signala noto sukcese forigita!
@@ -275,7 +319,6 @@ eo:
       comment:
         none: Nenio
       created_at: Signalita
-      id: ID
       mark_as_resolved: Marki solvita
       mark_as_unresolved: Marki nesolvita
       notes:
@@ -286,20 +329,15 @@ eo:
         placeholder: Priskribu faritajn agojn, aÅ ajnan novan informon pri tiu signaloâ€¦
       reopen: Remalfermi signalon
       report: 'Signalo #%{id}'
-      report_contents: Enhavo
       reported_account: Signalita konto
       reported_by: Signalita de
       resolved: Solvita
       resolved_msg: Signalo sukcese solvita!
-      silence_account: KaÅi konton
       status: MesaÄoj
-      suspend_account: Haltigi konton
-      target: Celo
       title: Signaloj
       unassign: Malasigni
       unresolved: Nesolvita
       updated_at: Äœisdatigita
-      view: Vidi
     settings:
       activity_api_enabled:
         desc_html: Sumo de lokaj mesaÄoj, aktivaj uzantoj, kaj novaj registriÄoj laÅsemajne
@@ -310,12 +348,21 @@ eo:
       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
       hero:
         desc_html: Montrata en la Ä‰efpaÄo. AlmenaÅ 600x100px rekomendita. Kiam ne agordita, la bildeto de la nodo estos uzata
         title: Kapbildo
       peers_api_enabled:
         desc_html: Nomoj de domajnoj, kiujn Ä‰i tiu nodo renkontis en la fediverse
         title: Publikigi liston de malkovritaj nodoj
+      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
       registrations:
         closed_message:
           desc_html: Montrita sur la hejma paÄo kiam registriÄoj estas fermitaj. Vi povas uzi HTML-etikedojn
@@ -336,11 +383,14 @@ eo:
         desc_html: Montri teaman insignon en paÄo de uzanto
         title: Montri teaman insignon
       site_description:
-        desc_html: Enkonduka alineo en la Ä‰efpaÄo kaj en informaj etikedoj. Vi povas uzi HTML-etikedojn, kiel <code>&lt;a&gt;</code> kaj <code>&lt;em&gt;</code>.
+        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 nodo
       site_description_extended:
         desc_html: Bona loko por viaj sintenaj reguloj, aliaj reguloj, gvidlinioj kaj aliaj aferoj, kiuj apartigas vian nodon. 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 nodo estos uzata.
+        title: Mallonga priskribo de la nodo
       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
@@ -362,6 +412,7 @@ eo:
       media:
         title: AÅdovidaÄµoj
       no_media: Neniu aÅdovidaÄµo
+      no_status_selected: Neniu mesaÄo estis ÅanÄita Ä‰ar neniu estis elektita
       title: MesaÄoj de la konto
       with_media: Kun aÅdovidaÄµoj
     subscriptions:
@@ -371,6 +422,12 @@ eo:
       last_delivery: Lasta livero
       title: WebSub
       topic: Temo
+    tags:
+      hide: KaÅi de la profilujo
+      name: Kradvorto
+      title: Kradvortoj
+      unhide: Montri en la profilujo
+      visible: Videbla
     title: Administrado
   admin_mailer:
     new_report:
@@ -393,7 +450,7 @@ eo:
     warning: Estu tre atenta kun Ä‰i tiu datumo. Neniam diskonigu Äin al iu ajn!
     your_token: Via alira Äµetono
   auth:
-    agreement_html: Per registriÄo, vi konsentas kun <a href="%{rules_path}">la reguloj de nia nodo</a> kaj <a href="%{terms_path}">niaj uzkondiÄ‰oj</a>.
+    agreement_html: Klakante â€œRegistriÄiâ€ sube, vi konsentas kun <a href="%{rules_path}">la reguloj de la nodo</a> kaj <a href="%{terms_path}">niaj uzkondiÄ‰oj</a>.
     change_password: Pasvorto
     confirm_email: Konfirmi retadreson
     delete_account: Forigi konton
@@ -449,6 +506,13 @@ eo:
     success_msg: Via konto estis sukcese forigita
     warning_html: La forigo de la enhavo estas certa nur por Ä‰i tiu aparta nodo. Enhavo, kiu estis disvastigita verÅajne lasos spurojn. Eksterretaj serviloj kaj serviloj, kiuj ne abonas viajn Äisdatigojn ne Äisdatigos siajn datumbazojn.
     warning_title: Disponebleco de disvastigita enhavo
+  directories:
+    directory: Profilujo
+    explanation: Malkovru uzantojn per iliaj interesoj
+    explore_mastodon: Esplori %{title}
+    people:
+      one: "%{count} personoj"
+      other: "%{count} personoj"
   errors:
     '403': Vi ne havas la rajton por vidi Ä‰i tiun paÄon.
     '404': La paÄo, kiun vi serÄ‰as, ne ekzistas.
@@ -462,7 +526,7 @@ eo:
       title: Äˆi tiu paÄo ne estas Äusta
     noscript_html: |-
       Por uzi la retan aplikaÄµon de Mastodon, bonvolu ebligi JavaScript. Alimaniere, provu unu el la
-      <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">operaciumaj aplikaÄµoj</a> por Mastodon por via platformo.
+      <a href="%{apps_path}">operaciumaj aplikaÄµoj</a> por Mastodon por via platformo.
   exports:
     archive_takeout:
       date: Dato
@@ -504,9 +568,13 @@ eo:
     true_privacy_html: Bonvolu atenti, ke <strong>vera privateco povas esti atingita nur per Ä‰ifrado de komenco al fino</strong>.
     unlocked_warning_html: Iu ajn povas eksekvi vin por tuj vidi viajn privatajn mesaÄojn. %{lock_link} por povi akcepti kaj rifuzi petojn de sekvado.
     unlocked_warning_title: Via konto ne estas Ålosita
+  footer:
+    developers: Programistoj
+    more: Pliâ€¦
+    resources: Rimedoj
   generic:
     changes_saved_msg: ÅœanÄoj sukcese konservitaj!
-    powered_by: povigita de %{link}
+    copy: Kopii
     save_changes: Konservi ÅanÄojn
     validation_errors:
       one: Io mise okazis! Bonvolu konsulti la suban erar-raporton
@@ -542,8 +610,6 @@ eo:
       expires_at: EksvalidiÄas je
       uses: Uzoj
     title: Inviti homojn
-  landing_strip_html: "<strong>%{name}</strong> estas uzanto en %{link_to_root_path}. Vi povas sekvi tiun aÅ interagi kun tiu, se vi havas konton ie ajn en la fediverse."
-  landing_strip_signup_html: Se vi ne havas, vi povas <a href="%{sign_up_path}">registriÄi Ä‰i tie</a>.
   lists:
     errors:
       limit: Vi atingis la maksimuman kvanton de listoj
@@ -615,7 +681,7 @@ eo:
     publishing: Publikado
     web: Reto
   remote_follow:
-    acct: Enmetu vian uzantnomo@domajno de kie vi volas sekvi
+    acct: Enmetu vian uzantnomo@domajno de kie vi volas agi
     missing_resource: La URL de plusendado 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
@@ -703,6 +769,7 @@ eo:
       private: MesaÄo nepublika ne povas esti alpinglita
       reblog: Diskonigo ne povas esti alpinglita
     show_more: Montri pli
+    sign_in_to_participate: Ensaluti por partopreni en la konversacio
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Montri nur al sekvantoj
@@ -712,7 +779,6 @@ eo:
       unlisted: Nelistigita
       unlisted_long: Äˆiuj povas vidi, sed nelistigita en publikaj tempolinioj
   stream_entries:
-    click_to_show: Alklaki por montri
     pinned: Alpinglita
     reblogged: diskonigita
     sensitive_content: Tikla enhavo
@@ -725,6 +791,7 @@ eo:
   time:
     formats:
       default: "%Y-%m-%d %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Enmetu la kodon kreitan de via aÅtentiga aplikaÄµo por konfirmi
     description_html: Se vi ebligas <strong>dufaktoran aÅtentigon</strong>, vi bezonos vian poÅtelefonon por ensaluti, Ä‰ar Äi kreos nombrojn, kiujn vi devos enmeti.
@@ -757,7 +824,6 @@ eo:
       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_bridge_html: Se vi venas de Twitter, vi povas trovi viajn amikojn en Mastodon per uzo de la <a href="%{bridge_url}">ponta aplikaÄµo</a>. Tamen, tio funkcias nur se ankaÅ ili uzis la pontan aplikaÄµon!
       tip_federated_timeline: La fratara tempolinio 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 tempoliniojn.
       tip_local_timeline: La loka tempolinio estas antaÅvido de la homoj en %{instance}. Äˆi tiuj estas viaj apudaj najbaroj!
@@ -765,8 +831,11 @@ eo:
       tips: Konsiloj
       title: Bonvenon, %{name}!
   users:
+    follow_limit_reached: Vi ne povas sekvi pli da %{limit} homojn
     invalid_email: La retadreso estas nevalida
     invalid_otp_token: Nevalida kodo de dufaktora aÅtentigo
     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:'
+  verification:
+    verification: Kontrolo
diff --git a/config/locales/es.yml b/config/locales/es.yml
index de5dac5a41e841c6e2b839f30f3063b440386445..e3106291d9517497bf1754aa509a282f91618164 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -5,13 +5,13 @@ es:
     about_mastodon_html: Mastodon es un servidor de red social <em>libre y de cÃ³digo abierto</em>. Una alternativa <em>descentralizada</em> a plataformas comerciales, que evita el riesgo de que una Ãºnica compaÃ±Ãa monopolice tu comunicaciÃ³n. Cualquiera puede ejecutar Mastodon y participar sin problemas en la <em>red social</em>.
     about_this: Acerca de esta instancia
     administered_by: 'Administrado por:'
+    api: API
+    apps: Aplicaciones mÃ³viles
     closed_registrations: Los registros estÃ¡n actualmente cerrados en esta instancia.
     contact: Contacto
     contact_missing: No especificado
     contact_unavailable: N/A
-    description_headline: "Â¿QuÃ© es %{domain}?"
-    domain_count_after: otras instancias
-    domain_count_before: Conectado a
+    documentation: DocumentaciÃ³n
     extended_description_html: |
       <h3>Un buen lugar para las reglas</h3>
       <p>La descripciÃ³n extendida no se ha colocado aÃºn.</p>
@@ -28,27 +28,44 @@ es:
     hosted_on: Mastodon hosteado en %{domain}
     learn_more: Aprende mÃ¡s
     other_instances: Otras instancias
+    privacy_policy: PolÃtica de privacidad
     source_code: CÃ³digo fuente
-    status_count_after: estados
+    status_count_after:
+      one: estado
+      other: estados
     status_count_before: QuÃ© han escrito
-    user_count_after: usuarios registrados
+    terms: Condiciones de servicio
+    user_count_after:
+      one: usuario
+      other: usuarios
     user_count_before: Tenemos
     what_is_mastodon: "Â¿QuÃ© es Mastodon?"
   accounts:
+    choices_html: 'Elecciones de %{name}:'
     follow: Seguir
-    followers: Seguidores
+    followers:
+      one: Seguidor
+      other: Seguidores
     following: Siguiendo
+    joined: Se uniÃ³ el %{date}
+    link_verified_on: La propiedad de este vÃnculo fue verificada el %{date}
     media: Media
     moved_html: "%{name} se ha trasladado a %{new_profile_link}:"
+    network_hidden: Esta informaciÃ³n no estÃ¡ disponible
     nothing_here: "Â¡No hay nada aquÃ!"
     people_followed_by: Usuarios a quien %{name} sigue
     people_who_follow: Usuarios que siguen a %{name}
-    posts: Toots
+    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
-    remote_follow: Seguir
     reserved_username: El nombre de usuario estÃ¡ reservado
     roles:
       admin: Administrador
+      bot: Bot
       moderator: Moderador
     unfollow: Dejar de seguir
   admin:
@@ -104,13 +121,10 @@ es:
       moderation_notes: Notas de moderaciÃ³n
       most_recent_activity: Actividad mÃ¡s reciente
       most_recent_ip: IP mÃ¡s reciente
+      no_limits_imposed: Sin lÃmites impuestos
       not_subscribed: No se estÃ¡ suscrito
-      order:
-        alphabetic: AlfabÃ©tico
-        most_recent: MÃ¡s reciente
-        title: Orden
       outbox_url: URL de bandeja de salida
-      perform_full_suspension: Performar suspensiÃ³n completa
+      perform_full_suspension: Suspender
       profile_url: URL del perfil
       promote: Promocionar
       protocol: Protocolo
@@ -121,7 +135,7 @@ es:
       resend_confirmation:
         already_confirmed: Este usuario ya estÃ¡ confirmado
         send: Reenviar el correo electrÃ³nico de confirmaciÃ³n
-        success: "Â¡Correo electrÃ³nico de confirmaciÃ³n enviado con Ã©xito"
+        success: "Â¡Correo electrÃ³nico de confirmaciÃ³n enviado con Ã©xito!"
       reset: Reiniciar
       reset_password: Reiniciar contraseÃ±a
       resubscribe: Re-suscribir
@@ -136,11 +150,12 @@ es:
       shared_inbox_url: URL de bandeja compartida
       show:
         created_reports: Reportes hechos por esta cuenta
-        report: reportar
         targeted_reports: Reportes hechos sobre esta cuenta
       silence: Silenciar
+      silenced: Silenciado
       statuses: Estados
       subscribe: Suscribir
+      suspended: Susependido
       title: Cuentas
       unconfirmed_email: Correo electrÃ³nico sin confirmar
       undo_silenced: Des-silenciar
@@ -157,6 +172,7 @@ es:
         create_domain_block: "%{name} bloqueÃ³ el dominio %{target}"
         create_email_domain_block: "%{name} puso en lista negra el dominio de correos %{target}"
         demote_user: "%{name} degradÃ³ al usuario %{target}"
+        destroy_custom_emoji: "%{name} destruyÃ³ el emoji %{target}"
         destroy_domain_block: "%{name} desbloqueÃ³ el dominio %{target}"
         destroy_email_domain_block: "%{name} puso en lista blanca el dominio de correos %{target}"
         destroy_status: "%{name} eliminÃ³ el estado de %{target}"
@@ -178,6 +194,7 @@ es:
         unsuspend_account: "%{name} desactivÃ³ la suspensiÃ³n de la cuenta de %{target}"
         update_custom_emoji: "%{name} actualizÃ³ el emoji %{target}"
         update_status: "%{name} actualizÃ³ el estado de %{target}"
+      deleted_status: "(estado borrado)"
       title: Log de auditorÃa
     custom_emojis:
       by_domain: Dominio
@@ -204,6 +221,27 @@ es:
       update_failed_msg: No se pudo actualizar ese emoji
       updated_msg: "Â¡Emoji actualizado con Ã©xito!"
       upload: Subir
+    dashboard:
+      backlog: trabajos de backlog
+      config: ConfiguraciÃ³n
+      feature_deletions: Borrados de cuenta
+      feature_invites: Enlaces de invitaciÃ³n
+      feature_registrations: Registros
+      feature_relay: RelÃ©s de federaciÃ³n
+      features: CaracterÃsticas
+      hidden_service: FederaciÃ³n con servicios ocultos
+      open_reports: informes abiertos
+      recent_users: Usuarios recientes
+      search: BÃºsqueda por texto completo
+      single_user_mode: Modo Ãºnico usuario
+      software: Software
+      space: Uso de almacenamiento
+      title: Tablero
+      total_users: usuarios en total
+      trends: Tendencias
+      week_interactions: interacciones esta semana
+      week_users_active: activo esta semana
+      week_users_new: usuarios esta semana
     domain_blocks:
       add_new: AÃ±adir nuevo
       created_msg: El bloque de dominio estÃ¡ siendo procesado
@@ -220,11 +258,8 @@ es:
         title: Nuevo bloque de dominio
       reject_media: Rechazar archivos multimedia
       reject_media_hint: Remueve localmente archivos multimedia almacenados para descargar cualquiera en el futuro. Irrelevante para suspensiones
-      severities:
-        noop: Ninguno
-        silence: Silenciar
-        suspend: Suspender
-      severity: Severidad
+      reject_reports: Rechazar informes
+      reject_reports_hint: Ignore todos los reportes de este dominio. Irrelevante para suspensiones
       show:
         affected_accounts:
           one: Una cuenta en la base de datos afectada
@@ -234,7 +269,6 @@ es:
           suspend: Des-suspender todas las cuentas existentes de este dominio
         title: Deshacer bloque de dominio para %{domain}
         undo: Deshacer
-      title: Bloques de Dominio
       undo: Deshacer
     email_domain_blocks:
       add_new: AÃ±adir nuevo
@@ -247,18 +281,30 @@ es:
         title: Nueva entrada en la lista negra de correo
       title: Lista negra de correo
     instances:
-      account_count: Cuentas conocidas
-      domain_name: Dominio
-      reset: Reiniciar
-      search: Buscar
       title: Instancias conocidas
     invites:
+      deactivate_all: Desactivar todos
       filter:
         all: Todas
         available: Disponibles
         expired: Expiradas
         title: Filtrar
       title: Invitaciones
+    relays:
+      add_new: AÃ±adir un nuevo relÃ©s
+      delete: Borrar
+      description_html: Un <strong>relÃ©s de federation</strong> es un servidor intermedio que intercambia grandes volÃºmenes de toots pÃºblicos entre servidores que se suscriben y publican en Ã©l. <strong>Puede ayudar a servidores pequeÃ±os y medianos a descubir contenido del fediverso</strong>, que de otra manera requerirÃa que los usuarios locales siguiesen manialmente a personas de servidores remotos.
+      disable: Deshabilitar
+      disabled: Deshabilitado
+      enable: Hablitar
+      enable_hint: Una vez conectado, tu servidor se suscribirÃ¡ a todos los toots pÃºblicos de este relÃ©s, y comenzarÃ¡ a enviar los toots pÃºblicos de este servidor hacia Ã©l.
+      enabled: Habilitado
+      inbox_url: URL del relÃ©s
+      pending: Esperando la aprobaciÃ³n del relÃ©s
+      save_and_enable: Guardar y conectar
+      setup: Preparar una conexiÃ³n de relÃ©s
+      status: Estado
+      title: Releses
     report_notes:
       created_msg: "Â¡El registro de la denuncia se ha creado correctamente!"
       destroyed_msg: "Â¡El registro de la denuncia se ha borrado correctamente!"
@@ -273,7 +319,6 @@ es:
       comment:
         none: Ninguno
       created_at: Denunciado
-      id: ID
       mark_as_resolved: Marcar como resuelto
       mark_as_unresolved: Marcar como no resuelto
       notes:
@@ -284,20 +329,15 @@ es:
         placeholder: Especificar quÃ© acciones se han tomado o cualquier otra novedad respecto a esta denunciaâ€¦
       reopen: Reabrir denuncia
       report: 'Reportar #%{id}'
-      report_contents: Contenido
       reported_account: Cuenta reportada
       reported_by: Reportado por
       resolved: Resuelto
       resolved_msg: "Â¡La denuncia se ha resuelto correctamente!"
-      silence_account: Silenciar cuenta
       status: Estado
-      suspend_account: Suspender cuenta
-      target: Objetivo
       title: Reportes
       unassign: Desasignar
       unresolved: No resuelto
       updated_at: Actualizado
-      view: Ver
     settings:
       activity_api_enabled:
         desc_html: Conteo de estados publicados localmente, usuarios activos, y nuevos registros en  periodos semanales
@@ -308,12 +348,21 @@ es:
       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
       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
       registrations:
         closed_message:
           desc_html: Se muestra en la portada cuando los registros estÃ¡n cerrados. Puedes usar tags HTML
@@ -339,6 +388,9 @@ es:
       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
@@ -360,6 +412,7 @@ es:
       media:
         title: Multimedia
       no_media: No hay multimedia
+      no_status_selected: No se cambiÃ³ ningÃºn estado al no seleccionar ninguno
       title: Estado de las cuentas
       with_media: Con multimedia
     subscriptions:
@@ -391,7 +444,7 @@ es:
     warning: Ten mucho cuidado con estos datos. Â¡No los compartas con nadie!
     your_token: Tu token de acceso
   auth:
-    agreement_html: Al registrarte, acepta seguir <a href="%{rules_path}">las reglas de la instancia</a> y <a href="%{terms_path}">nuestros tÃ©rminos de servicio</a>.
+    agreement_html: Al hacer click en "Registrarse" acepta seguir <a href="%{rules_path}">las reglas de la instancia</a> y <a href="%{terms_path}">nuestros tÃ©rminos de servicio</a>.
     change_password: ContraseÃ±a
     confirm_email: Confirmar email
     delete_account: Borrar cuenta
@@ -458,7 +511,7 @@ es:
     '500':
       content: Lo sentimos, algo ha funcionado mal por nuestra parte.
       title: Esta pÃ¡gina no es correcta
-    noscript_html: Para usar la aplicaciÃ³n web de Mastodon, por favor activa Javascript. Alternativamente, prueba alguna de las <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">aplicaciones nativas</a> para Mastodon para tu plataforma.
+    noscript_html: Para usar la aplicaciÃ³n web de Mastodon, por favor activa Javascript. Alternativamente, prueba alguna de las <a href="%{apps_path}">aplicaciones nativas</a> para Mastodon para tu plataforma.
   exports:
     archive_takeout:
       date: Fecha
@@ -472,6 +525,22 @@ es:
     follows: Personas que sigues
     mutes: Tienes en silencio
     storage: Almacenamiento
+  filters:
+    contexts:
+      home: Timeline propio
+      notifications: Notificaciones
+      public: Timeline pÃºblico
+      thread: Conversaciones
+    edit:
+      title: Editar filtro
+    errors:
+      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:
+      delete: Borrar
+      title: Filtros
+    new:
+      title: AÃ±adir un nuevo filtro
   followers:
     domain: Dominio
     explanation_html: Si deseas asegurar la privacidad de tus estados, tienes que cuidarte de quiÃ©n te sigue. <strong>Tus estados privados son enviados a todas las instancias de tus seguidores</strong>. Puede que desees revisarlas, y remover seguidores si no confÃas en tu privacidad para ser respetado por el staff o software de esas instancias.
@@ -484,9 +553,13 @@ es:
     true_privacy_html: Por favor ten en cuenta que <strong>la verdadera privacidad se consigue con encriptaciÃ³n de punto a punto</strong>.
     unlocked_warning_html: Todos pueden seguirte  para ver tus estados privados inmediatamente. %{lock_link} para poder chequear y rechazar seguidores.
     unlocked_warning_title: Tu cuenta no estÃ¡ bloqueada
+  footer:
+    developers: Desarrolladores
+    more: Masâ€¦
+    resources: Recursos
   generic:
     changes_saved_msg: "Â¡Cambios guardados con Ã©xito!"
-    powered_by: gracias a %{link}
+    copy: Copiar
     save_changes: Guardar cambios
     validation_errors:
       one: "Â¡Algo no estÃ¡ bien! Por favor, revisa el error"
@@ -499,7 +572,7 @@ es:
       following: Lista de seguidos
       muting: Lista de silenciados
     upload: Cargar
-  in_memoriam_html: In Memoriam.
+  in_memoriam_html: En memoria.
   invites:
     delete: Desactivar
     expired: Expiradas
@@ -512,6 +585,7 @@ es:
       '86400': 1 dÃa
     expires_in_prompt: Nunca
     generate: Generar
+    invited_by: 'Fuiste invitado por:'
     max_uses:
       one: 1 uso
       other: "%{count} usos"
@@ -521,8 +595,6 @@ es:
       expires_at: Expira
       uses: Usos
     title: Invitar a gente
-  landing_strip_html: "<strong>%{name}</strong> es un usuario en %{link_to_root_path}. Puedes seguirlo(a) o interactuar con el o ella si tienes una cuenta en cualquier parte del fediverse."
-  landing_strip_signup_html: Si no tienes una, puedes <a href="%{sign_up_path}">registrarte aquÃ</a>.
   lists:
     errors:
       limit: Has alcanzado la cantidad mÃ¡xima de listas
@@ -596,6 +668,7 @@ es:
   remote_follow:
     acct: Ingesa 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:'
   remote_unfollow:
@@ -667,10 +740,12 @@ es:
       video:
         one: "%{count} vÃdeo"
         other: "%{count} vÃdeos"
+    boosted_from_html: Impulsado desde %{acct_link}
     content_warning: 'Alerta de contenido: %{warning}'
     disallowed_hashtags:
       one: 'contenÃa un hashtag no permitido: %{tags}'
       other: 'contenÃa los hashtags no permitidos: %{tags}'
+    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:
@@ -679,6 +754,7 @@ es:
       private: Los toots no-pÃºblicos no pueden fijarse
       reblog: Un boost no puede fijarse
     show_more: Mostrar mÃ¡s
+    sign_in_to_participate: RegÃstrate para participar en la conversaciÃ³n
     title: '%{name}: "%{quote}"'
     visibilities:
       private: SÃ³lo mostrar a seguidores
@@ -688,7 +764,6 @@ es:
       unlisted: PÃºblico, pero no mostrar en la historia federada
       unlisted_long: Todos pueden ver, pero no estÃ¡ listado en las lÃneas de tiempo pÃºblicas
   stream_entries:
-    click_to_show: Click para mostrar
     pinned: Toot fijado
     reblogged: retooteado
     sensitive_content: Contenido sensible
@@ -697,9 +772,11 @@ es:
   themes:
     contrast: Alto contraste
     default: Mastodon
+    mastodon-light: Mastodon (claro)
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Ingresa el cÃ³digo generado por tu aplicaciÃ³n de autenticaciÃ³n para confirmar
     description_html: Si habilitas la <strong>autenticaciÃ³n de dos factores</strong>, se requerirÃ¡ estar en posesiÃ³n de su telÃ©fono, lo que generarÃ¡ tokens para que usted pueda iniciar sesiÃ³n.
@@ -732,7 +809,6 @@ es:
       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_bridge_html: Si esta viniendo desde Twitter, puedes encontrar a tus amigos en Mastodon usando la <a href="%{bridge_url}">aplicaciÃ³n puente</a>. Aunque solo funciona si ellos tambiÃ©n usaron la aplicaciÃ³n puente!
       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!
@@ -740,7 +816,12 @@ es:
       tips: Tips
       title: Te damos la bienvenida a bordo, %{name}!
   users:
+    follow_limit_reached: No puedes seguir a mÃ¡s de %{limit} personas
     invalid_email: La direcciÃ³n de correo es incorrecta
     invalid_otp_token: CÃ³digo de dos factores incorrecto
+    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:'
+  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/eu.yml b/config/locales/eu.yml
index 514c9cc57084f169b0c569de07ab753f16077cec..cae83e158d0bb02fb67c1b9efaa181d86bf7e911 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -5,13 +5,13 @@ eu:
     about_mastodon_html: Mastodon web protokolo ireki eta libreak darabiltzan gizarte sare bat da. E-mail sarea bezala deszentralizatua da.
     about_this: Honi buruz
     administered_by: 'Administratzailea(k):'
+    api: APIa
+    apps: Aplikazio mugikorrak
     closed_registrations: Harpidetza itxita dago orain instantzia honetan. Hala ere, beste instantzia bat aurkitu dezakezu kontua egiteko eta hona ere sarbidea izan.
     contact: Kontaktua
     contact_missing: Ezarri gabe
     contact_unavailable: E/E
-    description_headline: Zer da %{domain}?
-    domain_count_after: instantzia desberdinetara
-    domain_count_before: Konektatuta
+    documentation: Dokumentazioa
     extended_description_html: |
       <h3>Arauentzako toki egoki bat</h3>
       <p>Azalpen luzea ez da ezarri oraindik.</p>
@@ -28,25 +28,41 @@ eu:
     hosted_on: Mastodon %{domain} domeinuan ostatatua
     learn_more: Ikasi gehiago
     other_instances: Instantzien zerrenda
+    privacy_policy: Pribatutasun politika
     source_code: Iturburu kodea
-    status_count_after: mezu idatzi dituzte
+    status_count_after:
+      one: mezu
+      other: mezu
     status_count_before: Hauek
-    user_count_after: erabiltzaile daude
+    terms: Erabilera baldintzak
+    user_count_after:
+      one: erabiltzaile
+      other: erabiltzaile
     user_count_before: Hemen
     what_is_mastodon: Zer da Mastodon?
   accounts:
+    choices_html: "%{name}(r)en aukerak:"
     follow: Jarraitu
-    followers: Jarraitzaile
+    followers:
+      one: Jarraitzaile
+      other: jarraitzaile
     following: Jarraitzen
+    joined: "%{date}(e)an elkartua"
+    last_active: azkenekoz aktiboa
+    link_verified_on: 'Esteka honen jabetzaren egiaztaketa data: %{date}'
     media: Multimedia
     moved_html: "%{name} hona lekualdatu da %{new_profile_link}:"
     network_hidden: Informazio hau ez dago eskuragarri
     nothing_here: Ez dago ezer hemen!
     people_followed_by: "%{name}(e)k jarraitzen dituenak"
     people_who_follow: "%{name} jarraitzen dutenak"
-    posts: Toot-ak
+    pin_errors:
+      following: Onetsi nahi duzun pertsona aurretik jarraitu behar duzu
+    posts:
+      one: Toot
+      other: Toot
+    posts_tab_heading: Tootak
     posts_with_replies: Toot eta erantzunak
-    remote_follow: Jarraitu urrunetik
     reserved_username: Erabiltzaile-izena erreserbatuta dago
     roles:
       admin: Administratzailea
@@ -54,6 +70,9 @@ eu:
       moderator: Moderatzailea
     unfollow: Utzi jarraitzeari
   admin:
+    account_actions:
+      action: Burutu ekintza
+      title: Burutu moderazio ekintza %{acct} kontuan
     account_moderation_notes:
       create: Sortu oharra
       created_msg: Moderazio oharra ongi sortu da!
@@ -88,6 +107,7 @@ eu:
       followers: Jarraitzaileak
       followers_url: Jarraitzaileen URL-a
       follows: Jarraitzen du
+      header: Goiburua
       inbox_url: Sarrera ontziaren URL-a
       ip: IP
       location:
@@ -99,6 +119,7 @@ eu:
       media_attachments: Multimedia eranskinak
       memorialize: Bihurtu memoriala
       moderation:
+        active: Aktiboa
         all: Denak
         silenced: Isilarazita
         suspended: Kanporatua
@@ -106,13 +127,10 @@ eu:
       moderation_notes: Moderazio oharrak
       most_recent_activity: Azken jarduera
       most_recent_ip: Azken IP-a
+      no_limits_imposed: Ez da mugarik ezarri
       not_subscribed: Harpidetu gabe
-      order:
-        alphabetic: Alfabetikoa
-        most_recent: Azkena
-        title: Ordena
       outbox_url: Irteera ontziaren URL-a
-      perform_full_suspension: Aplikatu kanporatze osoa
+      perform_full_suspension: Kanporatu
       profile_url: Profilaren URL-a
       promote: Sustatu
       protocol: Protokoloa
@@ -120,6 +138,7 @@ eu:
       push_subscription_expires: Push harpidetzaren iraugitzea
       redownload: Freskatu abatarra
       remove_avatar: Kendu abatarra
+      remove_header: Kendu goiburua
       resend_confirmation:
         already_confirmed: Erabiltzaile hau berretsita dago
         send: Birbidali baieztapen e-maila
@@ -138,11 +157,12 @@ eu:
       shared_inbox_url: Partekatutako sarrera ontziaren URL-a
       show:
         created_reports: Kontu honek sortutako txostenak
-        report: salatu
         targeted_reports: Kontu honek egindako salaketak
       silence: Isilarazi
+      silenced: Isilarazita
       statuses: Mezuak
       subscribe: Harpidetu
+      suspended: Kanporatuta
       title: Kontuak
       unconfirmed_email: Baieztatu gabeko e-mail helbidea
       undo_silenced: Utzi isilarazteari
@@ -155,10 +175,12 @@ eu:
         assigned_to_self_report: "%{name}(e)k %{target} salaketa bere buruari esleitu dio"
         change_email_user: "%{name}(e)k %{target}(r)en e-mail helbidea aldatu du"
         confirm_user: "%{name}(e)k %{target}(r)en e-mail helbidea berretsi du"
+        create_account_warning: "%{name}-k abisua bidali dio %{target}-ri"
         create_custom_emoji: "%{name}(e)k emoji berria kargatu du %{target}"
         create_domain_block: "%{name}(e)k %{target} domeinua blokeatu du"
         create_email_domain_block: "%{name}(e)k %{target} e-mail helbideen domeinua zerrenda beltzean sartu du"
         demote_user: "%{name}(e)k %{target} mailaz jaitsi du"
+        destroy_custom_emoji: "%{name} erabiltzaileak %{target} emojia suntsitu du"
         destroy_domain_block: "%{name}(e)k %{target} domeinua desblokeatu du"
         destroy_email_domain_block: "%{name}(e)k %{target} e-mail helbideen domeinua zerrenda zurian sartu du"
         destroy_status: "%{name}(e)k %{target}(e)n egoera kendu du"
@@ -180,6 +202,7 @@ eu:
         unsuspend_account: "%{name}(e)k %{target} kontuaren kanporaketa atzera bota du"
         update_custom_emoji: "%{name}(e)k %{target} emoji-a eguneratu du"
         update_status: "%{name} (e)k %{target}(r)en mezua aldatu du"
+      deleted_status: "(ezabatutako mezua)"
       title: Auditoria-egunkaria
     custom_emojis:
       by_domain: Domeinua
@@ -206,6 +229,28 @@ eu:
       update_failed_msg: Ezin izan da emoji hori eguneratu
       updated_msg: Emoji-a ongi eguneratu da!
       upload: Igo
+    dashboard:
+      backlog: aurreikusitako lanak
+      config: Konfigurazioa
+      feature_deletions: Kontu ezabaketak
+      feature_invites: Gonbidapen estekak
+      feature_profile_directory: Profil-direktorioa
+      feature_registrations: Izen emateak
+      feature_relay: Federazio haria
+      features: Ezaugarriak
+      hidden_service: Federazioa ezkutuko zerbitzuekin
+      open_reports: salaketa irekiak
+      recent_users: Azken erabiltzaileak
+      search: Testu osoko bilaketa
+      single_user_mode: Erabiltzaile bakarreko modua
+      software: Software
+      space: Espazio erabilera
+      title: Kontrol panela
+      total_users: erabiltzaile guztira
+      trends: Joerak
+      week_interactions: interakzio aste honetan
+      week_users_active: aktibo aste honetan
+      week_users_new: erabiltzaile aste honetan
     domain_blocks:
       add_new: Gehitu berria
       created_msg: Domeinuaren blokeoa orain prozesatzen ari da
@@ -222,11 +267,8 @@ eu:
         title: Domeinu blokeo berria
       reject_media: Ukatu multimedia fitxategiak
       reject_media_hint: Lokalki gordetako multimedia fitxategiak ezabatzen ditu eta etorkizunean fitxategi berriak deskargatzeari uko egingo dio. Ez du garrantzirik kanporaketetan
-      severities:
-        noop: Bat ere ez
-        silence: Isilarazi
-        suspend: Kanporatu
-      severity: Larritasuna
+      reject_reports: Errefusatu salaketak
+      reject_reports_hint: Ezikusi domeinu honetatik jasotako salaketak. Kanporatzeentzako garrantzirik gabekoa
       show:
         affected_accounts:
           one: Datu-baseko kontu bati eragiten dio
@@ -236,7 +278,6 @@ eu:
           suspend: Kendu kanporatzeko agindua domeinu honetako kontu guztiei
         title: Desegin %{domain} domeinuko blokeoa
         undo: Desegin
-      title: Domeinuen blokeoak
       undo: Desegin
     email_domain_blocks:
       add_new: Gehitu berria
@@ -248,19 +289,34 @@ eu:
         create: Gehitu domeinua
         title: Sarrera berria e-mail zerrenda beltzean
       title: E-mail zerrenda beltza
+    followers:
+      back_to_account: Itzuli kontura
+      title: "%{acct} kontuaren jarraitzaileak"
     instances:
-      account_count: Kontu ezagunak
-      domain_name: Domeinua
-      reset: Berrezarri
-      search: Bilatu
       title: Instantzia ezagunak
     invites:
+      deactivate_all: Desgaitu guztiak
       filter:
         all: Denak
         available: Eskuragarri
         expired: Iraungitua
         title: Iragazi
       title: Gonbidapenak
+    relays:
+      add_new: Gehitu hari berria
+      delete: Ezabatu
+      description_html: "<strong>Federazio errele</strong> bat zerbitzari tartekari bat da, bertara harpidetutako eta bertan argitaratzen duten zerbitzarien artean toot publiko kopuru handiak banatzen ditu. <strong>Zerbitzari txiki eta ertainei Fedibertsoko edukia aurkitzen laguntzen die</strong>, bestela erabiltzaile lokalek eskuz jarraitu beharko lituzkete urruneko zerbitzarietako erabiltzaileak."
+      disable: Desgaitu
+      disabled: Desgaituta
+      enable: Gaitu
+      enable_hint: Behin gaituta, zure zerbitzaria errele honetako toot publiko guztietara harpidetuko da, eta zerbitzari honetako toot publikoak errelera bidaltzen hasiko da.
+      enabled: Gaituta
+      inbox_url: Errelearen URLa
+      pending: Erreleak onartzearen zain
+      save_and_enable: Gorde eta gaitu
+      setup: Ezarri errele konexio bat
+      status: Mezuak
+      title: Erreleak
     report_notes:
       created_msg: Salaketa oharra ongi sortu da!
       destroyed_msg: Salaketa oharra ongi ezabatu da!
@@ -275,7 +331,6 @@ eu:
       comment:
         none: Bat ere ez
       created_at: Salatua
-      id: ID
       mark_as_resolved: Markatu konpondutako gisa
       mark_as_unresolved: Markatu konpondu gabeko gisa
       notes:
@@ -286,20 +341,15 @@ eu:
         placeholder: Azaldu hartutako neurriak, edo erlazioa duten bestelako berriak...
       reopen: Berrireki salaketa
       report: 'Salaketa #%{id}'
-      report_contents: Edukiak
       reported_account: Salatutako kontua
       reported_by: Salatzailea
       resolved: Konponduta
       resolved_msg: Salaketa ongi konpondu da!
-      silence_account: Isilarazi kontua
       status: Mezua
-      suspend_account: Kanporatu kontua
-      target: Helburua
       title: Salaketak
       unassign: Kendu esleipena
       unresolved: Konpondu gabea
       updated_at: Eguneratua
-      view: Ikusi
     settings:
       activity_api_enabled:
         desc_html: Lokalki bidalitako mezu kopurua, erabiltzaile aktiboak, eta izen emate berriak asteko
@@ -310,12 +360,24 @@ eu:
       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
       hero:
         desc_html: Azaleko orrian bistaratua. Gutxienez 600x100px aholkatzen da. Ezartzen ez bada, instantziaren 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: Instantzia honek fedibertsuan aurkitutako domeinu-izenak
         title: Argitaratu aurkitutako instantzien 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
@@ -336,11 +398,14 @@ eu:
         desc_html: Erakutsi langile banda erabiltzailearen orrian
         title: Erakutsi langile banda
       site_description:
-        desc_html: Azaleko orrian eta meta etiketetan agertuko den sarrera paragrafoa. HTML etiketak erabili ditzakezu, zehazki <code>&lt;a&gt;</code> eta <code>&lt;em&gt;</code>.
+        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: Instantziaren deskripzioa
       site_description_extended:
         desc_html: Zure jokabide-koderako  toki on bat, arauak, gidalerroak eta zure instantzia 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: Instantziaren 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
@@ -362,6 +427,7 @@ eu:
       media:
         title: Multimedia
       no_media: Multimediarik ez
+      no_status_selected: Ez da mezurik aldatu ez delako mezurik aukeratu
       title: Kontuaren mezuak
       with_media: Multimediarekin
     subscriptions:
@@ -371,7 +437,21 @@ eu:
       last_delivery: Azken bidalketa
       title: WebSub
       topic: Mintzagaia
+    tags:
+      accounts: Kontuak
+      hidden: Ezkutatuta
+      hide: Ezkutatu direktoriotik
+      name: Traola
+      title: Traolak
+      unhide: Erakutsi direktorioan
+      visible: Ikusgai
     title: Administrazioa
+    warning_presets:
+      add_new: Gehitu berria
+      delete: Ezabatu
+      edit: Editatu
+      edit_preset: Editatu abisu aurre-ezarpena
+      title: Kudeatu abisu aurre-ezarpenak
   admin_mailer:
     new_report:
       body: "%{reporter}(e)k %{target} salatu du"
@@ -393,7 +473,7 @@ eu:
     warning: Kontuz datu hauekin, ez partekatu inoiz inorekin!
     your_token: Zure sarbide token-a
   auth:
-    agreement_html: Izena emanez<a href="%{rules_path}">instantziaren arauak</a> eta <a href="%{terms_path}">erabilera baldintzak</a> onartzen dituzu.
+    agreement_html: '"Izena eman" botoia sakatzean <a href="%{rules_path}">instantziaren arauak</a> eta <a href="%{terms_path}">erabilera baldintzak</a> onartzen dituzu.'
     change_password: Pasahitza
     confirm_email: Berretsi e-mail helbidea
     delete_account: Ezabatu kontua
@@ -449,6 +529,13 @@ eu:
     success_msg: Zure kontua ongi ezabatu da
     warning_html: Instantzia honetako edukiak ezabatzea besterik ezin da bermatu. Asko partekatu den edukiaren arrastoak geratzea izan liteke. Deskonektatuta dauden zerbitzariak edo zure eguneraketetatik harpidetza kendu duten zerbitzariek ez dituzte beraien datu-baseak eguneratuko.
     warning_title: Sakabanatutako edukiaren eskuragarritasuna
+  directories:
+    directory: Profilen direktorioa
+    explanation: Deskubritu erabiltzaileak interesen arabera
+    explore_mastodon: Esploratu %{title}
+    people:
+      one: pertsona %{count}
+      other: "%{count} pertsona"
   errors:
     '403': Ez duzu orri hau ikusteko baimenik.
     '404': Bilatu duzun orria ez da existitzen.
@@ -460,7 +547,7 @@ eu:
     '500':
       content: Sentitzen dugu, zerbait okerra gertatu da gure aldean.
       title: Orri hau ez da zuzena
-    noscript_html: Mastodon web aplikazioa erabiltzeko, gaitu JavaScript. Bestela, probatu Mastodon plataformarako <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">aplikazio natibo</a>ren bat.
+    noscript_html: Mastodon web aplikazioa erabiltzeko, gaitu JavaScript. Bestela, probatu Mastodon plataformarako <a href="%{apps_path}">aplikazio natibo</a>ren bat.
   exports:
     archive_takeout:
       date: Data
@@ -474,6 +561,22 @@ eu:
     follows: Zuk jarraitutakoak
     mutes: Zuk mututukoak
     storage: Multimedia biltegiratzea
+  filters:
+    contexts:
+      home: Hasierako denbora-lerroa
+      notifications: Jakinarazpenak
+      public: Denbora-lerro publikoak
+      thread: Elkarrizketak
+    edit:
+      title: Editatu iragazkia
+    errors:
+      invalid_context: Testuinguru baliogabe edo hutsa eman da
+      invalid_irreversible: Behin betiko iragazketa hasiera edo jakinarazpenen testuinguruan besterik ez dabil
+    index:
+      delete: Ezabatu
+      title: Iragazkiak
+    new:
+      title: Gehitu iragazki berria
   followers:
     domain: Domeinua
     explanation_html: Zure mezuen pribatutasuna bermatu nahi baduzu, nork jarraitzen zaituen jakin behar duzu. <strong>Zure mezu pribatuak zure jarraitzaileak dituzten instantzia guztietara bidaltzen dira</strong>.  Instantzia bateko langileek edo softwareak zure pribatutasunari dagokion begirunea ez dutela izango uste baduzu, berrikusi eta kendu jarraitzaileak.
@@ -486,9 +589,13 @@ eu:
     true_privacy_html: Kontuan izan <strong>egiazko pribatutasuna lortzeko muturretik muturrerako zifratzea ezinbestekoa dela</strong>.
     unlocked_warning_html: Edonork jarraitu zaitzake eta berehala zure mezu pribatuak ikusi. %{lock_link} jarraitzaileak berrikusi eta ukatu ahal izateko.
     unlocked_warning_title: Zure kontua ez dago giltzapetuta
+  footer:
+    developers: Garatzaileak
+    more: Gehiagoâ€¦
+    resources: Baliabideak
   generic:
     changes_saved_msg: Aldaketak ongi gorde dira!
-    powered_by: "(e)k %{link} darabil"
+    copy: Kopiatu
     save_changes: Gorde aldaketak
     validation_errors:
       one: Zerbait ez dabil ongi! Egiaztatu beheko errorea mesedez
@@ -524,8 +631,6 @@ eu:
       expires_at: Iraungitzea
       uses: Erabilerak
     title: Gonbidatu jendea
-  landing_strip_html: "<strong>%{name}</strong> %{link_to_root_path} instantziako erabiltzailea da. Fedibertsoko edozein tokitan kontua baduzu jarraitu dezakezu eta harremanetan jarri."
-  landing_strip_signup_html: Ez baduzu, <a href="%{sign_up_path}">hemen izena eman</a> dezakezu.
   lists:
     errors:
       limit: Gehieneko zerrenda kopurura heldu zara
@@ -599,6 +704,7 @@ eu:
   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:'
   remote_unfollow:
@@ -684,6 +790,7 @@ eu:
       private: Ezin dira publikoak ez diren toot-ak finkatu
       reblog: Bultzada bat ezin da finkatu
     show_more: Erakutsi gehiago
+    sign_in_to_participate: Eman izena elkarrizketan parte hartzeko
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Jarraitzaileak besterik ez
@@ -693,10 +800,9 @@ eu:
       unlisted: Zerrendatu gabea
       unlisted_long: Edonork ikusi dezake, baina ez da denbora-lerro publikoetan agertzen
   stream_entries:
-    click_to_show: Klik erakusteko
     pinned: Finkatutako toot-a
     reblogged: "(r)en bultzada"
-    sensitive_content: Eduki hunkigarria
+    sensitive_content: 'Kontuz: Eduki hunkigarria'
   terms:
     body_html: |
       <h2>Pribatutasun politika</h2>
@@ -787,6 +893,7 @@ eu:
   time:
     formats:
       default: "%Y(e)ko %b %d, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Sartu zure autentifikazio aplikazioak sortutako kodea berresteko
     description_html: "<strong>Bi faktoreetako autentifikazioa</strong> gaitzen baduzu, saioa hasteko telefonoa eskura izan beharko duzu, honek zuk sartu behar dituzun kodeak sortuko dituelako."
@@ -808,6 +915,19 @@ eu:
       explanation: Zure Mastodon kontuaren babes-kopia osoa eskatu duzu. Deskargatzeko prest dago!
       subject: Zure artxiboa deskargatzeko prest dago
       title: Artxiboa jasotzea
+    warning:
+      explanation:
+        disable: Zure kontua izoztuta dagoen bitartean, zure kontua bere horretan dirau, baina ezin duzu ekintzarik burutu desblokeatzen den arte.
+        silence: Zure kontua murriztua dagoen bitartean, jada zu jarraitzen zaituztenak besterik ez dituzte zure Toot-ak ikusiko zerbitzari honetan, eta agian zerrenda publikoetatik kenduko zaizu. Hala ere besteek oraindik zu jarraitu zaitzakete.
+      review_server_policies: Berrikusi zerbitzariko politikak
+      subject:
+        disable: Zure  %{acct} kontua izoztu da
+        none: "%{acct} konturako abisua"
+        silence: Zure  %{acct} kontua murriztu da
+      title:
+        disable: Kontu izoztua
+        none: Abisua
+        silence: Kontu murriztua
     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.
@@ -819,7 +939,6 @@ eu:
       review_preferences_action: Aldatu hobespenak
       review_preferences_step: Ziurtatu hobespenak ezartzen dituzula, jaso nahi dituzu e-mail mezuak, lehenetsitako pribatutasuna mezu berrietarako. Mareatzen ez bazaitu GIF-ak automatikoki abiatzea ezarri dezakezu ere.
       subject: Ongi etorri Mastodon-era
-      tip_bridge_html: Twitter-etik bazatoz, Mastodon-en lagunak aurkitu ditzakezu <a href="%{bridge_url}">zubi aplikazioa</a> erabiliz. Beraiek ere zubi aplikazioa erabili badute dabil besterik ez!
       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!
@@ -827,8 +946,12 @@ eu:
       tips: Aholkuak
       title: Ongi etorri, %{name}!
   users:
+    follow_limit_reached: Ezin dituzu %{limit} pertsona baino gehiago jarraitu
     invalid_email: E-mail helbidea baliogabea da
     invalid_otp_token: Bi faktoreetako 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:'
+  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 89ed2bbfb1c6df9ef694023edb744a73d8517aa8..e7dd86025f288fdd4b358510ff7a37fb421eaac7 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -5,13 +5,13 @@ fa:
     about_mastodon_html: Ù…Ø§Ø³ØªØ¯ÙˆÙ† (Mastodon) ÛŒÚ© Ø´Ø¨Ú©Ù‡Ù” Ø§Ø¬ØªÙ…Ø§Ø¹ÛŒ Ø§Ø³Øª Ú©Ù‡ Ø¨Ø± Ø§Ø³Ø§Ø³ Ù¾Ø±ÙˆØªÚ©Ù„â€ŒÙ‡Ø§ÛŒ Ø¢Ø²Ø§Ø¯ ÙˆØ¨ Ùˆ Ù†Ø±Ù…â€ŒØ§ÙØ²Ø§Ø±Ù‡Ø§ÛŒ Ø¢Ø²Ø§Ø¯ Ùˆ Ú©Ø¯Ø¨Ø§Ø² Ø³Ø§Ø®ØªÙ‡ Ø´Ø¯Ù‡ Ø§Ø³Øª. Ø§ÛŒÙ† Ø´Ø¨Ú©Ù‡ Ù…Ø§Ù†Ù†Ø¯ Ø§ÛŒÙ…ÛŒÙ„ ØºÛŒØ±Ù…ØªÙ…Ø±Ú©Ø² Ø§Ø³Øª.
     about_this: Ø¯Ø±Ø¨Ø§Ø±Ù‡
     administered_by: 'Ø¨Ø§ Ù…Ø¯ÛŒØ±ÛŒØª:'
+    api: Ø±Ø§Ø¨Ø· Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ†ÙˆÛŒØ³ÛŒ Ú©Ø§Ø±Ø¨Ø±Ø¯ÛŒ
+    apps: Ø§Ù¾â€ŒÙ‡Ø§ÛŒ Ù…ÙˆØ¨Ø§ÛŒÙ„
     closed_registrations: Ø«Ø¨Øªâ€ŒÙ†Ø§Ù… Ø±ÙˆÛŒ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ù‡Ù…â€ŒØ§ÛŒÙ†Ú© ÙØ¹Ø§Ù„ Ù†ÛŒØ³Øª. Ø§Ù…Ø§ Ø´Ù…Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø³Ø±ÙˆØ± Ø¯ÛŒÚ¯Ø±ÛŒ Ø¨ÛŒØ§Ø¨ÛŒØ¯ Ùˆ Ø¨Ø§ ØØ³Ø§Ø¨ÛŒ Ú©Ù‡ Ø¢Ù†â€ŒØ¬Ø§ Ù…ÛŒâ€ŒØ³Ø§Ø²ÛŒØ¯ Ø¯Ù‚ÛŒÙ‚Ø§Ù‹ Ø¨Ù‡ Ù‡Ù…ÛŒÙ† Ø´Ø¨Ú©Ù‡ Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯.
     contact: ØªÙ…Ø§Ø³
     contact_missing: ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡
     contact_unavailable: Ù…ÙˆØ¬ÙˆØ¯ Ù†ÛŒØ³Øª
-    description_headline: "%{domain} Ú†ÛŒØ³ØªØŸ"
-    domain_count_after: Ø³Ø±ÙˆØ± Ø¯ÛŒÚ¯Ø±
-    domain_count_before: Ù…ØªØµÙ„ Ø¨Ù‡
+    documentation: Ù…Ø³ØªÙ†Ø¯Ø§Øª
     extended_description_html: |
       <h3>Ø¬Ø§ÛŒ Ø®ÙˆØ¨ÛŒ Ø¨Ø±Ø§ÛŒ Ù‚Ø§Ù†ÙˆÙ†â€ŒÙ‡Ø§</h3>
       <p>ØªÙˆØ¶ÛŒØØ§Øª ØªÚ©Ù…ÛŒÙ„ÛŒ Ù†ÙˆØ´ØªÙ‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.</p>
@@ -28,25 +28,40 @@ fa:
     hosted_on: Ù…Ø§Ø³ØªØ¯ÙˆÙ†ØŒ Ù…ÛŒØ²Ø¨Ø§Ù†ÛŒâ€ŒØ´Ø¯Ù‡ Ø±ÙˆÛŒ %{domain}
     learn_more: Ø¨ÛŒØ´ØªØ± Ø¨Ø¯Ø§Ù†ÛŒØ¯
     other_instances: ÙÙ‡Ø±Ø³Øª Ø³Ø±ÙˆØ±Ù‡Ø§
+    privacy_policy: Ø³ÛŒØ§Ø³Øª Ø±Ø§Ø²Ø¯Ø§Ø±ÛŒ
     source_code: Ú©Ø¯Ù‡Ø§ÛŒ Ù…Ù†Ø¨Ø¹
-    status_count_after: Ú†ÛŒØ² Ù†ÙˆØ´ØªÙ‡â€ŒØ§Ù†Ø¯
-    status_count_before: Ú©Ù‡ Ø¬Ù…Ø¹Ø§Ù‹
-    user_count_after: Ú©Ø§Ø±Ø¨Ø±
+    status_count_after:
+      one: Ú†ÛŒØ² Ù†ÙˆØ´ØªÙ‡â€ŒØ§Ù†Ø¯
+      other: Ú†ÛŒØ² Ù†ÙˆØ´ØªÙ‡â€ŒØ§Ù†Ø¯
+    status_count_before: Ú©Ù‡ Ø¯Ø± Ú©Ù†Ø§Ø± Ù‡Ù…
+    terms: Ø´Ø±Ø§ÛŒØ· Ú©Ø§Ø±Ø¨Ø±ÛŒ
+    user_count_after:
+      one: Ú©Ø§Ø±Ø¨Ø±
+      other: Ú©Ø§Ø±Ø¨Ø±
     user_count_before: Ø¯Ø§Ø±Ø§ÛŒ
     what_is_mastodon: Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ú†ÛŒØ³ØªØŸ
   accounts:
+    choices_html: 'Ø§Ù†ØªØ®Ø§Ø¨â€ŒÙ‡Ø§ÛŒ %{name}:'
     follow: Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯
-    followers: Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù†
+    followers:
+      one: Ù¾ÛŒÚ¯ÛŒØ±
+      other: Ù¾ÛŒÚ¯ÛŒØ±
     following: Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯
+    joined: Ú©Ø§Ø±Ø¨Ø± Ø§Ø² %{date}
+    link_verified_on: Ù…Ø§Ù„Ú©ÛŒØª Ø§ÛŒÙ† Ù†Ø´Ø§Ù†ÛŒ Ø¯Ø± ØªØ§Ø±ÛŒØ® %{date} Ø¨Ø±Ø±Ø³ÛŒ Ø´Ø¯
     media: Ø¹Ú©Ø³ Ùˆ ÙˆÛŒØ¯ÛŒÙˆ
     moved_html: "%{name} ØØ³Ø§Ø¨ Ø®ÙˆØ¯ Ø±Ø§ Ø¨Ù‡ %{new_profile_link} Ù…Ù†ØªÙ‚Ù„ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª:"
     network_hidden: Ø§ÛŒÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª
     nothing_here: Ø§ÛŒÙ†â€ŒØ¬Ø§ Ú†ÛŒØ²ÛŒ Ù†ÛŒØ³Øª!
     people_followed_by: Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ %{name} Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯
     people_who_follow: Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ %{name} Ø±Ø§ Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ù†Ø¯
-    posts: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§
+    pin_errors:
+      following: Ø´Ù…Ø§ Ø¨Ø§ÛŒØ¯ Ù¾ÛŒÚ¯ÛŒØ± Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¨Ø§Ø´ÛŒØ¯ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø«Ø§Ø¨Øª Ú©Ù†ÛŒØ¯
+    posts:
+      one: Ø¨ÙˆÙ‚
+      other: Ø¨ÙˆÙ‚
+    posts_tab_heading: Ø¨ÙˆÙ‚â€ŒÙ‡Ø§
     posts_with_replies: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ Ùˆ Ù¾Ø§Ø³Ø®â€ŒÙ‡Ø§
-    remote_follow: Ù¾ÛŒÚ¯ÛŒØ±ÛŒ ØºÛŒØ±Ù…Ø³ØªÙ‚ÛŒÙ…
     reserved_username: Ø§ÛŒÙ† Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³Øª
     roles:
       admin: Ù…Ø¯ÛŒØ±
@@ -106,13 +121,10 @@ fa:
       moderation_notes: ÛŒØ§Ø¯Ø¯Ø§Ø´Øª Ù…Ø¯ÛŒØ±
       most_recent_activity: Ø¢Ø®Ø±ÛŒÙ† ÙØ¹Ø§Ù„ÛŒØªâ€ŒÙ‡Ø§
       most_recent_ip: Ø¢Ø®Ø±ÛŒÙ† IP Ù‡Ø§
+      no_limits_imposed: Ø¨Ø¯ÙˆÙ† Ù…ØØ¯ÙˆØ¯ÛŒØª
       not_subscribed: Ø¹Ø¶Ùˆ Ù†ÛŒØ³Øª
-      order:
-        alphabetic: Ø§Ù„ÙØ¨Ø§ÛŒÛŒ
-        most_recent: ØªØ§Ø²Ù‡â€ŒØªØ±ÛŒÙ†â€ŒÙ‡Ø§
-        title: ØªØ±ØªÛŒØ¨
       outbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙ†Ø¯ÙˆÙ‚ Ø®Ø±ÙˆØ¬ÛŒ
-      perform_full_suspension: Ø§Ù†Ø¬Ø§Ù… ØªØ¹Ù„ÛŒÙ‚ Ú©Ø§Ù…Ù„
+      perform_full_suspension: ØªØ¹Ù„ÛŒÙ‚
       profile_url: Ù†Ø´Ø§Ù†ÛŒ Ù†Ù…Ø§ÛŒÙ‡
       promote: ØªØ±ÙÛŒØ¹â€ŒØ¯Ø§Ø¯Ù†
       protocol: Ù¾Ø±ÙˆØªÚ©Ù„
@@ -138,11 +150,12 @@ fa:
       shared_inbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙ†Ø¯ÙˆÙ‚ ÙˆØ±ÙˆØ¯ÛŒ Ù…Ø´ØªØ±Ú©
       show:
         created_reports: Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§ Ø§Ø² Ø·Ø±Ù Ø§ÛŒÙ† ØØ³Ø§Ø¨
-        report: Ú¯Ø²Ø§Ø±Ø´
         targeted_reports: Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§ Ø¯Ø±Ø¨Ø§Ø±Ù‡Ù” Ø§ÛŒÙ† ØØ³Ø§Ø¨
       silence: Ø¨ÛŒâ€ŒØµØ¯Ø§
+      silenced: Ø¨ÛŒâ€ŒØµØ¯Ø§Ø´Ø¯Ù‡
       statuses: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§
       subscribe: Ø§Ø´ØªØ±Ø§Ú©
+      suspended: ØªØ¹Ù„ÛŒÙ‚â€ŒØ´Ø¯Ù‡
       title: ØØ³Ø§Ø¨â€ŒÙ‡Ø§
       unconfirmed_email: Ø§ÛŒÙ…ÛŒÙ„ ØªØ£ÛŒÛŒØ¯Ù†Ø´Ø¯Ù‡
       undo_silenced: ÙˆØ§Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ø¨ÛŒâ€ŒØµØ¯Ø§Ú©Ø±Ø¯Ù†
@@ -159,6 +172,7 @@ fa:
         create_domain_block: "%{name} Ø¯Ø§Ù…ÛŒÙ† %{target} Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ú©Ø±Ø¯"
         create_email_domain_block: "%{name} Ø¯Ø§Ù…ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ %{target} Ø±Ø§ Ù…Ø³Ø¯ÙˆØ¯ Ú©Ø±Ø¯"
         demote_user: "%{name} Ù…Ù‚Ø§Ù… Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ ØªÙ†Ø²Ù„ Ø¯Ø§Ø¯"
+        destroy_custom_emoji: "%{name} Ø´Ú©Ù„Ú© %{target} Ø±Ø§ ØØ°Ù Ú©Ø±Ø¯"
         destroy_domain_block: "%{name} Ø¯Ø§Ù…ÛŒÙ† %{target} Ø±Ø§ Ø¨Ø§Ø² Ú©Ø±Ø¯"
         destroy_email_domain_block: "%{name} Ø¯Ø§Ù…ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ %{target} Ø±Ø§ Ø¨Ø§Ø² Ú©Ø±Ø¯"
         destroy_status: "%{name} Ù†ÙˆØ´ØªÙ‡â€ŒØ§ÛŒ Ø§Ø² %{target} Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯"
@@ -180,6 +194,7 @@ fa:
         unsuspend_account: "%{name} ØØ³Ø§Ø¨ Ú©Ø§Ø±Ø¨Ø± %{target} Ø±Ø§ Ø§Ø² ØªØ¹Ù„ÛŒÙ‚ Ø®Ø§Ø±Ø¬ Ú©Ø±Ø¯"
         update_custom_emoji: "%{name} Ø´Ú©Ù„Ú© %{target} Ø±Ø§ Ø¨Ù‡â€ŒØ±ÙˆØ² Ú©Ø±Ø¯"
         update_status: "%{name} Ù†ÙˆØ´ØªÙ‡Ù” %{target} Ø±Ø§ Ø¨Ù‡â€ŒØ±ÙˆØ² Ú©Ø±Ø¯"
+      deleted_status: "(Ø¨ÙˆÙ‚ Ù¾Ø§Ú©â€ŒØ´Ø¯Ù‡)"
       title: Ø³ÛŒØ§Ù‡Ù‡Ù” Ø¨Ø§Ø²Ø±Ø³ÛŒ
     custom_emojis:
       by_domain: Ø¯Ø§Ù…ÛŒÙ†
@@ -206,6 +221,27 @@ fa:
       update_failed_msg: Ø§ÛŒÙ† Ø´Ú©Ù„Ú© Ù†ØªÙˆØ§Ù†Ø³Øª Ø¨Ù‡â€ŒØ±ÙˆØ² Ø´ÙˆØ¯
       updated_msg: Ø´Ú©Ù„Ú© Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ù‡â€ŒØ±ÙˆØ² Ø´Ø¯!
       upload: Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ
+    dashboard:
+      backlog: Ú©Ø§Ø±Ù‡Ø§ÛŒ Ø¨Ø§Ù‚ÛŒÙ…Ø§Ù†Ø¯Ù‡
+      config: Ù¾ÛŒÚ©Ø±Ø¨Ù†Ø¯ÛŒ
+      feature_deletions: ØØ³Ø§Ø¨â€ŒÙ‡Ø§ÛŒ ØØ°Ùâ€ŒØ´Ø¯Ù‡
+      feature_invites: Ø¯Ø¹ÙˆØªâ€ŒÙ†Ø§Ù…Ù‡â€ŒÙ‡Ø§
+      feature_registrations: Ø«Ø¨Øªâ€ŒÙ†Ø§Ù…â€ŒÙ‡Ø§
+      feature_relay: Ø±Ù„Ù‡
+      features: ÙˆÛŒÚ˜Ú¯ÛŒâ€ŒÙ‡Ø§
+      hidden_service: Ø§Ø±ØªØ¨Ø§Ø· Ù…ÛŒØ§Ù†â€ŒØ³Ø±ÙˆØ±ÛŒ Ø¨Ø§ Ø³Ø±ÙˆÛŒØ³â€ŒÙ‡Ø§ÛŒ Ù†Ù‡ÙØªÙ‡
+      open_reports: Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§ÛŒ ÙØ¹Ø§Ù„
+      recent_users: Ú©Ø§Ø±Ø¨Ø±Ø§Ù† ØªØ§Ø²Ù‡
+      search: Ø¬Ø³ØªØ¬ÙˆÛŒ Ù…ØªÙ†ÛŒ
+      single_user_mode: ØØ§Ù„Øª ØªÚ©â€ŒÚ©Ø§Ø±Ø¨Ø±Ù‡
+      software: Ù†Ø±Ù…â€ŒØ§ÙØ²Ø§Ø±
+      space: ÙØ¶Ø§ÛŒ Ù…ØµØ±Ùâ€ŒØ´Ø¯Ù‡
+      title: Ø§Ø¨Ø²Ø§Ø±Ù‡Ø§ÛŒ Ù…Ø¯ÛŒØ±ÛŒØª
+      total_users: Ø´Ù…Ø§Ø± Ú©Ø§Ø±Ø¨Ø±Ø§Ù†
+      trends: Ù‡Ø´ØªÚ¯â€ŒÙ‡Ø§ÛŒ Ù¾Ø±Ú©Ø§Ø±Ø¨Ø±Ø¯
+      week_interactions: ÙØ¹Ø§Ù„ÛŒØªâ€ŒÙ‡Ø§ Ø¯Ø± Ø§ÛŒÙ† Ù‡ÙØªÙ‡
+      week_users_active: Ú©Ø§Ø±Ø¨Ø±Ø§Ù† ÙØ¹Ø§Ù„ Ù‡ÙØªÙ‡Ù” Ø§Ø®ÛŒØ±
+      week_users_new: Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ù‡ÙØªÙ‡Ù” Ø§Ø®ÛŒØ±
     domain_blocks:
       add_new: Ø§ÙØ²ÙˆØ¯Ù† ØªØ§Ø²Ù‡
       created_msg: Ù…Ø³Ø¯ÙˆØ¯Ú©Ø±Ø¯Ù† Ø¯Ø§Ù…ÛŒÙ† Ø¯Ø± ØØ§Ù„ Ø§Ù†Ø¬Ø§Ù… Ø§Ø³Øª
@@ -222,11 +258,8 @@ fa:
         title: Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ø¯Ø§Ù…ÛŒÙ† Ø¯ÛŒÚ¯Ø±
       reject_media: Ù†Ù¾Ø°ÛŒØ±ÙØªÙ† Ù¾Ø±ÙˆÙ†Ø¯Ù‡â€ŒÙ‡Ø§ÛŒ ØªØµÙˆÛŒØ±ÛŒ
       reject_media_hint: ØªØµÙˆÛŒØ±Ù‡Ø§ÛŒ Ø°Ø®ÛŒØ±Ù‡â€ŒØ´Ø¯Ù‡ Ø¯Ø± Ø§ÛŒÙ†â€ŒØ¬Ø§ Ø±Ø§ Ù¾Ø§Ú© Ù…ÛŒâ€ŒÚ©Ù†Ø¯ Ùˆ Ø¬Ù„ÙˆÛŒ Ø¯Ø±ÛŒØ§ÙØª ØªØµÙˆÛŒØ±Ù‡Ø§ Ø±Ø§ Ø¯Ø± Ø¢ÛŒÙ†Ø¯Ù‡ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯. Ø¨ÛŒâ€ŒØªØ£Ø«ÛŒØ± Ø¨Ø±Ø§ÛŒ Ù…Ø¹Ù„Ù‚â€ŒØ´Ø¯Ù‡â€ŒÙ‡Ø§
-      severities:
-        noop: Ù‡ÛŒÚ†
-        silence: Ø¨ÛŒâ€ŒØµØ¯Ø§Ú©Ø±Ø¯Ù†
-        suspend: Ù…Ø¹Ù„Ù‚â€ŒÚ©Ø±Ø¯Ù†
-      severity: Ø´Ø¯Øª
+      reject_reports: Ù†Ù¾Ø°ÛŒØ±ÙØªÙ† Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§
+      reject_reports_hint: Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ø§Ø² Ø§ÛŒÙ† Ø¯Ø§Ù…ÛŒÙ† Ù…ÛŒâ€ŒØ¢ÛŒØ¯ Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯. Ø¨ÛŒâ€ŒØªØ£Ø«ÛŒØ± Ø¨Ø±Ø§ÛŒ Ù…Ø¹Ù„Ù‚â€ŒØ´Ø¯Ù‡â€ŒÙ‡Ø§
       show:
         affected_accounts:
           one: Ø±ÙˆÛŒ ÛŒÚ© ØØ³Ø§Ø¨ Ø¯Ø± Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡ ØªØ£Ø«ÛŒØ± Ú¯Ø°Ø§Ø´Øª
@@ -236,7 +269,6 @@ fa:
           suspend: Ù…Ø¹Ù„Ù‚â€ŒØ´Ø¯Ù† Ù‡Ù…Ù‡Ù” ØØ³Ø§Ø¨â€ŒÙ‡Ø§ÛŒ Ø§ÛŒÙ† Ø¯Ø§Ù…ÛŒÙ† Ø±Ø§ Ù„ØºÙˆ Ú©Ù†
         title: ÙˆØ§Ú¯Ø±Ø¯Ø§Ù†ÛŒ Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ø¯Ø§Ù…Ù†Ù‡ Ø¨Ø±Ø§ÛŒ %{domain}
         undo: ÙˆØ§Ú¯Ø±Ø¯Ø§Ù†ÛŒ
-      title: Ø¯Ø§Ù…ÛŒÙ†â€ŒÙ‡Ø§ÛŒ Ù…Ø³Ø¯ÙˆØ¯Ø´Ø¯Ù‡
       undo: ÙˆØ§Ú¯Ø±Ø¯Ø§Ù†ÛŒ
     email_domain_blocks:
       add_new: Ø§ÙØ²ÙˆØ¯Ù† ØªØ§Ø²Ù‡
@@ -249,18 +281,30 @@ fa:
         title: Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ø¯Ø§Ù…ÛŒÙ† Ø§ÛŒÙ…ÛŒÙ„ ØªØ§Ø²Ù‡
       title: Ù…Ø³Ø¯ÙˆØ¯Ø³Ø§Ø²ÛŒ Ø¯Ø§Ù…ÛŒÙ†â€ŒÙ‡Ø§ÛŒ Ø§ÛŒÙ…ÛŒÙ„
     instances:
-      account_count: ØØ³Ø§Ø¨â€ŒÙ‡Ø§ÛŒ Ø´Ù†Ø§Ø®ØªÙ‡â€ŒØ´Ø¯Ù‡
-      domain_name: Ø¯Ø§Ù…ÛŒÙ†
-      reset: Ø¨Ø§Ø²Ù†Ø´Ø§Ù†ÛŒ
-      search: Ø¬Ø³ØªØ¬Ùˆ
       title: Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ø´Ù†Ø§Ø®ØªÙ‡â€ŒØ´Ø¯Ù‡
     invites:
+      deactivate_all: ØºÛŒØ±ÙØ¹Ø§Ù„â€ŒÚ©Ø±Ø¯Ù† Ù‡Ù…Ù‡
       filter:
         all: Ù‡Ù…Ù‡
         available: Ø¯Ø± Ø¯Ø³ØªØ±Ø³
         expired: Ù…Ù†Ù‚Ø¶ÛŒâ€ŒØ´Ø¯Ù‡
         title: ÙÛŒÙ„ØªØ±
       title: Ø¯Ø¹ÙˆØªâ€ŒÙ‡Ø§
+    relays:
+      add_new: Ø§ÙØ²ÙˆØ¯Ù† Ø±Ù„Ù‡Ù” ØªØ§Ø²Ù‡
+      delete: ØØ°Ù
+      description_html: ÛŒÚ© <strong>Ø±Ù„Ù‡Ù” Ù…ÛŒØ§Ù†â€ŒØ³Ø±ÙˆØ±ÛŒ</strong> (federation relay) ÛŒÚ© Ø³Ø±ÙˆØ± Ù…ÛŒØ§Ù†Ø¬ÛŒ Ø§Ø³Øª Ú©Ù‡ ØØ¬Ù… Ø²ÛŒØ§Ø¯ÛŒ Ø§Ø² Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ Ø±Ø§ Ø¨ÛŒÙ† Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ú¯ÙˆÙ†Ø§Ú¯ÙˆÙ†ÛŒ Ú©Ù‡ Ø¹Ø¶ÙˆØ´ Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ Ø¬Ø§Ø¨Ù‡â€ŒØ¬Ø§ Ù…ÛŒâ€ŒÚ©Ù†Ø¯. <strong>Ø±Ù„Ù‡â€ŒÙ‡Ø§ Ø¨Ù‡ Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ú©ÙˆÚ†Ú© Ùˆ Ù…ØªÙˆØ³Ø· Ú©Ù…Ú© Ù…ÛŒâ€ŒÚ©Ù†Ù†Ø¯ ØªØ§ Ù…Ø·Ø§Ù„Ø¨ Ø¹Ù…ÙˆÙ…ÛŒ Ø¨ÛŒØ´ØªØ±ÛŒ Ø±Ø§ Ø¨ÛŒØ§Ø¨Ù†Ø¯.</strong> Ø§Ú¯Ø± Ø±Ù„Ù‡ Ù†Ø¨Ø§Ø´Ø¯ØŒ Ø§ÛŒÙ† Ù…Ø·Ø§Ù„Ø¨ Ø¹Ù…ÙˆÙ…ÛŒ ØªÙ†Ù‡Ø§ ÙˆÙ‚ØªÛŒ Ù¾ÛŒØ¯Ø§ Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ Ú©Ù‡ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ù…ØÙ„ÛŒ Ø®ÙˆØ¯Ø´Ø§Ù† Ù¾ÛŒÚ¯ÛŒØ± Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø±ÙˆÛŒ Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ Ø¯ÛŒÚ¯Ø± Ø´ÙˆÙ†Ø¯.
+      disable: ØºÛŒØ±ÙØ¹Ø§Ù„â€ŒÚ©Ø±Ø¯Ù†
+      disabled: ØºÛŒØ±ÙØ¹Ø§Ù„
+      enable: ÙØ¹Ø§Ù„â€ŒØ³Ø§Ø²ÛŒ
+      enable_hint: Ø§Ú¯Ø± ÙØ¹Ø§Ù„ Ø¨Ø§Ø´Ø¯ØŒ Ø³Ø±ÙˆØ± Ø´Ù…Ø§ Ø¹Ø¶Ùˆ Ù‡Ù…Ù‡Ù” Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒâ€ŒØ§ÛŒ Ø±Ø§ Ú©Ù‡ Ø§Ø² Ø§ÛŒÙ† Ø±Ù„Ù‡ Ù…ÛŒâ€ŒØ¢ÛŒØ¯ Ù…ÛŒâ€ŒÚ¯ÛŒØ±Ø¯ØŒ Ùˆ Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ Ø¹Ù…ÙˆÙ…ÛŒ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ø±Ø§ Ø¨Ù‡ Ø¢Ù† Ù…ÛŒâ€ŒÙØ±Ø³ØªÙ†Ø¯.
+      enabled: ÙØ¹Ø§Ù„
+      inbox_url: Ù†Ø´Ø§Ù†ÛŒ Ø±Ù„Ù‡
+      pending: Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø± Ù¾Ø°ÛŒØ±Ø´ Ø±Ù„Ù‡
+      save_and_enable: Ø°Ø®ÛŒØ±Ù‡ Ùˆ ÙØ¹Ø§Ù„â€ŒØ³Ø§Ø²ÛŒ
+      setup: Ù¾ÛŒÙˆØ³ØªÙ† Ø¨Ù‡ Ø±Ù„Ù‡â€ŒÙ‡Ø§
+      status: ÙˆØ¶Ø¹ÛŒØª
+      title: Ø±Ù„Ù‡â€ŒÙ‡Ø§
     report_notes:
       created_msg: ÛŒØ§Ø¯Ø¯Ø§Ø´Øª Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø³Ø§Ø®ØªÙ‡ Ø´Ø¯!
       destroyed_msg: ÛŒØ§Ø¯Ø¯Ø§Ø´Øª Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØØ°Ù Ø´Ø¯!
@@ -275,7 +319,6 @@ fa:
       comment:
         none: Ø®Ø§Ù„ÛŒ
       created_at: Ú¯Ø²Ø§Ø±Ø´â€ŒØ´Ø¯Ù‡
-      id: Ø´Ù†Ø§Ø³Ù‡
       mark_as_resolved: Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØÙ„â€ŒØ´Ø¯Ù‡
       mark_as_unresolved: Ø¹Ù„Ø§Ù…Øªâ€ŒÚ¯Ø°Ø§Ø±ÛŒ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØÙ„â€ŒÙ†Ø´Ø¯Ù‡
       notes:
@@ -286,20 +329,15 @@ fa:
         placeholder: Ú©Ø§Ø±Ù‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ø¯Ø± Ø§ÛŒÙ† Ø¨Ø§Ø±Ù‡ Ø§Ù†Ø¬Ø§Ù… Ø´Ø¯Ù‡ØŒ ÛŒØ§ Ù‡Ø± Ø¨Ù‡â€ŒØ±ÙˆØ²Ø±Ø³Ø§Ù†ÛŒ Ø¯ÛŒÚ¯Ø±ÛŒ Ø±Ø§ Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯...
       reopen: Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø¨Ù‡ Ø¬Ø±ÛŒØ§Ù† Ø¨ÛŒÙ†Ø¯Ø§Ø²ÛŒØ¯
       report: 'Ú¯Ø²Ø§Ø±Ø´ #%{id}'
-      report_contents: Ù…ØØªÙˆØ§
       reported_account: ØØ³Ø§Ø¨ Ú¯Ø²Ø§Ø±Ø´â€ŒØ´Ø¯Ù‡
       reported_by: Ú¯Ø²Ø§Ø±Ø´ Ø§Ø² Ø·Ø±Ù
       resolved: ØÙ„â€ŒØ´Ø¯Ù‡
       resolved_msg: Ú¯Ø²Ø§Ø±Ø´ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª ØÙ„ Ø´Ø¯!
-      silence_account: Ø¨ÛŒâ€ŒØµØ¯Ø§ Ú©Ø±Ø¯Ù† ØØ³Ø§Ø¨
       status: Ù†ÙˆØ´ØªÙ‡
-      suspend_account: Ù…Ø¹Ù„Ù‚â€ŒÚ©Ø±Ø¯Ù† ØØ³Ø§Ø¨
-      target: Ù‡Ø¯Ù
       title: Ú¯Ø²Ø§Ø±Ø´â€ŒÙ‡Ø§
       unassign: Ù¾Ø³â€ŒÚ¯Ø±ÙØªÙ† Ù…Ø³Ø¦ÙˆÙ„ÛŒØª
       unresolved: ØÙ„â€ŒÙ†Ø´Ø¯Ù‡
       updated_at: Ø¨Ù‡â€ŒØ±ÙˆØ² Ø´Ø¯
-      view: Ù†Ù…Ø§ÛŒØ´
     settings:
       activity_api_enabled:
         desc_html: ØªØ¹Ø¯Ø§Ø¯ Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒØŒ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† ÙØ¹Ø§Ù„ØŒ Ùˆ Ú©Ø§Ø±Ø¨Ø±Ø§Ù† ØªØ§Ø²Ù‡ Ø¯Ø± Ù‡Ø± Ù‡ÙØªÙ‡
@@ -310,9 +348,15 @@ fa:
       contact_information:
         email: Ø§ÛŒÙ…ÛŒÙ„ Ú©Ø§Ø±ÛŒ
         username: Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ
+      custom_css:
+        desc_html: Ø¸Ø§Ù‡Ø± Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø±Ø§ Ø¨Ø§ CSS-Ø§ÛŒ Ú©Ù‡ Ø¯Ø± Ù‡Ù…Ù‡Ù” ØµÙØÙ‡â€ŒÙ‡Ø§ Ø¬Ø§Ø³Ø§Ø²ÛŒ Ù…ÛŒâ€ŒØ´ÙˆØ¯ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯
+        title: Ø³Ø¨Ú© CSS Ø³ÙØ§Ø±Ø´ÛŒ
       hero:
         desc_html: Ø¯Ø± ØµÙØÙ‡Ù” Ø¢ØºØ§Ø²ÛŒÙ† Ù†Ù…Ø§ÛŒØ´ Ù…ÛŒâ€ŒÛŒØ§Ø¨Ø¯. Ø¯Ø³Øªâ€ŒÚ©Ù… Û¶Û°Û°Ã—Û±Û°Û° Ù¾ÛŒÚ©Ø³Ù„ ØªÙˆØµÛŒÙ‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯. Ø§Ú¯Ø± ØªØ¹ÛŒÛŒÙ† Ù†Ø´ÙˆØ¯ØŒ Ø¨Ø§ ØªØµÙˆÛŒØ± Ø¨Ù†Ø¯Ø§Ù†Ú¯Ø´ØªÛŒ Ø³Ø±ÙˆØ± Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
         title: ØªØµÙˆÛŒØ± Ø³Ø±Ø¨Ø±Ú¯
+      mascot:
+        desc_html: Ø¯Ø± ØµÙØÙ‡â€ŒÙ‡Ø§ÛŒ Ú¯ÙˆÙ†Ø§Ú¯ÙˆÙ†ÛŒ Ù†Ù…Ø§ÛŒØ´ Ù…ÛŒâ€ŒÛŒØ§Ø¨Ø¯. Ø¯Ø³Øªâ€ŒÚ©Ù… Û²Û¹Û³Ã—Û²Û°Ûµ Ù¾ÛŒÚ©Ø³Ù„. Ø§Ú¯Ø± ØªØ¹ÛŒÛŒÙ† Ù†Ø´ÙˆØ¯ØŒ Ø¨Ø§ ØªØµÙˆÛŒØ± Ù¾ÛŒØ´â€ŒÙØ±Ø¶ Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
+        title: ØªØµÙˆÛŒØ± Ù†Ù…Ø§Ø¯
       peers_api_enabled:
         desc_html: Ø¯Ø§Ù…ÛŒÙ†â€ŒÙ‡Ø§ÛŒÛŒ Ú©Ù‡ Ø§ÛŒÙ† Ø³Ø±ÙˆØ± Ø¨Ù‡ Ø¢Ù†â€ŒÙ‡Ø§ Ø¨Ø±Ø®ÙˆØ±Ø¯Ù‡ Ø§Ø³Øª
         title: Ø§Ù†ØªØ´Ø§Ø± ÙÙ‡Ø±Ø³Øª Ø³Ø±ÙˆØ±Ù‡Ø§ÛŒ ÛŒØ§ÙØªÙ‡â€ŒØ´Ø¯Ù‡
@@ -339,11 +383,14 @@ fa:
         desc_html: Ù†Ù…Ø§ÛŒØ´ Ø¹Ù„Ø§Ù…Øª Ù‡Ù…Ú©Ø§Ø± Ø±ÙˆÛŒ ØµÙØÙ‡Ù” Ú©Ø§Ø±Ø¨Ø±
         title: Ù†Ù…Ø§ÛŒØ´ Ø¹Ù„Ø§Ù…Øª Ù‡Ù…Ú©Ø§Ø±
       site_description:
-        desc_html: Ù…Ø¹Ø±ÙÛŒ Ú©ÙˆØªØ§Ù‡ÛŒ Ú©Ù‡ Ø±ÙˆÛŒ ØµÙØÙ‡Ù” Ø§ØµÙ„ÛŒ Ùˆ Ù‡Ù…Ú†Ù†ÛŒÙ† Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ÙØ±Ø§Ø¯Ø§Ø¯Ù‡Ù” ØµÙØÙ‡â€ŒÙ‡Ø§ Ù†Ù…Ø§ÛŒØ´ Ù…ÛŒâ€ŒÛŒØ§Ø¨Ø¯. Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ HTML Ø¨Ù†ÙˆÛŒØ³ÛŒØ¯, Ø¨Ù‡â€ŒÙˆÛŒÚ˜Ù‡ <code>&lt;a&gt;</code> Ùˆ <code>&lt;em&gt;</code>.
+        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: Ø´Ø±Ø§ÛŒØ· Ø§Ø³ØªÙØ§Ø¯Ù‡Ù” Ø³ÙØ§Ø±Ø´ÛŒ
@@ -365,6 +412,7 @@ fa:
       media:
         title: Ø±Ø³Ø§Ù†Ù‡
       no_media: Ø¨Ø¯ÙˆÙ† Ø¹Ú©Ø³ ÛŒØ§ ÙˆÛŒØ¯ÛŒÙˆ
+      no_status_selected: Ù‡ÛŒÚ† Ø¨ÙˆÙ‚ÛŒ ØªØºÛŒÛŒØ±ÛŒ Ù†Ú©Ø±Ø¯ Ø²ÛŒØ±Ø§ Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù… Ø§Ø² Ø¢Ù†â€ŒÙ‡Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´Ø¯Ù‡ Ø¨ÙˆØ¯Ù†Ø¯
       title: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ ØØ³Ø§Ø¨
       with_media: Ø¯Ø§Ø±Ø§ÛŒ Ø¹Ú©Ø³ ÛŒØ§ ÙˆÛŒØ¯ÛŒÙˆ
     subscriptions:
@@ -396,7 +444,7 @@ fa:
     warning: Ø®ÛŒÙ„ÛŒ Ù…ÙˆØ§Ø¸Ø¨ Ø§ÛŒÙ† Ø§Ø·Ù„Ø§Ø¹Ø§Øª Ø¨Ø§Ø´ÛŒØ¯ Ùˆ Ø¢Ù† Ø±Ø§ Ø¨Ù‡ Ù‡ÛŒÚ† Ú©Ø³ Ù†Ø¯Ù‡ÛŒØ¯!
     your_token: Ú©Ø¯ Ø¯Ø³ØªØ±Ø³ÛŒ Ø´Ù…Ø§
   auth:
-    agreement_html: Ù¾ÛŒØ´ Ø§Ø² Ø¹Ø¶Ùˆ Ø´Ø¯Ù† Ø¨Ø§ÛŒØ¯ <a href="%{rules_path}">Ù‚ÙˆØ§Ù†ÛŒÙ† Ø§ÛŒÙ† Ø³Ø±ÙˆØ±</a> Ùˆ <a href="%{terms_path}">Ø´Ø±Ø§ÛŒØ· Ø§Ø³ØªÙØ§Ø¯Ù‡Ù”</a> Ù…Ø§ Ø±Ø§ Ø¨Ù¾Ø°ÛŒØ±ÛŒØ¯.
+    agreement_html: Ø¨Ø§ Ú©Ù„ÛŒÚ© Ø±ÙˆÛŒ Ø¯Ú©Ù…Ù‡Ù” Ø¹Ø¶Ùˆ Ø´Ø¯Ù†ØŒ Ø´Ù…Ø§ <a href="%{rules_path}">Ù‚ÙˆØ§Ù†ÛŒÙ† Ø§ÛŒÙ† Ø³Ø±ÙˆØ±</a> Ùˆ <a href="%{terms_path}">Ø´Ø±Ø§ÛŒØ· Ø§Ø³ØªÙØ§Ø¯Ù‡Ù”</a> Ù…Ø§ Ø±Ø§ Ù…ÛŒâ€ŒÙ¾Ø°ÛŒØ±ÛŒØ¯.
     change_password: Ø±Ù…Ø²
     confirm_email: ØªØ£ÛŒÛŒØ¯ Ø§ÛŒÙ…ÛŒÙ„
     delete_account: Ù¾Ø§Ú©â€ŒÚ©Ø±Ø¯Ù† ØØ³Ø§Ø¨
@@ -463,7 +511,7 @@ fa:
     '500':
       content: Ø´Ø±Ù…Ù†Ø¯Ù‡ØŒ ÛŒÚ© Ú†ÛŒØ²ÛŒ Ø§Ø² Ø³Ù…Øª Ù…Ø§ Ø§Ø´ØªØ¨Ø§Ù‡ Ø´Ø¯Ù‡.
       title: Ø§ÛŒÙ† ØµÙØÙ‡ Ø¯Ø±Ø³Øª Ù†ÛŒØ³Øª
-    noscript_html: Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù†Ø³Ø®Ù‡Ù” ØªØØª ÙˆØ¨ Ù…Ø§Ø³ØªØ¯ÙˆÙ†ØŒ Ù„Ø·ÙØ§Ù‹ Ø¬Ø§ÙˆØ§Ø§Ø³Ú©Ø±ÛŒÙ¾Øª Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯. ÛŒØ§ Ø¨Ù‡ Ø¬Ø§ÛŒØ´ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">ÛŒÚ© Ø§Ù¾ Ù…Ø§Ø³ØªØ¯ÙˆÙ†</a> Ø±Ø§ Ø¨Ù‡â€ŒÚ©Ø§Ø± Ø¨Ø¨Ø±ÛŒØ¯.
+    noscript_html: Ø¨Ø±Ø§ÛŒ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² Ù†Ø³Ø®Ù‡Ù” ØªØØª ÙˆØ¨ Ù…Ø§Ø³ØªØ¯ÙˆÙ†ØŒ Ù„Ø·ÙØ§Ù‹ Ø¬Ø§ÙˆØ§Ø§Ø³Ú©Ø±ÛŒÙ¾Øª Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯. ÛŒØ§ Ø¨Ù‡ Ø¬Ø§ÛŒØ´ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ <a href="%{apps_path}">ÛŒÚ© Ø§Ù¾ Ù…Ø§Ø³ØªØ¯ÙˆÙ†</a> Ø±Ø§ Ø¨Ù‡â€ŒÚ©Ø§Ø± Ø¨Ø¨Ø±ÛŒØ¯.
   exports:
     archive_takeout:
       date: ØªØ§Ø±ÛŒØ®
@@ -505,9 +553,13 @@ fa:
     true_privacy_html: Ù„Ø·ÙØ§Ù‹ Ø¨Ø¯Ø§Ù†ÛŒØ¯ Ú©Ù‡ <strong>Ø¯Ø§Ø´ØªÙ† ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ ÙˆØ§Ù‚Ø¹ÛŒ ØªÙ†Ù‡Ø§ Ø¨Ø§ Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ Ø³Ø±ØªØ§Ø³Ø± (end-to-end encryption) Ù…Ù…Ú©Ù† Ø§Ø³Øª</strong>.
     unlocked_warning_html: Ù‡Ø± Ú©Ø³ÛŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†Ø¯ Ù¾ÛŒÚ¯ÛŒØ± Ø´Ù…Ø§ Ø´ÙˆØ¯ ØªØ§ Ø¨Ù„Ø§ÙØ§ØµÙ„Ù‡ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø®ØµÙˆØµÛŒ Ø´Ù…Ø§ Ø±Ø§ Ø¨Ø¨ÛŒÙ†Ø¯. Ø§Ú¯Ø±  %{lock_link} Ø®ÙˆØ§Ù‡ÛŒØ¯ ØªÙˆØ§Ù†Ø³Øª Ø¯Ø±Ø®ÙˆØ§Ø³Øªâ€ŒÙ‡Ø§ÛŒ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ Ø±Ø§ Ø¨Ø±Ø±Ø³ÛŒ Ú©Ø±Ø¯Ù‡ Ùˆ Ù†Ù¾Ø°ÛŒØ±ÛŒØ¯.
     unlocked_warning_title: ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ø®ØµÙˆØµÛŒ Ù†ÛŒØ³Øª
+  footer:
+    developers: Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ†ÙˆÛŒØ³Ø§Ù†
+    more: Ø¨ÛŒØ´ØªØ±â€¦
+    resources: Ù…Ù†Ø§Ø¨Ø¹
   generic:
     changes_saved_msg: ØªØºÛŒÛŒØ±Ø§Øª Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø°Ø®ÛŒØ±Ù‡ Ø´Ø¯Ù†Ø¯!
-    powered_by: Ù†ÛŒØ±Ùˆ Ú¯Ø±ÙØªÙ‡ Ø§Ø² %{link}
+    copy: Ø±ÙˆÙ†ÙˆØ´Øª
     save_changes: Ø°Ø®ÛŒØ±Ù‡Ù” ØªØºÛŒÛŒØ±Ø§Øª
     validation_errors:
       one: ÛŒÚ© Ú†ÛŒØ²ÛŒ Ù‡Ù†ÙˆØ² Ø¯Ø±Ø³Øª Ù†ÛŒØ³Øª! Ù„Ø·ÙØ§Ù‹ Ø®Ø·Ø§Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯
@@ -543,8 +595,6 @@ fa:
       expires_at: ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§
       uses: Ø§Ø³ØªÙØ§Ø¯Ù‡â€ŒÙ‡Ø§
     title: Ø¯Ø¹ÙˆØª Ø¯ÛŒÚ¯Ø±Ø§Ù†
-  landing_strip_html: "<strong>%{name}</strong> Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø±ÙˆÛŒ %{link_to_root_path} Ø§Ø³Øª. Ø´Ù…Ø§ Ø¨Ø§ Ø¯Ø§Ø´ØªÙ† ØØ³Ø§Ø¨ Ø±ÙˆÛŒ Ù‡Ø± Ø³Ø±ÙˆØ±ÛŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø§Ùˆ Ø±Ø§ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ Ú©Ø±Ø¯Ù‡ ÛŒØ§ Ø¨Ø§ Ø§Ùˆ Ø§Ø±ØªØ¨Ø§Ø· Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯."
-  landing_strip_signup_html: Ø§Ú¯Ø± Ù‡Ù†ÙˆØ² ØØ³Ø§Ø¨ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯ <a href="%{sign_up_path}">Ø§ÛŒÙ†â€ŒØ¬Ø§ ØØ³Ø§Ø¨ Ø¨Ø§Ø² Ú©Ù†ÛŒØ¯</a>.
   lists:
     errors:
       limit: Ø§Ø² Ø§ÛŒÙ† Ø¨ÛŒØ´ØªØ± Ù†Ù…ÛŒâ€ŒØ´ÙˆØ¯ ÙÙ‡Ø±Ø³Øª Ø¯Ø§Ø´Øª
@@ -704,6 +754,7 @@ fa:
       private: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ ØºÛŒØ±Ø¹Ù…ÙˆÙ…ÛŒ Ø±Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø«Ø§Ø¨Øª Ú©Ø±Ø¯
       reblog: Ø¨Ø§Ø²Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ Ø±Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù† Ø«Ø§Ø¨Øª Ú©Ø±Ø¯
     show_more: Ù†Ù…Ø§ÛŒØ´
+    sign_in_to_participate: Ø¨Ø±Ø§ÛŒ Ø´Ø±Ú©Øª Ø¯Ø± Ú¯ÙØªÚ¯Ùˆ ÙˆØ§Ø±Ø¯ ØØ³Ø§Ø¨ Ø®ÙˆØ¯ Ø´ÙˆÛŒØ¯
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Ø®ØµÙˆØµÛŒ
@@ -713,7 +764,6 @@ fa:
       unlisted: ÙÙ‡Ø±Ø³Øªâ€ŒÙ†Ø´Ø¯Ù‡
       unlisted_long: Ø¹Ù…ÙˆÙ…ÛŒØŒ ÙˆÙ„ÛŒ Ø¯Ø± ÙÙ‡Ø±Ø³Øª Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ Ù†Ù…Ø§ÛŒØ´ Ù†Ù…ÛŒâ€ŒÛŒØ§Ø¨Ø¯
   stream_entries:
-    click_to_show: Ø¨Ø±Ø§ÛŒ Ù†Ù…Ø§ÛŒØ´ Ú©Ù„ÛŒÚ© Ú©Ù†ÛŒØ¯
     pinned: Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø«Ø§Ø¨Øª
     reblogged: Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯
     sensitive_content: Ù…ØØªÙˆØ§ÛŒ ØØ³Ø§Ø³
@@ -726,6 +776,7 @@ fa:
   time:
     formats:
       default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Ø¨Ø±Ø§ÛŒ ØªØ£ÛŒÛŒØ¯ØŒ Ú©Ø¯ÛŒ Ø±Ø§ Ú©Ù‡ Ø¨Ø±Ù†Ø§Ù…Ù‡Ù” ØªØ£ÛŒÛŒØ¯Ú©Ù†Ù†Ø¯Ù‡ Ø³Ø§Ø®ØªÙ‡ Ø§Ø³Øª ÙˆØ§Ø±Ø¯ Ú©Ù†ÛŒØ¯
     description_html: Ø§Ú¯Ø± <strong>ÙˆØ±ÙˆØ¯ Ø¯ÙˆÙ…Ø±ØÙ„Ù‡â€ŒØ§ÛŒ</strong> Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯ØŒ Ø¨Ø±Ø§ÛŒ ÙˆØ±ÙˆØ¯ Ø¨Ù‡ Ø³ÛŒØ³ØªÙ… Ø¨Ù‡ ØªÙ„ÙÙ† Ø®ÙˆØ¯ Ù†ÛŒØ§Ø² Ø®ÙˆØ§Ù‡ÛŒØ¯ Ø¯Ø§Ø´Øª ØªØ§ Ø¨Ø±Ø§ÛŒØªØ§Ù† ÛŒÚ© Ú©Ø¯ Ù…ÙˆÙ‚ØªÛŒ Ø¨Ø³Ø§Ø²Ø¯.
@@ -758,7 +809,6 @@ fa:
       review_preferences_action: ØªØºÛŒÛŒØ± ØªØ±Ø¬ÛŒØØ§Øª
       review_preferences_step: Ø¨Ø§ Ø±ÙØªÙ† Ø¨Ù‡ ØµÙØÙ‡Ù” ØªØ±Ø¬ÛŒØØ§Øª Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ú†ÛŒØ²Ù‡Ø§ÛŒ Ú¯ÙˆÙ†Ø§Ú¯ÙˆÙ†ÛŒ Ø±Ø§ ØªÙ†Ø¸ÛŒÙ… Ú©Ù†ÛŒØ¯. Ù…Ø«Ù„Ø§Ù‹ Ø§ÛŒÙ† Ú©Ù‡ Ú†Ù‡ Ø§ÛŒÙ…ÛŒÙ„â€ŒÙ‡Ø§ÛŒ Ø¢Ú¯Ø§Ù‡â€ŒØ³Ø§Ø²ÛŒâ€ŒØ§ÛŒ Ø¨Ù‡ Ø´Ù…Ø§ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´ÙˆØ¯ØŒ ÛŒØ§ ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ù¾ÛŒØ´â€ŒÙØ±Ø¶ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒØªØ§Ù† Ú†Ù‡ Ø¨Ø§Ø´Ø¯. Ø§Ú¯Ø± Ø¨ÛŒÙ…Ø§Ø±ÛŒ Ø³ÙØ± (ØØ§Ù„Øª ØªÙ‡ÙˆØ¹ Ø¨Ø± Ø§Ø«Ø± Ø¯ÛŒØ¯Ù† Ø§Ø¬Ø³Ø§Ù… Ù…ØªØØ±Ú©) Ù†Ø¯Ø§Ø±ÛŒØ¯ØŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ù¾Ø®Ø´ Ø®ÙˆØ¯Ú©Ø§Ø± ÙˆÛŒØ¯ÛŒÙˆÙ‡Ø§ Ø±Ø§ ÙØ¹Ø§Ù„ Ú©Ù†ÛŒØ¯.
       subject: Ø¨Ù‡ Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯
-      tip_bridge_html: Ø§Ú¯Ø± Ù¾ÛŒØ´ Ø§Ø² Ø§ÛŒÙ† Ú©Ø§Ø±Ø¨Ø± ØªÙˆÛŒÛŒØªØ± Ø¨ÙˆØ¯ÛŒØ¯ØŒ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¯ÙˆØ³ØªØ§Ù† ØªÙˆÛŒÛŒØªØ±ÛŒ Ø®ÙˆØ¯ Ø±Ø§ Ú©Ù‡ Ø¯Ø± Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ù‡Ø³ØªÙ†Ø¯ Ø¨Ù‡ Ú©Ù…Ú© <a href="%{bridge_url}">bridge app</a> Ù¾ÛŒØ¯Ø§ Ú©Ù†ÛŒØ¯. Ø§Ù„Ø¨ØªÙ‡ Ø§ÛŒÙ† ÙÙ‚Ø· ÙˆÙ‚ØªÛŒ Ú©Ø§Ø± Ù…ÛŒâ€ŒÚ©Ù†Ø¯ Ú©Ù‡ Ø¢Ù†â€ŒÙ‡Ø§ Ù‡Ù… Ø§ÛŒÙ† Ø§Ù¾ Ø±Ø§ Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø±Ø¯Ù‡ Ø¨Ø§Ø´Ù†Ø¯!
       tip_federated_timeline: "Â«ÙÙ‡Ø±Ø³Øª Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡â€ŒØ¬Ø§Â» Ù†Ù…Ø§ÛŒÛŒ Ø§Ø² Ú©Ù„ Ø´Ø¨Ú©Ù‡Ù” Ø¨Ø²Ø±Ú¯ Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¨Ù‡ Ø´Ù…Ø§ Ù…ÛŒâ€ŒØ¯Ù‡Ø¯. Ø§Ù„Ø¨ØªÙ‡ Ø§ÛŒÙ† ÙÙ‡Ø±Ø³Øª ÙÙ‚Ø· Ø§ÙØ±Ø¯Ø§ÛŒ Ø±Ø§ Ù†Ø´Ø§Ù† Ù…ÛŒâ€ŒØ¯Ù‡Ø¯ Ú©Ù‡ Ù‡Ù…â€ŒØ³Ø±ÙˆØ±ÛŒâ€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¢Ù†â€ŒÙ‡Ø§ Ø±Ø§ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ Ù…ÛŒâ€ŒÚ©Ù†Ù†Ø¯ØŒ Ùˆ Ø¨Ù†Ø§Ø¨Ø±Ø§ÛŒÙ† Ù…Ù…Ú©Ù† Ø§Ø³Øª Ú©Ø§Ù…Ù„ Ù†Ø¨Ø§Ø´Ø¯."
       tip_following: Ø´Ù…Ø§ Ø¨Ù‡ Ø·ÙˆØ± Ù¾ÛŒØ´â€ŒÙØ±Ø¶ Ù…Ø¯ÛŒØ±(Ù‡Ø§ÛŒ) Ø³Ø±ÙˆØ± Ø®ÙˆØ¯ Ø±Ø§ Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±ÛŒØ¯. Ø¨Ø±Ø§ÛŒ ÛŒØ§ÙØªÙ† Ø§ÙØ±Ø§Ø¯ Ø¬Ø§Ù„Ø¨ Ø¯ÛŒÚ¯Ø±ØŒ ÙÙ‡Ø±Ø³Øª Â«Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒÂ» Ùˆ Â«Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡â€ŒØ¬Ø§Â» Ø±Ø§ Ø¨Ø¨ÛŒÙ†ÛŒØ¯.
       tip_local_timeline: ÙÙ‡Ø±Ø³Øª Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ù…ØÙ„ÛŒ Ù†Ù…Ø§ÛŒÛŒ Ú©Ù„ÛŒ Ø§Ø² Ú©Ø§Ø±Ø¨Ø±Ø§Ù† Ø±ÙˆÛŒ %{instance} Ø±Ø§ Ø§Ø±Ø§Ø¦Ù‡ Ù…ÛŒâ€ŒØ¯Ù‡Ø¯. Ø§ÛŒÙ†â€ŒÙ‡Ø§ Ù‡Ù…Ø³Ø§ÛŒÙ‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ù‡Ø³ØªÙ†Ø¯!
@@ -766,8 +816,12 @@ fa:
       tips: Ù†Ú©ØªÙ‡â€ŒÙ‡Ø§
       title: Ø®ÙˆØ´ Ø¢Ù…Ø¯ÛŒØ¯ØŒ Ú©Ø§Ø±Ø¨Ø± %{name}!
   users:
+    follow_limit_reached: Ø´Ù…Ø§ Ù†Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ Ø¨ÛŒØ´ Ø§Ø² %{limit} Ù†ÙØ± Ø±Ø§ Ù¾ÛŒ Ø¨Ú¯ÛŒØ±ÛŒØ¯
     invalid_email: Ù†Ø´Ø§Ù†ÛŒ Ø§ÛŒÙ…ÛŒÙ„ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª
     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> Ø±Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† attribute Ø¯Ø± Ø®ÙˆØ¯ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯. Ù…ØØªÙˆØ§ÛŒ Ù…ØªÙ† Ù¾ÛŒÙˆÙ†Ø¯ Ø§Ù‡Ù…ØªÛŒ Ù†Ø¯Ø§Ø±Ø¯. ÛŒÚ© Ù†Ù…ÙˆÙ†Ù‡ Ø§Ø² Ú†Ù†ÛŒÙ† Ù¾ÛŒÙˆÙ†Ø¯ÛŒ:'
+    verification: ØªØ£ÛŒÛŒØ¯
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index df4863809144109d8bd013855ff9e314b77f5b4b..4b5635622877f3d91c8ef77fbcad8b607b0de2fd 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -9,9 +9,6 @@ fi:
     contact: Ota yhteyttÃ¤
     contact_missing: Ei asetettu
     contact_unavailable: Ei saatavilla
-    description_headline: MikÃ¤ on %{domain}?
-    domain_count_after: muuhun instanssiin
-    domain_count_before: YhdistyneenÃ¤
     extended_description_html: |
       <h3>HyvÃ¤ paikka sÃ¤Ã¤nnÃ¶ille</h3>
       <p>PidempÃ¤Ã¤ kuvausta ei ole vielÃ¤ laadittu.</p>
@@ -46,7 +43,6 @@ fi:
     people_who_follow: KÃ¤yttÃ¤jÃ¤n %{name} seuraajat
     posts: Tuuttaukset
     posts_with_replies: Tuuttaukset ja vastaukset
-    remote_follow: EtÃ¤seuranta
     reserved_username: KÃ¤yttÃ¤jÃ¤nimi on varattu
     roles:
       admin: YllÃ¤pitÃ¤jÃ¤
@@ -106,10 +102,6 @@ fi:
       most_recent_activity: Viimeisin toiminta
       most_recent_ip: Viimeisin IP
       not_subscribed: Ei tilaaja
-      order:
-        alphabetic: AakkosjÃ¤rjestys
-        most_recent: Uusin
-        title: JÃ¤rjestys
       outbox_url: LÃ¤htevÃ¤n postilaatikon osoite
       perform_full_suspension: SiirrÃ¤ kokonaan jÃ¤Ã¤hylle
       profile_url: Profiilin osoite
@@ -137,7 +129,6 @@ fi:
       shared_inbox_url: Jaetun saapuvan postilaatikon osoite
       show:
         created_reports: TÃ¤mÃ¤n tilin luomat raportit
-        report: raportti
         targeted_reports: TÃ¤stÃ¤ tilistÃ¤ tehdyt raportit
       silence: HiljennÃ¤
       statuses: Tilat
@@ -220,11 +211,6 @@ fi:
         title: Uusi verkkotunnuksen esto
       reject_media: HylkÃ¤Ã¤ mediatiedostot
       reject_media_hint: Poistaa paikallisesti tallennetut mediatiedostot eikÃ¤ lataa niitÃ¤ enÃ¤Ã¤ jatkossa. Ei merkitystÃ¤ jÃ¤Ã¤hyn kohdalla
-      severities:
-        noop: Ei mitÃ¤Ã¤n
-        silence: Hiljennys
-        suspend: JÃ¤Ã¤hy
-      severity: Vakavuus
       show:
         affected_accounts:
           one: Vaikuttaa yhteen tiliin tietokannassa
@@ -234,7 +220,6 @@ fi:
           suspend: Peru kaikkien tÃ¤ssÃ¤ verkkotunnuksessa jo olemassa olevien tilien jÃ¤Ã¤hy
         title: Peru verkkotunnuksen %{domain} esto
         undo: Peru
-      title: Verkkotunnusten estot
       undo: Peru
     email_domain_blocks:
       add_new: LisÃ¤Ã¤ uusi
@@ -247,10 +232,6 @@ fi:
         title: Uusi sÃ¤hkÃ¶postiestolistan merkintÃ¤
       title: SÃ¤hkÃ¶postiestolista
     instances:
-      account_count: Tiedossa olevat tilit
-      domain_name: Verkkotunnus
-      reset: Palauta
-      search: Hae
       title: Tiedossa olevat instanssit
     invites:
       filter:
@@ -272,7 +253,6 @@ fi:
       comment:
         none: Ei mitÃ¤Ã¤n
       created_at: Raportoitu
-      id: Tunniste
       mark_as_resolved: Merkitse ratkaistuksi
       mark_as_unresolved: Merkitse ratkaisemattomaksi
       notes:
@@ -283,19 +263,14 @@ fi:
         placeholder: Kuvaile mitÃ¤ toimia on tehty tai muita pÃ¤ivityksiÃ¤ tÃ¤hÃ¤n raporttiinâ€¦
       reopen: Avaa raportti uudestaan
       report: Raportti nro %{id}
-      report_contents: SisÃ¤ltÃ¶
       reported_account: Raportoitu tili
       reported_by: Raportoija
       resolved: Ratkaistut
       resolved_msg: Raportti onnistuneesti ratkaistu!
-      silence_account: HiljennÃ¤ tili
       status: Tila
-      suspend_account: SiirrÃ¤ tili jÃ¤Ã¤hylle
-      target: Kohde
       title: Raportit
       unresolved: Ratkaisemattomat
       updated_at: PÃ¤ivitetty
-      view: NÃ¤ytÃ¤
     settings:
       activity_api_enabled:
         desc_html: Paikallisesti julkaistujen tilojen, aktiivisten kÃ¤yttÃ¤jien ja uusien rekisterÃ¶intien mÃ¤Ã¤rÃ¤t viikoittain
@@ -456,7 +431,7 @@ fi:
     '500':
       content: Valitettavasti jokin meni pieleen meidÃ¤n pÃ¤Ã¤ssÃ¤mme.
       title: Sivu ei ole oikein
-    noscript_html: Mastodon-selainsovelluksen kÃ¤yttÃ¶Ã¶n vaaditaan JavaScript. Voit vaihtoehtoisesti kokeilla jotakin omalle kÃ¤yttÃ¶jÃ¤rjestelmÃ¤llesi tehtyÃ¤ Mastodon<a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">sovellusta</a>.
+    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>.
   exports:
     archive_takeout:
       date: PÃ¤ivÃ¤ys
@@ -484,7 +459,6 @@ fi:
     unlocked_warning_title: TiliÃ¤si ei ole lukittu
   generic:
     changes_saved_msg: Muutosten tallennus onnistui!
-    powered_by: voimanlÃ¤hteenÃ¤ %{link}
     save_changes: Tallenna muutokset
     validation_errors:
       one: Kaikki ei ole aivan oikein! Tarkasta alla oleva virhe
@@ -519,8 +493,6 @@ fi:
       expires_at: Vanhenee
       uses: KÃ¤ytetty
     title: Kutsu ihmisiÃ¤
-  landing_strip_html: "<strong>%{name}</strong> on kÃ¤yttÃ¤jÃ¤nÃ¤ palvelimella %{link_to_root_path}. Voit seurata heitÃ¤ tai pitÃ¤Ã¤ heihin yhteyttÃ¤, jos sinulla on tili missÃ¤ tahansa fediversumin kolkassa."
-  landing_strip_signup_html: Jos sinulla ei ole tiliÃ¤, voit <a href="%{sign_up_path}">rekisterÃ¶ityÃ¤ tÃ¤tÃ¤ kautta</a>.
   lists:
     errors:
       limit: Sinulla on jo suurin sallittu mÃ¤Ã¤rÃ¤ listoja
@@ -620,7 +592,7 @@ fi:
       uc_browser: UCBrowser
       weibo: Weibo
     current_session: Nykyinen istunto
-    description: "%{selain}, %{platform}"
+    description: "%{browser}, %{platform}"
     explanation: NÃ¤mÃ¤ verkkoselaimet ovat tÃ¤llÃ¤ hetkellÃ¤ kirjautuneet Mastodon-tilillesi.
     ip: IP
     platforms:
@@ -684,7 +656,6 @@ fi:
       unlisted: Listaamaton julkinen
       unlisted_long: Kaikki voivat nÃ¤hdÃ¤, mutta ei nÃ¤ytetÃ¤ julkisilla aikajanoilla
   stream_entries:
-    click_to_show: Katso napsauttamalla
     pinned: Kiinnitetty tuuttaus
     reblogged: buustasi
     sensitive_content: Arkaluontoista sisÃ¤ltÃ¶Ã¤
@@ -721,19 +692,18 @@ fi:
       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.
       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 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.).'
       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_bridge_html: Jos tulet TwitteristÃ¤, voit etsiÃ¤ ystÃ¤viÃ¤si Mastodonista <a href="%{bridge_url}">siltasovelluksen</a> avulla. Se kuitenkin lÃ¶ytÃ¤Ã¤ heidÃ¤t vain, jos hekin kÃ¤yttÃ¤vÃ¤t sitÃ¤!
       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}!
+      title: Tervetuloa mukaan, %{name}!
   users:
     invalid_email: Virheellinen sÃ¤hkÃ¶postiosoite
     invalid_otp_token: Virheellinen kaksivaiheisen todentamisen koodi
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 1e1471f7295a14deeaf79ea3bfb142df840ff4bc..cbff58d918085e62404dffb2860deeac018bc3de 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -4,23 +4,23 @@ fr:
     about_hashtag_html: Figurent ci-dessous les pouets taguÃ©s avec <strong>#%{hashtag}</strong>. Vous pouvez interagir avec eux si vous avez un compte nâ€™importe oÃ¹ dans le Fediverse.
     about_mastodon_html: Mastodon est un rÃ©seau social utilisant des formats ouverts et des logiciels libres. Comme le courriel, il est dÃ©centralisÃ©.
     about_this: Ã€ propos
-    administered_by: 'AdministrÃ© par :'
+    administered_by: 'AdministrÃ©e parâ€¯:'
+    api: API
+    apps: Applications mobiles
     closed_registrations: Les inscriptions sont actuellement fermÃ©es sur cette instance. Cependant, vous pouvez trouver une autre instance sur laquelle vous crÃ©er un compte et Ã  partir de laquelle vous pourrez accÃ©der au mÃªme rÃ©seau.
     contact: Contact
     contact_missing: Manquant
     contact_unavailable: Non disponible
-    description_headline: Quâ€™est-ce que %{domain}â€¯?
-    domain_count_after: autres instances
-    domain_count_before: ConnectÃ©â‹…eâ‹…s Ã 
+    documentation: Documentation
     extended_description_html: |
       <h3>Un bon endroit pour les rÃ¨gles</h3>
       <p>La description Ã©tendue nâ€™a pas Ã©tÃ© remplie.</p>
     features:
       humane_approach_body: Ayant appris des Ã©checs dâ€™autres rÃ©seaux, Mastodon Ã  lâ€™ambition de combattre lâ€™abus des mÃ©dias sociaux en effectuant des choix de conception Ã©thiques.
       humane_approach_title: Une approche plus humaine
-      not_a_product_body: Mastodon nâ€™est pas un rÃ©seau commercial. Ici, pas de publicitÃ©s, pas de prospection de donnÃ©es et pas dâ€™environnement fermÃ©s. Il nâ€™y existe aucune autoritÃ© centrale.
+      not_a_product_body: Mastodon nâ€™est pas un rÃ©seau commercial. Ici, pas de publicitÃ©s, pas de prospection de donnÃ©es et pas dâ€™environnements fermÃ©s. Il nâ€™y existe aucune autoritÃ© centrale.
       not_a_product_title: Vous Ãªtes une personne, pas un produit
-      real_conversation_body: Avec 65535 caractÃ¨res Ã  votre dispostion, une grande granularitÃ© en terme de diffusion et la possibilitÃ© de masquer vos messages derriÃ¨res des avertissements, vous Ãªtes libre de vous exprimer de la maniÃ¨re qui vous plaÃ®t.
+      real_conversation_body: Avec 65535 caractÃ¨res Ã  votre disposition, une grande granularitÃ© en termes de diffusion et la possibilitÃ© de masquer vos messages derriÃ¨re des avertissements, vous Ãªtes libre de vous exprimer de la maniÃ¨re qui vous plaÃ®t.
       real_conversation_title: Construit pour de vraies conversations
       within_reach_body: GrÃ¢ce Ã  lâ€™existence dâ€™un environnement API accueillant pour les dÃ©veloppeurÂ·seÂ·s, de multiples applications pour iOS, Android et dâ€™autres plateformes vous permettent de rester en contact avec vos amiÂ·eÂ·s oÃ¹ que vous soyez.
       within_reach_title: Toujours Ã  portÃ©e de main
@@ -28,25 +28,41 @@ fr:
     hosted_on: Instance Mastodon hÃ©bergÃ©e par %{domain}
     learn_more: En savoir plus
     other_instances: Liste des instances
+    privacy_policy: Politique de vie privÃ©e
     source_code: Code source
-    status_count_after: statuts
+    status_count_after:
+      one: Statut
+      other: Statuts
     status_count_before: Ayant publiÃ©
-    user_count_after: utilisateurâ‹…iceâ‹…s
+    terms: Conditions d'utilisation
+    user_count_after:
+      one: utilisateur
+      other: utilisateurs
     user_count_before: Abrite
     what_is_mastodon: Quâ€™est-ce que Mastodonâ€¯?
   accounts:
+    choices_html: "%{name}â€¯recommandeâ€¯:"
     follow: Suivre
-    followers: AbonnÃ©â‹…eâ‹…s
+    followers:
+      one: AbonnÃ©Â·e
+      other: AbonnÃ©â‹…eâ‹…s
     following: Abonnements
+    joined: InscritÂ·e en %{date}
+    last_active: actif derniÃ¨rement
+    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
+    moved_html: "%{name} a changÃ© de compte pour %{new_profile_link}â€¯:"
+    network_hidden: Cette information nâ€™est pas disponible
     nothing_here: Rien Ã  voir iciâ€¯!
     people_followed_by: Personnes suivies par %{name}
     people_who_follow: Personnes qui suivent %{name}
-    posts: Statuts
+    pin_errors:
+      following: Vous devez Ãªtre dÃ©jÃ  abonnÃ©Â·e Ã  la personne que vous dÃ©sirez recommander
+    posts:
+      one: Pouet
+      other: Pouets
+    posts_tab_heading: Pouets
     posts_with_replies: Statuts & rÃ©ponses
-    remote_follow: Suivre Ã  distance
     reserved_username: Ce nom dâ€™utilisateurâ‹…ice est rÃ©servÃ©
     roles:
       admin: Admin
@@ -54,6 +70,9 @@ fr:
       moderator: ModÃ©rateurÂ·trice
     unfollow: Ne plus suivre
   admin:
+    account_actions:
+      action: Effectuer une action
+      title: Effectuer une action de modÃ©ration sur %{acct}
     account_moderation_notes:
       create: Laisser un commentaire
       created_msg: Note de modÃ©ration crÃ©Ã©e avec succÃ¨sâ€¯!
@@ -64,7 +83,7 @@ fr:
       avatar: Avatar
       by_domain: Domaine
       change_email:
-        changed_msg: Courriel du compte modifiÃ© avec succÃ¨s !
+        changed_msg: Courriel du compte modifiÃ© avec succÃ¨sâ€¯!
         current_email: Courriel actuel
         label: Modifier le courriel
         new_email: Nouveau courriel
@@ -73,6 +92,7 @@ fr:
       confirm: Confirmer
       confirmed: ConfirmÃ©
       confirming: Confirmation
+      deleted: EffacÃ©
       demote: RÃ©trograder
       disable: DÃ©sactiver
       disable_two_factor_authentication: DÃ©sactiver lâ€™authentification Ã  deux facteurs
@@ -88,7 +108,9 @@ fr:
       followers: AbonnÃ©â‹…eâ‹…s
       followers_url: URL des abonnÃ©Â·eÂ·s
       follows: Abonnements
+      header: EntÃªte
       inbox_url: URL dâ€™entrÃ©e
+      invited_by: InvitÃ© par
       ip: Adresse IP
       location:
         all: Tous
@@ -99,6 +121,7 @@ fr:
       media_attachments: Fichiers mÃ©dias
       memorialize: Convertir en mÃ©morial
       moderation:
+        active: Actif
         all: Tous
         silenced: MasquÃ©s
         suspended: Suspendus
@@ -106,24 +129,22 @@ fr:
       moderation_notes: Notes de modÃ©ration
       most_recent_activity: DerniÃ¨re activitÃ©
       most_recent_ip: Adresse IP la plus rÃ©cente
+      no_limits_imposed: Aucune limite imposÃ©e
       not_subscribed: Non abonnÃ©
-      order:
-        alphabetic: AlphabÃ©tique
-        most_recent: Plus rÃ©cent
-        title: Tri
       outbox_url: URL de sortie
-      perform_full_suspension: Effectuer une suspension complÃ¨te
+      perform_full_suspension: Suspendre
       profile_url: URL du profil
       promote: Promouvoir
       protocol: Protocole
       public: Publique
       push_subscription_expires: Expiration de lâ€™abonnement PuSH
-      redownload: RafraÃ®chir les avatars
-      remove_avatar: Supprimer l'avatar
+      redownload: RafraÃ®chir le profil
+      remove_avatar: Supprimer lâ€™avatar
+      remove_header: Supprimer l'entÃªte
       resend_confirmation:
-        already_confirmed: Cet utilisateur est dÃ©jÃ  confirmÃ©
+        already_confirmed: CetÂ·te utilisateurÂ·ice est dÃ©jÃ  confirmÃ©Â·e
         send: Renvoyer un courriel de confirmation
-        success: Email de confirmation envoyÃ© avec succÃ¨s !
+        success: Courriel de confirmation envoyÃ© avec succÃ¨sâ€¯!
       reset: RÃ©initialiser
       reset_password: RÃ©initialiser le mot de passe
       resubscribe: Se rÃ©abonner
@@ -137,12 +158,13 @@ fr:
       search: Rechercher
       shared_inbox_url: URL de la boite de rÃ©ception partagÃ©e
       show:
-        created_reports: Signalements crÃ©Ã©s par ce compte
-        report: signalement
-        targeted_reports: Signalements crÃ©Ã©s visant ce compte
+        created_reports: Signalements faits
+        targeted_reports: SignalÃ©s par d'autres
       silence: Masquer
+      silenced: SilenciÃ©
       statuses: Statuts
       subscribe: Sâ€™abonner
+      suspended: Suspendu
       title: Comptes
       unconfirmed_email: Courriel non-confirmÃ©
       undo_silenced: DÃ©masquer
@@ -152,35 +174,38 @@ fr:
       web: Web
     action_logs:
       actions:
-        assigned_to_self_report: "%{name} s'est assignÃ© le signalement de %{target} Ã  eux-mÃªme"
-        change_email_user: "%{name} a modifiÃ© l'adresse de courriel de l'utilisateur %{target}"
-        confirm_user: "%{name} adresse courriel confirmÃ©e de l'utilisateur %{target}"
-        create_custom_emoji: "%{name} a importÃ© de nouveaux emoji %{target}"
+        assigned_to_self_report: "%{name} sâ€™est assignÃ©Â·e le signalement de %{target}"
+        change_email_user: "%{name} a modifiÃ© lâ€™adresse de courriel de lâ€™utilisateurÂ·rice %{target}"
+        confirm_user: "%{name} adresse courriel confirmÃ©e de lâ€™utilisateurÂ·ice %{target}"
+        create_account_warning: "%{name} a envoyÃ© une attention Ã  %{target}"
+        create_custom_emoji: "%{name} a importÃ© de nouveaux Ã©mojis %{target}"
         create_domain_block: "%{name} a bloquÃ© le domaine %{target}"
         create_email_domain_block: "%{name} a mis le domaine du courriel %{target} sur liste noire"
-        demote_user: "%{name} a rÃ©trogradÃ© l'utilisateur %{target}"
+        demote_user: "%{name} a rÃ©trogradÃ© lâ€™utilisateurÂ·ice %{target}"
+        destroy_custom_emoji: "%{name} a dÃ©truit l'Ã©moticÃ´ne %{target}"
         destroy_domain_block: "%{name} a dÃ©bloquÃ© le domaine %{target}"
         destroy_email_domain_block: "%{name} a mis le domaine du courriel %{target} sur liste blanche"
         destroy_status: "%{name} a enlevÃ© le statut de %{target}"
-        disable_2fa_user: "%{name} a dÃ©sactivÃ© l'authentification Ã  deux facteurs pour l'utilisateur %{target}"
-        disable_custom_emoji: "%{name} a dÃ©sactivÃ© l'emoji %{target}"
-        disable_user: "%{name} a dÃ©sactivÃ© le login pour l'utilisateur %{target}"
-        enable_custom_emoji: "%{name} a activÃ© l'emoji %{target}"
-        enable_user: "%{name} a activÃ© le login pour l'utilisateur %{target}"
+        disable_2fa_user: "%{name} a dÃ©sactivÃ© lâ€™authentification Ã  deux facteurs pour lâ€™utilisateurÂ·ice %{target}"
+        disable_custom_emoji: "%{name} a dÃ©sactivÃ© lâ€™Ã©moji %{target}"
+        disable_user: "%{name} a dÃ©sactivÃ© le login pour lâ€™utilisateurÂ·ice %{target}"
+        enable_custom_emoji: "%{name} a activÃ© lâ€™Ã©moji %{target}"
+        enable_user: "%{name} a activÃ© le login pour lâ€™utilisateurÂ·ice %{target}"
         memorialize_account: "%{name} a transformÃ© le compte de %{target} en une page de mÃ©morial"
-        promote_user: "%{name} a promu l'utilisateur %{target}"
-        remove_avatar_user: "%{name} a supprimÃ© l'avatar de %{target}'s"
-        reopen_report: "%{name} a rÃ©-ouvert le signalement %{target}"
+        promote_user: "%{name} a promu lâ€™utilisateurÂ·ice %{target}"
+        remove_avatar_user: "%{name} a supprimÃ© lâ€™avatar de %{target}"
+        reopen_report: "%{name} a rouvert le signalement %{target}"
         reset_password_user: "%{name} a rÃ©initialisÃ© le mot de passe de %{target}"
-        resolve_report: "%{name} a rÃ©solu la dÃ©nonciation de %{target}"
+        resolve_report: "%{name} a rÃ©solu le signalement %{target}"
         silence_account: "%{name} a mis le compte %{target} en mode silence"
         suspend_account: "%{name} a suspendu le compte %{target}"
-        unassigned_report: "%{name} a dÃ©s-assignÃ© le signalement %{target}"
+        unassigned_report: "%{name} a dÃ©sassignÃ© le signalement %{target}"
         unsilence_account: "%{name} a mis fin au mode silence de %{target}"
         unsuspend_account: "%{name} a rÃ©activÃ© le compte de %{target}"
-        update_custom_emoji: "%{name} a mis Ã  jour l'emoji %{target}"
+        update_custom_emoji: "%{name} a mis Ã  jour lâ€™Ã©moji %{target}"
         update_status: "%{name} a mis Ã  jour le statut de %{target}"
-      title: Journal d'audit
+      deleted_status: "(statut supprimÃ©)"
+      title: Journal dâ€™audit
     custom_emojis:
       by_domain: Domaine
       copied_msg: Copie locale de lâ€™Ã©moji crÃ©Ã©e avec succÃ¨sâ€¯!
@@ -201,13 +226,35 @@ fr:
       overwrite: RÃ©Ã©crire
       shortcode: Raccourci
       shortcode_hint: Au moins deux caractÃ¨res, seulement des caractÃ¨res alphanumÃ©riques ou des tirets bas
-      title: Ã‰moji personnalisÃ©s
+      title: Ã‰mojis personnalisÃ©s
       unlisted: DÃ©listÃ©
-      update_failed_msg: N'a pas pu mettre Ã  jour cet emoji
-      updated_msg: Emoji mis Ã  jour avec succÃ¨s !
+      update_failed_msg: Nâ€™a pas pu mettre Ã  jour cet Ã©moji
+      updated_msg: Ã‰moji mis Ã  jour avec succÃ¨sâ€¯!
       upload: TÃ©lÃ©verser
+    dashboard:
+      backlog: tÃ¢ches en attente
+      config: Configuration
+      feature_deletions: Suppressions de comptes
+      feature_invites: Liens dâ€™invitation
+      feature_profile_directory: Annuaire des profils
+      feature_registrations: Inscriptions
+      feature_relay: Relais de fÃ©dÃ©ration
+      features: FonctionnalitÃ©s
+      hidden_service: FÃ©dÃ©ration avec des services cachÃ©s
+      open_reports: signalements non rÃ©solus
+      recent_users: UtilisateurÂ·riceÂ·s rÃ©centÂ·eÂ·s
+      search: Recherche plein texte
+      single_user_mode: Mode utilisateurÂ·ice unique
+      software: Logiciel
+      space: Espace utilisÃ©
+      title: Tableau de bord
+      total_users: utilisateurÂ·riceÂ·s au total
+      trends: Tendances
+      week_interactions: interactions cette semaine
+      week_users_active: actifÂ·veÂ·s cette semaine
+      week_users_new: utilisateurÂ·riceÂ·s cette semaine
     domain_blocks:
-      add_new: Ajouter
+      add_new: Ajouter un nouveau bloqueur de domaine
       created_msg: Le blocage de domaine est dÃ©sormais activÃ©
       destroyed_msg: Le blocage de domaine a Ã©tÃ© dÃ©sactivÃ©
       domain: Domaine
@@ -222,11 +269,13 @@ fr:
         title: Nouveau blocage de domaine
       reject_media: Fichiers mÃ©dia rejetÃ©s
       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
-      severities:
-        noop: Aucune
-        silence: Masquer
-        suspend: Suspendre
-      severity: SÃ©veritÃ©
+      reject_reports: Rapports de rejet
+      reject_reports_hint: Ignorez tous les rapports provenant de ce domaine. Sans objet pour les suspensions
+      rejecting_media: rejet des fichiers multimÃ©dia
+      rejecting_reports: rejet de rapports
+      severity:
+        silence: silenciÃ©
+        suspend: suspendu
       show:
         affected_accounts:
           one: Un compte affectÃ© dans la base de donnÃ©es
@@ -236,8 +285,7 @@ fr:
           suspend: Annuler la suspension sur tous les comptes existants pour ce domaine
         title: Annuler le blocage de domaine pour %{domain}
         undo: Annuler
-      title: Blocage de domaines
-      undo: Annuler
+      undo: Annuler le bloqueur de domaine
     email_domain_blocks:
       add_new: Ajouter
       created_msg: Le blocage de domaine de courriel est dÃ©sormais activÃ©
@@ -248,34 +296,60 @@ fr:
         create: CrÃ©er le blocage
         title: Nouveau blocage de domaine de courriel
       title: Blocage de domaines de courriel
+    followers:
+      back_to_account: Retour au compte
+      title: AbonnÃ©â‹…eâ‹…s de %{acct}
     instances:
-      account_count: Comptes connus
-      domain_name: Domaine
-      reset: RÃ©initialiser
-      search: Rechercher
-      title: Instances connues
+      known_accounts:
+        one: "%{count} compte connu"
+        other: "%{count} comptes connus"
+      moderation:
+        all: Tout
+        limited: LimitÃ©
+        title: ModÃ©ration
+      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 Ã  leurs propos
+      total_storage: Attachements de mÃ©dia
     invites:
+      deactivate_all: Tout dÃ©sactiver
       filter:
         all: Tout
         available: Disponible
         expired: ExpirÃ©
         title: Filtre
       title: Invitations
+    relays:
+      add_new: Ajouter un nouveau relais
+      delete: Effacer
+      description_html: Un <strong>relai de fÃ©dÃ©ration</strong> est un serveur intermÃ©diaire qui Ã©change de grandes quantitÃ©s de pouets entre les serveurs qui publient dessus et ceux qui y sont abonnÃ©s. <strong>Il peut aider les petites et moyennes instances Ã  dÃ©couvrir du contenu sur le fediverse</strong>, ce qui normalement nÃ©cessiterait que les membres locaux suivent des gens inscrits sur des serveurs distants.
+      disable: DÃ©sactiver
+      disabled: DÃ©sactivÃ©
+      enable: ActivÃ©
+      enable_hint: Une fois activÃ©, votre serveur souscrira Ã  tous les pouets publics prÃ©sents sur ce relais et y enverra ses propres pouets publics.
+      enabled: ActivÃ©
+      inbox_url: URL de relais
+      pending: En attente de l'approbation du relai
+      save_and_enable: Sauvegarder et activer
+      setup: ParamÃ©trer une connexion de relais
+      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 !
+      created_msg: Note de signalement crÃ©Ã©e avec succÃ¨sâ€¯!
+      destroyed_msg: Note de signalement effacÃ©e avec succÃ¨sâ€¯!
     reports:
       account:
         note: note
         report: signaler
       action_taken_by: Intervention de
       are_you_sure: ÃŠtes vous certainâ‹…eâ€¯?
-      assign_to_self: Me l'assigner
+      assign_to_self: Me lâ€™assigner
       assigned: ModÃ©rateur assignÃ©
       comment:
         none: Aucun
       created_at: SignalÃ©
-      id: ID
       mark_as_resolved: Marquer comme rÃ©solu
       mark_as_unresolved: Marquer comme non-rÃ©solu
       notes:
@@ -286,36 +360,43 @@ fr:
         placeholder: DÃ©crivez quelles actions ont Ã©tÃ© prises, ou toute autre mise Ã  jourâ€¦
       reopen: RÃ©-ouvrir le signalement
       report: 'Signalement #%{id}'
-      report_contents: Contenu
       reported_account: Compte signalÃ©
       reported_by: SignalÃ© par
       resolved: RÃ©solus
-      resolved_msg: Signalement rÃ©solu avec succÃ¨s !
-      silence_account: Masquer le compte
+      resolved_msg: Signalement rÃ©solu avec succÃ¨sâ€¯!
       status: Statut
-      suspend_account: Suspendre le compte
-      target: Cible
       title: Signalements
       unassign: DÃ©s-assigner
       unresolved: Non rÃ©solus
       updated_at: Mis Ã  jour
-      view: Voir
     settings:
       activity_api_enabled:
-        desc_html: Nombre de statuts affichÃ©s localement, d'utilisateurs actifs et de nouveaux enregistrements dans les registres hebdomadaires
-        title: Publier des statistiques agrÃ©gÃ©es sur l'activitÃ© des utilisateurs
+        desc_html: Nombre de statuts affichÃ©s localement, dâ€™utilisateurÂ·iceÂ·s actifÂ·veÂ·s et de nouveaux enregistrements dans les registres hebdomadaires
+        title: Publier des statistiques agrÃ©gÃ©es sur lâ€™activitÃ© des utilisateurÂ·iceÂ·s
       bootstrap_timeline_accounts:
-        desc_html: SÃ©parez les noms dâ€™utilisateurÂ·ice par des virgules. Ne fonctionne quâ€™avec des comptes locaux et non-verrouillÃ©s. Si laissÃ© vide, tous les administrateurâ‹…iceâ‹…s locaux sont sÃ©lectionnÃ©â‹…eâ‹…s.
+        desc_html: SÃ©parez les noms dâ€™utilisateurÂ·ice par des virgules. Ne fonctionne quâ€™avec des comptes locaux et non verrouillÃ©s. Si laissÃ© vide, tous les administrateurâ‹…iceâ‹…s locaux sont sÃ©lectionnÃ©â‹…eâ‹…s.
         title: Abonnements par dÃ©faut pour les nouveauxÂ·elles utilisateurÂ·iceÂ·s
       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Ã©e
       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 de l'instance
-        title: Image d'en-tÃªte
+        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 de lâ€™instance
+        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 cette instance a dÃ©couvert dans le fediverse
         title: Publier la liste des instances dÃ©couvertes
+      preview_sensitive_media:
+        desc_html: Les liens de prÃ©visualisation sur les autres sites web afficheront une vignette mÃªme si le mÃ©dia est sensible
+        title: Afficher 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
       registrations:
         closed_message:
           desc_html: AffichÃ© sur la page dâ€™accueil lorsque les inscriptions sont fermÃ©es<br>Vous pouvez utiliser des balises HTML
@@ -330,17 +411,20 @@ fr:
           desc_html: Autoriser tout le monde Ã  crÃ©er un compte
           title: Ouvrir les inscriptions
       show_known_fediverse_at_about_page:
-        desc_html: Lorsque l'option est activÃ©e, les pouets provenant de toutes les instances connues sont affichÃ©s dans la prÃ©visualisation. Si non, seuls les pouets locaux sont affichÃ©s.
+        desc_html: Lorsque lâ€™option est activÃ©e, les pouets provenant de toutes les instances connues sont affichÃ©s dans la prÃ©visualisation. Sinon, seuls les pouets locaux sont affichÃ©s.
         title: Afficher le fediverse connu dans la prÃ©visualisation du fil
       show_staff_badge:
-        desc_html: Montrer un badge de responsable sur une page utilisateur
+        desc_html: Montrer un badge de responsable sur une page utilisateurÂ·ice
         title: Montrer un badge de responsable
       site_description:
-        desc_html: Paragraphe introductif sur la page d'accueil et dans les mÃ©ta-balises. Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
+        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 site
       site_description_extended:
         desc_html: AffichÃ©e sur la page dâ€™informations complÃ©mentaires du site<br>Vous pouvez utiliser des balises HTML
         title: Description Ã©tendue du site
+      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 de lâ€™instance sera affichÃ© par dÃ©faut.
+        title: Description courte de lâ€™instance
       site_terms:
         desc_html: AffichÃ©e sur la page des conditions dâ€™utilisation du site<br>Vous pouvez utiliser des balises HTML
         title: Politique de confidentialitÃ©
@@ -362,6 +446,7 @@ fr:
       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: Ã‰tat du compte
       with_media: avec mÃ©dias
     subscriptions:
@@ -371,17 +456,31 @@ fr:
       last_delivery: DerniÃ¨re livraison
       title: WebSub
       topic: Sujet
+    tags:
+      accounts: Comptes
+      hidden: MasquÃ©
+      hide: Masquer dans l'annuaire
+      name: Hashtag
+      title: Hashtags
+      unhide: Afficher dans l'annuaire
+      visible: Visible
     title: Administration
+    warning_presets:
+      add_new: Ajouter un nouveau
+      delete: Effacer
+      edit: Ã‰diter
+      edit_preset: Ã‰diter la prÃ©sÃ©lection d'attention
+      title: GÃ©rer les prÃ©sÃ©lections d'attention
   admin_mailer:
     new_report:
       body: "%{reporter} a signalÃ© %{target}"
-      body_remote: Quelqu'un de %{domain} a signalÃ© %{target}
+      body_remote: Quelquâ€™un de %{domain} a signalÃ© %{target}
       subject: Nouveau signalement sur %{instance} (#%{id})
   application_mailer:
     notification_preferences: Modifier les prÃ©fÃ©rences de courriel
     salutation: "%{name},"
     settings: 'Changer les prÃ©fÃ©rences courrielâ€¯: %{link}'
-    view: 'Voir :'
+    view: 'Voirâ€¯:'
     view_profile: Voir le profil
     view_status: Afficher le statut
   applications:
@@ -393,7 +492,7 @@ fr:
     warning: Soyez prudentâ‹…e avec ces donnÃ©es. Ne les partagez pasâ€¯!
     your_token: Votre jeton dâ€™accÃ¨s
   auth:
-    agreement_html: En vous inscrivant, vous souscrivez <a href="%{rules_path}">aux rÃ¨gles de lâ€™instance</a> et Ã  <a href="%{terms_path}">nos conditions dâ€™utilisation</a>.
+    agreement_html: En cliquant sur "S'inscrire" ci-dessous, vous souscrivez <a href="%{rules_path}">aux rÃ¨gles de lâ€™instance</a> et Ã  <a href="%{terms_path}">nos conditions dâ€™utilisation</a>.
     change_password: Mot de passe
     confirm_email: Confirmer mon adresse mail
     delete_account: Supprimer le compte
@@ -411,7 +510,7 @@ fr:
       cas: CAS
       saml: SAML
     register: Sâ€™inscrire
-    register_elsewhere: S'inscrire sur un autre serveur
+    register_elsewhere: Sâ€™inscrire sur un autre serveur
     resend_confirmation: Envoyer Ã  nouveau les consignes de confirmation
     reset_password: RÃ©initialiser le mot de passe
     security: SÃ©curitÃ©
@@ -420,8 +519,8 @@ fr:
     already_following: Vous suivez dÃ©jÃ  ce compte
     error: Malheureusement, il y a eu une erreur en cherchant les dÃ©tails du compte distant
     follow: Suivre
-    follow_request: 'Vous avez demandÃ© Ã  suivre :'
-    following: 'Youpiâ€¯! Vous suivezâ€¯ :'
+    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
@@ -447,8 +546,18 @@ fr:
     description_html: Cela va supprimer votre compte et le dÃ©sactiver de maniÃ¨re <strong>permanente et irrÃ©versible</strong>. Votre nom dâ€™utilisateurâ‹…ice restera rÃ©servÃ© afin dâ€™Ã©viter la confusion.
     proceed: Supprimer compte
     success_msg: Votre compte a Ã©tÃ© supprimÃ© avec succÃ¨s
-    warning_html: Seule la suppression du contenu depuis cette instance est garantie. Le contenu qui a Ã©tÃ© partagÃ© est susceptible de laisser des traces. Les serveurs hors-lignes ainsi que ceux nâ€™Ã©tant plus abonnÃ©s Ã  vos publications ne mettront pas leur base de donnÃ©es Ã  jour.
+    warning_html: Seule la suppression du contenu depuis cette instance est garantie. Le contenu qui a Ã©tÃ© partagÃ© est susceptible de laisser des traces. Les serveurs hors-ligne ainsi que ceux nâ€™Ã©tant plus abonnÃ©s Ã  vos publications ne mettront pas leur base de donnÃ©es Ã  jour.
     warning_title: DisponibilitÃ© du contenu dissÃ©minÃ©
+  directories:
+    directory: Annuaire des profils
+    enabled: Vous Ãªtes actuellement listÃ© dans l'annuaire.
+    enabled_but_waiting: Vous avez choisi d'Ãªtre listÃ© dans l'annuaire, mais vous n'avez pas encore le nombre minimum de suiveurs (%{min_followers}) pour y Ãªtre inscrit.
+    explanation: DÃ©couvrir des utilisateurs en se basant sur leurs centres d'intÃ©rÃªt
+    explore_mastodon: Explorer %{title}
+    how_to_enable: Vous n'Ãªtes pas encore inscrit dans l'annuaire. Vous pouvez vous inscrire ci-dessous. Utilisez des hashtags dans votre texte biographique pour Ãªtre listÃ© sous des hashtags spÃ©cifiques !
+    people:
+      one: "%{count} personne"
+      other: "%{count} personne"
   errors:
     '403': Vous nâ€™avez pas accÃ¨s Ã  cette page.
     '404': La page que vous recherchez nâ€™existe pas.
@@ -460,20 +569,38 @@ fr:
     '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
-    noscript_html: Pour utiliser Mastodon, veuillez activer JavaScript. Sinon, essayez l'une des <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">applications natives</a> pour Mastodon pour votre plate-forme.
+    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.
   exports:
     archive_takeout:
       date: Date
       download: TÃ©lÃ©charger votre archive
       hint_html: Vous pouvez demander une archive de vos  <strong>pouets 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: Ã‰laboration de votre archive....
+      in_progress: CrÃ©ation de votre archiveâ€¦
       request: Demandez vos archives
       size: Taille
     blocks: Vous bloquez
     csv: CSV
+    domain_blocks: Bloqueurs de domaine
     follows: Vous suivez
+    lists: Listes
     mutes: Vous masquez
     storage: MÃ©dias stockÃ©s
+  filters:
+    contexts:
+      home: Accueil
+      notifications: Notifications
+      public: Fils publics
+      thread: Conversations
+    edit:
+      title: Ã‰diter le filtre
+    errors:
+      invalid_context: Contexte invalide ou insuffisant
+      invalid_irreversible: Le filtrage irrÃ©versible ne fonctionne que pour lâ€™accueil et les notifications
+    index:
+      delete: Effacer
+      title: Filtres
+    new:
+      title: Ajouter un nouveau filtre
   followers:
     domain: Domaine
     explanation_html: Si vous voulez Ãªtre sÃ»râ‹…e que vos statuts restent privÃ©s, vous devez savoir qui vous suit. <strong>Vos statuts privÃ©s seront diffusÃ©s Ã  toutes les instances des utilisateurâ‹…iceâ‹…s qui vous suivent</strong>. Vous voudrez peut-Ãªtre les passer en revue et les supprimer si vous nâ€™Ãªtes pas sÃ»râ‹…e que votre vie privÃ©e sera respectÃ©e par lâ€™administration ou le logiciel de ces instances.
@@ -486,9 +613,13 @@ fr:
     true_privacy_html: Soyez conscientâ‹…eâ‹…s <strong>quâ€™une vraie confidentialitÃ© ne peut Ãªtre atteinte que par un chiffrement de bout-en-bout</strong>.
     unlocked_warning_html: Nâ€™importe qui peut vous suivre et voir vos statuts privÃ©s. %{lock_link} afin de pouvoir vÃ©rifier et rejeter des abonnÃ©â‹…eâ‹…s.
     unlocked_warning_title: Votre compte nâ€™est pas privÃ©
+  footer:
+    developers: DÃ©veloppeurs
+    more: Davantageâ€¦
+    resources: Ressources
   generic:
     changes_saved_msg: Les modifications ont Ã©tÃ© enregistrÃ©es avec succÃ¨sâ€¯!
-    powered_by: propulsÃ© par %{link}
+    copy: Copier
     save_changes: Enregistrer les modifications
     validation_errors:
       one: Quelque chose ne va pasâ€¯! VÃ©rifiez lâ€™erreur ci-dessous
@@ -514,6 +645,7 @@ fr:
       '86400': 1 jour
     expires_in_prompt: Jamais
     generate: GÃ©nÃ©rer
+    invited_by: 'Vous avez Ã©tÃ© invitÃ©Â·e parâ€¯:'
     max_uses:
       one: 1 usage
       other: "%{count} usages"
@@ -523,8 +655,6 @@ fr:
       expires_at: Expire
       uses: Utilise
     title: Inviter des gens
-  landing_strip_html: <strong>%{name}</strong> utilise %{link_to_root_path}. Vous pouvez lÃ¦ suivre et interagir si vous possÃ©dez un compte quelque part dans le "fediverse".
-  landing_strip_signup_html: Si ce nâ€™est pas le cas, vous pouvez <a href="%{sign_up_path}">en crÃ©er un ici</a>.
   lists:
     errors:
       limit: Vous avez atteint le nombre maximum de listes
@@ -533,26 +663,26 @@ fr:
       images_and_video: Impossible de joindre une vidÃ©o Ã  un statut contenant dÃ©jÃ  des images
       too_many: Impossible de joindre plus de 4 fichiers
   migrations:
-    acct: utilisateur@domaine du nouveau compte
-    currently_redirecting: 'Votre profile va Ãªtre redirigÃ© vers :'
+    acct: profil@domaine du nouveau compte
+    currently_redirecting: 'Votre profil va Ãªtre redirigÃ© versâ€¯:'
     proceed: Enregistrer
-    updated_msg: Les paramÃ¨tres de votre migration de compte ont Ã©tÃ© mis Ã  jour avec succÃ¨s !
+    updated_msg: Les paramÃ¨tres de votre migration de compte ont Ã©tÃ© mis Ã  jour avec succÃ¨sâ€¯!
   moderation:
     title: ModÃ©ration
   notification_mailer:
     digest:
       action: Voir toutes les notifications
-      body: 'Voici ce que vous avez ratÃ© sur ${instance} depuis votre derniÃ¨re visite le %{since} :'
-      mention: "%{name} vous a mentionnÃ©â‹…e dans :"
+      body: Voici un bref rÃ©sumÃ© des messages que vous auriez ratÃ© depuis votre derniÃ¨re visite le %{since}
+      mention: "%{name} vous a mentionnÃ©â‹…e dansâ€¯:"
       new_followers_summary:
         one: Vous avez unâ‹…e nouvelâ‹…le abonnÃ©â‹…eâ€¯! Youpiâ€¯!
         other: Vous avez %{count} nouveauxâ‹…elles abonnÃ©â‹…eÂ·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...
+      title: Pendant votre absenceâ€¦
     favourite:
-      body: "%{name} a ajoutÃ© votre post Ã  ses favoris :"
+      body: "%{name} a ajoutÃ© votre pouet Ã  ses favorisâ€¯:"
       subject: "%{name} a ajoutÃ© votre post Ã  ses favoris"
       title: Nouveau favori
     follow:
@@ -560,17 +690,17 @@ fr:
       subject: "%{name} vous suit"
       title: NouvelÂ·le abonnÃ©Â·e
     follow_request:
-      action: GÃ©rer les demandes d'abonnement
+      action: GÃ©rer les demandes dâ€™abonnement
       body: "%{name} a demandÃ© Ã  vous suivre"
       subject: 'AbonnÃ©â‹…es en attenteâ€¯: %{name}'
-      title: Nouvelle demande d'abonnement
+      title: Nouvelle demande dâ€™abonnement
     mention:
       action: RÃ©pondre
-      body: "%{name} vous a mentionnÃ©â‹…e dans :"
+      body: "%{name} vous a mentionnÃ©â‹…e dansâ€¯:"
       subject: "%{name} vous a mentionnÃ©Â·e"
       title: Nouvelle mention
     reblog:
-      body: "%{name} a partagÃ© votre statut :"
+      body: "%{name} a partagÃ© votre statutâ€¯:"
       subject: "%{name} a partagÃ© votre statut"
       title: Nouveau partage
   number:
@@ -596,14 +726,27 @@ fr:
     publishing: Publication
     web: Web
   remote_follow:
-    acct: Entrez votre pseudo@instance depuis lequel vous voulez suivre cetÂ·te utilisateurâ‹…ice
+    acct: Entrez lâ€™adresse profil@instance depuis laquelle vous voulez vous abonner
     missing_resource: Lâ€™URL de redirection nâ€™a pas pu Ãªtre trouvÃ©e
-    proceed: Continuez pour suivre
-    prompt: 'Vous allez suivre :'
+    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 oÃ¹ vous vous Ãªtes inscrit, et nous devons donc vous rediriger vers votre serveur de base en premier."
+  remote_interaction:
+    favourite:
+      prompt: 'Vous souhaitez mettre ce pouet en favori :'
+    reblog:
+      prompt: 'Vous souhaitez repartager ce pouet :'
+    reply:
+      prompt: 'Vous souhaitez rÃ©pondre Ã  ce pouet :'
   remote_unfollow:
     error: Erreur
     title: Titre
     unfollowed: Non-suivi
+  scheduled_statuses:
+    over_daily_limit: Vous avez dÃ©passÃ© la limite de %{limit} pouets planifiÃ©s pour ce jour
+    over_total_limit: Vous avez dÃ©passÃ© la limite de %{limit} pouets planifiÃ©s
+    too_soon: La date planifiÃ©e doit Ãªtre dans le futur
   sessions:
     activity: DerniÃ¨re activitÃ©
     browser: Navigateur
@@ -662,7 +805,7 @@ fr:
     your_apps: Vos applications
   statuses:
     attached:
-      description: 'AttachÃ© : %{attached}'
+      description: 'AttachÃ©â€¯: %{attached}'
       image:
         one: "%{count} image"
         other: "%{count} images"
@@ -670,10 +813,11 @@ fr:
         one: "%{count} vidÃ©o"
         other: "%{count} vidÃ©os"
     boosted_from_html: RepartagÃ© depuis %{acct_link}
-    content_warning: 'Attention au contenu : %{warning}'
+    content_warning: 'Avertissement sur le contenuâ€¯: %{warning}'
     disallowed_hashtags:
-      one: 'contient un hashtag dÃ©sactivÃ© : %{tags}'
-      other: 'contient les hashtag dÃ©sactivÃ©s : %{tags}'
+      one: 'contient un hashtag dÃ©sactivÃ©â€¯: %{tags}'
+      other: 'contient les hashtags dÃ©sactivÃ©sâ€¯: %{tags}'
+    language_detection: DÃ©tecter automatiquement la langue
     open_in_web: Ouvrir sur le web
     over_character_limit: limite de caractÃ¨res dÃ©passÃ©e de %{max} caractÃ¨res
     pin_errors:
@@ -682,6 +826,7 @@ fr:
       private: Les statuts non-publics ne peuvent pas Ãªtre Ã©pinglÃ©s
       reblog: Un partage ne peut pas Ãªtre Ã©pinglÃ©
     show_more: Afficher plus
+    sign_in_to_participate: Inscrivez-vous pour prendre part Ã  la conversation
     title: '%{name}â€¯: "%{quote}"'
     visibilities:
       private: AbonnÃ©â‹…eâ‹…s uniquement
@@ -691,12 +836,92 @@ fr:
       unlisted: Public sans Ãªtre affichÃ© sur le fil public
       unlisted_long: Tout le monde peut voir vos statuts mais ils ne seront pas sur listÃ©s sur les fils publics
   stream_entries:
-    click_to_show: Cliquer pour afficher
     pinned: Pouet Ã©pinglÃ©
     reblogged: a partagÃ©
     sensitive_content: Contenu sensible
   terms:
-    title: "%{instance} Conditions dâ€™utilisations et politique de confidentialitÃ©"
+    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: "%{instance} Conditions dâ€™utilisation et politique de confidentialitÃ©"
   themes:
     contrast: Contraste Ã©levÃ©
     default: Mastodon
@@ -704,6 +929,7 @@ fr:
   time:
     formats:
       default: "%d %b %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Entrez le code gÃ©nÃ©rÃ© par votre application pour confirmer
     description_html: Si vous activez <strong>lâ€™identification Ã  deux facteurs</strong>, vous devrez Ãªtre en possession de votre tÃ©lÃ©phone afin de gÃ©nÃ©rer un code de connexion.
@@ -713,8 +939,8 @@ fr:
     enabled_success: Identification Ã  deux facteurs activÃ©e avec succÃ¨s
     generate_recovery_codes: GÃ©nÃ©rer les codes de rÃ©cupÃ©ration
     instructions_html: "<strong>Scannez ce QR code grÃ¢ce Ã  Google Authenticator, Authy ou une application similaire sur votre tÃ©lÃ©phone</strong>. DÃ©sormais, cette application gÃ©nÃ¨rera des jetons que vous devrez saisir Ã  chaque connexion."
-    lost_recovery_codes: Les codes de rÃ©cupÃ©ration vous permettent de retrouver les accÃ¨s Ã  votre comptre 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.
-    manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez lâ€™entrer manuellement, voici le secret en clair :'
+    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.
+    manual_instructions: 'Si vous ne pouvez pas scanner le code QR et devez lâ€™entrer manuellement, voici le secret en texte-plein :'
     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.
@@ -722,30 +948,49 @@ fr:
     wrong_code: Les codes entrÃ©s sont incorrectsâ€¯! Lâ€™heure du serveur et celle de votre appareil sont-elles correctesâ€¯?
   user_mailer:
     backup_ready:
-      explanation: Vous avez demandÃ© une sauvegarde complÃ¨te de votre compte Mastodon. Elle est maintenant prÃªte Ã  Ãªtre tÃ©lÃ©chargÃ©e !
+      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: Retrait de l'archive
+      title: RÃ©cupÃ©ration de lâ€™archive
+    warning:
+      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Ã©.
+        silence: Lorsque votre compte est limitÃ©, seulement les utilisateurs qui vous suivent dÃ©jÃ  verront vos pouets sur ce serveur, et vous pourriez Ãªtre exclu de plusieurs listes publiques. NÃ©anmoins, d'autres utilisateurs peuvent vous suivre manuellement.
+        suspend: Votre compte a Ã©tÃ© suspendu, et tous vos pouets et vos fichiers multimÃ©dia tÃ©lÃ©versÃ©s ont Ã©tÃ© supprimÃ©s irrÃ©versiblement de ce serveur, et des serveurs oÃ¹ vous aviez des abonnÃ©â‹…eâ‹…s.
+      review_server_policies: Passer en revue les politiques du serveur
+      subject:
+        disable: Votre compte %{acct} a Ã©tÃ© gelÃ©
+        none: Avertissement pour %{acct}
+        silence: Votre compte %{acct} a Ã©tÃ© limitÃ©
+        suspend: Votre compte %{acct} a Ã©tÃ© suspendu
+      title:
+        disable: Compte gelÃ©
+        none: Avertissement
+        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 un avatar, une image dâ€™en-tÃªte, en changeant votre pseudo et plus encore. Si vous souhaitez examiner les nouveauxÂ·lles abonnÃ©Â·eÂ·s avant quâ€™ilÂ·elleÂ·s ne soient autorisÃ©Â·eÂ·s Ã  vous suivre, vous pouvez verrouiller votre compte.
       explanation: Voici quelques conseils pour vous aider Ã  dÃ©marrer
       final_action: Commencer Ã  publier
-      final_step: 'Commencez Ã  poster ! MÃªme sans abonnÃ©Â·es, vos messages publics peuvent Ãªtre vus par d''autres, par exemple sur la chronologie locale et dans les hashtags. Vous pouvez vous prÃ©senter sur le hashtag #introductions.'
-      full_handle: Votre pleine maÃ®trise
-      full_handle_hint: C'est ce que vous diriez Ã  vos amis pour qu'ils puissent vous envoyer un message ou vous suivre Ã  partir d'une autre instance.
+      final_step: 'Commencez Ã  posterâ€¯! MÃªme sans abonnÃ©Â·eÂ·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.'
+      full_handle: Votre identifiant complet
+      full_handle_hint: Câ€™est ce que vous diriez Ã  vos amiÂ·eÂ·s pour quâ€™ilÂ·elleÂ·s puissent vous envoyer un message ou vous suivre Ã  partir dâ€™une autre instance.
       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 aimeriez que vos messages soient soumis par dÃ©faut. Si vous n'avez pas le mal des transports, vous pouvez choisir d'activer la lecture automatique GIF.
+      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 aimeriez que vos messages soient soumis par dÃ©faut. Si vous nâ€™avez pas le mal des transports, vous pouvez choisir dâ€™activer la lecture automatique des GIF.
       subject: Bienvenue sur Mastodon
-      tip_bridge_html: Si vous venez de Twitter, vous pouvez retrouver vos amis sur Mastodon en utilisant le <a href="%{bridge_url}">bridge app</a>. Cela ne fonctionne que s'ils ont aussi utilisÃ© cette application !
-      tip_federated_timeline: La chronologie fÃ©dÃ©rÃ©e est une vue en direct du rÃ©seau Mastodon. Mais elle n'inclut que les personnes auxquelles vos voisinÂ·es sont abonnÃ©Â·es, donc elle n'est pas complÃ¨te.
-      tip_following: Vous suivez les administrateurs et administratrices de votre serveur par dÃ©faut. Pour trouver d'autres personnes intÃ©ressantes, consultez les chronologies locales et fÃ©dÃ©rÃ©es.
-      tip_local_timeline: La chronologie locale 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 !
+      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 voisinÂ·es sont abonnÃ©Â·eÂ·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} !
+      title: Bienvenue Ã  bord, %{name}â€¯!
   users:
+    follow_limit_reached: Vous ne pouvez pas suivre plus de %{limit} personnes
     invalid_email: Lâ€™adresse courriel est invalide
     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 :'
+    signed_in_as: 'ConnectÃ©Â·e en tant queâ€¯:'
+  verification:
+    explanation_html: 'Vous pouvez <strong>vÃ©rifier vous-mÃªme que vous Ãªtes le 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 contenu textuel du lien n''a pas d''importance. En voici un exemple :'
+    verification: VÃ©rification
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 3963bf3e6b4de8d758b1c568fcd1987038933c72..8e0a9aeb1be78eb3bf13115d632f85acbdabcc5c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -5,13 +5,13 @@ gl:
     about_mastodon_html: Mastodon Ã© unha rede social que se basea en protocolos web abertos e libres, software de cÃ³digo aberto. Ã‰ descentralizada como o correo electrÃ³nico.
     about_this: Sobre
     administered_by: 'Administrada por:'
+    api: API
+    apps: Apps mÃ³biles
     closed_registrations: O rexistro en esta instancia estÃ¡ pechado en este intre. PorÃ©n! Pode atopar unha instancia diferente para obter unha conta e ter acceso exactamente a misma rede desde alÃ.
     contact: Contacto
     contact_missing: Non establecido
     contact_unavailable: N/A
-    description_headline: QuÃ© Ã© %{domain}?
-    domain_count_after: outras instancias
-    domain_count_before: Conectada a
+    documentation: DocumentaciÃ³n
     extended_description_html: |
       <h3>Un bo lugar para regras</h3>
       <p>A descriciÃ³n extendida aÃnda non se proporcionou.</p>
@@ -22,31 +22,47 @@ gl:
       not_a_product_title: Vostede Ã© unha persoa, non un producto
       real_conversation_body: Con 65535 caracteres a sÃºa disposiciÃ³n, soporte para contido polo miÃºdo e avisos sobre o contido, pode expresarse vostede con libertade.
       real_conversation_title: ConstruÃdo para conversaciÃ³ns reais
-      within_reach_body: Existen mÃºltiples aplicativos para iOS, Android e outras plataformas grazas a un entorno API amigable para o desenvolvedor que lle permite estar ao tanto cos seus amigos en calquer lugar.
+      within_reach_body: Existen mÃºltiples aplicaciÃ³ns para iOS, Android e outras plataformas grazas a un entorno API amigable para o desenvolvedor que lle permite estar ao tanto cos seus amigos en calquer lugar.
       within_reach_title: Sempre en contacto
     generic_description: "%{domain} Ã© un servidor na rede"
     hosted_on: Mastodon aloxado en %{domain}
     learn_more: CoÃ±eza mÃ¡is
     other_instances: Listado de instancias
+    privacy_policy: PolÃtica de intimidade
     source_code: CÃ³digo fonte
-    status_count_after: estados
+    status_count_after:
+      one: estado
+      other: estados
     status_count_before: Que publicaron
-    user_count_after: usuarias
+    terms: Termos do servizo
+    user_count_after:
+      one: usuaria
+      other: usuarias
     user_count_before: Fogar de
     what_is_mastodon: QuÃ© Ã© Mastodon?
   accounts:
+    choices_html: 'ElecciÃ³ns de %{name}:'
     follow: Seguir
-    followers: Seguidoras
+    followers:
+      one: Seguidora
+      other: Seguidoras
     following: Seguindo
+    joined: Uneuse %{date}
+    last_active: Ãºltima actividade
+    link_verified_on: A propiedade de esta ligazÃ³n foi comprobada en %{date}
     media: Medios
     moved_html: "%{name} mudouse a %{new_profile_link}:"
     network_hidden: A informaciÃ³n non estÃ¡ dispoÃ±ible
     nothing_here: Nada por aquÃ!
     people_followed_by: Personas que segue %{name}
     people_who_follow: Personas que seguen a %{name}
-    posts: Mensaxes
+    pin_errors:
+      following: Debe seguir a persoa que intenta recomendar
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
     posts_with_replies: Toots e respostas
-    remote_follow: Seguimento remoto
     reserved_username: O nome de usuaria estÃ¡ reservado
     roles:
       admin: Admin
@@ -54,6 +70,9 @@ gl:
       moderator: Mod
     unfollow: Deixar de seguir
   admin:
+    account_actions:
+      action: Realizar acciÃ³n
+      title: Realizar acciÃ³n de moderaciÃ³n sobre %{acct}
     account_moderation_notes:
       create: Deixar nota
       created_msg: Nota a moderaciÃ³n creada con Ã©xito!
@@ -65,14 +84,15 @@ gl:
       by_domain: Dominio
       change_email:
         changed_msg: Cambiouse correctamente o correo-e da conta!
-        current_email: Correo-e actual
-        label: Cambiar correo-e
-        new_email: Novo correo-e
-        submit: Cambiar correo-e
-        title: Cambiar o correo-e de %{username}
+        current_email: Correo actual
+        label: Cambiar correo
+        new_email: Novo correo
+        submit: Cambiar correo
+        title: Cambiar o correo de %{username}
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmar
+      deleted: Eliminado
       demote: Degradar
       disable: Deshabilitar
       disable_two_factor_authentication: Deshabilitar 2FA
@@ -80,16 +100,19 @@ gl:
       display_name: Mostrar nome
       domain: Dominio
       edit: Editar
-      email: E-mail
-      email_status: Estado del correo electrÃ³nico
+      email: Email
+      email_status: Estado do correo
       enable: Habilitar
       enabled: Habilitado
       feed_url: URL fonte
       followers: Seguidoras
       followers_url: URL das seguidoras
       follows: Segue
+      header: Cabeceira
       inbox_url: URL da Caixa de entrada
+      invited_by: Convidada por
       ip: IP
+      joined: Uniuse
       location:
         all: Todo
         local: Local
@@ -99,6 +122,7 @@ gl:
       media_attachments: Anexos de medios
       memorialize: Convertir a lembranza
       moderation:
+        active: Activa
         all: Todo
         silenced: Acalado
         suspended: Suspendido
@@ -106,20 +130,18 @@ gl:
       moderation_notes: Notas de moderaciÃ³n
       most_recent_activity: Actividade mÃ¡is recente
       most_recent_ip: IP mÃ¡is recente
+      no_limits_imposed: Sen lÃmites impostos
       not_subscribed: Non suscrita
-      order:
-        alphabetic: AlfabÃ©tica
-        most_recent: MÃ¡is recente
-        title: Orde
       outbox_url: URL caixa de saÃda
-      perform_full_suspension: Suspender completamente
+      perform_full_suspension: Suspender
       profile_url: URL do perfil
       promote: Promocionar
       protocol: Protocolo
       public: PÃºblico
       push_subscription_expires: A suscriciÃ³n PuSH caduca
-      redownload: Actualizar avatar
+      redownload: Actualizar perfil
       remove_avatar: Eliminar avatar
+      remove_header: Eliminar cabeceira
       resend_confirmation:
         already_confirmed: Este usuario ya estÃ¡ confirmado
         send: Reenviar el correo electrÃ³nico de confirmaciÃ³n
@@ -137,28 +159,32 @@ gl:
       search: Busca
       shared_inbox_url: URL da caixa de entrada compartida
       show:
-        created_reports: Informes creados por esta conta
-        report: informar
-        targeted_reports: Informes feitos sobre esta conta
+        created_reports: Informes creados
+        targeted_reports: Informes feitos por outros
       silence: Acalar
+      silenced: Acalada
       statuses: Estados
       subscribe: Subscribir
+      suspended: Suspendida
       title: Contas
-      unconfirmed_email: Correo-e non confirmado
+      unconfirmed_email: Correo non confirmado
       undo_silenced: Desfacer acalar
       undo_suspension: Desfacer suspensiÃ³n
       unsubscribe: Non subscribir
       username: Nome de usuaria
+      warn: Aviso
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} asignou o informe %{target} a ela misma"
         change_email_user: "%{name} cambiou o enderezo de correo-e da usuaria %{target}"
         confirm_user: "%{name} comfirmou o enderezo de correo da usuaria %{target}"
+        create_account_warning: "%{name} enviou un aviso sobre %{target}"
         create_custom_emoji: "%{name} subeu un novo emoji %{target}"
         create_domain_block: "%{name} bloqueou o dominio %{target}"
         create_email_domain_block: "%{name} engadeu a lista negra o dominio de correo %{target}"
         demote_user: "%{name} degradou a usuaria %{target}"
+        destroy_custom_emoji: "%{name} destruÃu emoji %{target}"
         destroy_domain_block: "%{name} desbloqueou o dominio %{target}"
         destroy_email_domain_block: "%{name} meteu na lista blanca de correo o dominio %{target}"
         destroy_status: "%{name} eliminou o estado de %{target}"
@@ -180,6 +206,7 @@ gl:
         unsuspend_account: "%{name} activou a conta de %{target}"
         update_custom_emoji: "%{name} actualizou emoji %{target}"
         update_status: "%{name} actualizou un estado de %{target}"
+      deleted_status: "(estado eliminado)"
       title: Rexistro de auditorÃa
     custom_emojis:
       by_domain: Dominio
@@ -197,17 +224,39 @@ gl:
       image_hint: PNG ate 50KB
       listed: Listado
       new:
-        title: Engadir novo emoji personalizado
+        title: Engadir novo emoji persoalizado
       overwrite: Sobrescribir
       shortcode: CÃ³digo corto
       shortcode_hint: Cando menos 2 caracteres, sÃ³ caracteres alfanumÃ©ricos e subliÃ±ados
-      title: Emojis personalizados
+      title: Emojis persoalizados
       unlisted: Non listado
       update_failed_msg: Non se puido actualizar ese emoji
       updated_msg: Actualizouse correctamente o emoji!
       upload: Subir
+    dashboard:
+      backlog: traballos respaldados
+      config: Axustes
+      feature_deletions: Borrado de contas
+      feature_invites: LigazÃ³ns de convite
+      feature_profile_directory: Directorio do perfil
+      feature_registrations: Rexistros
+      feature_relay: Repetidores de federaciÃ³n
+      features: CaracterÃsticas
+      hidden_service: FederaciÃ³n con servizos ocultos
+      open_reports: informes abertos
+      recent_users: Usuarias recentes
+      search: Busca de texto completo
+      single_user_mode: Modo de usuario individual
+      software: Software
+      space: Uso de espazo
+      title: Taboleiro
+      total_users: total de usuarias
+      trends: Tendencias
+      week_interactions: interacciÃ³ns en esta semana
+      week_users_active: activas estas semana
+      week_users_new: usuarias esta semana
     domain_blocks:
-      add_new: Engadir novo
+      add_new: Engadir novo bloqueo de dominio
       created_msg: Estase a procesar o bloqueo do dominio
       destroyed_msg: Desfixose a acciÃ³n de bloqueo de dominio
       domain: Dominio
@@ -222,11 +271,13 @@ gl:
         title: Novo bloqueo de dominio
       reject_media: Rexeitar ficheiros de medios
       reject_media_hint: Eliminar ficheiros de medios almacenados localmente e rexeita descargalos no futuro. Irrelevante para as suspensiÃ³ns
-      severities:
-        noop: NingÃºn
-        silence: Silenciar
-        suspend: Suspender
-      severity: Severidade
+      reject_reports: Rexeitar informes
+      reject_reports_hint: Ignorar todos os informes procedentes de este dominio. Irrelevante para as suspensiÃ³ns
+      rejecting_media: rexeitando ficheiros de medios
+      rejecting_reports: rexeitando informes
+      severity:
+        silence: acalado
+        suspend: suspendido
       show:
         affected_accounts:
           one: Afectoulle a unha conta na base de datos
@@ -236,8 +287,7 @@ gl:
           suspend: Non suspender todas as contas existentes de este dominio
         title: Desfacer o bloqueo de dominio para %{domain}
         undo: Desfacer
-      title: Bloqueos de domino
-      undo: Desfacer
+      undo: Desfacer bloqueo de dominio
     email_domain_blocks:
       add_new: Engadir novo
       created_msg: Engadeuse correctamente o dominio de email a lista negra
@@ -248,19 +298,47 @@ gl:
         create: Engadir dominio
         title: Nova entrada la lista negra de e-mail
       title: Lista negra de E-mail
+    followers:
+      back_to_account: Voltar a Conta
+      title: Seguidoras de %{acct}
     instances:
-      account_count: Contas coÃ±ecidas
-      domain_name: Dominio
-      reset: Restablecer
-      search: Buscar
-      title: Instancias coÃ±ecidas
+      delivery_available: A entrega estÃ¡ dispoÃ±ible
+      known_accounts:
+        one: "%{count} conta coÃ±ecida"
+        other: "%{count} contas coÃ±ecidas"
+      moderation:
+        all: Todo
+        limited: Limitado
+        title: ModeraciÃ³n
+      title: FederaciÃ³n
+      total_blocked_by_us: Bloqueado por nÃ³s
+      total_followed_by_them: Seguidas por eles
+      total_followed_by_us: Seguidas por nÃ³s
+      total_reported: Informes sobre elas
+      total_storage: Anexos de medios
     invites:
+      deactivate_all: Desactivar todo
       filter:
         all: Todo
         available: DispoÃ±ible
         expired: Cadudado
         title: Filtro
       title: Convida
+    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 toots pÃºblicos 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.
+      disable: Desactivar
+      disabled: Desactivada
+      enable: Activar
+      enable_hint: Unha vez activado, o seu servidor suscribirase a todos os toots pÃºblicos de este servidor, e tamÃ©n comezarÃ¡ a eviar a el os toots pÃºblicos do servidor.
+      enabled: Activada
+      inbox_url: URL do repetidor
+      pending: Agardando polo permiso do repetidor
+      save_and_enable: Gardar e activar
+      setup: Configurar a conexiÃ³n ao repetidor
+      status: Estado
+      title: Repetidores
     report_notes:
       created_msg: Creouse correctamente a nota do informe!
       destroyed_msg: Nota do informe eliminouse con Ã©xito!
@@ -275,7 +353,6 @@ gl:
       comment:
         none: Nada
       created_at: Reportado
-      id: ID
       mark_as_resolved: Marcar como resolto
       mark_as_unresolved: Marcar como non resolto
       notes:
@@ -286,20 +363,15 @@ gl:
         placeholder: Describe quÃ© medidas foron tomadas, ou calquer outra informaciÃ³n relacionada...
       reopen: Voltar a abrir o informe
       report: 'Informe #%{id}'
-      report_contents: Contidos
       reported_account: Conta reportada
       reported_by: Reportada por
       resolved: Resolto
       resolved_msg: Resolveuse con Ã©xito o informe!
-      silence_account: Acalar conta
       status: Estado
-      suspend_account: Suspender conta
-      target: Obxetivo
       title: Informes
       unassign: Non asignar
       unresolved: Non resolto
       updated_at: Actualizado
-      view: Vista
     settings:
       activity_api_enabled:
         desc_html: Conta de estados publicados localmente, usuarias activas, e novos rexistros por semana
@@ -310,15 +382,24 @@ gl:
       contact_information:
         email: e-mail de traballo
         username: Nome de usuaria de contacto
+      custom_css:
+        desc_html: Modificar o aspecto con CSS cargado en cada pÃ¡xina
+        title: CSS persoalizado
       hero:
         desc_html: Mostrado na portada. RecomÃ©ndase 600x100px como mÃnimo. Si non se establece, mostrarÃ¡ a imaxe por omisiÃ³n da instancia
         title: ImÃ¡xe HerÃ³e
+      mascot:
+        desc_html: Mostrado en varias pÃ¡xinas. RecomÃ©ndase 293x205 como mÃnimo. Se non se establece publÃcase a mascota por omisiÃ³n
+        title: Imaxe da mascota
       peers_api_enabled:
         desc_html: Nome de dominio que esta instancia atopou no fediverso
         title: Publicar lista de instancias descubertas
       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 etiquetas HTML
@@ -339,14 +420,17 @@ gl:
         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 e nas meta etiquetas. Pode utilizar etiquetas HTML, en particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
+        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 etiquetas HTML, en particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
         title: DescriciÃ³n da instancia
       site_description_extended:
         desc_html: Un bo lugar para o seu cÃ³digo de conducta, regras, guÃas e outras cousas que distingan a sÃºa instancia. Pode utilizar etiquetas HTML
-        title: InformaciÃ³n extendida da personalizaciÃ³n
+        title: InformaciÃ³n extendida da persoalizaciÃ³n
+      site_short_description:
+        desc_html: Mostrado na barra lateral e nas etiquetas meta. Describe o que Ã© Mastodon e que fai especial a este servidor nun sÃ³ parÃ¡grafo. Si estÃ¡ baldeiro, mostrarÃ¡ a descriciÃ³n da instancia.
+        title: DescriciÃ³n curta da instancia
       site_terms:
         desc_html: Pode escribir a sÃºa propia polÃtica de intimidade, termos de servizo ou aclaraciÃ³ns legais. Pode utilizar etiquetas HTML
-        title: Termos de servizo personalizados
+        title: Termos de servizo persoalizados
       site_title: Nome da instancia
       thumbnail:
         desc_html: Utilizado para vistas previsas vÃa OpenGraph e API. RecomÃ©ndase 1200x630px
@@ -365,6 +449,7 @@ gl:
       media:
         title: Medios
       no_media: Sen medios
+      no_status_selected: Non se cambiou ningÃºn estado xa que ningÃºn foi seleccionado
       title: Estados da conta
       with_media: con medios
     subscriptions:
@@ -374,7 +459,21 @@ gl:
       last_delivery: Ãšltima entrega
       title: WebSub
       topic: Asunto
+    tags:
+      accounts: Contas
+      hidden: Ocultas
+      hide: Ocultar do directorio
+      name: Etiqueta
+      title: Etiquetas
+      unhide: Mostrar en directorio
+      visible: Visible
     title: AdministraciÃ³n
+    warning_presets:
+      add_new: Engadir novo
+      delete: Eliminar
+      edit: Editar
+      edit_preset: Editar aviso preestablecido
+      title: Xestionar avisos preestablecidos
   admin_mailer:
     new_report:
       body: "%{reporter} informou sobre %{target}"
@@ -396,7 +495,7 @@ gl:
     warning: TeÃ±a moito tino con estos datos. Nunca os comparta con ninguÃ©n!
     your_token: O seu testemuÃ±o de acceso
   auth:
-    agreement_html: RexistrÃ¡ndose acorda seguir <a href="%{rules_path}">as normas da instancia</a> e <a href="%{terms_path}">os termos do servizo</a>.
+    agreement_html: Ao pulsar "Rexistrar" vostede acorda seguir <a href="%{rules_path}">as normas da instancia</a> e <a href="%{terms_path}">os termos do servizo</a>.
     change_password: Contrasinal
     confirm_email: Confirmar correo-e
     delete_account: Eliminar conta
@@ -407,7 +506,7 @@ gl:
     login: Conectar
     logout: Desconectar
     migrate_account: Mover a unha conta diferente
-    migrate_account_html: Si desexa redirixir esta conta hacia outra diferente, pode <a href="%{path}">configuralo aquÃ</a>.
+    migrate_account_html: Se desexa redirixir esta conta hacia outra diferente, pode <a href="%{path}">configuralo aquÃ</a>.
     or: ou
     or_log_in_with: ou conectar con
     providers:
@@ -452,6 +551,16 @@ gl:
     success_msg: A sÃºa conta eliminouse correctamente
     warning_html: SÃ³ se garantiza a eliminaciÃ³n de contido de esta instancia. O contido que foi compartido con outras instancias Ã© probable que deixe rastros. O servidores fora de liÃ±a e servidores que se desuscribiron das sÃºas actualizaciÃ³ns non actualizarÃ¡n as sÃºas bases de datos.
     warning_title: DispoÃ±ibilidade do contido espallado
+  directories:
+    directory: Directorio de perfil
+    enabled: Vostede estÃ¡ actualmente na lista do directorio.
+    enabled_but_waiting: Vostede optou por ser incluÃda no directorio, mais por agora non ten o nÃºmero mÃnimo de seguidoras (%{min_followers}) para aparecer.
+    explanation: Descubra usuarias segÃºn o seu interese
+    explore_mastodon: Explorar %{title}
+    how_to_enable: Actualmente non solicitou ser incluÃda no directorio, pode facelo abaixo. Utilice etiquetas no texto de biografÃa para ser incluÃda baixo etiquetas especÃficas!
+    people:
+      one: "%{count} persoa"
+      other: "%{count} persoas"
   errors:
     '403': Non ten permiso para ver esta pÃ¡xina.
     '404': A pÃ¡xina que estÃ¡ a buscar non existe.
@@ -463,7 +572,7 @@ gl:
     '500':
       content: SentÃmolo, pero algo do noso lado falloou.
       title: Esta pÃ¡xina non Ã© correcta
-    noscript_html: Para utilizar a aplicaciÃ³n web de Mastodon debe habilitar JavaScript. De xeito alternativo, intente unha das <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">apps nativas</a> para Mastodon da sÃºa plataforma.
+    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.
   exports:
     archive_takeout:
       date: Data
@@ -474,7 +583,9 @@ gl:
       size: TamaÃ±o
     blocks: A bloquear
     csv: CSV
+    domain_blocks: Bloqueos de dominio
     follows: A seguir
+    lists: Listas
     mutes: Acalou
     storage: Almacenamento de medios
   filters:
@@ -505,9 +616,13 @@ gl:
     true_privacy_html: Por favor teÃ±a en conta que <strong>a verdadeira intimidade sÃ³ pode ser conseguida con cifrado de extremo-a-extremo</strong>.
     unlocked_warning_html: Calquera pode seguila para inmediatamente ver os seus estados privados. %{lock_link} para poder revisar e rexeitar seguidoras.
     unlocked_warning_title: A sÃºa conta non estÃ¡ pechada
+  footer:
+    developers: Desenvolvedoras
+    more: MÃ¡isâ€¦
+    resources: Recursos
   generic:
     changes_saved_msg: Cambios gardados correctamente!!
-    powered_by: grazas a %{link}
+    copy: Copiar
     save_changes: Gardar cambios
     validation_errors:
       one: Algo non estÃ¡ ben de todo! Por favor revise abaixo o erro
@@ -543,8 +658,6 @@ gl:
       expires_at: Caduca
       uses: Usos
     title: Convidar xente
-  landing_strip_html: "<strong>%{name}</strong> Ã© unha usuaria en %{link_to_root_path}.  Pode seguila ou interactuar con ela si ten unha conta en algÃºn lugar do fediverso."
-  landing_strip_signup_html: Si non, pode <a href="%{sign_up_path}">rexistrarse aquÃ</a>.
   lists:
     errors:
       limit: Acadou o nÃºmero mÃ¡ximo de listas
@@ -616,15 +729,30 @@ gl:
     publishing: Publicando
     web: Web
   remote_follow:
-    acct: Introduza o seu nomedeusuaria@dominio desde onde quere facer seguimento
+    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: 'Vostede vai seguir:'
+    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: 'Vostede quere favorecer este toot:'
+    reblog:
+      proceed: Darlle a promocionar
+      prompt: 'Vostede quere promocionar este toot:'
+    reply:
+      proceed: Respostar
+      prompt: 'Vostede quere respostar a este toot:'
   remote_unfollow:
     error: Fallo
     title: TÃtulo
     unfollowed: Deixou de seguir
+  scheduled_statuses:
+    over_daily_limit: Excedeu o lÃmite de %{limit} toots programados para ese dÃa
+    over_total_limit: Excedeu o lÃmite de %{limit} toots programados
+    too_soon: A data de programaciÃ³n debe estar no futuro
   sessions:
     activity: Ãšltima actividade
     browser: Navegador
@@ -667,7 +795,7 @@ gl:
     revoke_success: A sesiÃ³n revocouse con Ã©xito
     title: SesiÃ³ns
   settings:
-    authorized_apps: Apps autorizados
+    authorized_apps: Apps autorizadas
     back: Voltar a Mastodon
     delete: EliminaciÃ³n da conta
     development: Desenvolvemento
@@ -680,7 +808,7 @@ gl:
     preferences: Preferencias
     settings: Axustes
     two_factor_authentication: Validar Doble Factor
-    your_apps: Os seus aplicativos
+    your_apps: As sÃºas aplicaciÃ³ns
   statuses:
     attached:
       description: 'Axenado: %{attached}'
@@ -704,6 +832,7 @@ gl:
       private: As mensaxes non-pÃºblicas non poden ser fixadas
       reblog: Non se poden fixar as mensaxes promovidas
     show_more: Mostrar mÃ¡is
+    sign_in_to_participate: ConÃ©ctese para participar na conversa
     title: '%{name}: "%{quote}"'
     visibilities:
       private: SÃ³ seguidoras
@@ -713,7 +842,6 @@ gl:
       unlisted: Non listado
       unlisted_long: Visible para calquera, pero non listado en liÃ±as de tempo pÃºblicas
   stream_entries:
-    click_to_show: Pulse para mostrar
     pinned: Mensaxe fixada
     reblogged: promovida
     sensitive_content: Contido sensible
@@ -736,7 +864,7 @@ gl:
       <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 si 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 proporcionar a funcionabiliade bÃ¡sica de Mastodon. SÃ³ pode interactuar co contido de outra xente e publicar o seu propio contido si estÃ¡ conectada. Por exemplo, poderÃa seguir outra xente e ver as sÃºas publicaciÃ³ns combinadas nunha liÃ±a temporal inicial persoalizada.</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>
@@ -745,7 +873,7 @@ gl:
 
       <h3 id="protect">CÃ³mo proxetemos os seus datos?</h3>
 
-      <p>Implementamos varias medidas de seguridade para protexer os seus datos personais cando introduce, envÃa ou accede a sÃºa informaciÃ³n personal. 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>
+      <p>Implementamos varias medidas de seguridade para protexer os seus datos personais 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" />
 
@@ -807,6 +935,7 @@ gl:
   time:
     formats:
       default: "%d %b, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Introducir o cÃ³digo xerado polo seu aplicativo de autenticaciÃ³n para confirmar
     description_html: Si habilita a <strong>autenticaciÃ³n de doble factor</strong>, a conexiÃ³n pediralle estar en posesiÃ³n do seu telÃ©fono, que xerarÃ¡ testemuÃ±os para poder entrar.
@@ -828,9 +957,25 @@ gl:
       explanation: Solicitou un respaldo completo da sÃºa conta de Mastodon. Xa estÃ¡ listo para descargar!
       subject: O seu ficheiro xa estÃ¡ listo para descargar
       title: Leve o ficheiro
+    warning:
+      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.
+        silence: Mentras a conta estÃ¡ limitada, sÃ³ a xente que actualmente a segue verÃ¡ os seus toots en este servidor, e vostede poderÃa estar excluÃda de varias listas pÃºblicas. PorÃ©n, outras persoas poderÃana seguila 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.
+      review_server_policies: Revisar polÃticas do servidor
+      subject:
+        disable: A sÃºa conta %{acct} foi conxelada
+        none: Aviso para %{acct}
+        silence: A sÃºa conta %{acct} foi limitada
+        suspend: A sÃºa conta %{acct} foi suspendida
+      title:
+        disable: Conta conxelada
+        none: Aviso
+        silence: Conta limitada
+        suspend: Conta suspendida
     welcome:
       edit_profile_action: Configurar perfil
-      edit_profile_step: Vostede pode personalizar o seu perfil subindo un avatar, cabeceira, cambiar o seu nome pÃºblico e aÃnda mÃ¡is. Si restrinxe a sÃºa conta pode revisar a conta das personas que solicitan seguilas antes de permitirlles o acceso aos seus toots.
+      edit_profile_step: Vostede pode persoalizar o seu perfil subindo un avatar, cabeceira, cambiar o seu nome pÃºblico e aÃnda mÃ¡is. Si restrinxe a sÃºa conta pode revisar a conta das personas que solicitan seguilas antes de permitirlles o acceso aos seus toots.
       explanation: AquÃ ten alunhas endereitas para ir aprendendo
       final_action: Comece a publicar
       final_step: 'Publique! Incluso sin seguidoras as sÃºas mensaxes serÃ¡n vistas por outras, por exemplo na liÃ±a temporal local e nas etiquetas. PoderÃa presentarse no #fediverso utilizando a etiqueta #introductions.'
@@ -839,7 +984,6 @@ gl:
       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.
       subject: Benvida a Mastodon
-      tip_bridge_html: Si chega desde a Twitter, pode atopar aos seus amigos en Mastodon utilizando o <a href="%{bridge_url}">aplicativo ponte</a>. SÃ³ funciona si eles tamÃ©n utilizan o aplicativo ponte!
       tip_federated_timeline: A liÃ±a temporal federada Ã© unha visiÃ³n ampla da rede Mastodon. Pero so inclÃºe xente a que segue xente que vostede segue, asÃ que non Ã© completa.
       tip_following: Por omisiÃ³n vostede segue ao Admin do seu servidor. Para atopar mÃ¡is xente interesante, mire nas liÃ±as temporais local e federada.
       tip_local_timeline: A liÃ±a temporal local Ã© unha ollada xeral sobre a xente en %{instance}. Son as sÃºas veciÃ±as mÃ¡is prÃ³ximas!
@@ -847,8 +991,12 @@ gl:
       tips: Consellos
       title: Benvida, %{name}!
   users:
+    follow_limit_reached: Non pode seguir a mÃ¡is de %{limit} persoas
     invalid_email: O enderezo de correo non Ã© vÃ¡lido
     invalid_otp_token: CÃ³digo de doble-factor non vÃ¡lido
     otp_lost_help_html: Si perde o acceso a ambos, pode 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.
     signed_in_as: 'Rexistrada como:'
+  verification:
+    explanation_html: 'Pode <strong>validarse a vostede mesma como a dona das ligazÃ³ns nos metadatos do seu 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Ã ten un exemplo:'
+    verification: ValidaciÃ³n
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0ac1787f20a092cc2afe988822b35512d13f987a..6d50ed459dfb190a43ff0bf598135af9b616c899 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -4,13 +4,13 @@ he:
     about_hashtag_html: ××œ×• ×¡×˜×˜×•×¡×™× ×¤×•×ž×‘×™×™× ×”×ž×ª×•×™×™×’×™× ×‘×ª×•×¨<strong>#%{hashtag}</strong>. × ×™×ª×Ÿ ×œ×”×’×™×‘, ×œ×”×“×”×“ ××• ×œ×—×‘×‘ ××•×ª× ×× ×™×© ×œ×š ×—×©×‘×•×Ÿ ×‘×›×œ ×ž×§×•× ×‘×¤×“×¨×¦×™×”.
     about_mastodon_html: ×ž×¡×˜×•×“×•×Ÿ ×”×™× ×¨×©×ª ×—×‘×¨×ª×™×ª <em>×—×•×¤×©×™×ª, ×ž×‘×•×¡×¡×ª ×ª×•×›× ×” ×—×•×¤×©×™×ª ("×§×•×“ ×¤×ª×•×—")</em>. ×›××œ×˜×¨× ×˜×™×‘×” <em>×‘×œ×ª×™ ×¨×™×›×•×–×™×ª</em> ×œ×¤×œ×˜×¤×¨×•×ž×•×ª ×”×ž×¡×—×¨×™×•×ª, ×ž×¡×˜×•×“×•×Ÿ ×ž××¤×©×¨×ª ×œ×”×ž× ×¢ ×ž×”×¡×™×›×•× ×™× ×”× ×œ×•×•×™× ×œ×”×¤×§×“×ª ×”×ª×§×©×•×¨×ª ×©×œ×š ×‘×™×“×™ ×—×‘×¨×” ×™×—×™×“×”. ×©×ž×ª ××ª ×ž×‘×˜×—×š ×‘×©×¨×ª ××—×“ &mdash; ×œ× ×ž×©× ×” ×‘×ž×™ ×‘×—×¨×ª, ×ª×ž×™×“ ××¤×©×¨ ×œ×“×‘×¨ ×¢× ×›×œ ×©××¨ ×”×ž×©×ª×ž×©×™×. ×œ×›×œ ×ž×™ ×©×¨×•×¦×” ×™×© ××ª ×”××¤×©×¨×•×ª ×œ×”×§×™× ×©×¨×ª ×ž×¡×˜×•×“×•×Ÿ ×¢×¦×ž××™, ×•×œ×”×©×ª×ª×£ ×‘<em>×¨×©×ª ×”×—×‘×¨×ª×™×ª</em> ×‘××•×¤×Ÿ ×—×œ×§.
     about_this: ××•×“×•×ª ×©×¨×ª ×–×”
+    api: API
+    apps: ×™×™×©×•×ž×•× ×™× ×œ× ×™×™×“
     closed_registrations: ×”×¨×©×ž×•×ª ×¡×’×•×¨×•×ª ×œ×©×¨×ª ×–×” ×œ×¢×ª ×¢×ª×”.
-    contact: ×¦×•×¨ ×§×©×¨
-    contact_missing: ××™×Ÿ
+    contact: ×™×¦×™×¨×ª ×§×©×¨
+    contact_missing: ×œ×œ× ×”×’×“×¨×”
     contact_unavailable: ×œ× ×¨×œ×•×•× ×˜×™/×—×¡×¨
-    description_headline: ×ž×”×• %{domain}?
-    domain_count_after: ×©×¨×ª×™× ××—×¨×™×
-    domain_count_before: ×ž×—×•×‘×¨ ××œ
+    documentation: ×ª×™×¢×•×“
     extended_description_html: |
       <h3>×ž×§×•× ×˜×•×‘ ×œ×›×œ×œ×™×</h3>
       <p>×”×ª×™××•×¨ ×”×ž×•×¨×—×‘ ×˜×¨× ×”×•×’×“×¨.</p>
@@ -44,7 +44,6 @@ he:
     people_who_follow: ×”×¢×•×§×‘×™× ×©×œ %{name}
     posts: ×”×•×“×¢×•×ª
     posts_with_replies: ×—×¦×¨×•×¦×™× ×•×ª×’×•×‘×•×ª
-    remote_follow: ×ž×¢×§×‘ ×ž×¨×—×•×§
     reserved_username: ×©× ×”×ž×©×ª×ž×© ×©×ž×•×¨
     roles:
       admin: ×ž× ×”×œ
@@ -96,10 +95,6 @@ he:
       most_recent_activity: ×¤×¢×™×œ×•×ª ×¢×“×›× ×™×ª
       most_recent_ip: ×›×ª×•×‘×•×ª ××—×¨×•× ×•×ª
       not_subscribed: ×œ× ×¨×©×•×
-      order:
-        alphabetic: ××œ×¤×‘×™×ª×™
-        most_recent: ×¢×“×›× ×™
-        title: ×¡×™×“×•×¨
       outbox_url: ×›×ª×•×‘×ª ×ª×™×‘×ª ×“×•××¨ ×™×•×¦×
       perform_full_suspension: ×‘×™×¦×•×¢ ×”×©×¢×™×™×” ×ž×œ××”
       profile_url: ×›×ª×•×‘×ª ×¤×¨×•×¤×™×œ
@@ -125,7 +120,6 @@ he:
       shared_inbox_url: ×ª×™×‘×” ×ž×©×•×ª×¤×ª ×œ×“×•××¨ × ×›× ×¡
       show:
         created_reports: ×“×™×•×•×—×™× ×ž××ª ×—×©×‘×•×Ÿ ×–×”
-        report: ×“×•"×—
         targeted_reports: ×“×™×•×•×—×™× × ×’×“ ×—×©×‘×•×Ÿ ×–×”
       silence: ×”×©×ª×§×”
       statuses: ×”×•×“×¢×•×ª
@@ -162,10 +156,6 @@ he:
         title: ×—×¡×™×ž×ª ×©×¨×ª ×—×“×©×”
       reject_media: ×—×¡×™×ž×ª ×§×‘×¦×™ ×ž×“×™×”
       reject_media_hint: ×ž×¡×™×¨×” ×§×‘×¦×™ ×ž×“×™×” ×”×©×ž×•×¨×™× ×ž×§×•×ž×™×ª ×•×ž×•× ×¢×ª ×ž×”×•×¨×“×ª ×§×‘×¦×™× × ×•×¡×¤×™× ×‘×¢×ª×™×“. ×œ× ×¨×œ×•×•× ×˜×™ ×œ×”×©×¢×™×•×ª
-      severities:
-        silence: ×”×©×ª×§×”
-        suspend: ×”×©×¢×™×™×”
-      severity: ×—×•Ö¼×ž×¨×”
       show:
         affected_accounts:
           one: ×—×©×‘×•×Ÿ ××—×“ ×‘×ž×¡×“ ×”× ×ª×•× ×™× ×ž×•×©×¤×¢
@@ -175,30 +165,21 @@ he:
           suspend: ×”×¡×¨×ª ×”×©×¢×™×™×” ×ž×›×œ ×”×—×©×‘×•× ×•×ª ×¢×œ ×©×¨×ª ×–×”
         title: ×‘×™×˜×•×œ ×—×¡×™×ž×ª ×©×¨×ª ×¢×‘×•×¨ %{domain}
         undo: ×‘×™×˜×•×œ
-      title: ×—×¡×™×ž×ª ×©×¨×ª×™×
       undo: ×‘×™×˜×•×œ
     instances:
-      account_count: ×—×©×‘×•× ×•×ª ×ž×•×›×¨×™×
-      domain_name: ×©× ×ž×ª×—×
       title: ×©×¨×ª×™× ×ž×•×›×¨×™×
     reports:
       are_you_sure: 100% ×¢×œ ×‘×˜×•×—?
       comment:
         none: ×œ×œ×
-      id: ID
       mark_as_resolved: ×¡×™×ž×•×Ÿ ×›×¤×ª×•×¨
       report: '×“×•×•×— ×¢×œ #%{id}'
-      report_contents: ×ª×•×›×Ÿ
       reported_account: ×—×©×‘×•×Ÿ ×ž×“×•×•×—
       reported_by: ×“×•×•×— ×¢×œ ×™×“×™
       resolved: ×¤×ª×•×¨
-      silence_account: ×”×©×ª×§×ª ×—×©×‘×•×Ÿ
       status: ×”×•×“×¢×”
-      suspend_account: ×”×©×¢×™×™×ª ×—×©×‘×•×Ÿ
-      target: ×ž×˜×¨×”
       title: ×“×™×•×•×—×™×
       unresolved: ×œ× ×¤×ª×•×¨
-      view: ×ª×¦×•×’×”
     settings:
       contact_information:
         email: × × ×œ×”×§×œ×™×“ ×›×ª×•×‘×ª ×“×•×"×œ ×¤×•×ž×‘×™×ª
@@ -286,7 +267,6 @@ he:
     unlocked_warning_title: ×—×©×‘×•× ×š ××™× ×• × ×¢×•×œ
   generic:
     changes_saved_msg: ×”×©×™× ×•×™×™× × ×©×ž×¨×• ×‘×”×¦×œ×—×”!
-    powered_by: ×¨×¥ ×¢×œ %{link}
     save_changes: ×©×ž×•×¨ ×©×™× ×•×™×™×
     validation_errors:
       one: ×ž×©×”×• ×œ× ×œ×’×ž×¨×™ ×‘×¡×“×¨ ×¢×“×™×™×Ÿ! ×× × ×”×¦×™×¦×• ×¢×œ ×”×©×’×™××” ×ž×˜×”
@@ -299,15 +279,13 @@ he:
       following: ×¨×©×™×ž×ª × ×¢×§×‘×™×
       muting: ×¨×©×™×ž×ª ×”×©×ª×§×•×ª
     upload: ×™×‘×•×
-  landing_strip_html: "<strong>%{name}</strong> ×ž×–×”×” ×ž×©×ª×ž×©(×ª) ×ž×”×§×”×™×œ×” %{link_to_root_path}. × ×™×ª×Ÿ ×œ×¢×§×•×‘ ××—×¨×™×”× ××• ×œ×“×‘×¨ ××™×ª× ×‘×¢×–×¨×ª ×—×©×‘×•×Ÿ ×¢×œ ×›×œ ×©×¨×ª ×§×”×™×œ×” ×‘×¨×—×‘×™ ×”×¤×“×¨×¦×™×”."
-  landing_strip_signup_html: ×œ×—×œ×•×¤×™×Ÿ , × ×™×ª×Ÿ <a href="%{sign_up_path}">×œ×”×¨×©× ×ž×§×•×ž×™×ª ×›××Ÿ</a>.
   media_attachments:
     validations:
       images_and_video: ×œ× × ×™×ª×Ÿ ×œ×”×•×¡×™×£ ×•×™×“××• ×œ×—×¦×¨×•×¥ ×©×›×‘×¨ ×ž×›×™×œ ×ª×ž×•× ×•×ª
       too_many: ×œ× × ×™×ª×Ÿ ×œ×”×•×¡×™×£ ×™×•×ª×¨ ×ž××¨×‘×¢×” ×§×‘×¦×™×
   notification_mailer:
     digest:
-      body: '×œ×”×œ×Ÿ ×¡×™×›×•× ×–×¨×™×– ×©×œ ×”×“×‘×¨×™× ×©×§×¨×• ×¢×œ %{instance} ×ž××– ×‘×™×§×•×¨×š ×”××—×¨×•×Ÿ ×‘-%{since}:'
+      body: ×œ×”×œ×Ÿ ×¡×™×›×•× ×–×¨×™×– ×©×œ ×”×“×‘×¨×™× ×©×§×¨×• ×¢×œ ×ž××– ×‘×™×§×•×¨×š ×”××—×¨×•×Ÿ ×‘-%{since}
       mention: "%{name} ×¤× ×” ××œ×™×š ×‘:"
       new_followers_summary:
         one: × ×•×¡×£ ×œ×š ×¢×•×§×‘! ×¡×—×ª×™×™×Ÿ!
@@ -372,7 +350,6 @@ he:
       unlisted: ×ž×•×¡×ª×¨
       unlisted_long: ×¤×•×ž×‘×™, ××‘×œ ×œ× ×œ×”×¦×’×” ×‘×¤×™×“ ×”×¦×™×‘×•×¨×™
   stream_entries:
-    click_to_show: ×œ×œ×—×•×¥ ×œ×”×¦×’×”
     reblogged: ×”×•×“×”×“
     sensitive_content: ×ª×•×›×Ÿ ×¨×’×™×©
   time:
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/config/locales/hi.yml
@@ -0,0 +1 @@
+{}
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 2d2eddc08c64bf5fe7d6de4dd4ba8f24bfc9ab40..38971833c1fd2ac9874d433609f01d6d1cd01b85 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -5,9 +5,6 @@ hr:
     about_this: O ovoj instanci
     closed_registrations: Registracije na ovoj instanci su trenutno zatvorene.
     contact: Kontakt
-    description_headline: Å to je %{domain}?
-    domain_count_after: druge instance
-    domain_count_before: Spojen na
     other_instances: Druge instance
     source_code: Izvorni kod
     status_count_after: statusi
@@ -22,7 +19,6 @@ hr:
     people_followed_by: Ljudi koje %{name} slijedi
     people_who_follow: Ljudi koji slijede %{name}
     posts: Postovi
-    remote_follow: Remote follow
     unfollow: Prestani slijediti
   application_mailer:
     settings: 'Promijeni e-mail postavke: %{link}'
@@ -64,11 +60,8 @@ hr:
     storage: Pohrana media zapisa
   generic:
     changes_saved_msg: Izmjene su uspjeÅ¡no saÄuvane!
-    powered_by: omoguÄ‡uje %{link}
     save_changes: SaÄuvaj izmjene
-    validation_errors:
-      one: NeÅ¡to ne Å¡tima! Vidi greÅ¡ku ispod
-      other: NeÅ¡to joÅ¡ uvijek ne Å¡tima! Vidi %{count} greÅ¡ke ispod
+    validation_errors: NeÅ¡to joÅ¡ uvijek ne Å¡tima! Vidi %{count} greÅ¡ke ispod
   imports:
     preface: MoÅ¾eÅ¡ uvesti odreÄ‘ene podatke kao Å¡to su svi ljudi koje slijediÅ¡ ili blokiraÅ¡ u svoj raÄun na ovoj instanci, sa fajlova kreiranih izvozom sa druge instance.
     success: Tvoji podaci su uspjeÅ¡no uploadani i bit Ä‡e obraÄ‘eni u dogledno vrijeme
@@ -77,18 +70,12 @@ hr:
       following: Lista onih koje slijedim
       muting: Lista utiÅ¡anih
     upload: Upload
-  landing_strip_html: "<strong>%{name}</strong> je korisnik na %{link_to_root_path}. MoÅ¾eÅ¡ ih slijediti ili komunicirati s njima ako imaÅ¡ raÄun igdje u fediversu."
-  landing_strip_signup_html: Ako nemaÅ¡, moÅ¾eÅ¡ se <a href="%{sign_up_path}">registrirati ovdje</a>.
   notification_mailer:
     digest:
-      body: 'Ovo je kratak saÅ¾etak propuÅ¡tenog %{instance} od tvog proÅ¡log posjeta %{since}:'
+      body: Ovo je kratak saÅ¾etak propuÅ¡tenog od tvog proÅ¡log posjeta %{since}
       mention: "%{name} te je spomenuo:"
-      new_followers_summary:
-        one: ImaÅ¡ novog sljedbenika! Yay!
-        other: ImaÅ¡ %{count} novih sljedbenika! PrekraÅ¡no!
-      subject:
-        one: "1 nova notifikacija od tvog proÅ¡log posjeta \U0001F418"
-        other: "%{count} novih notifikacija od tvog proÅ¡log posjeta \U0001F418"
+      new_followers_summary: ImaÅ¡ %{count} novih sljedbenika! PrekraÅ¡no!
+      subject: "%{count} novih notifikacija od tvog proÅ¡log posjeta \U0001F418"
     favourite:
       body: 'Tvoj status je %{name} oznaÄio kao omiljen:'
       subject: "%{name} je oznaÄio kao omiljen tvoj status"
@@ -141,7 +128,6 @@ hr:
       public: Javno
       unlisted: Javno, no nemoj prikazati na javnom timelineu
   stream_entries:
-    click_to_show: Klikni da bi prikazao
     reblogged: potaknut
     sensitive_content: Osjetljivi sadrÅ¾aj
   time:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index c0dcb438aa77a6ce29cd5c9ab404d50998483f49..d093815a8c72b73683a9ba8cf58275348e25f6ee 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -8,9 +8,6 @@ hu:
     contact: Kapcsolat
     contact_missing: Nincs megadva
     contact_unavailable: N/A
-    description_headline: Mi az a %{domain}?
-    domain_count_after: tovÃ¡bbi instanciÃ¡val
-    domain_count_before: Kapcsolatban
     extended_description_html: |
       <h3>Ez itt a szabÃ¡lyzat helye</h3>
       <p>MÃ©g nem Ã¡llÃtottÃ¡l be bÅ‘vebb leÃrÃ¡st.</p>
@@ -44,7 +41,6 @@ hu:
     people_who_follow: "%{name} kÃ¶vetÅ‘i"
     posts: TÃ¼lkÃ¶k
     posts_with_replies: TÃ¼lkÃ¶k Ã©s vÃ¡laszok
-    remote_follow: KÃ¶vetÃ©s mÃ¡s hÃ¡lÃ³zaton
     reserved_username: Ez egy mÃ¡r lefoglalt felhasznÃ¡lÃ³nÃ©v
     roles:
       admin: AdminisztrÃ¡tor
@@ -96,10 +92,6 @@ hu:
       most_recent_activity: LegutÃ³bbi tevÃ©kenysÃ©gek
       most_recent_ip: LegutÃ³bbi IP-cÃm
       not_subscribed: Nincs feliratkozÃ¡s
-      order:
-        alphabetic: Alfabetikus
-        most_recent: LegutÃ³bbi
-        title: RendezÃ©s
       outbox_url: KimenÅ‘ Ã¼zenetek URL
       perform_full_suspension: Teljes felfÃ¼ggesztÃ©s
       profile_url: Profil URL
@@ -126,7 +118,6 @@ hu:
       shared_inbox_url: BejÃ¶vÅ‘ Ã¼zenetek URL keresÃ©se
       show:
         created_reports: Ezen fiÃ³k Ã¡ltal lÃ©trehozott jelentÃ©sek
-        report: jelentÃ©s
         targeted_reports: JelentÃ©sek ezzel a fiÃ³kkal kapcsolatban
       silence: NÃ©mÃtÃ¡s
       statuses: TÃ¼lkÃ¶k
@@ -204,11 +195,6 @@ hu:
         title: Ãšj domain-tiltÃ¡s
       reject_media: MÃ©diafÃ¡jlok elutasÃtÃ¡sa
       reject_media_hint: EltÃ¡volÃtja a helyben tÃ¡rolt mÃ©diafÃ¡jlokat Ã©s a tovÃ¡bbiakban letiltja az Ãºj mÃ©diafÃ¡jlok letÃ¶ltÃ©sÃ©t. FelfÃ¼ggesztett fiÃ³kok esetÃ©ben irrelevÃ¡ns opciÃ³
-      severities:
-        noop: Egyik sem
-        silence: NÃ©mÃtÃ¡s
-        suspend: FelfÃ¼ggesztÃ©s
-      severity: SÃºlyossÃ¡g
       show:
         affected_accounts:
           one: Ã–sszesen egy fiÃ³k Ã©rintett az adatbÃ¡zisban
@@ -218,7 +204,6 @@ hu:
           suspend: Minden felhasznÃ¡lÃ³ felfÃ¼ggesztÃ©sÃ©nek feloldÃ¡sa ezen a domainen
         title: "%{domain} domain tiltÃ¡sÃ¡nak feloldÃ¡sa"
         undo: VisszavonÃ¡s
-      title: Tiltott domainek
       undo: VisszavonÃ¡s
     email_domain_blocks:
       add_new: Ãšj hozzÃ¡adÃ¡sa
@@ -231,10 +216,6 @@ hu:
         title: Ãšj e-mail feketelista bejegyzÃ©s
       title: E-mail feketelista
     instances:
-      account_count: NyilvÃ¡ntartott fiÃ³kok
-      domain_name: Domain
-      reset: VisszaÃ¡llÃtÃ¡s
-      search: KeresÃ©s
       title: NyilvÃ¡ntartott instanciÃ¡k
     invites:
       filter:
@@ -248,20 +229,14 @@ hu:
       are_you_sure: Biztos vagy benne?
       comment:
         none: Egyik sem
-      id: ID
       mark_as_resolved: MegjelÃ¶lÃ©s megoldottkÃ©nt
       report: "#%{id} szÃ¡mÃº jelentÃ©s"
-      report_contents: Tartalom
       reported_account: Bejelentett fiÃ³k
       reported_by: 'Jelentette:'
       resolved: Megoldott
-      silence_account: FelhasznÃ¡lÃ³ nÃ©mÃtÃ¡sa
       status: Ãllapot
-      suspend_account: FelhasznÃ¡lÃ³ felfÃ¼ggesztÃ©se
-      target: CÃ©l
       title: JelentÃ©sek
       unresolved: Megoldatlan
-      view: MegtekintÃ©s
     settings:
       activity_api_enabled:
         desc_html: Helyi tÃ¼lkÃ¶k, aktÃv felhasznÃ¡lÃ³k Ã©s Ãºj regisztrÃ¡ciÃ³k szÃ¡ma heti bontÃ¡sban
@@ -406,7 +381,7 @@ hu:
     '500':
       content: SajnÃ¡ljuk, valami hiba tÃ¶rtÃ©nt a mi oldalunkon.
       title: Az oldal nem megfelelÅ‘
-    noscript_html: A Mastodon webalkalmazÃ¡s hasznÃ¡latÃ¡hoz engedÃ©lyezned kell a JavaScriptet. A mÃ¡sik megoldÃ¡s, hogy kiprÃ³bÃ¡lod az egyik, a platformodnak megfelelÅ‘ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">alkalmazÃ¡st</a>.
+    noscript_html: A Mastodon webalkalmazÃ¡s hasznÃ¡latÃ¡hoz engedÃ©lyezned kell a JavaScriptet. A mÃ¡sik megoldÃ¡s, hogy kiprÃ³bÃ¡lod az egyik, a platformodnak megfelelÅ‘ <a href="%{apps_path}">alkalmazÃ¡st</a>.
   exports:
     blocks: TiltÃ³listÃ¡don
     csv: CSV
@@ -427,11 +402,10 @@ hu:
     unlocked_warning_title: A fiÃ³kod jelenleg nem privÃ¡t
   generic:
     changes_saved_msg: VÃ¡ltozÃ¡sok sikeresen elmentve!
-    powered_by: mÅ±kÃ¶dteti a %{link}
     save_changes: VÃ¡ltozÃ¡sok mentÃ©se
     validation_errors:
       one: Valami nincs rendjÃ©n! KÃ©rlek tekintsd meg a hibÃ¡t alant
-      other: Valami nincs rendjÃ©n! KÃ©rlek tekintsd meg a %{count} darab hibÃ¡t alant.
+      other: Valami nincs rendjÃ©n! KÃ©rlek tekintsd meg a %{count} darab hibÃ¡t alant
   imports:
     preface: Itt importÃ¡lhatod egy mÃ¡sik instanciÃ¡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
@@ -461,8 +435,6 @@ hu:
       expires_at: LejÃ¡rat
       uses: HasznÃ¡lat
     title: MeghÃvÃ¡sok
-  landing_strip_html: "<strong>%{name}</strong> az alÃ¡bbi instancia hasznÃ¡lÃ³ja: %{link_to_root_path}. KÃ¶vetheted vagy kapcsolatba lÃ©phetsz vele, ha mÃ¡r van felhasznÃ¡lÃ³i fiÃ³kod a fÃ¶derÃ¡ciÃ³ban."
-  landing_strip_signup_html: Ha mÃ©g nincs fiÃ³kod, <a href="%{sign_up_path}">itt regisztrÃ¡lhatsz</a>.
   lists:
     errors:
       limit: ElÃ©rted a hozzÃ¡adhatÃ³ listÃ¡k maximÃ¡lis szÃ¡mÃ¡t
@@ -610,7 +582,6 @@ hu:
       unlisted: ListÃ¡zatlan
       unlisted_long: Mindenki lÃ¡tja, de a nyilvÃ¡nos idÅ‘folyamokban nem jelenik meg
   stream_entries:
-    click_to_show: MegtekintÃ©shez kattints
     pinned: KitÅ±zÃ¶tt tÃ¼lk
     reblogged: reblogolt
     sensitive_content: SzenzitÃv tartalom
@@ -649,7 +620,6 @@ hu:
       review_preferences_action: BeÃ¡llÃtÃ¡sok mÃ³dosÃtÃ¡sa
       review_preferences_step: Tekintsd Ã¡t beÃ¡llÃtÃ¡saidat, pÃ©ldÃ¡ul hogy milyen Ã©rtesÃtÃ©seket kÃ©rsz emailben vagy hogy alapÃ©rtelmezettkÃ©nt mi legyen a tÃ¼lkjeid adatvÃ©delmi beÃ¡llÃtÃ¡sa. Ha nem vagy szÃ©dÃ¼lÅ‘s alkat, azt is engedÃ©lyezheted, hogy automatikusan lejÃ¡tsszuk a GIF-eket.
       subject: ÃœdvÃ¶zÃ¶l a Mastodon
-      tip_bridge_html: Ha a TwitterrÅ‘l Ã©rkezel, hasznÃ¡lhatod <a href="%{bridge_url}">alkalmazÃ¡sunkat</a>, amellyel megtalÃ¡lhatod Twitteres barÃ¡taidat a Mastodonon. Az alkalmazÃ¡s csak azon barÃ¡taidat tudja megtalÃ¡lni, akik maguk is hasznÃ¡ltÃ¡k azt!
       tip_federated_timeline: A nyilvÃ¡nos idÅ‘folyam a Mastodon Ã¼tÅ‘ere, ahol minden tÃ¼lk Ã¶sszefolyik. Nem teljes ugyan, mert csak azokat az emberek fogod lÃ¡tni, akiket instanciÃ¡d tÃ¶bbi felhasznÃ¡lÃ³ja kÃ¶vet.
       tip_following: AlapÃ©rtelmezettkÃ©nt instanciÃ¡d adminisztrÃ¡torait kÃ¶veted. LÃ¡togasd meg a helyi Ã©s a nyilvÃ¡nos idÅ‘folyamot, hogy mÃ¡s Ã©rdekes emberekre is rÃ¡talÃ¡lj.
       tip_local_timeline: A helyi idÅ‘folyam a sajÃ¡t instanciÃ¡d (%{instance}) Ã¼tÅ‘ere. Ezek a kedves emberek itt mind a szomszÃ©daid!
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 4fb75f2b0e5fa56f1d3262d30192337693049983..fabf2746e396661134fe2a9abf07092359ea0077 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1,30 +1,75 @@
 ---
 id:
   about:
+    about_hashtag_html: Ini adalah toot public 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
-    closed_registrations: Pendaftaran untuk server ini sedang ditutup.
+    api: API
+    apps: Aplikasi hp
+    closed_registrations: Pendaftaran untuk server ini sedang ditutup. Tetapi, anda bisa mencari server lain untuk membuat akun dan mendapatkan akses dari jaringan yang sama di sana.
     contact: Kontak
-    description_headline: Apa itu %{domain}?
-    domain_count_after: server lain
-    domain_count_before: Terhubung dengan
-    other_instances: Server lain
+    contact_missing: Belum diset
+    contact_unavailable: Tidak Tersedia
+    documentation: Dokumentasi
+    extended_description_html: |
+      <h3>Tempat yang baik untuk peraturan</h3>
+      <p>Deskripsi lainnya belum diset.</p>
+    features:
+      humane_approach_body: Belajar dari kegagalan jaringan lain, Mastodon berupaya untuk membuat pilihan desain yang etis untuk melawan penyalahgunaan media sosial.
+      humane_approach_title: Pendekatan yang lebih manusiawi
+      not_a_product_body: Mastodon bukanlah jaringan komersil. Tidak ada iklan, tidak ada pengumpulan data, tidak ada batasan vendor. Tidak ada otoritas terpusat.
+      not_a_product_title: Anda adalah orang, bukanlah sebuah produk
+      real_conversation_body: Dengan 500 karakter dan dukungan konten granular dan peringatan media, anda dapat mengekspresikan diri anda sendiri sesuai yang anda mau.
+      real_conversation_title: Dibangun untuk percakapan yang sebenarnya
+      within_reach_body: Berbagai aplikasi untuk iOS, Android, dan platform lainnya berkat ekosistem API yang ramah pada pengembang untuk tetap terhubung dengan teman-teman anda dimanapun.
+      within_reach_title: Selalu dalam jangkauan
+    generic_description: "%{domain} adalah satu server dalam jaringan"
+    hosted_on: Mastodon dihosting di %{domain}
+    learn_more: Pelajari selengkapnya
+    other_instances: Daftar Server
+    privacy_policy: Kebijakan Privasi
     source_code: Kode sumber
-    status_count_after: status
+    status_count_after:
+      one: status
+      other: status
     status_count_before: Yang telah menulis
-    user_count_after: pengguna
+    terms: Kebijakan layanan
+    user_count_after:
+      one: pengguna
+      other: pengguna
     user_count_before: Tempat bernaung bagi
+    what_is_mastodon: Apa itu Mastodon?
   accounts:
     follow: Ikuti
-    followers: Pengikut
-    following: Mengikut
+    followers:
+      one: Pengikut
+      other: Pengikut
+    following: Mengikuti
+    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
     nothing_here: Tidak ada apapun disini!
     people_followed_by: Orang yang diikuti %{name}
     people_who_follow: Orang-orang yang mengikuti %{name}
-    posts: Postingan
-    remote_follow: Mengikuti
+    pin_errors:
+      following: Anda harus mengikuti orang yang ingin anda endorse
+    posts:
+      one: Toot
+      other: Toot
+    posts_tab_heading: Toot
+    posts_with_replies: Toot dan balasan
+    reserved_username: Nama pengguna telah dipesan
+    roles:
+      admin: Admin
+      bot: Bot
+      moderator: Moderator
     unfollow: Berhenti mengikuti
   admin:
+    account_actions:
+      action: Lakukan aksi
     accounts:
       are_you_sure: Anda yakin?
       confirm: Konfirmasi
@@ -52,10 +97,6 @@ id:
       most_recent_activity: Aktivitas terbaru
       most_recent_ip: IP terbaru
       not_subscribed: Tidak berlangganan
-      order:
-        alphabetic: Alfabetik
-        most_recent: Terbaru
-        title: Urutan
       perform_full_suspension: Lakukan suspen penuh
       profile_url: URL profil
       public: Publik
@@ -68,7 +109,6 @@ id:
       salmon_url: URL Salmon
       show:
         created_reports: Laporan yang dibuat oleh akun ini
-        report: laporan
         targeted_reports: Laporan yang dibuat tentang akun ini
       silence: Diam
       statuses: Status
@@ -92,10 +132,6 @@ id:
         title: Pemblokiran domain baru
       reject_media: Tolak berkas media
       reject_media_hint: Hapus file media yang tersimpan dan menolak semua unduhan nantinya. Tidak terpengaruh dengan suspen
-      severities:
-        silence: Diamkan
-        suspend: Suspen
-      severity: Keparahan
       show:
         affected_accounts:
           one: Satu akun di dalam database terpengaruh
@@ -105,28 +141,19 @@ id:
           suspend: Hapus suspen terhadap akun pada domain ini
         title: Hapus pemblokiran domain %{domain}
         undo: Undo
-      title: Pemblokiran Domain
     instances:
-      account_count: Akun yang diketahui
-      domain_name: Domain
       title: Server yang diketahui
     reports:
       comment:
         none: Tidak ada
-      id: ID
       mark_as_resolved: Tandai telah diseleseikan
       report: 'Laporkan #%{id}'
-      report_contents: Konten
       reported_account: Akun yang dilaporkan
       reported_by: Dilaporkan oleh
       resolved: Terseleseikan
-      silence_account: Akun yang didiamkan
       status: Status
-      suspend_account: Akun yang disuspen
-      target: Target
       title: Laporan
       unresolved: Belum Terseleseikan
-      view: Tampilan
     settings:
       contact_information:
         email: Masukkan alamat email
@@ -192,7 +219,7 @@ id:
     '410': Halaman yang anda cari sudah tidak dapat ditemukan lagi.
     '422':
       content: Verifikasi keamanan gagal. Apa anda memblokir cookie?
-      title: Verifikasi keamanan gagal.
+      title: Verifikasi keamanan gagal
   exports:
     blocks: Anda blokir
     csv: CSV
@@ -213,11 +240,8 @@ id:
     unlocked_warning_title: Akun anda tidak dikunci
   generic:
     changes_saved_msg: Perubahan berhasil disimpan!
-    powered_by: didukung oleh %{link}
     save_changes: Simpan perubahan
-    validation_errors:
-      one: Ada yang tidak beres! Mohon tinjau error dibawah ini
-      other: Ada yang tidak beres! Mohon tinjau error dibawah ini
+    validation_errors: Ada yang tidak beres! Mohon tinjau error dibawah ini
   imports:
     preface: Anda bisa mengimpor data tertentu seperti orang-orang yang anda ikuti atau anda blokir di server ini, dari file yang dibuat oleh fitur expor di server lain.
     success: Data anda berhasil diupload dan akan diproses sesegera mungkin
@@ -226,15 +250,13 @@ id:
       following: Daftar diikuti
       muting: Daftar didiamkan
     upload: Unggah
-  landing_strip_html: "<strong>%{name}</strong> adalah pengguna di %{link_to_root_path}.Anda dapat mengikuti mereka atau berinteraksi dengan mereka jika anda memiliki akun di fediverse."
-  landing_strip_signup_html: Jika anda tidak punya, anda bisa <a href="%{sign_up_path}">daftar disini</a>.
   media_attachments:
     validations:
       images_and_video: Tidak bisa melampirkan video pada status yang telah memiliki gambar
       too_many: Tidak dapat melampirkan lebih dari 4 file
   notification_mailer:
     digest:
-      body: 'Ini adalah ringkasan singkat yang anda lewatkan pada %{instance} sejak kunjungan terakhir anda pada %{since}:'
+      body: Ini adalah ringkasan singkat yang anda lewatkan pada sejak kunjungan terakhir anda pada %{since}
       mention: "%{name} menyebut anda di:"
       new_followers_summary:
         one: Anda mendapatkan satu pengikut baru! Hore!
@@ -298,7 +320,6 @@ id:
       public_long: Bisa dilihat semua orang
       unlisted: Bisa dilihat semua orang, tapi tidak ditampilkan di linimasa publik
   stream_entries:
-    click_to_show: Klik untuk menampilkan
     reblogged: di-boost-kan
     sensitive_content: Konten sensitif
   time:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index bf15de4886ab43227f1744bb4a567e512a956e97..73c981a985a9971a392146ec32bdfb2af0a4ba5d 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -5,9 +5,6 @@ io:
     about_this: Pri ta instaluro
     closed_registrations: Membresko ne nun esas posible en ta instaluro.
     contact: Kontaktar
-    description_headline: Quo esas %{domain}?
-    domain_count_after: altra instaluri
-    domain_count_before: Konektita ad
     other_instances: Altra instaluri
     source_code: Fontkodexo
     status_count_after: mesaji
@@ -22,7 +19,6 @@ io:
     people_followed_by: Sequati da %{name}
     people_who_follow: Sequanti di %{name}
     posts: Mesaji
-    remote_follow: Fore sequar
     unfollow: Dessequar
   admin:
     accounts:
@@ -48,10 +44,6 @@ io:
       most_recent_activity: Most recent activity
       most_recent_ip: Most recent IP
       not_subscribed: Not subscribed
-      order:
-        alphabetic: Alphabetic
-        most_recent: Most recent
-        title: Order
       perform_full_suspension: Perform full suspension
       profile_url: Profile URL
       public: Public
@@ -60,7 +52,6 @@ io:
       salmon_url: Salmon URL
       show:
         created_reports: Reports created by this account
-        report: report
         targeted_reports: Reports made about this account
       silence: Silence
       statuses: Statuses
@@ -84,10 +75,6 @@ io:
         title: New domain block
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
-      severities:
-        silence: Silence
-        suspend: Suspend
-      severity: Severity
       show:
         affected_accounts:
           one: One account in the database affected
@@ -97,28 +84,20 @@ io:
           suspend: Unsuspend all existing accounts from this domain
         title: Undo domain block for %{domain}
         undo: Undo
-      title: Domain Blocks
       undo: Undo
     instances:
-      account_count: Known accounts
-      domain_name: Domain
       title: Known Instances
     reports:
       comment:
         none: None
-      id: ID
       mark_as_resolved: Mark as resolved
       report: 'Report #%{id}'
       reported_account: Reported account
       reported_by: Reported by
       resolved: Resolved
-      silence_account: Silence account
       status: Status
-      suspend_account: Suspend account
-      target: Target
       title: Reports
       unresolved: Unresolved
-      view: View
     settings:
       contact_information:
         email: Enter a public e-mail address
@@ -192,28 +171,25 @@ io:
     storage: Konservado di kontenajo
   generic:
     changes_saved_msg: Chanji senprobleme konservita!
-    powered_by: povigita da %{link}
     save_changes: Konservar la chanji
     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.
+      one: Ulo ne eventis senprobleme! Voluntez konsultar la suba eror-raporto
+      other: Ulo ne eventis senprobleme! Voluntez konsultar la suba %{count} eror-raporti
   imports:
     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.
+    success: Tua datumi esis senprobleme importacita ed esos traktita quale projetita
     types:
       blocking: Listo de blokusiti
       following: Listo de sequati
       muting: Muting list
     upload: Kargar
-  landing_strip_html: "<strong>%{name}</strong> esas uzero en %{link_to_root_path}. Tu povas sequar lu o komunikar kun lu, se tu havas konto irgaloke en la Fediverse."
-  landing_strip_signup_html: Se tu ne havas, tu povas <a href="%{sign_up_path}">membreskar hike</a>.
   media_attachments:
     validations:
       images_and_video: Cannot attach a video to a status that already contains images
       too_many: Cannot attach more than 4 files
   notification_mailer:
     digest:
-      body: 'Yen mikra rezumo di to, quo eventis en %{instance}, depos ke tu laste vizitis en %{since}:'
+      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!
@@ -274,7 +250,6 @@ io:
       public: Publika
       unlisted: Publika, ma ne aperos en publika tempolinei
   stream_entries:
-    click_to_show: Kliktar por montrar
     reblogged: diskonocigita
     sensitive_content: Titiliva kontenajo
   time:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 31dffd5a9995ef18786cd0a5fdb82fc90a5882a8..6d45ece8356c1bdff059d0c7c339580c7297f6e5 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -5,49 +5,64 @@ it:
     about_mastodon_html: Mastodon Ã¨ un social network <em>gratuito e open-source</em>. Un'alternativa <em>decentralizzata</em> alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi &mdash; qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque puÃ² sviluppare un suo server Mastodon e partecipare alla vita del <em>social network</em>.
     about_this: A proposito di questo server
     administered_by: 'Amministrato da:'
-    closed_registrations: Al momento le iscrizioni a questo server sono chiuse. Tuttavia! Puoi provare a cercare un istanza diversa su cui creare un account ed avere accesso alla stessa identica rete di questa.
+    api: API
+    apps: Applicazioni Mobile
+    closed_registrations: Al momento le iscrizioni a questo server sono chiuse. Tuttavia! Puoi provare a cercare un istanza diversa su cui creare un account ed avere accesso alla stessa identica rete.
     contact: Contatti
     contact_missing: Non impostato
     contact_unavailable: N/D
-    description_headline: Cos'Ã¨ %{domain}?
-    domain_count_after: altri server
-    domain_count_before: Connesso a
+    documentation: Documentazione
     extended_description_html: |
       <h3>Un buon posto per le regole</h3>
       <p>La descrizione estesa non Ã¨ ancora stata preparata.</p>
     features:
-      humane_approach_body: Imparando dai fallimenti degli altri networks, Mastodon mira a fare scelte di design etico per combattere l'abuso dei social media.
+      humane_approach_body: Imparando dai fallimenti degli altri networks, Mastodon mira a fare scelte etiche di design per combattere l'abuso dei social media.
       humane_approach_title: Un approccio piÃ¹ umano
-      not_a_product_body: Mastodon non Ã¨ una rete commerciale. Niente pubblicitÃ , niente data mining, nessun giardino murato. Non c'Ã¨ nessuna autoritÃ  centrale.
+      not_a_product_body: Mastodon non Ã¨ una rete commerciale. Niente pubblicitÃ , niente data mining, nessun recinto dorato. Non c'Ã¨ nessuna autoritÃ  centrale.
       not_a_product_title: Tu sei una persona, non un prodotto
       real_conversation_body: Con 65535 caratteri a disposizione, un supporto per i contenuti granulari ed avvisi sui media potrai esprimerti nel modo desiderato.
       real_conversation_title: Creato per conversazioni reali
-      within_reach_body: Apps per iOS, Android ed altre piattaforme, realizzate grazie ad un ecosistema di API adatto agli sviluppatori, ti consentono di poter stare ovunque al passo con i tuoi amici.
+      within_reach_body: Apps per iOS, Android ed altre piattaforme, realizzate grazie ad un ecosistema di API adatto agli sviluppatori, ti consentono di poter stare in contatto con i tuoi amici ovunque ti trovi.
       within_reach_title: Sempre a portata di mano
     generic_description: "%{domain} Ã¨ un server nella rete"
     hosted_on: Mastodon ospitato su %{domain}
     learn_more: Scopri altro
     other_instances: Elenco istanze
+    privacy_policy: Policy su la Privacy
     source_code: Codice sorgente
-    status_count_after: stati
+    status_count_after:
+      one: status
+      other: status
     status_count_before: Che hanno pubblicato
-    user_count_after: utenti
+    terms: Termini di Servizio
+    user_count_after:
+      one: utente
+      other: utenti
     user_count_before: Home di
     what_is_mastodon: Che cos'Ã¨ Mastodon?
   accounts:
+    choices_html: 'Suggerimenti da %{name}:'
     follow: Segui
-    followers: Seguaci
+    followers:
+      one: Seguace
+      other: Seguaci
     following: Segui
+    joined: Dal %{date}
+    link_verified_on: La proprietÃ  di questo link Ã¨ stata controllata il %{date}
     media: Media
     moved_html: "%{name} Ã¨ stato spostato su %{new_profile_link}:"
     network_hidden: Questa informazione non e' disponibile
     nothing_here: Qui non c'Ã¨ nulla!
     people_followed_by: Persone seguite da %{name}
     people_who_follow: Persone che seguono %{name}
-    posts: Posts
+    pin_errors:
+      following: Devi gia seguire la persona che vuoi promuovere
+    posts:
+      one: Toot
+      other: Toot
+    posts_tab_heading: Toot
     posts_with_replies: Toot e risposte
-    remote_follow: Segui da remoto
-    reserved_username: Il nome utente Ã¨ riservato
+    reserved_username: Il nome utente Ã¨ gia stato preso
     roles:
       admin: Amministratore
       bot: Bot
@@ -106,13 +121,10 @@ it:
       moderation_notes: Note di moderazione
       most_recent_activity: AttivitÃ  piÃ¹ recenti
       most_recent_ip: IP piÃ¹ recenti
+      no_limits_imposed: Nessun limite imposto
       not_subscribed: Non sottoscritto
-      order:
-        alphabetic: Alfabetico
-        most_recent: PiÃ¹ recente
-        title: Ordine
       outbox_url: URL outbox
-      perform_full_suspension: Esegui sospensione completa
+      perform_full_suspension: Sospendi
       profile_url: URL profilo
       promote: Promuovi
       protocol: Protocollo
@@ -138,11 +150,12 @@ it:
       shared_inbox_url: URL Inbox Condiviso
       show:
         created_reports: Rapporti creati da questo account
-        report: segnala
         targeted_reports: Rapporti che riguardano questo account
       silence: Silenzia
+      silenced: Silenziato
       statuses: Stati
       subscribe: Sottoscrivi
+      suspended: Sospeso
       title: Account
       unconfirmed_email: Email non confermata
       undo_silenced: Rimuovi silenzia
@@ -158,6 +171,8 @@ it:
         create_custom_emoji: "%{name} ha caricato un nuovo emoji %{target}"
         create_domain_block: "%{name} ha bloccato il dominio %{target}"
         create_email_domain_block: "%{name} ha messo il dominio email %{target} nella blacklist"
+        demote_user: "%{name} ha degradato l'utente %{target}"
+        destroy_custom_emoji: "%{name} ha distrutto l'emoji %{target}"
         destroy_domain_block: "%{name} ha sbloccato il dominio %{target}"
         destroy_email_domain_block: "%{name}ha messo il dominio email %{target} nella whitelist"
         destroy_status: "%{name} ha eliminato lo status di %{target}"
@@ -174,9 +189,13 @@ it:
         resolve_report: "%{name} ha risolto il rapporto %{target}"
         silence_account: "%{name} ha silenziato l'account di %{target}"
         suspend_account: "%{name} ha sospeso l'account di %{target}"
+        unassigned_report: "%{name} report non assegnato %{target}"
         unsilence_account: "%{name} ha de-silenziato l'account di %{target}"
         unsuspend_account: "%{name} ha annullato la sospensione dell'account di %{target}"
         update_custom_emoji: "%{name} ha aggiornato l'emoji %{target}"
+        update_status: "%{name} stato aggiornato da %{target}"
+      deleted_status: "(stato cancellato)"
+      title: Audit log
     custom_emojis:
       by_domain: Dominio
       copied_msg: Creata con successo una copia locale dell'emoji
@@ -202,6 +221,27 @@ it:
       update_failed_msg: Impossibile aggiornare questa emojii
       updated_msg: Emoji aggiornata con successo!
       upload: Carica
+    dashboard:
+      backlog: backlogged jobs
+      config: Configurazione
+      feature_deletions: Cancellazioni di account
+      feature_invites: Link di invito
+      feature_registrations: Registrazioni
+      feature_relay: Ripetitore di federazione
+      features: FunzionalitÃ 
+      hidden_service: Federazione con servizi nascosti
+      open_reports: apri report
+      recent_users: Utenti Recenti
+      search: Ricerca testo intero
+      single_user_mode: Modalita utente singolo
+      software: Software
+      space: Utilizzo dello spazio
+      title: Dashboard
+      total_users: utenti totali
+      trends: Tendenze
+      week_interactions: interazioni per questa settimana
+      week_users_active: attivi questa settimana
+      week_users_new: utenti questa settimana
     domain_blocks:
       add_new: Aggiungi nuovo
       created_msg: Il blocco del dominio sta venendo processato
@@ -209,16 +249,17 @@ it:
       domain: Dominio
       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."
           noop: Nessuno
           silence: Silenzia
           suspend: Sospendi
         title: Nuovo blocco dominio
-      severities:
-        noop: Nessuno
-        silence: Silenzia
-        suspend: Sospendi
-      severity: SeveritÃ 
+      reject_media: Rifiuta file media
+      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
       show:
         affected_accounts:
           one: Interessato un solo account nel database
@@ -228,7 +269,6 @@ it:
           suspend: Annulla la sospensione di tutti gli account esistenti da questo dominio
         title: Annulla il blocco del dominio per %{domain}
         undo: Annulla
-      title: Blocchi dominio
       undo: Annulla
     email_domain_blocks:
       add_new: Aggiungi nuovo
@@ -238,29 +278,47 @@ it:
       domain: Dominio
       new:
         create: Aggiungi dominio
+        title: Nuova voce della lista nera delle email
+      title: Lista nera email
     instances:
-      account_count: Accounts conosciuti
-      domain_name: Dominio
-      reset: Reimposta
-      search: Cerca
       title: Istanze conosciute
     invites:
+      deactivate_all: Disattiva tutto
       filter:
         all: Tutto
         available: Disponibile
         expired: Scaduto
         title: Filtro
       title: Inviti
+    relays:
+      add_new: Aggiungi ripetitore
+      delete: Cancella
+      description_html: Un <strong>ripetitore di federazione</strong> Ã¨ un server che fa da intermediario e scambia grandi quantitÃ  di toot pubblici tra server che si collegano e pubblicano su di esso. <strong>PuÃ² aiutare server piccoli e medi a ottenere contenuti dal fediverse</strong>, che altrimenti riceverebbero solo se i loro utenti locali seguissero altre persone su server remoti.
+      disable: Disabilita
+      disabled: Disabilitato
+      enable: Abilita
+      enable_hint: Dopo l'attivazione, il vostro server riceverÃ  tutti i toot pubblici da questo ripetitore, e inizierÃ  a inviargli i suoi toot pubblici.
+      enabled: Abilitato
+      inbox_url: Url Relay
+      pending: In attesa dell'approvazione del ripetitore
+      save_and_enable: Salva e attiva
+      setup: Crea una connessione con un ripetitore
+      status: Status
+      title: Ripetitori
+    report_notes:
+      created_msg: Nota rapporto creata!
+      destroyed_msg: Nota rapporto cancellata!
     reports:
       account:
         note: note
+        report: rapporto
       action_taken_by: Azione intrapresa da
       are_you_sure: Sei sicuro?
       assign_to_self: Assegna a me
       assigned: Moderatore assegnato
       comment:
         none: Nessuno
-      id: ID
+      created_at: Segnalato
       mark_as_resolved: Segna come risolto
       mark_as_unresolved: Segna come non risolto
       notes:
@@ -268,30 +326,42 @@ it:
         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...
       reopen: Riapri rapporto
       report: 'Rapporto #%{id}'
-      report_contents: Contenuti
+      reported_account: Account segnalato
       reported_by: Inviato da
       resolved: Risolto
-      silence_account: Silenzia account
+      resolved_msg: Rapporto risolto!
       status: Stato
-      suspend_account: Sospendi account
-      target: Obbiettivo
+      title: Rapporti
       unassign: Non assegnare
       unresolved: Non risolto
       updated_at: Aggiornato
-      view: Mostra
     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:
         username: Nome utente del contatto
+      custom_css:
+        desc_html: Modifica l'aspetto con il CSS caricato in ogni pagina
+        title: CSS personalizzato
+      hero:
+        desc_html: Mostrata nella pagina iniziale. Almeno 600x100 px consigliati. Se non impostata, sarÃ  usato il thumbnail dell'istanza
+        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 questa istanza ha incontrato nella fediverse
         title: Pubblica elenco di istanze scoperte
+      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
       registrations:
         closed_message:
           desc_html: Mostrato nella pagina iniziale quando le registrazioni sono chiuse. Puoi usare tag HTML
@@ -311,11 +381,23 @@ it:
       show_staff_badge:
         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 istanza
+      site_description_extended:
+        desc_html: Un posto adatto per pubblicare regole di comportamento, linee guida e altre cose specifiche della vostra istanza. 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 dell'istanza.
+        title: Breve descrizione dell'istanza
       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 istanza
+      thumbnail:
+        desc_html: Usato per anteprime tramite OpenGraph e API. 1200x630px consigliati
+        title: Thumbnail dell'istanza
       timeline_preview:
+        desc_html: Mostra la timeline pubblica sulla pagina iniziale
         title: Anteprima timeline
       title: Impostazioni sito
     statuses:
@@ -328,6 +410,7 @@ it:
       media:
         title: Media
       no_media: Nessun media
+      no_status_selected: Nessun status Ã¨ stato modificato perchÃ© nessuno era stato selezionato
       title: Gli status dell'account
       with_media: con media
     subscriptions:
@@ -359,7 +442,7 @@ it:
     didnt_get_confirmation: Non hai ricevuto le istruzioni di conferma?
     forgot_password: Hai dimenticato la tua password?
     login: Entra
-    logout: Sloggati
+    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: o
@@ -379,6 +462,7 @@ it:
     post_follow:
       close: Oppure puoi chiudere questa finestra.
       return: Mostra il profilo dell'utente
+      web: Vai al web
     title: Segui %{acct}
   datetime:
     distance_in_words:
@@ -408,7 +492,10 @@ it:
     '422':
       content: Verifica di sicurezza non riuscita. Stai bloccando i cookies?
       title: Verifica di sicurezza non riuscita
-    noscript_html: Per usare l'interfaccia web di Mastodon dovi abilitare JavaScript. In alternativa puoi provare una delle <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">app native</a> per Mastodon per la tua piattaforma.
+    '500':
+      content: Siamo spiacenti, ma qualcosa non ha funzionato dal nostro lato.
+      title: Questa pagina non Ã¨ corretta
+    noscript_html: Per usare l'interfaccia web di Mastodon dovi abilitare JavaScript. In alternativa puoi provare una delle <a href="%{apps_path}">app native</a> per Mastodon per la tua piattaforma.
   exports:
     archive_takeout:
       date: Data
@@ -422,16 +509,36 @@ it:
     follows: Stai seguendo
     mutes: Stai silenziando
     storage: Archiviazione media
+  filters:
+    contexts:
+      home: Timeline home
+      notifications: Notifiche
+      public: Timeline pubbliche
+      thread: Conversazioni
+    edit:
+      title: Modifica filtro
+    errors:
+      invalid_context: Contesto mancante o non valido
+    index:
+      delete: Cancella
+      title: Filtri
+    new:
+      title: Aggiungi filtro
   followers:
     domain: Dominio
     explanation_html: Se vuoi garantire la privacy dei tuoi status, devi sapere chi ti sta seguendo. <strong>I tuoi status privati vengono inviati a tutte le istanze su cui hai dei seguaci</strong>. Puoi controllare chi sono i tuoi seguaci, ed eliminarli se non hai fiducia che la tua privacy venga rispettata dallo staff o dal software di quelle istanze.
     followers_count: Numero di seguaci
+    lock_link: Blocca il tuo account
     purge: Elimina dai seguaci
     true_privacy_html: Tieni presente che <strong>l'effettiva riservatezza si puÃ² ottenere solo con la crittografia end-to-end</strong>.
     unlocked_warning_html: Chiunque puÃ² seguirti per vedere immediatamente i tuoi status privati. %{lock_link} per poter esaminare e respingere gli utenti che vogliono seguirti.
+    unlocked_warning_title: Il tuo account non Ã¨ bloccato
+  footer:
+    developers: Sviluppatori
+    more: Altroâ€¦
   generic:
     changes_saved_msg: Modifiche effettuate con successo!
-    powered_by: offerto da %{link}
+    copy: Copia
     save_changes: Salva modifiche
     validation_errors:
       one: Qualcosa ancora non va bene! Per favore, controlla l'errore qui sotto
@@ -457,7 +564,9 @@ it:
       '86400': 1 giorno
     expires_in_prompt: Mai
     generate: Genera
+    invited_by: 'Sei stato invitato da:'
     max_uses:
+      one: un uso
       other: "%{count} utilizzi"
     max_uses_prompt: Nessun limite
     prompt: Genera e condividi dei link ad altri per garantire l'accesso a questa istanza
@@ -465,8 +574,6 @@ it:
       expires_at: Scade
       uses: Utilizzi
     title: Invita persone
-  landing_strip_html: "<strong>%{name}</strong> Ã¨ un utente su %{link_to_root_path}. Puoi seguirlo o interagire con lui se possiedi un account ovunque nel fediverse."
-  landing_strip_signup_html: Se non possiedi un account, puoi <a href="%{sign_up_path}">iscriverti qui</a>.
   lists:
     errors:
       limit: Hai raggiunto il numero massimo di liste
@@ -540,6 +647,7 @@ it:
   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:'
   remote_unfollow:
@@ -551,12 +659,29 @@ it:
     browsers:
       blackberry: Blackberry
       chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
       generic: Browser sconosciuto
+      ie: Internet Explorer
+      opera: Opera
+      safari: Safari
     current_session: Sessione corrente
     description: "%{browser} su %{platform}"
     explanation: Questi sono i browser da cui attualmente Ã¨ avvenuto l'accesso al tuo account 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: piattaforma sconosciuta
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     title: Sessioni
   settings:
     authorized_apps: Applicazioni autorizzate
@@ -595,6 +720,7 @@ it:
       private: Un toot non pubblico non puÃ² essere fissato in cima
       reblog: Un toot condiviso non puÃ² essere fissato in cima
     show_more: Mostra di piÃ¹
+    sign_in_to_participate: Accedi per partecipare alla conversazione
     visibilities:
       private: Mostra solo ai tuoi seguaci
       private_long: Mostra solo ai seguaci
@@ -603,7 +729,6 @@ it:
       unlisted: Pubblico, ma non visibile sulla timeline pubblica
       unlisted_long: Tutti lo possono vedere, ma non compare nelle timeline pubbliche
   stream_entries:
-    click_to_show: Clicca per mostrare
     pinned: Toot fissato in cima
     reblogged: condiviso
     sensitive_content: Materiale sensibile
@@ -612,6 +737,7 @@ it:
   themes:
     contrast: Contrasto elevato
     default: Mastodon
+    mastodon-light: Mastodon (chiaro)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
@@ -626,10 +752,11 @@ it:
     instructions_html: "<strong>Scannerizza questo QR code con Google Authenticator o un'app TOTP simile sul tuo telefono</strong>. Da ora in poi, quell'applicazione genererÃ  codici da inserire necessariamente per eseguire l'accesso."
     lost_recovery_codes: I codici di recupero ti permettono di accedere al tuo account se perdi il telefono. Se hai perso i tuoi codici di recupero, puoi rigenerarli qui. Quelli vecchi saranno annullati.
     manual_instructions: 'Se non puoi scannerizzare il QR code e hai bisogno di inserirlo manualmente, questo Ã¨ il codice segreto in chiaro:'
+    recovery_codes: Codici di recupero del backup
     recovery_codes_regenerated: I codici di recupero sono stati rigenerati
     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.
     setup: Configura
-    wrong_code: Il codice inserito non Ã¨ corretto! Assicurati che l'orario del server e l'orario del dispotivo siano corretti.
+    wrong_code: Il codice inserito non Ã¨ corretto! Assicurati che l'orario del server e l'orario del dispositivo siano corretti.
   user_mailer:
     backup_ready:
       explanation: Hai richiesto un backup completo del tuo account Mastodon. Ãˆ pronto per essere scaricato!
@@ -645,7 +772,6 @@ it:
       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_bridge_html: Se vieni da Twitter, puoi trovare i tuoi amici su Mastodon usando la<a href="%{bridge_url}">app bridge</a>. Ma funziona solo se anche loro la usano!
       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!
@@ -653,6 +779,11 @@ it:
       tips: Suggerimenti
       title: Benvenuto a bordo, %{name}!
   users:
+    follow_limit_reached: Non puoi seguire piÃ¹ di %{limit} persone
     invalid_email: L'indirizzo email inserito non Ã¨ valido
     invalid_otp_token: Codice d'accesso non valido
     seamless_external_login: Ti sei collegato per mezzo di un servizio esterno, quindi le impostazioni di email e password non sono disponibili.
+    signed_in_as: 'Hai effettuato l''accesso come:'
+  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 0e30a39e74c658f9560e6463fa45dd77cb3c4a40..7ccb2f21c52fb5a8d86c153261f14e3485ee346c 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -5,20 +5,20 @@ ja:
     about_mastodon_html: Mastodon ã¯ã€ã‚ªãƒ¼ãƒ—ãƒ³ãªã‚¦ã‚§ãƒ–ãƒ—ãƒãƒˆã‚³ãƒ«ã‚’æŽ¡ç”¨ã—ãŸã€è‡ªç”±ã§ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãªã‚½ãƒ¼ã‚·ãƒ£ãƒ«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚é›»åãƒ¡ãƒ¼ãƒ«ã®ã‚ˆã†ãªåˆ†æ•£åž‹ã®ä»•çµ„ã¿ã‚’æŽ¡ã£ã¦ã„ã¾ã™ã€‚
     about_this: è©³ç´°æƒ…å ±
     administered_by: 'ç®¡ç†è€…:'
+    api: API
+    apps: ã‚¢ãƒ—ãƒª
     closed_registrations: ç¾åœ¨ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§ã®æ–°è¦ç™»éŒ²ã¯å—ã‘ä»˜ã‘ã¦ã„ã¾ã›ã‚“ã€‚ã—ã‹ã—ã€ä»–ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ä½œæˆã—ã¦ã‚‚å…¨ãåŒã˜ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«å‚åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
     contact: é€£çµ¡å…ˆ
     contact_missing: æœªè¨å®š
     contact_unavailable: N/A
-    description_headline: "%{domain} ã¨ã¯ï¼Ÿ"
-    domain_count_after: å€‹ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹
-    domain_count_before: æŽ¥ç¶šä¸
+    documentation: ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆ
     extended_description_html: |
       <h3>ãƒ«ãƒ¼ãƒ«ã‚’æ›¸ãã®ã«é©ã—ãŸå ´æ‰€</h3>
       <p>è©³ç´°èª¬æ˜ŽãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚</p>
     features:
       humane_approach_body: ä»–ã® SNS ã®å¤±æ•—ã‹ã‚‰å¦ã³ã€Mastodon ã¯ã‚½ãƒ¼ã‚·ãƒ£ãƒ«ãƒ¡ãƒ‡ã‚£ã‚¢ãŒèª¤ã£ãŸä½¿ã„æ–¹ã‚’ã•ã‚Œã‚‹ã“ã¨ã®ç„¡ã„ã‚ˆã†ã«å€«ç†çš„ãªè¨è¨ˆã‚’ç›®æŒ‡ã—ã¦ã„ã¾ã™ã€‚
       humane_approach_title: ã‚ˆã‚Šæ€ã„ã‚„ã‚Šã®ã‚ã‚‹è¨è¨ˆ
-      not_a_product_body: Mastodon ã¯å–¶åˆ©çš„ãª SNS ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚åºƒå‘Šã‚„ã€ãƒ‡ãƒ¼ã‚¿ã®åŽé›†ãƒ»è§£æžã¯ç„¡ãã€ã¾ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã®å›²ã„è¾¼ã¿ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã“ã«ã¯ä¸å¤®æ¨©åŠ›ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚
+      not_a_product_body: Mastodon ã¯å–¶åˆ©çš„ãª SNS ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚åºƒå‘Šã‚„ã€ãƒ‡ãƒ¼ã‚¿ã®åŽé›†ãƒ»è§£æžã«ã‚ˆã‚‹ã‚¿ãƒ¼ã‚²ãƒ†ã‚£ãƒ³ã‚°ã¯ç„¡ãã€ã¾ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã®å›²ã„è¾¼ã¿ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ã“ã“ã«ã¯ä¸å¤®æ¨©åŠ›ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚
       not_a_product_title: ã‚ãªãŸã¯äººé–“ã§ã‚ã‚Šã€å•†å“ã§ã¯ã‚ã‚Šã¾ã›ã‚“
       real_conversation_body: å¥½ããªã‚ˆã†ã«æ›¸ã‘ã‚‹500æ–‡å—ã¾ã§ã®æŠ•ç¨¿ã‚„ã€æ–‡ç« ã‚„ãƒ¡ãƒ‡ã‚£ã‚¢ã®å†…å®¹ã«è¦å‘Šã‚’ã¤ã‘ã‚‰ã‚Œã‚‹æ©Ÿèƒ½ã§ã€æ€ã„é€šã‚Šã«è‡ªåˆ†è‡ªèº«ã‚’è¡¨ç¾ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
       real_conversation_title: æœ¬å½“ã®ã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã®ãŸã‚ã«
@@ -28,25 +28,41 @@ ja:
     hosted_on: Mastodon hosted on %{domain}
     learn_more: ã‚‚ã£ã¨è©³ã—ã
     other_instances: ä»–ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹
+    privacy_policy: ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼
     source_code: ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰
-    status_count_after: ãƒˆã‚¥ãƒ¼ãƒˆ
+    status_count_after:
+      one: ãƒˆã‚¥ãƒ¼ãƒˆ
+      other: ãƒˆã‚¥ãƒ¼ãƒˆ
     status_count_before: ãƒˆã‚¥ãƒ¼ãƒˆæ•°
-    user_count_after: äºº
+    terms: åˆ©ç”¨è¦ç´„
+    user_count_after:
+      one: äºº
+      other: äºº
     user_count_before: ãƒ¦ãƒ¼ã‚¶ãƒ¼æ•°
     what_is_mastodon: Mastodon ã¨ã¯ï¼Ÿ
   accounts:
+    choices_html: "%{name} ã«ã‚ˆã‚‹ãŠã™ã™ã‚:"
     follow: ãƒ•ã‚©ãƒãƒ¼
-    followers: ãƒ•ã‚©ãƒãƒ¯ãƒ¼
+    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} ã•ã‚“ã‚’ãƒ•ã‚©ãƒãƒ¼ä¸ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ"
-    posts: ãƒˆã‚¥ãƒ¼ãƒˆ
+    pin_errors:
+      following: ãŠã™ã™ã‚ã—ãŸã„äººã¯ã‚ãªãŸãŒæ—¢ã«ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™
+    posts:
+      one: ãƒˆã‚¥ãƒ¼ãƒˆ
+      other: ãƒˆã‚¥ãƒ¼ãƒˆ
+    posts_tab_heading: ãƒˆã‚¥ãƒ¼ãƒˆ
     posts_with_replies: ãƒˆã‚¥ãƒ¼ãƒˆã¨è¿”ä¿¡
-    remote_follow: ãƒªãƒ¢ãƒ¼ãƒˆãƒ•ã‚©ãƒãƒ¼
     reserved_username: ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¯äºˆç´„ã•ã‚Œã¦ã„ã¾ã™
     roles:
       admin: Admin
@@ -54,6 +70,9 @@ ja:
       moderator: Mod
     unfollow: ãƒ•ã‚©ãƒãƒ¼è§£é™¤
   admin:
+    account_actions:
+      action: ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’å®Ÿè¡Œ
+      title: "%{acct}ã•ã‚“ã«å¯¾ã—ã¦ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’å®Ÿè¡Œ"
     account_moderation_notes:
       create: æ›¸ãè¾¼ã‚€
       created_msg: ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ¡ãƒ¢ã‚’æ›¸ãè¾¼ã¿ã¾ã—ãŸï¼
@@ -73,6 +92,7 @@ ja:
       confirm: ç¢ºèª
       confirmed: ç¢ºèªæ¸ˆã¿
       confirming: ç¢ºèªä¸
+      deleted: å‰Šé™¤æ¸ˆã¿
       demote: é™æ ¼
       disable: ç„¡åŠ¹åŒ–
       disable_two_factor_authentication: äºŒæ®µéšŽèªè¨¼ã‚’ç„¡åŠ¹ã«ã™ã‚‹
@@ -88,8 +108,11 @@ ja:
       followers: ãƒ•ã‚©ãƒãƒ¯ãƒ¼æ•°
       followers_url: Followers URL
       follows: ãƒ•ã‚©ãƒãƒ¼æ•°
+      header: ãƒ˜ãƒƒãƒ€ãƒ¼
       inbox_url: Inbox URL
+      invited_by: æ‹›å¾…ã—ãŸäºº
       ip: IP
+      joined: ç™»éŒ²æ—¥
       location:
         all: ã™ã¹ã¦
         local: ãƒãƒ¼ã‚«ãƒ«
@@ -99,20 +122,18 @@ ja:
       media_attachments: æ·»ä»˜ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢
       memorialize: è¿½æ‚¼ã‚¢ã‚«ã‚¦ãƒ³ãƒˆåŒ–
       moderation:
+        active: ã‚¢ã‚¯ãƒ†ã‚£ãƒ–
         all: ã™ã¹ã¦
-        silenced: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ä¸
-        suspended: åœæ¢ä¸
+        silenced: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹æ¸ˆã¿
+        suspended: åœæ¢æ¸ˆã¿
         title: ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³
       moderation_notes: ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ¡ãƒ¢
       most_recent_activity: ç›´è¿‘ã®æ´»å‹•
       most_recent_ip: ç›´è¿‘ã®IP
+      no_limits_imposed: åˆ¶é™ãªã—
       not_subscribed: è³¼èªã—ã¦ã„ãªã„
-      order:
-        alphabetic: ã‚¢ãƒ«ãƒ•ã‚¡ãƒ™ãƒƒãƒˆé †
-        most_recent: ç›´è¿‘ã®æ´»å‹•é †
-        title: é †åº
       outbox_url: Outbox URL
-      perform_full_suspension: å®Œå…¨ã«æ´»å‹•åœæ¢ã•ã›ã‚‹
+      perform_full_suspension: æ´»å‹•ã‚’å®Œå…¨ã«åœæ¢ã•ã›ã‚‹
       profile_url: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«URL
       promote: æ˜‡æ ¼
       protocol: ãƒ—ãƒãƒˆã‚³ãƒ«
@@ -120,6 +141,7 @@ ja:
       push_subscription_expires: PuSHè³¼èªæœŸé™
       redownload: ã‚¢ãƒã‚¿ãƒ¼ã®æ›´æ–°
       remove_avatar: ã‚¢ã‚¤ã‚³ãƒ³ã‚’å‰Šé™¤
+      remove_header: ãƒ˜ãƒƒãƒ€ãƒ¼ã‚’å‰Šé™¤
       resend_confirmation:
         already_confirmed: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã¯ç¢ºèªæ¸ˆã¿ã§ã™
         send: ç¢ºèªãƒ¡ãƒ¼ãƒ«ã‚’å†é€
@@ -135,30 +157,34 @@ ja:
         user: ãƒ¦ãƒ¼ã‚¶ãƒ¼
       salmon_url: Salmon URL
       search: æ¤œç´¢
-      shared_inbox_url: Shared Inbox URL
+      shared_inbox_url: Shared inbox URL
       show:
         created_reports: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã§ä½œã‚‰ã‚ŒãŸãƒ¬ãƒãƒ¼ãƒˆ
-        report: ãƒ¬ãƒãƒ¼ãƒˆ
         targeted_reports: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã¤ã„ã¦ã®ãƒ¬ãƒãƒ¼ãƒˆ
       silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
+      silenced: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹æ¸ˆã¿
       statuses: ãƒˆã‚¥ãƒ¼ãƒˆæ•°
       subscribe: è³¼èªã™ã‚‹
+      suspended: åœæ¢æ¸ˆã¿
       title: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ
       unconfirmed_email: ç¢ºèªå¾…ã¡ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹
       undo_silenced: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã‹ã‚‰æˆ»ã™
       undo_suspension: åœæ¢ã‹ã‚‰æˆ»ã™
       unsubscribe: è³¼èªã®è§£é™¤
       username: ãƒ¦ãƒ¼ã‚¶ãƒ¼å
+      warn: è¦å‘Š
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} ã•ã‚“ãŒãƒ¬ãƒãƒ¼ãƒˆ %{target} ã‚’è‡ªèº«ã®æ‹…å½“ã«å‰²ã‚Šå½“ã¦ã¾ã—ãŸ"
         change_email_user: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’å¤‰æ›´ã—ã¾ã—ãŸ"
         confirm_user: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’ç¢ºèªæ¸ˆã¿ã«ã—ã¾ã—ãŸ"
+        create_account_warning: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã«è¦å‘Šãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ã¾ã—ãŸ"
         create_custom_emoji: "%{name} ã•ã‚“ãŒã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å— %{target} ã‚’è¿½åŠ ã—ã¾ã—ãŸ"
         create_domain_block: "%{name} ã•ã‚“ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ %{target} ã‚’ãƒ–ãƒãƒƒã‚¯ã—ã¾ã—ãŸ"
         create_email_domain_block: "%{name} ã•ã‚“ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ %{target} ã‚’ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ç”¨ãƒ–ãƒ©ãƒƒã‚¯ãƒªã‚¹ãƒˆã«è¿½åŠ ã—ã¾ã—ãŸ"
         demote_user: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã‚’é™æ ¼ã—ã¾ã—ãŸ"
+        destroy_custom_emoji: "%{name} ã•ã‚“ãŒã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å— %{target} ã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
         destroy_domain_block: "%{name} ã•ã‚“ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ %{target} ã®ãƒ–ãƒãƒƒã‚¯ã‚’å¤–ã—ã¾ã—ãŸ"
         destroy_email_domain_block: "%{name} ã•ã‚“ãŒãƒ‰ãƒ¡ã‚¤ãƒ³ %{target} ã‚’ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ç”¨ãƒ–ãƒ©ãƒƒã‚¯ãƒªã‚¹ãƒˆã‹ã‚‰å¤–ã—ã¾ã—ãŸ"
         destroy_status: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®æŠ•ç¨¿ã‚’å‰Šé™¤ã—ã¾ã—ãŸ"
@@ -180,6 +206,7 @@ ja:
         unsuspend_account: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®åœæ¢ã‚’è§£é™¤ã—ã¾ã—ãŸ"
         update_custom_emoji: "%{name} ã•ã‚“ãŒã‚«ã‚¹ã‚¿ãƒ çµµæ–‡å— %{target} ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
         update_status: "%{name} ã•ã‚“ãŒ %{target} ã•ã‚“ã®æŠ•ç¨¿ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
+      deleted_status: "(å‰Šé™¤æ¸ˆ)"
       title: æ“ä½œå±¥æ´
     custom_emojis:
       by_domain: ãƒ‰ãƒ¡ã‚¤ãƒ³
@@ -206,8 +233,30 @@ ja:
       update_failed_msg: çµµæ–‡å—ã‚’æ›´æ–°ã§ãã¾ã›ã‚“ã§ã—ãŸ
       updated_msg: çµµæ–‡å—ã®æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸï¼
       upload: ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰
+    dashboard:
+      backlog: æœªå‡¦ç†ã®ã‚¸ãƒ§ãƒ–
+      config: æ§‹æˆ
+      feature_deletions: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆå‰Šé™¤
+      feature_invites: æ‹›å¾…ãƒªãƒ³ã‚¯
+      feature_profile_directory: ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª
+      feature_registrations: æ–°è¦ç™»éŒ²
+      feature_relay: é€£åˆãƒªãƒ¬ãƒ¼
+      features: æ©Ÿèƒ½
+      hidden_service: ç§˜åŒ¿ã‚µãƒ¼ãƒ“ã‚¹ã¨ã®é€£åˆ
+      open_reports: æœªè§£æ±ºã®ãƒ¬ãƒãƒ¼ãƒˆ
+      recent_users: æœ€è¿‘ç™»éŒ²ã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼
+      search: å…¨æ–‡æ¤œç´¢
+      single_user_mode: ã‚·ãƒ³ã‚°ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ãƒ¢ãƒ¼ãƒ‰
+      software: ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢
+      space: ãƒ‡ã‚£ã‚¹ã‚¯ä½¿ç”¨é‡
+      title: ãƒ€ãƒƒã‚·ãƒ¥ãƒœãƒ¼ãƒ‰
+      total_users: å…¨ãƒ¦ãƒ¼ã‚¶ãƒ¼
+      trends: ãƒˆãƒ¬ãƒ³ãƒ‰ã‚¿ã‚°
+      week_interactions: ä»Šé€±äº¤æµã®ã‚ã£ãŸå›žæ•°
+      week_users_active: ä»Šé€±æ´»å‹•ã—ãŸäººæ•°
+      week_users_new: ä»Šé€±ç™»éŒ²ã—ãŸäººæ•°
     domain_blocks:
-      add_new: æ–°è¦è¿½åŠ 
+      add_new: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’è¿½åŠ 
       created_msg: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯å‡¦ç†ã‚’å®Œäº†ã—ã¾ã—ãŸ
       destroyed_msg: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’å¤–ã—ã¾ã—ãŸ
       domain: ãƒ‰ãƒ¡ã‚¤ãƒ³
@@ -215,18 +264,20 @@ ja:
         create: ãƒ–ãƒãƒƒã‚¯ã‚’ä½œæˆ
         hint: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã¯ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ä¸ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆé …ç›®ã®ä½œæˆã‚’å¦¨ã’ã¾ã›ã‚“ãŒã€é¡ã£ã¦è‡ªå‹•çš„ã«æŒ‡å®šã•ã‚ŒãŸãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚’ãã‚Œã‚‰ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«é©ç”¨ã—ã¾ã™ã€‚
         severity:
-          desc_html: "<strong>ã‚µã‚¤ãƒ¬ãƒ³ã‚¹</strong>ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ãªã„äººã‹ã‚‰éš ã—ã¾ã™ã€‚<strong>åœæ¢</strong>ã¯ãã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã€ãƒ¡ãƒ‡ã‚£ã‚¢ã€ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ãƒ‡ãƒ¼ã‚¿ã‚’ã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã€‚ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹’å¦ã¯<strong>ãªã—</strong>ã‚’ä½¿ã„ã¾ã™ã€‚"
+          desc_html: "<strong>ã‚µã‚¤ãƒ¬ãƒ³ã‚¹</strong>ã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ãªã„äººã‹ã‚‰éš ã—ã¾ã™ã€‚<strong>åœæ¢</strong>ã¯ãã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã€ãƒ¡ãƒ‡ã‚£ã‚¢ã€ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ãƒ‡ãƒ¼ã‚¿ã‚’ã™ã¹ã¦å‰Šé™¤ã—ã¾ã™ã€‚ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ‹’å¦ã—ãŸã„ã ã‘ã®å ´åˆã¯<strong>ãªã—</strong>ã‚’ä½¿ã„ã¾ã™ã€‚"
           noop: ãªã—
           silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
           suspend: åœæ¢
         title: æ–°è¦ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯
       reject_media: ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ‹’å¦
       reject_media_hint: ãƒãƒ¼ã‚«ãƒ«ã«ä¿å˜ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã—ã€ä»Šå¾Œã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã‚’æ‹’å¦ã—ã¾ã™ã€‚åœæ¢ã¨ã¯ç„¡é–¢ä¿‚ã§ã™
-      severities:
-        noop: ãªã—
-        silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
-        suspend: åœæ¢
-      severity: æ·±åˆ»åº¦
+      reject_reports: ãƒ¬ãƒãƒ¼ãƒˆã‚’æ‹’å¦
+      reject_reports_hint: ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‹ã‚‰ã®ãƒ¬ãƒãƒ¼ãƒˆã‚’ã™ã¹ã¦ç„¡è¦–ã—ã¾ã™ã€‚åœæ¢ã¨ã¯ç„¡é–¢ä¿‚ã§ã™
+      rejecting_media: ãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ‹’å¦ä¸
+      rejecting_reports: ãƒ¬ãƒãƒ¼ãƒˆã‚’æ‹’å¦ä¸
+      severity:
+        silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ä¸
+        suspend: åœæ¢ä¸
       show:
         affected_accounts:
           one: ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ä¸ã®ä¸€ã¤ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«å½±éŸ¿ã—ã¾ã™
@@ -236,7 +287,6 @@ ja:
           suspend: ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‹ã‚‰ã®å˜åœ¨ã™ã‚‹ã™ã¹ã¦ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®åœæ¢ã‚’æˆ»ã™
         title: "%{domain}ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯ã‚’æˆ»ã™"
         undo: å…ƒã«æˆ»ã™
-      title: ãƒ‰ãƒ¡ã‚¤ãƒ³ãƒ–ãƒãƒƒã‚¯
       undo: å…ƒã«æˆ»ã™
     email_domain_blocks:
       add_new: æ–°è¦è¿½åŠ 
@@ -248,19 +298,47 @@ ja:
         create: ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’è¿½åŠ 
         title: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ç”¨ãƒ–ãƒ©ãƒƒã‚¯ãƒªã‚¹ãƒˆæ–°è¦è¿½åŠ 
       title: ãƒ¡ãƒ¼ãƒ«ãƒ–ãƒ©ãƒƒã‚¯ãƒªã‚¹ãƒˆ
+    followers:
+      back_to_account: æˆ»ã‚‹
+      title: "%{acct}ã•ã‚“ã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼"
     instances:
-      account_count: æ—¢çŸ¥ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆæ•°
-      domain_name: ãƒ‰ãƒ¡ã‚¤ãƒ³å
-      reset: ãƒªã‚»ãƒƒãƒˆ
-      search: æ¤œç´¢
+      delivery_available: é…é€å¯èƒ½
+      known_accounts:
+        one: æ—¢çŸ¥ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆæ•° %{count}
+        other: æ—¢çŸ¥ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆæ•° %{count}
+      moderation:
+        all: ã™ã¹ã¦
+        limited: åˆ¶é™ã‚ã‚Š
+        title: ãƒ¢ãƒ‡ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³
       title: æ—¢çŸ¥ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹
+      total_blocked_by_us: ãƒ–ãƒãƒƒã‚¯åˆè¨ˆ
+      total_followed_by_them: è¢«ãƒ•ã‚©ãƒãƒ¼åˆè¨ˆ
+      total_followed_by_us: ãƒ•ã‚©ãƒãƒ¼åˆè¨ˆ
+      total_reported: ãƒ¬ãƒãƒ¼ãƒˆåˆè¨ˆ
+      total_storage: æ·»ä»˜ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢
     invites:
+      deactivate_all: ã™ã¹ã¦ç„¡åŠ¹åŒ–
       filter:
         all: ã™ã¹ã¦
         available: ä½¿ç”¨å¯èƒ½
         expired: æœŸé™åˆ‡ã‚Œ
         title: ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼
       title: æ‹›å¾…
+    relays:
+      add_new: ãƒªãƒ¬ãƒ¼ã‚’è¿½åŠ 
+      delete: å‰Šé™¤
+      description_html: "<strong>é€£åˆãƒªãƒ¬ãƒ¼</strong>ã¨ã¯ã€ç™»éŒ²ã—ã¦ã„ã‚‹ã‚µãƒ¼ãƒãƒ¼é–“ã®å…¬é–‹ãƒˆã‚¥ãƒ¼ãƒˆã‚’ä»²ä»‹ã™ã‚‹ã‚µãƒ¼ãƒãƒ¼ã§ã™ã€‚<strong>ä¸å°è¦æ¨¡ã®ã‚µãƒ¼ãƒãƒ¼ãŒé€£åˆã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã‚’è¦‹ã¤ã‘ã‚‹ã®ã‚’åŠ©ã‘ã¾ã™ã€‚</strong>ã“ã‚Œã‚’ä½¿ç”¨ã—ãªã„å ´åˆã€ãƒãƒ¼ã‚«ãƒ«ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒãƒªãƒ¢ãƒ¼ãƒˆãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’æ‰‹å‹•ã§ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
+      disable: ç„¡åŠ¹åŒ–
+      disabled: ç„¡åŠ¹
+      enable: æœ‰åŠ¹åŒ–
+      enable_hint: æœ‰åŠ¹ã«ã™ã‚‹ã¨ã€ãƒªãƒ¬ãƒ¼ã‹ã‚‰å…¨ã¦ã®å…¬é–‹ãƒˆã‚¥ãƒ¼ãƒˆã‚’å—ä¿¡ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã€ã¾ãŸã“ã®ã‚µãƒ¼ãƒãƒ¼ã®å…¨ã¦ã®å…¬é–‹ãƒˆã‚¥ãƒ¼ãƒˆã‚’ãƒªãƒ¬ãƒ¼ã«é€ä¿¡ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚
+      enabled: æœ‰åŠ¹
+      inbox_url: ãƒªãƒ¬ãƒ¼URL
+      pending: ãƒªãƒ¬ãƒ¼ã‚µãƒ¼ãƒãƒ¼ã®æ‰¿èªå¾…ã¡ã§ã™
+      save_and_enable: ä¿å˜ã—ã¦æœ‰åŠ¹ã«ã™ã‚‹
+      setup: ãƒªãƒ¬ãƒ¼æŽ¥ç¶šã‚’è¨å®šã™ã‚‹
+      status: ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹
+      title: ãƒªãƒ¬ãƒ¼
     report_notes:
       created_msg: ãƒ¬ãƒãƒ¼ãƒˆãƒ¡ãƒ¢ã‚’æ›¸ãè¾¼ã¿ã¾ã—ãŸï¼
       destroyed_msg: ãƒ¬ãƒãƒ¼ãƒˆãƒ¡ãƒ¢ã‚’å‰Šé™¤ã—ã¾ã—ãŸï¼
@@ -275,7 +353,6 @@ ja:
       comment:
         none: ãªã—
       created_at: ãƒ¬ãƒãƒ¼ãƒˆæ—¥æ™‚
-      id: ID
       mark_as_resolved: è§£æ±ºæ¸ˆã¿ã¨ã—ã¦ãƒžãƒ¼ã‚¯
       mark_as_unresolved: æœªè§£æ±ºã¨ã—ã¦å†ã³é–‹ã
       notes:
@@ -286,20 +363,15 @@ ja:
         placeholder: ã©ã®ã‚ˆã†ãªæŽªç½®ãŒå–ã‚‰ã‚ŒãŸã‹ã€ã¾ãŸã¯é–¢é€£ã™ã‚‹æ›´æ–°ã‚’è¨˜è¿°ã—ã¦ãã ã•ã„â€¦
       reopen: å†ã³é–‹ã
       report: ãƒ¬ãƒãƒ¼ãƒˆ#%{id}
-      report_contents: å†…å®¹
       reported_account: å ±å‘Šå¯¾è±¡ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ
       reported_by: å ±å‘Šè€…
       resolved: è§£æ±ºæ¸ˆã¿
       resolved_msg: ãƒ¬ãƒãƒ¼ãƒˆã‚’è§£æ±ºæ¸ˆã¿ã«ã—ã¾ã—ãŸï¼
-      silence_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
       status: ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹
-      suspend_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’åœæ¢
-      target: ã‚¿ãƒ¼ã‚²ãƒƒãƒˆ
       title: ãƒ¬ãƒãƒ¼ãƒˆ
       unassign: æ‹…å½“ã‚’å¤–ã™
       unresolved: æœªè§£æ±º
       updated_at: æ›´æ–°æ—¥æ™‚
-      view: è¡¨ç¤º
     settings:
       activity_api_enabled:
         desc_html: é€±ã”ã¨ã®ãƒãƒ¼ã‚«ãƒ«ã«æŠ•ç¨¿ã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆæ•°ã€ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªãƒ¦ãƒ¼ã‚¶ãƒ¼æ•°ã€æ–°è¦ç™»éŒ²è€…æ•°
@@ -310,15 +382,24 @@ ja:
       contact_information:
         email: ãƒ“ã‚¸ãƒã‚¹ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹
         username: é€£çµ¡å…ˆã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å
+      custom_css:
+        desc_html: å…¨ãƒšãƒ¼ã‚¸ã«é©ç”¨ã•ã‚Œã‚‹CSSã®ç·¨é›†
+        title: ã‚«ã‚¹ã‚¿ãƒ CSS
       hero:
-        desc_html: ãƒ•ãƒãƒ³ãƒˆãƒšãƒ¼ã‚¸ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ã‚µã‚¤ã‚ºã¯600x100pxä»¥ä¸ŠæŽ¨å¥¨ã§ã™ã€‚æœªè¨å®šã®å ´åˆã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ã‚µãƒ ãƒã‚¤ãƒ«ãŒä½¿ç”¨ã•ã‚Œã¾ã™
+        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ã‚¿ã‚°ãŒä½¿ãˆã¾ã™
@@ -339,11 +420,14 @@ ja:
         desc_html: ãƒ¦ãƒ¼ã‚¶ãƒ¼ãƒšãƒ¼ã‚¸ã«ã‚¹ã‚¿ãƒƒãƒ•ã®ãƒãƒƒã‚¸ã‚’è¡¨ç¤ºã—ã¾ã™
         title: ã‚¹ã‚¿ãƒƒãƒ•ãƒãƒƒã‚¸ã‚’è¡¨ç¤ºã™ã‚‹
       site_description:
-        desc_html: ãƒ•ãƒãƒ³ãƒˆãƒšãƒ¼ã‚¸ã¸ã®è¡¨ç¤ºã¨ meta ã‚¿ã‚°ã«ä½¿ç”¨ã•ã‚Œã‚‹ç´¹ä»‹æ–‡ã§ã™ã€‚HTMLã‚¿ã‚°ã€ç‰¹ã«<code>&lt;a&gt;</code> ã¨ <code>&lt;em&gt;</code>ãŒä½¿ãˆã¾ã™ã€‚
+        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: ã‚«ã‚¹ã‚¿ãƒ åˆ©ç”¨è¦ç´„
@@ -365,6 +449,7 @@ ja:
       media:
         title: ãƒ¡ãƒ‡ã‚£ã‚¢
       no_media: ãƒ¡ãƒ‡ã‚£ã‚¢ãªã—
+      no_status_selected: ä½•ã‚‚é¸æŠžã•ã‚Œã¦ã„ãªã„ãŸã‚ã€å¤‰æ›´ã•ã‚Œã¦ã„ã¾ã›ã‚“
       title: ãƒˆã‚¥ãƒ¼ãƒˆä¸€è¦§
       with_media: ãƒ¡ãƒ‡ã‚£ã‚¢ã‚ã‚Š
     subscriptions:
@@ -374,7 +459,21 @@ ja:
       last_delivery: æœ€çµ‚é…é€
       title: WebSub
       topic: ãƒˆãƒ”ãƒƒã‚¯
+    tags:
+      accounts: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ
+      hidden: éžè¡¨ç¤º
+      hide: ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰éš ã™
+      name: ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°
+      title: ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°
+      unhide: ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«è¡¨ç¤ºã™ã‚‹
+      visible: è¡¨ç¤º
     title: ç®¡ç†
+    warning_presets:
+      add_new: è¿½åŠ 
+      delete: å‰Šé™¤
+      edit: ç·¨é›†
+      edit_preset: ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡ã‚’ç·¨é›†
+      title: ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡ã‚’ç®¡ç†
   admin_mailer:
     new_report:
       body: "%{reporter} ãŒ %{target} ã‚’é€šå ±ã—ã¾ã—ãŸ"
@@ -396,7 +495,7 @@ ja:
     warning: ã“ã®ãƒ‡ãƒ¼ã‚¿ã¯æ°—ã‚’ã¤ã‘ã¦å–ã‚Šæ‰±ã£ã¦ãã ã•ã„ã€‚ä»–ã®äººã¨å…±æœ‰ã—ãªã„ã§ãã ã•ã„ï¼
     your_token: ã‚¢ã‚¯ã‚»ã‚¹ãƒˆãƒ¼ã‚¯ãƒ³
   auth:
-    agreement_html: ç™»éŒ²ã™ã‚‹ã¨ <a href="%{rules_path}">ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ãƒ«ãƒ¼ãƒ«</a> ã¨ <a href="%{terms_path}">ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼</a> ã«å¾“ã†ã“ã¨ã«åŒæ„ã—ãŸã“ã¨ã«ãªã‚Šã¾ã™ã€‚
+    agreement_html: ç™»éŒ²ã™ã‚‹ã‚’ã‚¯ãƒªãƒƒã‚¯ã™ã‚‹ã¨ <a href="%{rules_path}">ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ãƒ«ãƒ¼ãƒ«</a> ã¨ <a href="%{terms_path}">ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼</a> ã«å¾“ã†ã“ã¨ã«åŒæ„ã—ãŸã“ã¨ã«ãªã‚Šã¾ã™ã€‚
     change_password: ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰
     confirm_email: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ç¢ºèª
     delete_account: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®å‰Šé™¤
@@ -452,6 +551,16 @@ ja:
     success_msg: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯æ£å¸¸ã«å‰Šé™¤ã•ã‚Œã¾ã—ãŸ
     warning_html: å‰Šé™¤ãŒä¿è¨¼ã•ã‚Œã‚‹ã®ã¯ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ä¸Šã®ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®ã¿ã§ã™ã€‚ä»–ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ç‰ã€å¤–éƒ¨ã«åºƒãå…±æœ‰ã•ã‚ŒãŸã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã«ã¤ã„ã¦ã¯ç—•è·¡ãŒæ®‹ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ç¾åœ¨æŽ¥ç¶šã§ããªã„ã‚µãƒ¼ãƒãƒ¼ã‚„ã€ã‚ãªãŸã®æ›´æ–°ã‚’å—ã‘å–ã‚‰ãªããªã£ãŸã‚µãƒ¼ãƒãƒ¼ã«å¯¾ã—ã¦ã¯ã€å‰Šé™¤ã¯åæ˜ ã•ã‚Œã¾ã›ã‚“ã€‚
     warning_title: å…±æœ‰ã•ã‚ŒãŸã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã«ã¤ã„ã¦
+  directories:
+    directory: ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª
+    enabled: ã‚ãªãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æŽ²è¼‰ã•ã‚Œã¦ã„ã¾ã™ã€‚
+    enabled_but_waiting: ã‚ãªãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®æŽ²è¼‰ã‚’é¸æŠžã—ã¾ã—ãŸãŒã€æŽ²è¼‰ã«å¿…è¦ãªæœ€å°ãƒ•ã‚©ãƒãƒ¯ãƒ¼æ•° (%{min_followers} äºº) ã‚’æº€ãŸã—ã¦ã„ã¾ã›ã‚“ã€‚
+    explanation: é–¢å¿ƒã‚’è»¸ã«ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’ç™ºè¦‹ã—ã‚ˆã†
+    explore_mastodon: "%{title}ã‚’æŽ¢ç´¢"
+    how_to_enable: ã‚ãªãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¸ã®æŽ²è¼‰ã‚’é¸æŠžã—ã¦ã„ã¾ã›ã‚“ã€‚ä¸‹è¨˜ã‹ã‚‰é¸æŠžã§ãã¾ã™ã€‚ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã‚«ãƒ©ãƒ ã«æŽ²è¼‰ã™ã‚‹ã«ã¯ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«æ–‡ã«ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã‚’ä½¿ç”¨ã—ã¦ãã ã•ã„ã€‚
+    people:
+      one: "%{count} äºº"
+      other: "%{count} äºº"
   errors:
     '403': ã“ã®ãƒšãƒ¼ã‚¸ã‚’è¡¨ç¤ºã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“ã€‚
     '404': ãŠæŽ¢ã—ã®ãƒšãƒ¼ã‚¸ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚
@@ -463,7 +572,7 @@ ja:
     '500':
       content: ã‚‚ã†ã—ã‚ã‘ã‚ã‚Šã¾ã›ã‚“ãŒã€ãªã«ã‹ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚
       title: ã“ã®ãƒšãƒ¼ã‚¸ã¯æ£ã—ãã‚ã‚Šã¾ã›ã‚“
-    noscript_html: Mastodonã®ã‚¦ã‚§ãƒ–ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’åˆ©ç”¨ã™ã‚‹å ´åˆã¯JavaScriptã‚’æœ‰åŠ¹ã«ã—ã¦ãã ã•ã„ã€‚ã¾ãŸã¯ã‚ãªãŸã®ãƒ—ãƒ©ãƒƒãƒˆãƒ•ã‚©ãƒ¼ãƒ å‘ã‘ã®<a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Mastodonãƒã‚¤ãƒ†ã‚£ãƒ–ã‚¢ãƒ—ãƒª</a>ã‚’æŽ¢ã™ã“ã¨ãŒã§ãã¾ã™ã€‚
+    noscript_html: Mastodonã®ã‚¦ã‚§ãƒ–ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’åˆ©ç”¨ã™ã‚‹å ´åˆã¯JavaScriptã‚’æœ‰åŠ¹ã«ã—ã¦ãã ã•ã„ã€‚ã¾ãŸã¯ã‚ãªãŸã®ãƒ—ãƒ©ãƒƒãƒˆãƒ•ã‚©ãƒ¼ãƒ å‘ã‘ã®<a href="%{apps_path}">Mastodonãƒã‚¤ãƒ†ã‚£ãƒ–ã‚¢ãƒ—ãƒª</a>ã‚’æŽ¢ã™ã“ã¨ãŒã§ãã¾ã™ã€‚
   exports:
     archive_takeout:
       date: æ—¥æ™‚
@@ -474,7 +583,9 @@ ja:
       size: å®¹é‡
     blocks: ãƒ–ãƒãƒƒã‚¯
     csv: CSV
+    domain_blocks: éžè¡¨ç¤ºã«ã—ãŸãƒ‰ãƒ¡ã‚¤ãƒ³
     follows: ãƒ•ã‚©ãƒãƒ¼
+    lists: ãƒªã‚¹ãƒˆ
     mutes: ãƒŸãƒ¥ãƒ¼ãƒˆ
     storage: ãƒ¡ãƒ‡ã‚£ã‚¢
   filters:
@@ -505,9 +616,13 @@ ja:
     true_privacy_html: "<strong>ãƒ—ãƒ©ã‚¤ãƒã‚·ãƒ¼ã®ä¿è·ã¯ã‚¨ãƒ³ãƒ‰ãƒ„ãƒ¼ã‚¨ãƒ³ãƒ‰ã®æš—å·åŒ–ã§ã®ã¿å®Ÿç¾å¯èƒ½</strong>ã§ã‚ã‚‹ã“ã¨ã«ç•™æ„ãã ã•ã„ã€‚"
     unlocked_warning_html: èª°ã§ã‚‚ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹ã“ã¨ãŒã§ãã€ãƒ•ã‚©ãƒãƒ¯ãƒ¼é™å®šã®æŠ•ç¨¿ã‚’ã™ãã«è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹äººã‚’é™å®šã—ãŸã„å ´åˆã¯%{lock_link}ã«è¨å®šã—ã¦ãã ã•ã„ã€‚
     unlocked_warning_title: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯æ‰¿èªåˆ¶ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«è¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“
+  footer:
+    developers: é–‹ç™ºè€…å‘ã‘
+    more: ã•ã‚‰ã«â€¦
+    resources: ãƒªã‚½ãƒ¼ã‚¹
   generic:
     changes_saved_msg: æ£å¸¸ã«å¤‰æ›´ã•ã‚Œã¾ã—ãŸï¼
-    powered_by: powered by %{link}
+    copy: ã‚³ãƒ”ãƒ¼
     save_changes: å¤‰æ›´ã‚’ä¿å˜
     validation_errors:
       one: ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸï¼ ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ã‚’ç¢ºèªã—ã¦ãã ã•ã„
@@ -543,8 +658,6 @@ ja:
       expires_at: æœ‰åŠ¹æœŸé™
       uses: ä½¿ç”¨
     title: æ–°è¦ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®æ‹›å¾…
-  landing_strip_html: "<strong>%{name}</strong> ã•ã‚“ã¯ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ %{link_to_root_path} ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã§ã™ã€‚ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã•ãˆæŒã£ã¦ã„ã‚Œã°ãƒ•ã‚©ãƒãƒ¼ã—ãŸã‚Šä¼šè©±ã—ãŸã‚Šã§ãã¾ã™ã€‚"
-  landing_strip_signup_html: ã‚‚ã—ãŠæŒã¡ã§ãªã„ãªã‚‰ <a href="%{sign_up_path}">ã“ã¡ã‚‰</a> ã‹ã‚‰ã‚µã‚¤ãƒ³ã‚¢ãƒƒãƒ—ã§ãã¾ã™ã€‚
   lists:
     errors:
       limit: ãƒªã‚¹ãƒˆã®ä¸Šé™ã«é”ã—ã¾ã—ãŸ
@@ -603,7 +716,6 @@ ja:
           quadrillion: Q
           thousand: K
           trillion: T
-          unit: ''
   pagination:
     newer: æ–°ã—ã„ãƒˆã‚¥ãƒ¼ãƒˆ
     next: æ¬¡
@@ -621,10 +733,25 @@ ja:
     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: 'è¿”ä¿¡ã—ã‚ˆã†ã¨ã—ã¦ã„ã¾ã™:'
   remote_unfollow:
     error: ã‚¨ãƒ©ãƒ¼
     title: ã‚¿ã‚¤ãƒˆãƒ«
     unfollowed: ãƒ•ã‚©ãƒãƒ¼è§£é™¤ã—ã¾ã—ãŸ
+  scheduled_statuses:
+    over_daily_limit: ãã®æ—¥äºˆç´„ã§ãã‚‹æŠ•ç¨¿æ•° %{limit} ã‚’è¶…ãˆã¦ã„ã¾ã™
+    over_total_limit: äºˆç´„ã§ãã‚‹æŠ•ç¨¿æ•° %{limit} ã‚’è¶…ãˆã¦ã„ã¾ã™
+    too_soon: ã‚ˆã‚Šå…ˆã®æ™‚é–“ã‚’æŒ‡å®šã—ã¦ãã ã•ã„
   sessions:
     activity: æœ€å¾Œã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ“ãƒ†ã‚£
     browser: ãƒ–ãƒ©ã‚¦ã‚¶
@@ -695,7 +822,7 @@ ja:
     disallowed_hashtags:
       one: 'è¨±å¯ã•ã‚Œã¦ã„ãªã„ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ãŒå«ã¾ã‚Œã¦ã„ã¾ã™: %{tags}'
       other: 'è¨±å¯ã•ã‚Œã¦ã„ãªã„ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ãŒå«ã¾ã‚Œã¦ã„ã¾ã™: %{tags}'
-    language_detection: è‡ªå‹•çš„ã«è¨€èªžã‚’æ¤œå‡ºã™ã‚‹
+    language_detection: è‡ªå‹•æ¤œå‡º
     open_in_web: Webã§é–‹ã
     over_character_limit: ä¸Šé™ã¯ %{max}æ–‡å—ã¾ã§ã§ã™
     pin_errors:
@@ -704,6 +831,7 @@ ja:
       private: éžå…¬é–‹ã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’å›ºå®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
       reblog: ãƒ–ãƒ¼ã‚¹ãƒˆã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆã‚’å›ºå®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“
     show_more: ã‚‚ã£ã¨è¦‹ã‚‹
+    sign_in_to_participate: ãƒã‚°ã‚¤ãƒ³ã—ã¦ä¼šè©±ã«å‚åŠ 
     title: '%{name}: "%{quote}"'
     visibilities:
       private: ãƒ•ã‚©ãƒãƒ¯ãƒ¼é™å®š
@@ -713,7 +841,6 @@ ja:
       unlisted: æœªåŽè¼‰
       unlisted_long: èª°ã§ã‚‚è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ãŒã€å…¬é–‹ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã«ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“
   stream_entries:
-    click_to_show: ã‚¯ãƒªãƒƒã‚¯ã—ã¦è¡¨ç¤º
     pinned: å›ºå®šã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆ
     reblogged: ã•ã‚“ãŒãƒ–ãƒ¼ã‚¹ãƒˆ
     sensitive_content: é–²è¦§æ³¨æ„
@@ -807,6 +934,7 @@ ja:
   time:
     formats:
       default: "%Yå¹´%mæœˆ%dæ—¥ %H:%M"
+      month: "%Yå¹´ %b"
   two_factor_authentication:
     code_hint: ç¢ºèªã™ã‚‹ã«ã¯èªè¨¼ã‚¢ãƒ—ãƒªã§è¡¨ç¤ºã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã—ã¦ãã ã•ã„
     description_html: "<strong>äºŒæ®µéšŽèªè¨¼</strong>ã‚’æœ‰åŠ¹ã«ã™ã‚‹ã¨ãƒã‚°ã‚¤ãƒ³æ™‚ã€èªè¨¼ã‚¢ãƒ—ãƒªã‹ã‚‰ã‚³ãƒ¼ãƒ‰ã‚’å…¥åŠ›ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
@@ -822,12 +950,28 @@ ja:
     recovery_codes_regenerated: ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ãŒå†ç”Ÿæˆã•ã‚Œã¾ã—ãŸ
     recovery_instructions_html: æºå¸¯é›»è©±ã‚’ç´›å¤±ã—ãŸå ´åˆã€ä»¥ä¸‹ã®å†…ã©ã‚Œã‹ã®ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã‚’ä½¿ç”¨ã—ã¦ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚<strong>ãƒªã‚«ãƒãƒªãƒ¼ã‚³ãƒ¼ãƒ‰ã¯å¤§åˆ‡ã«ä¿å…¨ã—ã¦ãã ã•ã„ã€‚</strong>ãŸã¨ãˆã°å°åˆ·ã—ã¦ã»ã‹ã®é‡è¦ãªæ›¸é¡žã¨ä¸€ç·’ã«ä¿ç®¡ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
     setup: åˆæœŸè¨å®š
-    wrong_code: ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚ã‚µãƒ¼ãƒãƒ¼ä¸Šã®æ™‚é–“ã¨ãƒ‡ãƒã‚¤ã‚¹ä¸Šã®æ™‚é–“ãŒä¸€è‡´ã—ã¦ã„ã‚‹ã“ã¨ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚
+    wrong_code: ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚ã‚µãƒ¼ãƒãƒ¼ä¸Šã®æ™‚é–“ã¨ãƒ‡ãƒã‚¤ã‚¹ä¸Šã®æ™‚é–“ãŒä¸€è‡´ã—ã¦ã„ã¾ã™ã‹ï¼Ÿ
   user_mailer:
     backup_ready:
       explanation: Mastodonã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã‚’å—ã‘ä»˜ã‘ã¾ã—ãŸã€‚ä»Šã™ããƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã§ãã¾ã™ï¼
       subject: ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®æº–å‚™ãŒã§ãã¾ã—ãŸ
       title: ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®å–ã‚Šå‡ºã—
+    warning:
+      explanation:
+        disable: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå‡çµã•ã‚Œã¦ã„ã‚‹é–“ã€ãƒ‡ãƒ¼ã‚¿ã¯ãã®ã¾ã¾æ®‹ã‚Šã¾ã™ãŒã€å‡çµãŒè§£é™¤ã•ã‚Œã‚‹ã¾ã§ã¯ä½•ã®æ“ä½œã‚‚ã§ãã¾ã›ã‚“ã€‚
+        silence: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åˆ¶é™ã•ã‚Œã¦ã„ã¾ã™ãŒã€ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ã¿ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ä¸Šã®æŠ•ç¨¿ã‚’è¦‹ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãã—ã¦ã‚ãªãŸã¯æ§˜ã€…ãªå…¬é–‹ãƒªã‚¹ãƒˆã‹ã‚‰é™¤å¤–ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚ãŸã ã—ã€ä»–ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯æ‰‹å‹•ã§ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
+        suspend: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯åœæ¢ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚ãªãŸã®æŠ•ç¨¿ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¨ã‚ãªãŸã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼ãŒå‚åŠ ã—ã¦ã„ãŸã‚µãƒ¼ãƒãƒ¼ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚
+      review_server_policies: ã‚µãƒ¼ãƒãƒ¼ã®ãƒãƒªã‚·ãƒ¼ã‚’ç¢ºèª
+      subject:
+        disable: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã¯å‡çµã•ã‚Œã¦ã„ã¾ã™
+        none: "%{acct} ã«å¯¾ã™ã‚‹è¦å‘Š"
+        silence: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã¯ã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã«ã•ã‚Œã¦ã„ã¾ã™
+        suspend: ã‚ãªãŸã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ %{acct} ã¯åœæ¢ã•ã‚Œã¦ã„ã¾ã™
+      title:
+        disable: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒå‡çµã•ã‚Œã¾ã—ãŸ
+        none: è¦å‘Š
+        silence: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒã‚µã‚¤ãƒ¬ãƒ³ã‚¹ã«ã•ã‚Œã¾ã—ãŸ
+        suspend: ã‚¢ã‚«ã‚¦ãƒ³ãƒˆãŒåœæ¢ã•ã‚Œã¾ã—ãŸ
     welcome:
       edit_profile_action: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’è¨å®š
       edit_profile_step: ã‚¢ãƒã‚¿ãƒ¼ç”»åƒã‚„ãƒ˜ãƒƒãƒ€ãƒ¼ç”»åƒã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ãŸã‚Šã€è¡¨ç¤ºåã‚„ãã®ä»–ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’å¤‰æ›´ã—ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚æ–°ã—ã„ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã‹ã‚‰ã®ãƒ•ã‚©ãƒãƒ¼ã‚’è¨±å¯ã™ã‚‹å‰ã«æ¤œè¨Žã—ãŸã„å ´åˆã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’æ‰¿èªåˆ¶ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
@@ -839,7 +983,6 @@ ja:
       review_preferences_action: è¨å®šã®å¤‰æ›´
       review_preferences_step: å—ã‘å–ã‚ŠãŸã„ãƒ¡ãƒ¼ãƒ«ã‚„æŠ•ç¨¿ã®å…¬é–‹ç¯„å›²ãªã©ã®è¨å®šã‚’å¿…ãšè¡Œã£ã¦ãã ã•ã„ã€‚ä¸å¿«ã§ãªã„ãªã‚‰ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ GIF ã®è‡ªå‹•å†ç”Ÿã‚’æœ‰åŠ¹ã«ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚
       subject: Mastodon ã¸ã‚ˆã†ã“ã
-      tip_bridge_html: ã‚‚ã— Twitter ã‹ã‚‰æ¥ã‚‰ã‚ŒãŸã®ã§ã‚ã‚Œã°ã€<a href="%{bridge_url}">bridge app</a> ã‚’ä½¿ç”¨ã™ã‚‹ã“ã¨ã§ Mastodon ã§ã®å‹é”ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’æŽ¢ã™ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ãŸã ã— bridge app ã‚’ä½¿ç”¨ã—ãŸã“ã¨ã®ã‚ã‚‹ç›¸æ‰‹ã«é™ã‚Šã¾ã™ï¼
       tip_federated_timeline: é€£åˆã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã¯ Mastodon ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®æµã‚Œã‚’è¦‹ã‚‰ã‚Œã‚‹ã‚‚ã®ã§ã™ã€‚ãŸã ã—ã‚ãªãŸã¨åŒã˜ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®äººãŒãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã‚‹äººã ã‘ãŒå«ã¾ã‚Œã‚‹ã®ã§ã€ãã‚ŒãŒå…¨ã¦ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚
       tip_following: æ¨™æº–ã§ã¯è‡ªå‹•ã§ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ç®¡ç†è€…ã‚’ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ã¾ã™ã€‚ã‚‚ã£ã¨èˆˆå‘³ã®ã‚ã‚‹äººãŸã¡ã‚’è¦‹ã¤ã‘ã‚‹ã«ã¯ã€ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã¨é€£åˆã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã‚’ç¢ºèªã—ã¦ãã ã•ã„ã€‚
       tip_local_timeline: ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ãƒ©ã‚¤ãƒ³ã¯ %{instance} ã«ã„ã‚‹äººã€…ã®æµã‚Œã‚’è¦‹ã‚‰ã‚Œã‚‹ã‚‚ã®ã§ã™ã€‚å½¼ã‚‰ã¯ã‚ãªãŸã¨åŒã˜ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«ã„ã‚‹éš£äººã®ã‚ˆã†ãªã‚‚ã®ã§ã™ï¼
@@ -847,8 +990,12 @@ ja:
       tips: è±†çŸ¥è˜
       title: ã‚ˆã†ã“ãã€%{name} ï¼
   users:
+    follow_limit_reached: ã‚ãªãŸã¯ç¾åœ¨ %{limit} äººä»¥ä¸Šãƒ•ã‚©ãƒãƒ¼ã§ãã¾ã›ã‚“
     invalid_email: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒç„¡åŠ¹ã§ã™
     invalid_otp_token: äºŒæ®µéšŽèªè¨¼ã‚³ãƒ¼ãƒ‰ãŒé–“é•ã£ã¦ã„ã¾ã™
     otp_lost_help_html: ã©ã¡ã‚‰ã‚‚ä½¿ç”¨ã§ããªã„å ´åˆã€%{email} ã«é€£çµ¡ã‚’å–ã‚‹ã¨è§£æ±ºã§ãã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“
     seamless_external_login: ã‚ãªãŸã¯å¤–éƒ¨ã‚µãƒ¼ãƒ“ã‚¹ã‚’ä»‹ã—ã¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã‚‹ãŸã‚ã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¨ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®è¨å®šã¯åˆ©ç”¨ã§ãã¾ã›ã‚“ã€‚
     signed_in_as: 'ä¸‹è¨˜ã§ãƒã‚°ã‚¤ãƒ³ä¸:'
+  verification:
+    explanation_html: <strong>ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«å†…ã®ãƒªãƒ³ã‚¯ã®æ‰€æœ‰è€…ã§ã‚ã‚‹ã“ã¨ã‚’èªè¨¼ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™</strong>ã€‚ãã®ãŸã‚ã«ã¯ãƒªãƒ³ã‚¯ã•ã‚ŒãŸã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã«Mastodonãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã¸ã®ãƒªãƒ³ã‚¯ãŒå«ã¾ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ãƒªãƒ³ã‚¯ã«ã¯<code>rel="me"</code>å±žæ€§ã‚’<strong>å¿…ãš</strong>ä¸Žãˆãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ã€‚ãƒªãƒ³ã‚¯ã®ãƒ†ã‚ã‚¹ãƒˆã«ã¤ã„ã¦ã¯é‡è¦ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ä»¥ä¸‹ã¯ä¾‹ã§ã™ï¼š
+    verification: èªè¨¼
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
new file mode 100644
index 0000000000000000000000000000000000000000..056942ecd5503a5cc876e727c930a68f60075995
--- /dev/null
+++ b/config/locales/ka.yml
@@ -0,0 +1,874 @@
+---
+ka:
+  about:
+    about_hashtag_html: áƒ”áƒ¡ áƒ¡áƒáƒ¯áƒáƒ áƒ áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜áƒ, áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ˜áƒª áƒáƒ¢áƒáƒ áƒ”áƒ‘áƒ”áƒœ <strong>#%{hashtag}</strong> áƒ¢áƒ”áƒ’áƒ¡. áƒ›áƒáƒ—áƒ—áƒáƒœ áƒ˜áƒœáƒ¢áƒ”áƒ áƒáƒ¥áƒªáƒ˜áƒáƒ¡ áƒ¨áƒ”áƒ«áƒšáƒ”áƒ‘áƒ—, áƒ—áƒ£ áƒ¤áƒ”áƒ“áƒ˜áƒ•áƒ”áƒ áƒ¡áƒ¨áƒ˜ áƒ’áƒáƒ¥áƒ•áƒ— áƒ áƒáƒ˜áƒ›áƒ” áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜.
+    about_mastodon_html: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜ áƒ¦áƒ˜áƒ áƒ•áƒ”áƒ‘ áƒžáƒ áƒáƒ¢áƒáƒ™áƒáƒšáƒ”áƒ‘áƒ–áƒ” áƒ“áƒ áƒ£áƒ¤áƒáƒ¡áƒ, áƒ¦áƒ˜áƒ áƒžáƒ áƒáƒ’áƒ áƒáƒ›áƒ”áƒ‘áƒ–áƒ” áƒ“áƒáƒ¤áƒ£áƒ«áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¡áƒáƒªáƒ˜áƒáƒšáƒ£áƒ áƒ˜ áƒ¥áƒ¡áƒ”áƒšáƒ˜áƒ. áƒ˜áƒ¡ áƒ˜áƒ¡áƒ”áƒ—áƒ˜ áƒ“áƒ”áƒªáƒ”áƒœáƒ¢áƒ áƒáƒšáƒ˜áƒ–áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ áƒ áƒáƒ’áƒáƒ áƒª áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ.
+    about_this: áƒ¨áƒ”áƒ¡áƒáƒ®áƒ”áƒ‘
+    administered_by: 'áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜:'
+    api: áƒáƒžáƒ˜
+    apps: áƒ›áƒáƒ‘áƒ˜áƒšáƒ£áƒ áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+    closed_registrations: áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜ áƒáƒ›áƒŸáƒáƒ›áƒáƒ“ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒáƒ–áƒ” áƒ“áƒáƒ®áƒ£áƒ áƒ£áƒšáƒ˜áƒ. áƒ—áƒ£áƒ›áƒªáƒ! áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ¥áƒ›áƒœáƒ”áƒšáƒáƒ“ áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ˜áƒžáƒáƒ•áƒáƒ— áƒ¡áƒ®áƒ•áƒ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ áƒ“áƒ áƒ˜áƒ›áƒáƒ•áƒ” áƒ¥áƒ¡áƒ”áƒšáƒ–áƒ” áƒ˜áƒ¥áƒáƒœáƒ˜áƒáƒ— áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ˜áƒ¥áƒ˜áƒ“áƒáƒœ.
+    contact: áƒ™áƒáƒœáƒ¢áƒáƒ¥áƒ¢áƒ˜
+    contact_missing: áƒáƒ áƒáƒ áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜
+    contact_unavailable: áƒ›áƒ˜áƒ£áƒ¬.
+    documentation: áƒ“áƒáƒ™áƒ£áƒ›áƒ”áƒœáƒ¢áƒáƒªáƒ˜áƒ
+    extended_description_html: |
+      <h3>áƒ™áƒáƒ áƒ’áƒ˜ áƒáƒ“áƒ’áƒ˜áƒšáƒ˜ áƒ¬áƒ”áƒ¡áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡</h3>
+      <p>áƒ’áƒáƒœáƒ•áƒ áƒªáƒáƒ‘áƒ˜áƒšáƒ˜ áƒáƒ¦áƒ¬áƒ”áƒ áƒ˜áƒšáƒáƒ‘áƒ áƒ¯áƒ”áƒ  áƒáƒ  áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ˜áƒšáƒ.</p>
+    features:
+      humane_approach_body: áƒ¡áƒ®áƒ•áƒ áƒ¥áƒ¡áƒ”áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ—áƒ•áƒáƒšáƒ˜áƒ¡áƒ¬áƒ˜áƒœáƒ”áƒ‘áƒ˜áƒ—, áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜ áƒ›áƒ˜áƒ–áƒœáƒáƒ“ áƒ˜áƒ¡áƒáƒ®áƒáƒ•áƒ¡ áƒ”áƒ¢áƒ˜áƒ™áƒ£áƒ áƒ˜ áƒ“áƒ˜áƒ–áƒáƒ˜áƒœáƒ˜áƒ¡ áƒáƒ áƒ©áƒ”áƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ™áƒ”áƒ—áƒ”áƒ‘áƒáƒ¡, áƒ“áƒáƒ£áƒžáƒ˜áƒ áƒ˜áƒ¡áƒžáƒ˜áƒ áƒ“áƒ”áƒ¡ áƒ¡áƒáƒªáƒ˜áƒáƒšáƒ£áƒ áƒ˜ áƒ›áƒ”áƒ“áƒ˜áƒ˜áƒ¡ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ  áƒ›áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒáƒ¡.
+      humane_approach_title: áƒ£áƒ¤áƒ áƒ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ£áƒ áƒ˜ áƒ›áƒ˜áƒ“áƒ’áƒáƒ›áƒ
+      not_a_product_body: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒ›áƒ”áƒ áƒªáƒ˜áƒ£áƒšáƒ˜ áƒ¥áƒ¡áƒ”áƒšáƒ˜. áƒáƒ áƒáƒ áƒ áƒ”áƒ™áƒšáƒáƒ›áƒ, áƒáƒ áƒáƒ áƒ›áƒáƒ˜áƒœáƒ˜áƒœáƒ’áƒ˜, áƒáƒ áƒáƒ áƒ¨áƒ”áƒ›áƒáƒ¦áƒáƒ‘áƒ˜áƒšáƒ˜ áƒ‘áƒáƒ¦áƒ”áƒ‘áƒ˜. áƒáƒ áƒáƒ áƒªáƒ”áƒœáƒ¢áƒ áƒáƒšáƒ£áƒ áƒ˜ áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ¢áƒ”áƒ¢áƒ˜.
+      not_a_product_title: áƒ¨áƒ”áƒœ áƒ®áƒáƒ  áƒžáƒ”áƒ áƒ¡áƒáƒœáƒ áƒ“áƒ áƒáƒ áƒ áƒžáƒ áƒáƒ“áƒ£áƒ¥áƒ¢áƒ˜
+      real_conversation_body: 500 áƒœáƒ˜áƒ¨áƒœáƒ˜áƒ¡ áƒ’áƒáƒœáƒ™áƒáƒ áƒ’áƒ£áƒšáƒ”áƒ‘áƒ˜áƒ—, áƒ›áƒáƒ áƒªáƒ•áƒšáƒáƒ•áƒáƒœáƒ˜ áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ“áƒ áƒ›áƒ”áƒ“áƒ˜áƒ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒ®áƒáƒ áƒ“áƒáƒáƒ”áƒ áƒ˜áƒ—, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ’áƒáƒ›áƒáƒ®áƒáƒ¢áƒáƒ— áƒ˜áƒ¡áƒ” áƒ áƒáƒ’áƒáƒ áƒª áƒ’áƒ¡áƒ£áƒ áƒ—.
+      real_conversation_title: áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ˜áƒšáƒ˜áƒ áƒœáƒáƒ›áƒ“áƒ•áƒ˜áƒšáƒ˜ áƒ¡áƒáƒ£áƒ‘áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡
+      within_reach_body: áƒ“áƒ”áƒ•áƒ”áƒšáƒáƒžáƒ”áƒ áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡-áƒ›áƒ”áƒ’áƒáƒ‘áƒ áƒ£áƒšáƒ˜ áƒáƒžáƒ˜ áƒ”áƒ¥áƒáƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ˜áƒ¡ áƒ¬áƒ§áƒáƒšáƒáƒ‘áƒ˜áƒ—, áƒ›áƒ áƒáƒ•áƒáƒšáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒáƒ˜-áƒáƒ¡áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒáƒœáƒ“áƒ áƒáƒ˜áƒ“áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ“áƒ áƒ¡áƒ®áƒ•áƒ áƒžáƒšáƒáƒ¢áƒ¤áƒáƒ áƒ›áƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ¡áƒáƒ¨áƒáƒšáƒ”áƒ‘áƒáƒ¡ áƒ›áƒáƒ’áƒªáƒ”áƒ›áƒ— áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒ›áƒ˜áƒ”áƒ áƒ˜ áƒáƒ“áƒ’áƒ˜áƒšáƒ˜áƒ“áƒáƒœ áƒ˜áƒ¥áƒáƒœáƒ˜áƒáƒ— áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ›áƒ”áƒ’áƒáƒ‘áƒ áƒ”áƒ‘áƒ—áƒáƒœ.
+      within_reach_title: áƒ›áƒ£áƒ“áƒáƒ› áƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ¡ áƒ¥áƒ•áƒ”áƒ¨
+    generic_description: "%{domain} áƒ”áƒ áƒ—áƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ áƒ¥áƒ¡áƒ”áƒšáƒ¨áƒ˜"
+    hosted_on: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ¡ áƒ›áƒáƒ¡áƒžáƒ˜áƒœáƒ«áƒšáƒáƒ‘áƒ¡ %{domain}
+    learn_more: áƒ’áƒáƒ˜áƒ’áƒ” áƒ›áƒ”áƒ¢áƒ˜
+    other_instances: áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ
+    privacy_policy: áƒ™áƒáƒœáƒ¤áƒ˜áƒ“áƒ”áƒœáƒªáƒ˜áƒáƒšáƒ£áƒ áƒáƒ‘áƒ˜áƒ¡ áƒžáƒáƒšáƒ˜áƒ¢áƒ˜áƒ™áƒ
+    source_code: áƒ™áƒáƒ“áƒ˜
+    status_count_after: áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜
+    status_count_before: áƒ•áƒ˜áƒœáƒª áƒ£áƒáƒ•áƒ¢áƒáƒ áƒ
+    terms: áƒ›áƒáƒ›áƒ¡áƒáƒ®áƒ£áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒžáƒ˜áƒ áƒáƒ‘áƒ”áƒ‘áƒ˜
+    user_count_after: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡
+    user_count_before: áƒ¡áƒáƒ®áƒšáƒ˜
+    what_is_mastodon: áƒ áƒ áƒáƒ áƒ˜áƒ¡ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜?
+  accounts:
+    choices_html: "%{name}-áƒ˜áƒ¡ áƒáƒ áƒ©áƒ”áƒ•áƒœáƒ”áƒ‘áƒ˜:"
+    follow: áƒ’áƒáƒ§áƒ”áƒ•áƒ˜
+    followers: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜
+    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: áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜
+    posts_with_replies: áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜ áƒ“áƒ áƒžáƒáƒ¡áƒ£áƒ®áƒ”áƒ‘áƒ˜
+    reserved_username: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ
+    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: áƒáƒ®áƒáƒšáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ
+        submit: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ
+        title: áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ”áƒ— áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ %{username}
+      confirm: áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒ
+      confirmed: áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ
+      confirming: áƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ“áƒ”áƒ‘áƒ
+      demote: áƒ“áƒáƒ¥áƒ•áƒ”áƒ˜áƒ—áƒ”áƒ‘áƒ
+      disable: áƒ’áƒáƒ›áƒáƒ áƒ—áƒ•áƒ
+      disable_two_factor_authentication: áƒ’áƒáƒ›áƒáƒ áƒ—áƒ” 2FA
+      disabled: áƒ’áƒáƒ›áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ
+      display_name: áƒ“áƒ˜áƒ¡áƒžáƒšáƒ”áƒ˜ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
+      domain: áƒ“áƒáƒ›áƒ”áƒœáƒ˜
+      edit: áƒ¨áƒ”áƒªáƒ•áƒšáƒ
+      email: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ
+      email_status: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜
+      enable: áƒ©áƒáƒ áƒ—áƒ•áƒ
+      enabled: áƒ©áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ
+      feed_url: áƒšáƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ£áƒ áƒš
+      followers: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜
+      followers_url: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ áƒš
+      follows: áƒ“áƒáƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      inbox_url: áƒ˜áƒœáƒ‘áƒáƒ¥áƒ¡áƒ˜áƒ¡ áƒ£áƒ áƒš
+      ip: áƒáƒ˜-áƒžáƒ˜
+      location:
+        all: áƒ§áƒ•áƒ”áƒšáƒ
+        local: áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜
+        remote: áƒ“áƒ˜áƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ£áƒ áƒ˜
+        title: áƒáƒ“áƒ’áƒ˜áƒšáƒ›áƒ“áƒ”áƒ‘áƒáƒ áƒ”áƒáƒ‘áƒ
+      login_status: áƒšáƒáƒ’áƒ˜áƒœáƒ˜áƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜
+      media_attachments: áƒ—áƒáƒœ-áƒ“áƒáƒ áƒ—áƒ£áƒšáƒ˜ áƒ›áƒ”áƒ“áƒ˜áƒ
+      memorialize: áƒáƒ¥áƒªáƒ˜áƒ” áƒ›áƒ”áƒ›áƒáƒ áƒáƒœáƒ“áƒ£áƒ›áƒáƒ“
+      moderation:
+        all: áƒ§áƒ•áƒ”áƒšáƒ
+        silenced: áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ£áƒšáƒ˜
+        suspended: áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜
+        title: áƒ›áƒáƒ“áƒ”áƒ áƒáƒªáƒ˜áƒ
+      moderation_notes: áƒ›áƒáƒ“áƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ”áƒ‘áƒ˜
+      most_recent_activity: áƒ£áƒáƒ®áƒšáƒ”áƒ¡áƒ˜ áƒáƒ¥áƒ¢áƒ˜áƒ•áƒáƒ‘áƒ
+      most_recent_ip: áƒ£áƒáƒ®áƒšáƒ”áƒ¡áƒ˜ áƒáƒ˜-áƒžáƒ˜
+      not_subscribed: áƒ’áƒáƒ›áƒáƒ£áƒ¬áƒ”áƒ áƒ”áƒšáƒ˜
+      outbox_url: áƒáƒ£áƒ—áƒ‘áƒáƒ¥áƒ¡áƒ˜áƒ¡ áƒ£áƒ áƒš
+      perform_full_suspension: áƒ›áƒáƒáƒ®áƒ“áƒ˜áƒœáƒ”áƒ— áƒ¡áƒ áƒ£áƒšáƒ˜ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ
+      profile_url: áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒ£áƒ áƒš
+      promote: áƒ“áƒáƒ¬áƒ˜áƒœáƒáƒ£áƒ áƒ”áƒ‘áƒ
+      protocol: áƒžáƒ áƒáƒ¢áƒáƒ™áƒáƒšáƒ˜
+      public: áƒ¡áƒáƒ¯áƒáƒ áƒ
+      push_subscription_expires: áƒ¤áƒ£áƒ¨ áƒ’áƒáƒ›áƒáƒ¬áƒ”áƒ áƒ áƒ£áƒ¥áƒ›áƒ“áƒ”áƒ‘áƒ
+      redownload: áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒ” áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜
+      remove_avatar: áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒ” áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜
+      resend_confirmation:
+        already_confirmed: áƒ”áƒ¡ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ£áƒ™áƒ•áƒ” áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ
+        send: áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ“áƒáƒ’áƒ–áƒáƒ•áƒœáƒ
+        success: áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒ!
+      reset: áƒ’áƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ
+      reset_password: áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ’áƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ
+      resubscribe: áƒ®áƒ”áƒšáƒáƒ®áƒáƒšáƒ˜ áƒ’áƒáƒ›áƒáƒ¬áƒ”áƒ áƒ
+      role: áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      roles:
+        admin: áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜
+        moderator: áƒ›áƒáƒ“áƒ”áƒ áƒáƒ¢áƒáƒ áƒ˜
+        staff: áƒ¡áƒ¢áƒáƒ¤áƒ˜
+        user: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜
+      salmon_url: áƒ¡áƒáƒšáƒ›áƒáƒœáƒ˜áƒ¡ áƒ£áƒ áƒš
+      search: áƒ«áƒ”áƒ‘áƒœáƒ
+      shared_inbox_url: áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ˜áƒœáƒ‘áƒáƒ¥áƒ¡áƒ˜áƒ¡ áƒ£áƒ áƒš
+      show:
+        created_reports: áƒáƒ› áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒ˜áƒ”áƒ  áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ˜áƒšáƒ˜ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ”áƒ‘áƒ˜
+        targeted_reports: áƒáƒ› áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ–áƒ” áƒ›áƒ˜áƒ¦áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ”áƒ‘áƒ˜
+      silence: áƒ¡áƒ˜áƒ©áƒ£áƒ›áƒ”
+      statuses: áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜
+      subscribe: áƒ’áƒáƒ›áƒáƒ¬áƒ”áƒ áƒ
+      title: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ”áƒ‘áƒ˜
+      unconfirmed_email: áƒ“áƒáƒ£áƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ
+      undo_silenced: áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ¨áƒáƒ áƒ”áƒ‘áƒ
+      undo_suspension: áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ¨áƒáƒ áƒ”áƒ‘áƒ
+      unsubscribe: áƒ’áƒáƒ›áƒáƒ¬áƒ”áƒ áƒ˜áƒ¡ áƒ¨áƒ”áƒ¬áƒ§áƒ•áƒ”áƒ¢áƒ
+      username: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
+      web: áƒ•áƒ”áƒ‘áƒ˜
+    action_logs:
+      actions:
+        assigned_to_self_report: "%{name}-áƒ›áƒ áƒ“áƒáƒœáƒ˜áƒ¨áƒœáƒ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜ %{target} áƒ¡áƒáƒ™áƒ£áƒ—áƒáƒ  áƒ—áƒáƒ•áƒ–áƒ”"
+        change_email_user: "%{name}-áƒ›áƒ áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ %{target} áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜"
+        confirm_user: "%{name}-áƒ›áƒ áƒ“áƒáƒáƒ›áƒáƒ¬áƒ›áƒ %{target} áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜"
+        create_custom_emoji: "%{name}-áƒ›áƒ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ áƒáƒ®áƒáƒšáƒ˜ áƒ”áƒ›áƒáƒ¯áƒ˜ %{target}"
+        create_domain_block: "%{name}-áƒ›áƒ áƒ“áƒáƒ‘áƒšáƒáƒ™áƒ áƒ“áƒáƒ›áƒ”áƒœáƒ˜ %{target}"
+        create_email_domain_block: "%{name}-áƒ›áƒ áƒ¨áƒáƒ• áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ›áƒáƒáƒ¥áƒªáƒ˜áƒ áƒ“áƒáƒ›áƒ”áƒœáƒ˜ %{target}"
+        demote_user: "%{name}-áƒ›áƒ áƒ“áƒáƒáƒ¥áƒ•áƒ”áƒ˜áƒ—áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ %{target}"
+        destroy_domain_block: "%{name}-áƒ›áƒ áƒ‘áƒšáƒáƒ™áƒ˜ áƒ›áƒáƒ®áƒ¡áƒœáƒ áƒ“áƒáƒ›áƒ”áƒœáƒ¡ %{target}"
+        destroy_email_domain_block: "%{name} áƒ—áƒ”áƒ—áƒ  áƒ¡áƒ˜áƒáƒ¨áƒ˜ áƒ›áƒáƒáƒ¥áƒªáƒ˜áƒ áƒ“áƒáƒ›áƒ”áƒœáƒ˜ %{target}"
+        destroy_status: "%{name}-áƒ›áƒ áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜ %{target}-áƒ–áƒ”"
+        disable_2fa_user: "%{name} áƒ’áƒáƒ—áƒ˜áƒ¨áƒ áƒ›áƒ”áƒáƒ áƒ” áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ˜áƒšáƒ”áƒ‘áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ–áƒ” %{target}"
+        disable_custom_emoji: "%{name}-áƒ›áƒ áƒ’áƒáƒ—áƒ˜áƒ¡áƒ áƒ”áƒ›áƒáƒ¯áƒ˜ %{target}"
+        disable_user: "%{name}-áƒ›áƒ áƒ’áƒáƒ—áƒ˜áƒ¨áƒ áƒšáƒáƒ’áƒ˜áƒœáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ %{target}"
+        enable_custom_emoji: "%{name}-áƒ›áƒ áƒ©áƒáƒ áƒ—áƒ áƒ”áƒ›áƒáƒ¯áƒ˜ %{target}"
+        enable_user: "%{name}-áƒ›áƒ áƒ©áƒáƒ áƒ—áƒ áƒšáƒáƒ’áƒ˜áƒœáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ %{target}"
+        memorialize_account: "%{name}-áƒ›áƒ áƒáƒ¥áƒªáƒ˜áƒ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ %{target} áƒ›áƒ”áƒ›áƒáƒ áƒáƒœáƒ“áƒ£áƒ›áƒ˜áƒ¡ áƒ’áƒ•áƒ”áƒ áƒ“áƒáƒ“"
+        promote_user: "%{name}-áƒ›áƒ áƒ“áƒáƒáƒ¬áƒ˜áƒœáƒáƒ£áƒ áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ %{target}"
+        remove_avatar_user: "%{name}-áƒ›áƒ áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒ %{target} áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜"
+        reopen_report: "%{name}-áƒ›áƒ áƒ®áƒ”áƒšáƒáƒ®áƒšáƒ áƒ’áƒáƒ®áƒ¡áƒœáƒ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜ %{target}"
+        reset_password_user: "%{name} áƒ’áƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ %{target} áƒžáƒáƒ áƒáƒšáƒ˜"
+        resolve_report: "%{name}-áƒ›áƒ áƒ›áƒáƒáƒ’áƒ•áƒáƒ áƒ %{target} áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜"
+        silence_account: "%{name}-áƒ›áƒ áƒ’áƒáƒáƒ©áƒ£áƒ›áƒ %{target} áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜"
+        suspend_account: "%{name} áƒ¨áƒ”áƒáƒ©áƒ”áƒ áƒ %{target} áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜"
+        unassigned_report: "%{name}-áƒ›áƒ áƒ›áƒáƒáƒ¨áƒáƒ áƒ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜ %{target}"
+        unsilence_account: "%{name}-áƒ›áƒ áƒ›áƒáƒáƒ¨áƒáƒ áƒ áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ %{target} áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ¡"
+        unsuspend_account: "%{name}-áƒ›áƒ áƒ›áƒáƒáƒ¨áƒáƒ áƒ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ %{target} áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ¡"
+        update_custom_emoji: "%{name}-áƒ›áƒ áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒ áƒ”áƒ›áƒáƒ¯áƒ˜ %{target}"
+        update_status: "%{name}-áƒ›áƒ áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜ %{target}-áƒ˜áƒ—"
+      deleted_status: "(áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜)"
+      title: áƒáƒ£áƒ“áƒ˜áƒ¢áƒ˜áƒ¡ áƒšáƒáƒ’áƒ˜
+    custom_emojis:
+      by_domain: áƒ“áƒáƒ›áƒ”áƒœáƒ˜
+      copied_msg: áƒ”áƒ›áƒáƒ¯áƒ˜áƒ¡ áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ áƒáƒ¡áƒšáƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒ
+      copy: áƒ™áƒáƒžáƒ˜áƒ áƒ”áƒ‘áƒ
+      copy_failed_msg: áƒáƒ› áƒ”áƒ›áƒáƒ¯áƒ˜áƒ¡ áƒšáƒáƒ™áƒáƒšáƒ£áƒ áƒ˜ áƒáƒ¡áƒšáƒ˜ áƒ•áƒ”áƒ  áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒ
+      created_msg: áƒ”áƒ›áƒáƒ¯áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒ!
+      delete: áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+      destroyed_msg: áƒ”áƒ›áƒáƒ¯áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ!
+      disable: áƒ’áƒáƒ—áƒ˜áƒ¨áƒ•áƒ
+      disabled_msg: áƒ”áƒ¡ áƒ”áƒ›áƒáƒ¯áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ˜áƒ—áƒ˜áƒ¨áƒ
+      emoji: áƒ”áƒ›áƒáƒ¯áƒ˜
+      enable: áƒ©áƒáƒ áƒ—áƒ•áƒ
+      enabled_msg: áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ©áƒáƒ˜áƒ áƒ—áƒ áƒ”áƒ¡ áƒ”áƒ›áƒáƒ¯áƒ˜
+      image_hint: PNG 50áƒ™áƒ‘áƒ›áƒ“áƒ”
+      listed: áƒ©áƒáƒ›áƒáƒ—áƒ•áƒšáƒ˜áƒšáƒ˜
+      new:
+        title: áƒáƒ®áƒáƒšáƒ˜ áƒžáƒ”áƒ áƒ¡áƒáƒœáƒáƒšáƒ˜áƒ–áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ”áƒ›áƒáƒ¯áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ
+      overwrite: áƒ’áƒáƒ“áƒáƒ¬áƒ”áƒ áƒ
+      shortcode: áƒ›áƒáƒ™áƒšáƒ”-áƒ™áƒáƒ“áƒ˜
+      shortcode_hint: áƒ›áƒ˜áƒœ. 2 áƒœáƒ˜áƒ¨áƒáƒœáƒ˜, áƒ›áƒ®áƒáƒšáƒáƒ“ áƒáƒšáƒ¤áƒáƒœáƒ£áƒ›áƒ”áƒ áƒ˜áƒ™áƒ£áƒšáƒ˜ áƒœáƒ˜áƒ¨áƒœáƒ”áƒ‘áƒ˜ áƒ“áƒ "áƒ¥áƒ•áƒ”áƒ“áƒ-áƒ¢áƒ˜áƒ áƒ”áƒ”áƒ‘áƒ˜"
+      title: áƒžáƒ”áƒ áƒ¡áƒáƒœáƒáƒšáƒ˜áƒ–áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ”áƒ›áƒáƒ¯áƒ˜áƒ”áƒ‘áƒ˜
+      unlisted: áƒ©áƒáƒ›áƒáƒ£áƒ—áƒ•áƒšáƒ”áƒšáƒ˜
+      update_failed_msg: áƒ”áƒ›áƒáƒ¯áƒ˜áƒ¡ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ
+      updated_msg: áƒ”áƒ›áƒáƒ¯áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒœáƒáƒ®áƒšáƒ“áƒ!
+      upload: áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ
+    dashboard:
+      backlog: áƒ“áƒáƒ£áƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ¡áƒáƒ¥áƒ›áƒ”áƒ”áƒ‘áƒ˜
+      config: áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ
+      feature_deletions: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      feature_invites: áƒ›áƒáƒ¬áƒ•áƒ”áƒ•áƒ˜áƒ¡ áƒ‘áƒ›áƒ£áƒšáƒ”áƒ‘áƒ˜
+      feature_registrations: áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+      feature_relay: áƒ¤áƒ”áƒ“áƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ áƒ˜áƒšáƒ”áƒ˜
+      features: áƒ¤áƒ£áƒœáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜
+      hidden_service: áƒ¤áƒ”áƒ“áƒ”áƒ áƒáƒªáƒ˜áƒ áƒ“áƒáƒ›áƒáƒšáƒ£áƒš áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ”áƒ‘áƒ—áƒáƒœ
+      open_reports: áƒ¦áƒ˜áƒ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ”áƒ‘áƒ˜
+      recent_users: áƒáƒ®áƒáƒšáƒ˜ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜
+      search: áƒ¡áƒ áƒ£áƒšáƒ˜-áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜áƒ¡ áƒ«áƒ˜áƒ”áƒ‘áƒ
+      single_user_mode: áƒ”áƒ áƒ—-áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒáƒœáƒ˜ áƒ áƒ”áƒŸáƒ˜áƒ›áƒ˜
+      software: áƒžáƒ áƒáƒ’áƒ áƒáƒ›áƒ
+      space: áƒ›áƒáƒªáƒ£áƒšáƒáƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ
+      title: áƒ“áƒáƒ¤áƒ
+      total_users: áƒ¡áƒ£áƒš áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜
+      trends: áƒ¢áƒ áƒ”áƒœáƒ“áƒ”áƒ‘áƒ˜
+      week_interactions: áƒáƒ› áƒ™áƒ•áƒ˜áƒ áƒ˜áƒ¡ áƒ˜áƒœáƒ¢áƒ”áƒ áƒáƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜
+      week_users_active: áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ áƒ˜ áƒáƒ› áƒ™áƒ•áƒ˜áƒ áƒáƒ¡
+      week_users_new: áƒáƒ› áƒ™áƒ•áƒ˜áƒ áƒ˜áƒ¡ áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ˜
+    domain_blocks:
+      add_new: áƒáƒ®áƒšáƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ
+      created_msg: áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ¡ áƒ‘áƒšáƒáƒ™áƒ˜ áƒáƒ®áƒšáƒ áƒžáƒ áƒáƒªáƒ”áƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ¥áƒ•áƒ”áƒ¨áƒáƒ
+      destroyed_msg: áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ¡ áƒ‘áƒšáƒáƒ™áƒ˜ áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ
+      domain: áƒ“áƒáƒ›áƒ”áƒœáƒ˜
+      new:
+        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: áƒ“áƒáƒ›áƒ”áƒœáƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ
+        title: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒáƒ®áƒáƒšáƒ˜ áƒ¨áƒ”áƒœáƒáƒ¢áƒáƒœáƒ˜ áƒ¨áƒáƒ• áƒ¡áƒ˜áƒáƒ¨áƒ˜
+      title: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ¨áƒáƒ•áƒ˜ áƒ¡áƒ˜áƒ
+    instances:
+      title: áƒªáƒœáƒáƒ‘áƒ˜áƒšáƒ˜ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ”áƒ‘áƒ˜
+    invites:
+      deactivate_all: áƒ§áƒ•áƒ”áƒšáƒáƒ¡ áƒ“áƒ”áƒáƒ¥áƒ¢áƒ˜áƒ•áƒáƒªáƒ˜áƒ
+      filter:
+        all: áƒ§áƒ•áƒ”áƒšáƒ
+        available: áƒ®áƒ”áƒšáƒ›áƒ˜áƒ¡áƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜
+        expired: áƒ•áƒáƒ“áƒáƒ’áƒáƒ¡áƒ£áƒšáƒ˜
+        title: áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜
+      title: áƒ›áƒáƒ¬áƒ•áƒ”áƒ•áƒ”áƒ‘áƒ˜
+    relays:
+      add_new: áƒáƒ®áƒ”áƒšáƒ˜ áƒ áƒ˜áƒšáƒ”áƒ˜
+      description_html: "<strong>áƒ¤áƒ”áƒ“áƒ”áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ áƒ˜áƒšáƒ”áƒ˜</strong> áƒ¨áƒ£áƒáƒ›áƒáƒ•áƒáƒšáƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒªáƒ•áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ¯áƒáƒ áƒ áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ˜áƒ“ áƒáƒ“áƒ”áƒœáƒáƒ‘áƒáƒ¡ áƒ˜áƒ› áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ”áƒ‘áƒ¡ áƒ¨áƒáƒ áƒ˜áƒ¡, áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ˜áƒª áƒ’áƒáƒ›áƒáƒ˜áƒ¬áƒ”áƒ áƒ”áƒœ áƒ“áƒ áƒ›áƒáƒ¡áƒ–áƒ” áƒ’áƒáƒ›áƒáƒáƒ¥áƒ•áƒ”áƒ§áƒœáƒ”áƒ‘áƒ”áƒœ. <strong>áƒ”áƒ¡ áƒ›áƒªáƒ˜áƒ áƒ” áƒ“áƒ áƒ¡áƒáƒ¨áƒ£áƒáƒšáƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ”áƒ‘áƒ¡ áƒ”áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ áƒáƒ¦áƒ›áƒáƒáƒ©áƒ˜áƒœáƒáƒœ áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ˜ áƒ¤áƒ”áƒ“áƒ˜áƒ•áƒ”áƒ áƒ¡áƒ˜áƒ¡áƒ’áƒáƒœ</strong>, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ¡áƒ®áƒ•áƒ áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜ áƒ›áƒáƒ›áƒ®áƒáƒ áƒ”áƒ‘áƒšáƒ”áƒ‘áƒ¡ áƒáƒ˜áƒ«áƒ£áƒšáƒ”áƒ‘áƒ“áƒ áƒ›áƒ”áƒ¥áƒœáƒ˜áƒ™áƒ£áƒ  áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜ áƒ’áƒáƒ°áƒ§áƒáƒšáƒáƒ“áƒœáƒ”áƒœ áƒ®áƒáƒšáƒ®áƒ¡ áƒ¡áƒ®áƒ•áƒ áƒ“áƒ˜áƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ£áƒ  áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ”áƒ‘áƒ–áƒ”."
+      enable_hint: áƒáƒ›áƒáƒ¥áƒ›áƒ“áƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’, áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜ áƒ’áƒáƒ›áƒáƒ˜áƒ¬áƒ”áƒ áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ áƒ¡áƒáƒ¯áƒáƒ áƒ áƒ¢áƒ£áƒ¢áƒ¡ áƒáƒ› áƒ áƒ˜áƒšáƒ”áƒ˜áƒ“áƒáƒœ áƒ“áƒ áƒ“áƒáƒ˜áƒ¬áƒ§áƒ”áƒ‘áƒ¡ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ¦áƒ˜áƒ áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒ¥ áƒ’áƒáƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡.
+      inbox_url: áƒ áƒ˜áƒšáƒ”áƒ˜ áƒ£áƒ áƒš
+      setup: áƒ áƒ˜áƒšáƒ”áƒ˜ áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ˜áƒ¡ áƒ“áƒáƒ›áƒ§áƒáƒ áƒ”áƒ‘áƒ
+      status: áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜
+      title: áƒ áƒ˜áƒšáƒ”áƒ˜ áƒ¡áƒ˜áƒ
+    report_notes:
+      created_msg: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜áƒ¡ áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒ!
+      destroyed_msg: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜áƒ¡ áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ!
+    reports:
+      account:
+        note: áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ˜
+        report: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜
+      action_taken_by: áƒ›áƒáƒ¥áƒ›áƒ”áƒ“áƒ”áƒ‘áƒ áƒ¨áƒ”áƒáƒ¡áƒ áƒ£áƒšáƒ
+      are_you_sure: áƒ“áƒáƒ áƒ¬áƒ›áƒ£áƒœáƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ®áƒáƒ ?
+      assign_to_self: áƒ“áƒáƒœáƒ˜áƒ¨áƒœáƒ” áƒ©áƒ”áƒ›áƒ–áƒ”
+      assigned: áƒ“áƒáƒ˜áƒœáƒ˜áƒ¨áƒœáƒ áƒ›áƒáƒ“áƒ”áƒ áƒáƒ¢áƒáƒ áƒ˜
+      comment:
+        none: áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜
+      created_at: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜áƒ¡ áƒ“áƒ áƒ
+      mark_as_resolved: áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ” áƒ’áƒáƒ“áƒáƒ¬áƒ§áƒ•áƒ”áƒ¢áƒ˜áƒšáƒáƒ“
+      mark_as_unresolved: áƒ›áƒáƒœáƒ˜áƒ¨áƒœáƒ” áƒ’áƒáƒ“áƒáƒ£áƒ¬áƒ§áƒ•áƒ”áƒ¢áƒšáƒáƒ“
+      notes:
+        create: áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ
+        create_and_resolve: áƒ’áƒáƒ“áƒáƒ¬áƒ§áƒ•áƒ”áƒ¢áƒ áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ˜áƒ—
+        create_and_unresolve: áƒ®áƒ”áƒšáƒáƒ®áƒáƒšáƒ˜ áƒ’áƒáƒ®áƒ¡áƒœáƒ áƒ©áƒáƒœáƒáƒ¬áƒ”áƒ áƒ˜áƒ—
+        delete: áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+        placeholder: áƒáƒ¦áƒ¬áƒ”áƒ áƒ”áƒ— áƒ—áƒ£ áƒ áƒ áƒœáƒáƒ‘áƒ˜áƒ¯áƒ”áƒ‘áƒ˜ áƒ£áƒœáƒ“áƒ áƒ’áƒáƒ“áƒáƒ˜áƒ“áƒ’áƒáƒ¡, áƒáƒœ áƒ¡áƒ®áƒ•áƒ áƒ“áƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜...
+      reopen: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜áƒ¡ áƒ®áƒ”áƒšáƒáƒ®áƒáƒšáƒ˜ áƒ’áƒáƒ®áƒ¡áƒœáƒ
+      report: 'áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜ #%{id}'
+      reported_account: áƒ“áƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜
+      reported_by: áƒ“áƒáƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒ
+      resolved: áƒ’áƒáƒ“áƒáƒ¬áƒ§áƒ•áƒ”áƒ¢áƒ˜áƒšáƒ˜
+      resolved_msg: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ“áƒáƒ¬áƒ§áƒ“áƒ!
+      status: áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜
+      title: áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ”áƒ‘áƒ˜
+      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: áƒœáƒ”áƒ‘áƒ áƒ“áƒáƒ”áƒ áƒ—áƒáƒ¡ áƒ›áƒáƒ¬áƒ•áƒ”áƒ”áƒ•áƒ”áƒ‘áƒ¡
+        open:
+          desc_html: áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒ›áƒ˜áƒ”áƒªáƒ˜áƒ— áƒ§áƒ•áƒ”áƒšáƒáƒ¡, áƒ’áƒáƒ®áƒ¡áƒœáƒáƒœ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜
+          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: áƒ›áƒ”áƒ“áƒ˜áƒ˜áƒ—
+    subscriptions:
+      callback_url: áƒ¥áƒáƒšáƒ‘áƒ”áƒ¥ áƒ£áƒ áƒš
+      confirmed: áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ“áƒ
+      expires_in: áƒ•áƒáƒ“áƒ áƒ’áƒáƒ¡áƒ“áƒ˜áƒ¡
+      last_delivery: áƒ‘áƒáƒšáƒ áƒ›áƒ˜áƒ¦áƒ”áƒ‘áƒ
+      title: áƒ•áƒ”áƒ‘-áƒ¡áƒáƒ‘áƒ˜
+      topic: áƒ¡áƒáƒ—áƒáƒ£áƒ áƒ˜
+    title: áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒªáƒ˜áƒ
+  admin_mailer:
+    new_report:
+      body: "%{reporter}-áƒ›áƒ áƒ“áƒáƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒ %{target}"
+      body_remote: áƒ•áƒ˜áƒ¦áƒáƒªáƒáƒ› %{domain}-áƒ˜áƒ“áƒáƒœ áƒ“áƒáƒáƒ áƒ”áƒžáƒáƒ áƒ¢áƒ %{target}
+      subject: áƒáƒ®áƒáƒšáƒ˜ áƒ áƒ”áƒžáƒáƒ áƒ¢áƒ˜ %{instance} (#%{id})-áƒ–áƒ”
+  application_mailer:
+    notification_preferences: áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ”áƒ— áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒžáƒ áƒ”áƒ¤áƒ”áƒ áƒœáƒ¡áƒ˜áƒ”áƒ‘áƒ˜
+    salutation: "%{name},"
+    settings: 'áƒ¨áƒ”áƒªáƒ•áƒáƒšáƒ”áƒ— áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒžáƒ áƒ”áƒ¤áƒ”áƒ áƒ”áƒœáƒ¡áƒ˜áƒ”áƒ‘áƒ˜: %{link}'
+    view: 'áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ:'
+    view_profile: áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ
+    view_status: áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ
+  applications:
+    created: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ¨áƒ”áƒ˜áƒ¥áƒ›áƒœáƒ
+    destroyed: áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ
+    invalid_url: áƒ›áƒáƒ¬áƒáƒ“áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ£áƒ áƒš áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ
+    regenerate_token: áƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ˜áƒ¡ áƒ áƒ”áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ
+    token_regenerated: áƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ˜áƒ¡ áƒ áƒ”áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ
+    warning: áƒ˜áƒ§áƒáƒ•áƒ˜áƒ— áƒ«áƒáƒšáƒ˜áƒáƒœ áƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒáƒ“ áƒáƒ› áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒáƒœ. áƒáƒ áƒáƒ¡áƒ“áƒ áƒáƒ¡ áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒáƒ— áƒ”áƒ¡!
+    your_token: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¬áƒ•áƒ“áƒáƒ›áƒ˜áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ˜
+  auth:
+    agreement_html: áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒáƒªáƒ˜áƒ˜áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ”áƒ—áƒáƒœáƒ®áƒ›áƒ”áƒ‘áƒ˜áƒ— <a href="%{rules_path}">áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ˜áƒ¡ áƒ¬áƒ”áƒ¡áƒ”áƒ‘áƒ¡</a> áƒ“áƒ <a href="%{terms_path}">áƒ©áƒ•áƒ”áƒœ áƒ›áƒáƒ›áƒ¡áƒáƒ®áƒ£áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒžáƒ˜áƒ áƒáƒ‘áƒ”áƒ‘áƒ¡</a>.
+    change_password: áƒžáƒáƒ áƒáƒšáƒ˜
+    confirm_email: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ
+    delete_account: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+    delete_account_html: áƒ—áƒ£ áƒ’áƒ¡áƒ£áƒ áƒ— áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— <a href="%{path}">áƒ’áƒáƒáƒ’áƒ áƒ«áƒ”áƒšáƒáƒ— áƒáƒ¥</a>. áƒ¡áƒáƒáƒ˜áƒ áƒ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ.
+    didnt_get_confirmation: áƒáƒ  áƒ›áƒáƒ’áƒ¡áƒ•áƒšáƒ˜áƒáƒ— áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜?
+    forgot_password: áƒ“áƒáƒ’áƒáƒ•áƒ˜áƒ¬áƒ§áƒ“áƒáƒ— áƒžáƒáƒ áƒáƒšáƒ˜?
+    invalid_reset_password_token: áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ’áƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ˜ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜áƒ áƒáƒœ áƒ•áƒáƒ“áƒáƒ’áƒáƒ¡áƒ£áƒšáƒ˜. áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒ”áƒ— áƒáƒ®áƒáƒšáƒ˜.
+    login: áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ
+    logout: áƒ’áƒáƒ¡áƒ•áƒšáƒ
+    migrate_account: áƒ¡áƒ®áƒ•áƒ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ–áƒ” áƒ’áƒáƒ“áƒáƒ¡áƒ•áƒšáƒ
+    migrate_account_html: áƒ—áƒ£ áƒ’áƒ¡áƒ£áƒ áƒ— áƒáƒ› áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ áƒ”áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒ˜áƒ¡ áƒ®áƒ•áƒáƒ–áƒ”, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— <a href="%{path}">áƒ’áƒáƒ£áƒ¬áƒ˜áƒáƒ— áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ áƒáƒ¥</a>.
+    or: áƒáƒœ
+    or_log_in_with: áƒáƒœ áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒ”áƒ—
+    providers:
+      cas: áƒ¥áƒ”áƒ¡
+      saml: áƒ¡áƒáƒ›áƒš
+    register: áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒáƒªáƒ˜áƒ
+    register_elsewhere: áƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒáƒªáƒ˜áƒ áƒ¡áƒ®áƒ•áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ–áƒ”
+    resend_confirmation: áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ¡áƒ¢áƒ áƒ£áƒ¥áƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ®áƒ”áƒšáƒáƒ®áƒáƒšáƒ˜ áƒ’áƒáƒ›áƒáƒ’áƒ–áƒáƒ•áƒœáƒ
+    reset_password: áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ’áƒáƒ“áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ
+    security: áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ
+    set_new_password: áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ
+  authorize_follow:
+    already_following: áƒ£áƒ™áƒ•áƒ” áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ— áƒáƒ› áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ¡
+    error: áƒ¡áƒáƒ›áƒ¬áƒ£áƒ®áƒáƒ áƒáƒ—, áƒ“áƒ˜áƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ£áƒ áƒ˜ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ¬áƒáƒ™áƒ˜áƒ—áƒ®áƒ•áƒáƒ› áƒ’áƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ˜áƒ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ
+    follow: áƒ’áƒáƒ§áƒ”áƒ•áƒ˜
+    follow_request: 'áƒ“áƒáƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒœáƒ•áƒ áƒ’áƒáƒ”áƒ’áƒ–áƒáƒ•áƒœáƒ:'
+    following: 'áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ! áƒáƒ®áƒšáƒ áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—:'
+    post_follow:
+      close: áƒáƒœ áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ“áƒáƒ®áƒ£áƒ áƒáƒ— áƒ”áƒ¡ áƒ¤áƒáƒœáƒ¯áƒáƒ áƒ.
+      return: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ
+      web: áƒ•áƒ”áƒ‘áƒ–áƒ” áƒ’áƒáƒ“áƒáƒ¡áƒ•áƒšáƒ
+    title: áƒ’áƒáƒ§áƒ”áƒ•áƒ˜ %{acct}-áƒ¡
+  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:
+    bad_password_msg: áƒ™áƒáƒ áƒ’áƒáƒ“ áƒ¡áƒªáƒáƒ“áƒ”áƒ—, áƒ°áƒáƒ™áƒ”áƒ áƒ”áƒ‘áƒ! áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜
+    confirm_password: áƒ˜áƒ“áƒ”áƒœáƒ¢áƒáƒ‘áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒšáƒáƒ“ áƒ¨áƒ”áƒ˜áƒ§áƒ•áƒáƒœáƒ”áƒ— áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒžáƒáƒ áƒáƒšáƒ˜
+    description_html: áƒ”áƒ¡ <strong>áƒ¡áƒáƒ›áƒ£áƒ“áƒáƒ›áƒáƒ“, áƒ“áƒáƒ£áƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒšáƒáƒ“</strong> áƒ’áƒáƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ¡ áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ“áƒáƒœ áƒ“áƒ áƒ›áƒáƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ›áƒ˜áƒ¡ áƒ“áƒ”áƒáƒ¥áƒ¢áƒ˜áƒ•áƒáƒªáƒ˜áƒáƒ¡. áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒ™áƒ˜, áƒ¡áƒáƒ›áƒáƒ›áƒáƒ•áƒšáƒ áƒ˜áƒ›áƒžáƒ”áƒ áƒ¡áƒáƒœáƒáƒªáƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ¡áƒáƒ©áƒ”áƒ áƒ”áƒ‘áƒšáƒáƒ“, áƒ’áƒáƒ®áƒ“áƒ”áƒ‘áƒ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜.
+    proceed: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+    success_msg: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ
+    warning_html: áƒ›áƒáƒªáƒ£áƒšáƒáƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ áƒ’áƒáƒ áƒáƒœáƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒáƒ› áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒáƒ–áƒ”. áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ¤áƒáƒ áƒ—áƒ áƒ›áƒáƒ¡áƒ¨áƒ¢áƒáƒ‘áƒ˜áƒ— áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ“áƒ áƒ£áƒ¤áƒ áƒ áƒ“áƒáƒ¢áƒáƒ•áƒ”áƒ‘áƒ¡ áƒ™áƒ•áƒáƒšáƒ¡. áƒáƒ¤áƒšáƒáƒ˜áƒœ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ”áƒ‘áƒ˜ áƒ“áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ”áƒ‘áƒ˜, áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ›áƒáƒª áƒ¨áƒ”áƒ¬áƒ§áƒ•áƒ˜áƒ¢áƒ”áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ¬áƒ”áƒ áƒ áƒáƒ  áƒ’áƒáƒœáƒáƒáƒ®áƒšáƒ”áƒ‘áƒ”áƒœ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ—áƒ áƒ‘áƒáƒ–áƒ”áƒ‘áƒ¡.
+    warning_title: áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ’áƒáƒ•áƒ áƒªáƒ”áƒšáƒ”áƒ‘áƒ£áƒš áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ–áƒ”
+  errors:
+    '403': áƒáƒ› áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜áƒ¡ áƒ®áƒ˜áƒšáƒ•áƒ˜áƒ¡ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒ áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ—.
+    '404': áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ¡áƒáƒª áƒ”áƒ«áƒ”áƒ‘áƒ— áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡.
+    '410': áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒ áƒáƒ›áƒ”áƒšáƒ¡áƒáƒª áƒ”áƒ«áƒ”áƒ‘áƒ“áƒ˜áƒ— áƒáƒ¦áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡.
+    '422':
+      content: áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ•áƒ”áƒ áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ. áƒ‘áƒšáƒáƒ™áƒáƒ•áƒ— áƒ¥áƒ£áƒ¥áƒ˜áƒ¡?
+      title: áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ•áƒ”áƒ áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒáƒ  áƒ¨áƒ”áƒ“áƒ’áƒ
+    '429': áƒ“áƒáƒ áƒ¢áƒ§áƒ›áƒ
+    '500':
+      content: áƒ‘áƒáƒ“áƒ˜áƒ¨áƒ˜, áƒ©áƒ•áƒ”áƒœ áƒ›áƒ®áƒáƒ áƒ”áƒ¡ áƒ áƒáƒ¦áƒáƒª áƒáƒ áƒ˜áƒ.
+      title: áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒáƒ áƒáƒ áƒ¡áƒ¬áƒáƒ áƒ˜
+    noscript_html: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœ áƒ•áƒ”áƒ‘-áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ©áƒáƒ áƒ—áƒáƒ— áƒ¯áƒáƒ•áƒáƒ¡áƒ™áƒ áƒ˜áƒžáƒ¢áƒ˜. áƒ¡áƒ®áƒ•áƒ áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜, áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒáƒ¢áƒ¤áƒáƒ áƒ›áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ¡áƒªáƒáƒ“áƒ”áƒ— áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ— áƒ”áƒ áƒ—-áƒ”áƒ áƒ—áƒ˜ <a href="%{apps_path}">áƒ›áƒ¨áƒáƒ‘áƒšáƒ˜áƒ£áƒ áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ</a>.
+  exports:
+    archive_takeout:
+      date: áƒ—áƒáƒ áƒ˜áƒ¦áƒ˜
+      download: áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ áƒ¥áƒ˜áƒ•áƒ˜
+      hint_html: áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ¥áƒ˜áƒ•áƒ˜ <strong>áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜áƒ¡áƒ áƒ“áƒ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ£áƒšáƒ˜ áƒ›áƒ”áƒ“áƒ˜áƒ˜áƒ¡áƒ</strong>. áƒ”áƒ¥áƒ¡áƒžáƒáƒ áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ áƒ”áƒ¥áƒ—áƒ˜áƒ•áƒ˜áƒ—áƒ˜-áƒ¤áƒáƒ‘ áƒ¤áƒáƒ áƒ›áƒáƒ¢áƒ¨áƒ˜, áƒ¬áƒáƒ™áƒ˜áƒ—áƒ®áƒ•áƒáƒ“áƒ˜ áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒ›áƒ˜áƒ”áƒ áƒ˜ áƒ—áƒáƒ•áƒ¡áƒ”áƒ‘áƒáƒ“áƒ˜ áƒžáƒ áƒáƒ’áƒ áƒáƒ›áƒ˜áƒ—. áƒáƒ áƒ¥áƒ˜áƒ•áƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— 7 áƒ“áƒ¦áƒ”áƒ¨áƒ˜ áƒ”áƒ áƒ—áƒ®áƒ”áƒš.
+      in_progress: áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ áƒ¥áƒ˜áƒ•áƒ˜áƒ¡ áƒ¨áƒ”áƒ“áƒ’áƒ”áƒœáƒ...
+      request: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ áƒ¥áƒ˜áƒ•áƒ˜áƒ¡ áƒ›áƒáƒ—áƒ®áƒáƒ•áƒœáƒ
+      size: áƒ–áƒáƒ›áƒ
+    blocks: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ‘áƒšáƒáƒ™áƒáƒ•áƒ—
+    csv: áƒªáƒ¡áƒ•
+    follows: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—
+    mutes: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ—
+    storage: áƒ›áƒ”áƒ“áƒ˜áƒ áƒ¡áƒáƒªáƒáƒ•áƒ˜
+  filters:
+    contexts:
+      home: áƒ¡áƒáƒ®áƒšáƒ˜áƒ¡ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜
+      notifications: áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+      public: áƒ¡áƒáƒ¯áƒáƒ áƒ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ˜
+      thread: áƒ¡áƒáƒ£áƒ‘áƒ áƒ”áƒ‘áƒ˜
+    edit:
+      title: áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ
+    errors:
+      invalid_context: áƒ›áƒáƒ¬áƒáƒ“áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒáƒœ áƒªáƒáƒ áƒ˜áƒ”áƒšáƒ˜ áƒ™áƒáƒœáƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜
+      invalid_irreversible: áƒ“áƒáƒ£áƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒáƒªáƒ˜áƒ áƒ›áƒ£áƒ¨áƒáƒáƒ‘áƒ¡ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ¡áƒáƒ®áƒšáƒ˜áƒ¡ áƒáƒœ áƒœáƒáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ¨áƒ˜
+    index:
+      delete: áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+      title: áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ”áƒ‘áƒ˜
+    new:
+      title: áƒáƒ®áƒáƒšáƒ˜ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒ
+  followers:
+    domain: áƒ“áƒáƒ›áƒ”áƒœáƒ˜
+    explanation_html: áƒ—áƒ£ áƒ’áƒ¡áƒ£áƒ áƒ— áƒ£áƒ–áƒ áƒ£áƒœáƒ•áƒ”áƒšáƒ§áƒáƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ“áƒ”áƒœáƒªáƒ˜áƒáƒšáƒ£áƒ áƒáƒ‘áƒ, áƒ£áƒœáƒ“áƒ áƒ˜áƒªáƒáƒ“áƒ”áƒ— áƒ—áƒ£ áƒ•áƒ˜áƒœ áƒ›áƒáƒ’áƒ§áƒ•áƒ”áƒ‘áƒáƒ—. <strong>áƒ™áƒ”áƒ áƒ«áƒ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜ áƒ›áƒ˜áƒ”áƒ¬áƒáƒ“áƒ”áƒ‘áƒ áƒ§áƒ•áƒ”áƒšáƒ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒáƒ¡, áƒ¡áƒáƒ“áƒáƒª áƒ’áƒ§áƒáƒ•áƒ— áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜</strong>. áƒ¨áƒ”áƒ¡áƒáƒ«áƒšáƒáƒ áƒ’áƒ¡áƒ£áƒ áƒ“áƒ”áƒ— áƒ’áƒáƒœáƒ˜áƒ®áƒ˜áƒšáƒáƒ— áƒ˜áƒ¡áƒ˜áƒœáƒ˜ áƒ“áƒ áƒáƒ›áƒáƒ¨áƒáƒšáƒáƒ— áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜ áƒ—áƒ£ áƒáƒ  áƒ”áƒœáƒ“áƒáƒ‘áƒ˜áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ™áƒáƒœáƒ¤áƒ˜áƒ“áƒ”áƒœáƒªáƒ˜áƒáƒšáƒ£áƒ áƒáƒ‘áƒ˜áƒ¡ áƒžáƒáƒ¢áƒ˜áƒ•áƒ˜áƒ¡áƒªáƒ”áƒ›áƒáƒ¡ áƒ¡áƒ¢áƒáƒ¤áƒ˜áƒ¡áƒ áƒ—áƒ£ áƒžáƒ áƒáƒ’áƒ áƒáƒ›áƒ˜áƒ¡áƒ’áƒáƒœ áƒ˜áƒ› áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ”áƒ‘áƒ¨áƒ˜.
+    followers_count: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ áƒáƒáƒ“áƒ”áƒœáƒáƒ‘áƒ
+    lock_link: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ©áƒáƒ™áƒ”áƒ¢áƒ•áƒ
+    purge: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ“áƒáƒœ áƒáƒ›áƒáƒ¨áƒšáƒ
+    success:
+      one: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒáƒ¤áƒ¢-áƒ‘áƒšáƒáƒ™áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒžáƒ áƒáƒªáƒ”áƒ¡áƒ˜ áƒ”áƒ áƒ—áƒ˜ áƒ“áƒáƒ›áƒ”áƒœáƒ–áƒ”...
+      other: áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒáƒ¤áƒ¢-áƒ‘áƒšáƒáƒ™áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒžáƒ áƒáƒªáƒ”áƒ¡áƒ˜ %{count} áƒ“áƒáƒ›áƒ”áƒœáƒ–áƒ”...
+    true_privacy_html: áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒ˜áƒ—áƒ•áƒáƒšáƒ˜áƒ¡áƒ¬áƒ˜áƒœáƒ”áƒ—, <strong>áƒáƒ”áƒ¨áƒ›áƒáƒ áƒ˜áƒ¢áƒ˜ áƒ™áƒáƒœáƒ¤áƒ˜áƒ“áƒ”áƒœáƒªáƒ˜áƒáƒšáƒ£áƒ áƒáƒ‘áƒ áƒ›áƒ˜áƒ¦áƒ¬áƒ”áƒ•áƒáƒ“áƒ˜áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ”áƒœáƒ“-áƒ—áƒ£-áƒ”áƒœáƒ“ áƒ¨áƒ˜áƒ¤áƒ áƒáƒªáƒ˜áƒ˜áƒ—</strong>.
+    unlocked_warning_html: áƒ§áƒ•áƒ”áƒšáƒáƒ¡ áƒ¨áƒ”áƒ£áƒ«áƒšáƒ˜áƒ áƒ’áƒáƒ›áƒáƒ’áƒ§áƒ•áƒ”áƒ—, áƒ áƒáƒ› áƒ£áƒªáƒ‘áƒáƒ“ áƒ˜áƒ®áƒ˜áƒšáƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ”áƒ‘áƒ˜. %{lock_link} áƒ áƒáƒ› áƒ¨áƒ”áƒ«áƒšáƒáƒ— áƒ’áƒáƒœáƒ˜áƒ®áƒ˜áƒšáƒáƒ— áƒ“áƒ áƒ£áƒáƒ áƒ§áƒáƒ— áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜.
+    unlocked_warning_title: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒáƒ áƒáƒ áƒ©áƒáƒ™áƒ”áƒ¢áƒ˜áƒšáƒ˜
+  footer:
+    developers: áƒ“áƒ”áƒ•áƒ”áƒšáƒáƒžáƒ”áƒ áƒ”áƒ‘áƒ˜
+    more: áƒ›áƒ”áƒ¢áƒ˜â€¦
+    resources: áƒ áƒ”áƒ¡áƒ£áƒ áƒ¡áƒ”áƒ‘áƒ˜
+  generic:
+    changes_saved_msg: áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ“áƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ“áƒ!
+    save_changes: áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒœáƒáƒ®áƒ•áƒ
+    validation_errors:
+      one: áƒ áƒáƒ¦áƒáƒª áƒ¯áƒ”áƒ  áƒáƒ áƒáƒ áƒ›áƒ—áƒšáƒáƒ“ áƒ™áƒáƒ áƒ’áƒáƒ“! áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒ˜áƒ®áƒ˜áƒšáƒáƒ— áƒ¥áƒ•áƒ”áƒ›áƒáƒ— áƒ›áƒáƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ”áƒ‘áƒ˜
+      other: áƒ áƒáƒ¦áƒáƒª áƒ¯áƒ”áƒ  áƒáƒ áƒáƒ áƒ›áƒ—áƒšáƒáƒ“ áƒ™áƒáƒ áƒ’áƒáƒ“! áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒœáƒ˜áƒ®áƒ˜áƒšáƒáƒ— áƒ¥áƒ•áƒ”áƒ›áƒáƒ— áƒ›áƒáƒªáƒ”áƒ›áƒ£áƒšáƒ˜ %{count} áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ
+  imports:
+    preface: áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ“áƒáƒáƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒáƒ— áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜, áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ˜áƒª áƒ“áƒáƒáƒ”áƒ¥áƒ¡áƒžáƒáƒ áƒ¢áƒ”áƒ— áƒ¡áƒ®áƒ•áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ“áƒáƒœ, áƒ›áƒáƒ’áƒáƒšáƒ˜áƒ—áƒáƒ“ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ, áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ¡áƒáƒª áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ— áƒáƒœ áƒ‘áƒšáƒáƒ™áƒáƒ•áƒ—.
+    success: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ áƒ“áƒ áƒ›áƒáƒ—áƒ˜ áƒžáƒ áƒáƒªáƒ”áƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ áƒ›áƒáƒ®áƒ“áƒ”áƒ‘áƒ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒš áƒ“áƒ áƒáƒ¨áƒ˜
+    types:
+      blocking: áƒ‘áƒšáƒáƒ™áƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ
+      following: áƒ“áƒáƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ
+      muting: áƒ’áƒáƒ©áƒ£áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ˜áƒ
+    upload: áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ
+  in_memoriam_html: áƒ›áƒ”áƒ›áƒáƒ áƒáƒœáƒ“áƒ£áƒ›áƒ¨áƒ˜.
+  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: áƒ›áƒ˜áƒáƒ¦áƒ¬áƒ˜áƒ”áƒ— áƒ¡áƒ˜áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ  áƒáƒ“áƒ”áƒœáƒáƒ‘áƒáƒ¡
+  media_attachments:
+    validations:
+      images_and_video: áƒ•áƒ˜áƒ“áƒ”áƒáƒ¡ áƒ“áƒáƒ áƒ—áƒ•áƒ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ–áƒ”, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ£áƒ™áƒ•áƒ” áƒ›áƒáƒ˜áƒªáƒáƒ•áƒ¡ áƒ¡áƒ£áƒ áƒáƒ—áƒ”áƒ‘áƒ¡, áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ”áƒ‘áƒ
+      too_many: áƒ—áƒáƒœ áƒ•áƒ”áƒ  áƒ“áƒáƒ£áƒ áƒ—áƒáƒ•áƒ— 4 áƒ¤áƒáƒ˜áƒšáƒ–áƒ” áƒ›áƒ”áƒ¢áƒ¡
+  migrations:
+    acct: username@domain áƒáƒ®áƒáƒšáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡
+    currently_redirecting: 'áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜ áƒ’áƒáƒ›áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ áƒ›áƒáƒáƒ®áƒ“áƒ˜áƒœáƒáƒ¡ áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ–áƒ”:'
+    proceed: áƒ¨áƒ”áƒœáƒáƒ®áƒ•áƒ
+    updated_msg: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒ˜áƒ’áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ”áƒ‘áƒ˜áƒ— áƒ“áƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ“áƒ!
+  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}-áƒ›áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜ áƒ’áƒáƒ®áƒáƒ“áƒ áƒ¤áƒáƒ•áƒáƒ áƒ˜áƒ¢áƒ˜"
+      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: áƒáƒ®áƒáƒšáƒ˜ áƒ‘áƒ£áƒ¡áƒ¢áƒ˜
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: áƒ‘áƒ˜áƒš.
+          million: áƒ›áƒ˜áƒš.
+          quadrillion: áƒ™áƒ£áƒáƒ“.
+          thousand: áƒáƒ—áƒáƒ¡.
+          trillion: áƒ¢áƒ áƒ˜áƒš.
+          unit: ''
+  pagination:
+    newer: áƒ£áƒ¤áƒ áƒ áƒáƒ®áƒáƒšáƒ˜
+    next: áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜
+    older: áƒ«áƒ•áƒ”áƒšáƒ˜
+    prev: áƒ¬áƒ˜áƒœáƒ
+    truncate: "&hellip;"
+  preferences:
+    languages: áƒ”áƒœáƒ”áƒ‘áƒ˜
+    other: áƒ¡áƒ®áƒ•áƒ
+    publishing: áƒ’áƒáƒ›áƒáƒ¥áƒ•áƒ”áƒ§áƒœáƒ”áƒ‘áƒ
+    web: áƒ•áƒ”áƒ‘áƒ˜
+  remote_follow:
+    acct: áƒ¨áƒ”áƒ˜áƒ§áƒ•áƒáƒœáƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ username@domain áƒ¡áƒáƒ˜áƒ“áƒáƒœáƒáƒª áƒ’áƒ¡áƒ£áƒ áƒ— áƒ’áƒáƒ°áƒ§áƒ•áƒ”áƒ—
+    missing_resource: áƒ¡áƒáƒáƒ˜áƒ áƒ áƒ’áƒáƒ“áƒáƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ£áƒ áƒš áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ•áƒ”áƒ  áƒ›áƒáƒ˜áƒ«áƒ”áƒ‘áƒœáƒ
+    no_account_html: áƒáƒ  áƒ’áƒáƒ¥áƒ•áƒ— áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜? áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— <a href='%{sign_up_path}' target='_blank'>áƒ“áƒáƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ“áƒ”áƒ— áƒáƒ¥</a>
+    proceed: áƒ’áƒáƒáƒ’áƒ áƒ«áƒ”áƒšáƒ”áƒ— áƒ’áƒáƒ¡áƒáƒ§áƒáƒšáƒáƒ“
+    prompt: 'áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ’áƒáƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—:'
+  remote_unfollow:
+    error: áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ
+    title: áƒ¡áƒáƒ—áƒáƒ£áƒ áƒ˜
+    unfollowed: áƒ“áƒáƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ¬áƒ§áƒ•áƒ”áƒ¢áƒ
+  sessions:
+    activity: áƒ‘áƒáƒšáƒ áƒáƒ¥áƒ¢áƒ˜áƒ•áƒáƒ‘áƒ
+    browser: áƒ‘áƒ áƒáƒ£áƒ–áƒ”áƒ áƒ˜
+    browsers:
+      alipay: áƒáƒšáƒ˜áƒ¤áƒ”áƒ˜
+      blackberry: áƒ‘áƒšáƒ”áƒ¥áƒ‘áƒ”áƒ áƒ˜
+      chrome: áƒ¥áƒ áƒáƒ›áƒ˜
+      edge: áƒ›áƒáƒ˜áƒ™áƒ áƒáƒ¡áƒáƒ¤áƒ— áƒ”áƒ“áƒ¯áƒ˜
+      electron: áƒ”áƒšáƒ”áƒ¥áƒ¢áƒ áƒáƒœáƒ˜
+      firefox: áƒ¤áƒáƒ˜áƒ áƒ¤áƒáƒ¥áƒ¡áƒ˜
+      generic: áƒáƒ›áƒáƒ£áƒªáƒœáƒáƒ‘áƒ˜ áƒ‘áƒ áƒáƒ£áƒ–áƒ”áƒ áƒ˜
+      ie: áƒ˜áƒœáƒ¢áƒ”áƒ áƒœáƒ”áƒ¢ áƒ”áƒ¥áƒ¤áƒšáƒáƒ áƒ”áƒ áƒ˜
+      micro_messenger: áƒ›áƒ˜áƒ™áƒ áƒ-áƒ›áƒ”áƒ¡áƒ˜áƒœáƒ¯áƒ”áƒ áƒ˜
+      nokia: áƒœáƒáƒ™áƒ˜áƒ áƒ¡40 áƒáƒ•áƒ˜ áƒ‘áƒ áƒáƒ£áƒ–áƒ”áƒ áƒ˜
+      opera: áƒáƒžáƒ”áƒ áƒ
+      otter: áƒáƒ¢áƒ”áƒ áƒ˜
+      phantom_js: áƒ¤áƒáƒœáƒ¢áƒáƒ›áƒ¯áƒ”áƒ˜áƒ”áƒ¡áƒ˜
+      qq: áƒ¥áƒ¥ áƒ‘áƒ áƒáƒ£áƒ–áƒ”áƒ áƒ˜
+      safari: áƒ¡áƒáƒ¤áƒáƒ áƒ˜
+      uc_browser: áƒ˜áƒ£áƒ¡áƒ˜áƒ‘áƒ˜áƒ‘áƒ áƒáƒ£áƒ–áƒ”áƒ áƒ˜
+      weibo: áƒ•áƒ”áƒ˜áƒ‘áƒ
+    current_session: áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒ¡áƒ”áƒ¡áƒ˜áƒ
+    description: "%{browser} %{platform}-áƒ–áƒ”"
+    explanation: áƒ”áƒ¡ áƒ•áƒ”áƒ‘-áƒ‘áƒ áƒáƒ£áƒ–áƒ”áƒ áƒ”áƒ‘áƒ˜áƒ, áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ˜áƒª áƒáƒ›áƒŸáƒáƒ›áƒáƒ“ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒªáƒ˜áƒ áƒ”áƒ‘áƒ£áƒš áƒáƒ áƒ˜áƒáƒœ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ—áƒáƒœ.
+    ip: áƒáƒ˜-áƒžáƒ˜
+    platforms:
+      adobe_air: áƒ”áƒ“áƒáƒ‘ áƒ”áƒáƒ áƒ˜
+      android: áƒáƒœáƒ“áƒ áƒáƒ˜áƒ“áƒ˜
+      blackberry: áƒ‘áƒšáƒ”áƒ¥áƒ‘áƒ”áƒ áƒ˜
+      chrome_os: áƒ¥áƒ áƒáƒ›áƒ-áƒáƒ¡áƒ˜
+      firefox_os: áƒ¤áƒáƒ˜áƒ áƒ¤áƒáƒ¥áƒ¡-áƒáƒ¡áƒ˜
+      ios: áƒáƒ˜-áƒáƒ¡áƒ˜
+      linux: áƒšáƒ˜áƒœáƒ£áƒ¥áƒ¡áƒ˜
+      mac: áƒ›áƒáƒ™áƒ˜
+      other: áƒáƒ›áƒáƒ£áƒªáƒœáƒáƒ‘áƒ˜ áƒžáƒšáƒáƒ¢áƒ¤áƒáƒ áƒ›áƒ
+      windows: áƒ•áƒ˜áƒœáƒ“áƒáƒ£áƒ¡áƒ˜
+      windows_mobile: áƒ•áƒ˜áƒœáƒ“áƒáƒ£áƒ¡ áƒ›áƒáƒ‘áƒáƒ˜áƒšáƒ˜
+      windows_phone: áƒ•áƒ˜áƒœáƒ“áƒáƒ£áƒ¡ áƒ¤áƒáƒ£áƒœáƒ˜
+    revoke: áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+    revoke_success: áƒ¡áƒ”áƒ¡áƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ
+    title: áƒ¡áƒ”áƒ¡áƒ˜áƒ”áƒ‘áƒ˜
+  settings:
+    authorized_apps: áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+    back: áƒ£áƒ™áƒáƒœ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜áƒ¡áƒ™áƒ”áƒœ
+    delete: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ
+    development: áƒ“áƒ”áƒ•áƒ”áƒšáƒáƒžáƒ›áƒ”áƒœáƒ¢áƒ˜
+    edit_profile: áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ
+    export: áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ˜áƒ¡ áƒ”áƒ¥áƒ¡áƒžáƒáƒ áƒ¢áƒ˜
+    followers: áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜
+    import: áƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ˜
+    migrate: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ›áƒ˜áƒ’áƒ áƒáƒªáƒ˜áƒ
+    notifications: áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜
+    preferences: áƒžáƒ áƒ”áƒ¤áƒ”áƒ áƒ”áƒœáƒªáƒ˜áƒ”áƒ‘áƒ˜
+    settings: áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜
+    two_factor_authentication: áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ
+    your_apps: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜
+  statuses:
+    attached:
+      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}'
+    language_detection: áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒáƒ“ áƒ“áƒáƒ“áƒ’áƒ˜áƒœáƒ“áƒ”áƒ¡ áƒ”áƒœáƒ
+    open_in_web: áƒ•áƒ”áƒ‘áƒ¨áƒ˜ áƒ’áƒáƒ®áƒœáƒ¡áƒ
+    over_character_limit: áƒœáƒ˜áƒ¨áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒšáƒ˜áƒ›áƒ˜áƒ¢áƒ˜ áƒ’áƒáƒ“áƒáƒ¡áƒªáƒ“áƒ %{max}-áƒ¡
+    pin_errors:
+      limit: áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ¥áƒ¡áƒ˜áƒ›áƒáƒšáƒ£áƒ áƒ˜ áƒ áƒáƒáƒ“áƒ”áƒœáƒáƒ‘áƒ áƒ£áƒ™áƒ•áƒ” áƒáƒžáƒ˜áƒœáƒ”áƒ—
+      ownership: áƒ¡áƒ®áƒ•áƒ˜áƒ¡áƒ˜ áƒ¢áƒ£áƒ¢áƒ˜ áƒ•áƒ”áƒ  áƒáƒ˜áƒžáƒ˜áƒœáƒ”áƒ‘áƒ
+      private: áƒáƒ áƒ-áƒ¡áƒáƒ¯áƒáƒ áƒ áƒ¢áƒ£áƒ¢áƒ˜ áƒ•áƒ”áƒ  áƒáƒ˜áƒžáƒ˜áƒœáƒ”áƒ‘áƒ
+      reblog: áƒ‘áƒ£áƒ¡áƒ¢áƒ˜ áƒ•áƒ”áƒ  áƒáƒ˜áƒžáƒ˜áƒœáƒ”áƒ‘áƒ
+    show_more: áƒ›áƒ”áƒ¢áƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒ
+    sign_in_to_participate: áƒ¡áƒáƒ£áƒ‘áƒáƒ áƒ¨áƒ˜ áƒ›áƒáƒœáƒáƒ¬áƒ˜áƒšáƒ”áƒáƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ˜áƒáƒ áƒ”áƒ— áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ
+    title: '%{name}: "%{quote}"'
+    visibilities:
+      private: áƒ›áƒ®áƒáƒšáƒáƒ“-áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜
+      private_long: áƒáƒ©áƒ•áƒ”áƒœáƒ” áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ¡
+      public: áƒ¡áƒáƒ¯áƒáƒ áƒ
+      public_long: áƒ®áƒ”áƒ“áƒáƒ•áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ
+      unlisted: áƒ©áƒáƒ›áƒáƒ£áƒ—áƒ•áƒšáƒ”áƒšáƒ˜
+      unlisted_long: áƒ®áƒ”áƒ“áƒáƒ•áƒ¡ áƒ§áƒ•áƒ”áƒšáƒ, áƒ›áƒáƒ’áƒ áƒáƒ› áƒáƒ  áƒ©áƒáƒœáƒ¡ áƒ¡áƒáƒ¯áƒáƒ áƒ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ”áƒ‘áƒ¨áƒ˜
+  stream_entries:
+    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: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜
+    mastodon-light: áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜ (áƒ¦áƒ˜áƒ)
+  time:
+    formats:
+      default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
+  two_factor_authentication:
+    code_hint: áƒ“áƒáƒ¡áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒšáƒáƒ“ áƒ¨áƒ”áƒ˜áƒ§áƒ•áƒáƒœáƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒáƒ  áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡áƒ’áƒáƒœ áƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜ áƒ™áƒáƒ“áƒ˜
+    description_html: áƒ—áƒ£ áƒ©áƒáƒ áƒ—áƒáƒ•áƒ— <strong>áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¡</strong>, áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ˜áƒ¡áƒáƒ¡ áƒáƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ áƒ¤áƒšáƒáƒ‘áƒ“áƒ”áƒ— áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ¡, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ“áƒáƒáƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ¡ áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ”áƒ‘áƒ¡.
+    disable: áƒ’áƒáƒ—áƒ˜áƒ¨áƒ•áƒ
+    enable: áƒ©áƒáƒ áƒ—áƒ•áƒ
+    enabled: áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ©áƒáƒ áƒ—áƒ£áƒšáƒ˜áƒ
+    enabled_success: áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ©áƒáƒ˜áƒ áƒ—áƒ
+    generate_recovery_codes: áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ
+    instructions_html: "<strong>áƒ“áƒáƒáƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ— áƒ”áƒ¡ áƒ¥áƒ  áƒ™áƒáƒ“áƒ˜ áƒ’áƒ£áƒ’áƒš áƒáƒ£áƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒ¢áƒáƒ áƒ¨áƒ˜ áƒáƒœ áƒ›áƒ¡áƒ’áƒáƒ•áƒ¡ áƒ¢áƒáƒ¢áƒž áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¨áƒ˜ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ–áƒ”</strong>. áƒáƒ›áƒ˜áƒ”áƒ áƒ˜áƒ“áƒáƒœ, áƒ”áƒ¡ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ áƒ“áƒáƒáƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ¡ áƒ¢áƒáƒ™áƒ”áƒœáƒ”áƒ‘áƒ¡ áƒ›áƒáƒ¨áƒ˜áƒœ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ“áƒáƒ’áƒáƒ˜áƒ áƒ“áƒ”áƒ‘áƒáƒ— áƒáƒ•áƒ¢áƒáƒ áƒ˜áƒ–áƒáƒªáƒ˜áƒ."
+    lost_recovery_codes: áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒ£áƒ¤áƒšáƒ”áƒ‘áƒáƒ¡ áƒ’áƒáƒ«áƒšáƒ”áƒ•áƒ— áƒ›áƒ˜áƒ˜áƒ¦áƒáƒ— áƒ®áƒ”áƒšáƒ›áƒ”áƒáƒ áƒ” áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡áƒáƒ“áƒ›áƒ˜ áƒ—áƒ£ áƒ“áƒáƒ™áƒáƒ áƒ’áƒáƒ•áƒ— áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ¡. áƒ—áƒ£ áƒ“áƒáƒ™áƒáƒ áƒ’áƒ”áƒ— áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜, áƒ›áƒáƒ— áƒ áƒ”áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒáƒ¥. áƒ«áƒ•áƒ”áƒšáƒ˜ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒáƒ¦áƒáƒ  áƒ˜áƒ¥áƒœáƒ”áƒ‘áƒ áƒ•áƒáƒšáƒ˜áƒ“áƒ£áƒ áƒ˜.
+    manual_instructions: 'áƒ—áƒ£ áƒ•áƒ”áƒ  áƒáƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ— áƒ¥áƒ  áƒ™áƒáƒ“áƒ¡ áƒ“áƒ áƒ¡áƒáƒáƒ˜áƒ áƒáƒ”áƒ‘áƒ— áƒ›áƒ˜áƒ¡ áƒ›áƒ”áƒ¥áƒáƒœáƒ˜áƒ™áƒ£áƒ  áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜ áƒ¨áƒ”áƒ§áƒ•áƒáƒœáƒáƒ¡, áƒáƒ¥ áƒáƒ áƒ˜áƒ¡ áƒ©áƒ•áƒ”áƒ£áƒšáƒ”áƒ‘áƒ áƒ˜áƒ•áƒ˜ áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ£áƒ áƒ˜ áƒ¡áƒáƒ˜áƒ“áƒ£áƒ›áƒšáƒ:'
+    recovery_codes: áƒ’áƒáƒ£áƒ¬áƒ˜áƒ”áƒ— áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ¡ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒáƒªáƒ˜áƒ
+    recovery_codes_regenerated: áƒáƒ¦áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜áƒ¡ áƒ áƒ”áƒ’áƒ”áƒœáƒ”áƒ áƒáƒªáƒ˜áƒ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒ¨áƒ”áƒ¡áƒ áƒ£áƒšáƒ“áƒ
+    recovery_instructions_html: áƒ—áƒ£ áƒ áƒáƒ“áƒ”áƒ¡áƒ›áƒ” áƒ“áƒáƒ™áƒáƒ áƒ’áƒáƒ•áƒ— áƒ¬áƒ•áƒ“áƒáƒ›áƒáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ—áƒáƒœ, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒ¥áƒ•áƒ”áƒ›áƒáƒ— áƒ›áƒáƒªáƒ”áƒ›áƒ£áƒšáƒ˜ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ”áƒœáƒáƒ—, áƒ áƒáƒ—áƒ áƒ›áƒáƒ˜áƒžáƒáƒ•áƒáƒ— áƒ®áƒ”áƒšáƒ›áƒ”áƒáƒ áƒ” áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡áƒáƒ“áƒ›áƒ˜. <strong>áƒ˜áƒ¥áƒáƒœáƒ˜áƒ”áƒ— áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜ áƒ“áƒáƒªáƒ£áƒšáƒáƒ“</strong>. áƒ›áƒáƒ’áƒáƒšáƒ˜áƒ—áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡, áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒáƒ— áƒáƒ›áƒáƒ‘áƒ”áƒáƒ“áƒáƒ— áƒ“áƒ áƒ¨áƒ”áƒ˜áƒœáƒáƒ®áƒáƒ— áƒ¡áƒ®áƒ•áƒ áƒ¡áƒáƒ‘áƒ£áƒ—áƒ”áƒ‘áƒ—áƒáƒœ áƒ”áƒ áƒ—áƒáƒ“.
+    setup: áƒ“áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ
+    wrong_code: áƒ¨áƒ”áƒ§áƒ•áƒáƒœáƒ˜áƒšáƒ˜ áƒ™áƒáƒ“áƒ˜ áƒáƒ  áƒ˜áƒ§áƒ áƒ¡áƒ¬áƒáƒ áƒ˜! áƒ¡áƒ¬áƒáƒ áƒ˜áƒ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ˜áƒ¡ áƒ“áƒ áƒ›áƒáƒ¬áƒ§áƒáƒ‘áƒ˜áƒšáƒáƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒ?
+  user_mailer:
+    backup_ready:
+      explanation: áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒáƒ˜áƒ—áƒ®áƒáƒ•áƒ”áƒ— áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜áƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ¡áƒ áƒ£áƒšáƒ˜ áƒ áƒ”áƒ–áƒ”áƒ áƒ•áƒáƒªáƒ˜áƒ. áƒ˜áƒ¡ áƒáƒ®áƒšáƒ áƒ£áƒ™áƒ•áƒ” áƒ›áƒ–áƒáƒ“áƒáƒ áƒ’áƒáƒ“áƒ›áƒáƒ¡áƒáƒ¬áƒ”áƒ áƒáƒ“!
+      subject: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒáƒ áƒ¥áƒ˜áƒ•áƒ˜ áƒ’áƒáƒ“áƒ›áƒáƒ¡áƒáƒ¬áƒ”áƒ áƒáƒ“ áƒ›áƒ–áƒáƒ“áƒáƒ
+      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_email: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ áƒáƒ áƒáƒ áƒ›áƒáƒ áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜
+    invalid_otp_token: áƒáƒ áƒáƒ¡áƒ¬áƒáƒ áƒ˜ áƒ›áƒ”áƒáƒ áƒ” áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒ“áƒ˜
+    otp_lost_help_html: áƒ—áƒ£ áƒ“áƒáƒ™áƒáƒ áƒ’áƒ”áƒ— áƒ¬áƒ•áƒ“áƒáƒ›áƒ áƒáƒ áƒ˜áƒ•áƒ”áƒ–áƒ”, áƒ¨áƒ”áƒ¡áƒáƒ«áƒšáƒáƒ áƒ“áƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ“áƒ”áƒ— %{email}-áƒ¡
+    seamless_external_login: áƒ¨áƒ”áƒ¡áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ— áƒ’áƒáƒ áƒ” áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ˜áƒ—, áƒáƒ¥áƒ”áƒ“áƒáƒœ áƒ’áƒáƒ›áƒáƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒžáƒáƒ áƒáƒšáƒ˜ áƒ“áƒ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜ áƒáƒ áƒáƒ áƒ®áƒ”áƒšáƒ›áƒ˜áƒ¡áƒáƒ¬áƒ•áƒ“áƒáƒ›áƒ˜.
+    signed_in_as: 'áƒ¨áƒ”áƒ¡áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ— áƒ áƒáƒ’áƒáƒ áƒª:'
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 9b742d18bab4261c2e58e36cdb025d69d13319af..bf6a8b7705d4597121a7bddd283d1c5499dd60dc 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -5,13 +5,13 @@ ko:
     about_mastodon_html: ë§ˆìŠ¤í† ëˆì€ <em>ì˜¤í”ˆ ì†ŒìŠ¤ ê¸°ë°˜ì˜</em> ì†Œì…œ ë„¤íŠ¸ì›Œí¬ ì„œë¹„ìŠ¤ ìž…ë‹ˆë‹¤. ìƒìš© í”Œëž«í¼ì˜ ëŒ€ì²´ë¡œì„œ <em>ë¶„ì‚°í˜• êµ¬ì¡°</em>ë¥¼ ì±„íƒí•´, ì—¬ëŸ¬ë¶„ì˜ ëŒ€í™”ê°€ í•œ íšŒì‚¬ì— ë…ì ë˜ëŠ” ê²ƒì„ ë°©ì§€í•©ë‹ˆë‹¤. ì‹ ë¢°í•  ìˆ˜ ìžˆëŠ” ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì„ íƒí•˜ì„¸ìš” &mdash; ì–´ë–¤ ì¸ìŠ¤í„´ìŠ¤ë¥¼ ê³ ë¥´ë”ë¼ë„, ëˆ„êµ¬ì™€ë„ ëŒ€í™”í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ëˆ„êµ¬ë‚˜ ìžì‹ ë§Œì˜ ë§ˆìŠ¤í† ëˆ ì¸ìŠ¤í„´ìŠ¤ë¥¼ ë§Œë“¤ ìˆ˜ ìžˆìœ¼ë©°, ì•„ì£¼ ë§¤ë„ëŸ½ê²Œ <em>ì†Œì…œ ë„¤íŠ¸ì›Œí¬</em>ì— ì°¸ê°€í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
     about_this: ì´ ì¸ìŠ¤í„´ìŠ¤ì— ëŒ€í•´ì„œ
     administered_by: 'ê´€ë¦¬ìž:'
+    api: API
+    apps: ëª¨ë°”ì¼ ì•±
     closed_registrations: í˜„ìž¬ ì´ ì¸ìŠ¤í„´ìŠ¤ì—ì„œëŠ” ì‹ ê·œ ë“±ë¡ì„ ë°›ê³  ìžˆì§€ ì•ŠìŠµë‹ˆë‹¤.
     contact: ì—°ë½ì²˜
     contact_missing: ë¯¸ì„¤ì •
     contact_unavailable: N/A
-    description_headline: "%{domain} (ì€)ëŠ” ë¬´ì—‡ì¸ê°€ìš”?"
-    domain_count_after: ê°œì˜ ì¸ìŠ¤í„´ìŠ¤
-    domain_count_before: ì—°ê²°ëœ
+    documentation: ë¬¸ì„œ
     extended_description_html: |
       <h3>ë£°ì„ ìž‘ì„±í•˜ëŠ” ìž¥ì†Œ</h3>
       <p>ì•„ì§ ì„¤ëª…ì´ ìž‘ì„±ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.</p>
@@ -28,25 +28,41 @@ ko:
     hosted_on: "%{domain}ì—ì„œ í˜¸ìŠ¤íŒ… ë˜ëŠ” ë§ˆìŠ¤í† ëˆ"
     learn_more: ìžì„¸ížˆ
     other_instances: ë‹¤ë¥¸ ì¸ìŠ¤í„´ìŠ¤
+    privacy_policy: ê°œì¸ì •ë³´ ì •ì±…
     source_code: ì†ŒìŠ¤ ì½”ë“œ
-    status_count_after: íˆ¿
+    status_count_after:
+      one: íˆ¿
+      other: íˆ¿
     status_count_before: íˆ¿ ìˆ˜
-    user_count_after: ëª…
+    terms: ì´ìš©ì•½ê´€
+    user_count_after:
+      one: ëª…
+      other: ëª…
     user_count_before: ì‚¬ìš©ìž ìˆ˜
     what_is_mastodon: ë§ˆìŠ¤í† ëˆì´ëž€?
   accounts:
+    choices_html: "%{name}ì˜ ì¶”ì²œ:"
     follow: íŒ”ë¡œìš°
-    followers: íŒ”ë¡œì›Œ
+    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} ë‹˜ì„ íŒ”ë¡œìš° ì¤‘ì¸ ê³„ì •"
-    posts: íˆ¿
+    pin_errors:
+      following: ì¶”ì²œí•˜ë ¤ëŠ” ì‚¬ëžŒì„ íŒ”ë¡œìš° í•˜ê³  ìžˆì–´ì•¼ í•©ë‹ˆë‹¤
+    posts:
+      one: íˆ¿
+      other: íˆ¿
+    posts_tab_heading: íˆ¿
     posts_with_replies: íˆ¿ê³¼ ë‹µìž¥
-    remote_follow: ë¦¬ëª¨íŠ¸ íŒ”ë¡œìš°
     reserved_username: ì´ ì•„ì´ë””ëŠ” ì˜ˆì•½ë˜ì–´ ìžˆìŠµë‹ˆë‹¤
     roles:
       admin: ê´€ë¦¬ìž
@@ -54,6 +70,9 @@ ko:
       moderator: ëª¨ë”ë ˆì´í„°
     unfollow: íŒ”ë¡œìš° í•´ì œ
   admin:
+    account_actions:
+      action: ì¡°ì¹˜ ì·¨í•˜ê¸°
+      title: "%{acct} ê³„ì •ì— ì¡°ì • ì·¨í•˜ê¸°"
     account_moderation_notes:
       create: ëª¨ë”ë ˆì´ì…˜ ë…¸íŠ¸ ìž‘ì„±í•˜ê¸°
       created_msg: ëª¨ë”ë ˆì´ì…˜ ê¸°ë¡ì´ ì„±ê³µì ìœ¼ë¡œ ìž‘ì„±ë˜ì—ˆìŠµë‹ˆë‹¤!
@@ -73,6 +92,7 @@ ko:
       confirm: í™•ì¸
       confirmed: í™•ì¸ë¨
       confirming: í™•ì¸ ì¤‘
+      deleted: ì‚ì œë¨
       demote: ëª¨ë”ë ˆì´í„° ê°•ë“±
       disable: ë¹„í™œì„±í™”
       disable_two_factor_authentication: 2ë‹¨ê³„ ì¸ì¦ì„ ë¹„í™œì„±í™”
@@ -80,16 +100,19 @@ ko:
       display_name: ì´ë¦„
       domain: ë„ë©”ì¸
       edit: íŽ¸ì§‘
-      email: E-mail
+      email: ì´ë©”ì¼
       email_status: ì´ë©”ì¼ ìƒíƒœ
       enable: í™œì„±í™”
-      enabled: í™œì„±í™”ëœ
+      enabled: í™œì„±
       feed_url: í”¼ë“œ URL
       followers: íŒ”ë¡œì›Œ ìˆ˜
       followers_url: íŒ”ë¡œì›Œ URL
       follows: íŒ”ë¡œìž‰ ìˆ˜
+      header: í—¤ë”
       inbox_url: ìˆ˜ì‹ í•¨ URL
+      invited_by: ì´ˆëŒ€ìž
       ip: IP
+      joined: ê°€ìž…
       location:
         all: ì „ì²´
         local: ë¡œì»¬
@@ -99,6 +122,7 @@ ko:
       media_attachments: ì²¨ë¶€ëœ ë¯¸ë””ì–´
       memorialize: ë©”ëª¨ë¦¬ì—„ìœ¼ë¡œ ì „í™˜
       moderation:
+        active: í™œë™
         all: ì „ì²´
         silenced: ì¹¨ë¬µ ì¤‘
         suspended: ì •ì§€ ì¤‘
@@ -106,20 +130,18 @@ ko:
       moderation_notes: ëª¨ë”ë ˆì´ì…˜ ê¸°ë¡
       most_recent_activity: ìµœê·¼ í™œë™
       most_recent_ip: ìµœê·¼ IP
+      no_limits_imposed: ì œí•œ ì—†ìŒ
       not_subscribed: êµ¬ë…í•˜ì§€ ì•ŠìŒ
-      order:
-        alphabetic: ì•ŒíŒŒë²³ ìˆœ
-        most_recent: ìµœê·¼ ìˆœ
-        title: ìˆœì„œ
       outbox_url: ë°œì‹ í•¨ URL
-      perform_full_suspension: ì™„ì „ížˆ ì •ì§€ì‹œí‚¤ê¸°
+      perform_full_suspension: ì •ì§€ì‹œí‚¤ê¸°
       profile_url: í”„ë¡œí•„ URL
       promote: ëª¨ë”ë ˆì´í„°ë¡œ ìŠ¹ê¸‰
       protocol: í”„ë¡œí† ì½œ
       public: ì „ì²´ ê³µê°œ
       push_subscription_expires: PuSH êµ¬ë… ê¸°ê°„ ë§Œë£Œ
-      redownload: ì•„ë°”íƒ€ ì—…ë°ì´íŠ¸
+      redownload: í”„ë¡œí•„ ì—…ë°ì´íŠ¸
       remove_avatar: ì•„ë°”íƒ€ ì§€ìš°ê¸°
+      remove_header: í—¤ë” ì‚ì œ
       resend_confirmation:
         already_confirmed: ì´ ì‚¬ìš©ìžëŠ” ì´ë¯¸ í™•ì¸ë˜ì—ˆìŠµë‹ˆë‹¤
         send: ë‹¤ì‹œ í™•ì¸ ì´ë©”ì¼
@@ -138,27 +160,31 @@ ko:
       shared_inbox_url: ê³µìœ ëœ inbox URL
       show:
         created_reports: ì´ ê³„ì •ì—ì„œ ì œì¶œëœ ì‹ ê³ 
-        report: ì‹ ê³ 
         targeted_reports: ì´ ê³„ì •ì— ëŒ€í•œ ì‹ ê³ 
       silence: ì¹¨ë¬µ
+      silenced: ì¹¨ë¬µ ë¨
       statuses: íˆ¿ ìˆ˜
       subscribe: êµ¬ë…í•˜ê¸°
+      suspended: ì •ì§€ ë¨
       title: ê³„ì •
       unconfirmed_email: ë¯¸í™•ì¸ ëœ ì´ë©”ì¼ ì£¼ì†Œ
       undo_silenced: ì¹¨ë¬µ í•´ì œ
       undo_suspension: ì •ì§€ í•´ì œ
       unsubscribe: êµ¬ë… í•´ì œ
       username: ì•„ì´ë””
+      warn: ê²½ê³ 
       web: ì›¹
     action_logs:
       actions:
         assigned_to_self_report: "%{name}ì´ ë¦¬í¬íŠ¸ %{target}ì„ ìžì‹ ì—ê²Œ í• ë‹¹í–ˆìŠµë‹ˆë‹¤"
         change_email_user: "%{name}ì´ %{target}ì˜ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ë³€ê²½í–ˆìŠµë‹ˆë‹¤"
         confirm_user: "%{name}ì´ %{target}ì˜ ì´ë©”ì¼ ì£¼ì†Œë¥¼ ì»¨íŽŒí–ˆìŠµë‹ˆë‹¤"
+        create_account_warning: "%{name}ê°€ %{target}ì—ê²Œ ê²½ê³  ë³´ëƒ„"
         create_custom_emoji: "%{name}ì´ ìƒˆë¡œìš´ ì—ëª¨ì§€ %{target}ë¥¼ ì¶”ê°€í–ˆìŠµë‹ˆë‹¤"
         create_domain_block: "%{name}ì´ ë„ë©”ì¸ %{target}ë¥¼ ì°¨ë‹¨í–ˆìŠµë‹ˆë‹¤"
         create_email_domain_block: "%{name}ì´ ì´ë©”ì¼ ë„ë©”ì¸ %{target}ë¥¼ ì°¨ë‹¨í–ˆìŠµë‹ˆë‹¤"
         demote_user: "%{name}ì´ %{target}ì„ ê°•ë“±í–ˆìŠµë‹ˆë‹¤"
+        destroy_custom_emoji: "%{name}ì´ %{target} ì—ëª¨ì§€ë¥¼ ì‚ì œí•¨"
         destroy_domain_block: "%{name}ì´ ë„ë©”ì¸ %{target}ì˜ ì°¨ë‹¨ì„ í•´ì œí–ˆìŠµë‹ˆë‹¤"
         destroy_email_domain_block: "%{name}ì´ ì´ë©”ì¼ ë„ë©”ì¸ %{target}ì„ í™”ì´íŠ¸ë¦¬ìŠ¤íŠ¸ì— ë„£ì—ˆìŠµë‹ˆë‹¤"
         destroy_status: "%{name}ì´ %{target}ì˜ íˆ¿ì„ ì‚ì œí–ˆìŠµë‹ˆë‹¤"
@@ -180,6 +206,7 @@ ko:
         unsuspend_account: "%{name}ì´ %{target}ì— ëŒ€í•œ ì •ì§€ë¥¼ í•´ì œí–ˆìŠµë‹ˆë‹¤"
         update_custom_emoji: "%{name}ì´ ì—ëª¨ì§€ %{target}ë¥¼ ì—…ë°ì´íŠ¸ í–ˆìŠµë‹ˆë‹¤"
         update_status: "%{name}ì´ %{target}ì˜ ìƒíƒœë¥¼ ì—…ë°ì´íŠ¸ í–ˆìŠµë‹ˆë‹¤"
+      deleted_status: "(ì‚ì œë¨)"
       title: ê°ì‚¬ ê¸°ë¡
     custom_emojis:
       by_domain: ë„ë©”ì¸
@@ -206,8 +233,30 @@ ko:
       update_failed_msg: ì—ëª¨ì§€ë¥¼ ì—…ë°ì´íŠ¸ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤
       updated_msg: ì—ëª¨ì§€ê°€ ì„±ê³µì ìœ¼ë¡œ ì—…ë°ì´íŠ¸ ë˜ì—ˆìŠµë‹ˆë‹¤!
       upload: ì—…ë¡œë“œ
+    dashboard:
+      backlog: ë¯¸ì²˜ë¦¬ ëœ ìž‘ì—…
+      config: ì„¤ì •
+      feature_deletions: ê³„ì • ì‚ì œ
+      feature_invites: ì´ˆëŒ€ ë§í¬
+      feature_profile_directory: í”„ë¡œí•„ ë””ë ‰í† ë¦¬
+      feature_registrations: ê°€ìž…
+      feature_relay: ì—°í•© ë¦´ë ˆì´
+      features: ê¸°ëŠ¥
+      hidden_service: ížˆë“  ì„œë¹„ìŠ¤ì™€ì˜ ì—°í•©
+      open_reports: ë¯¸í•´ê²° ì‹ ê³ 
+      recent_users: ìµœê·¼ ê°€ìž… í•œ ìœ ì €
+      search: ì „ë¬¸ ê²€ìƒ‰
+      single_user_mode: ì‹±ê¸€ ìœ ì € ëª¨ë“œ
+      software: ì†Œí”„íŠ¸ì›¨ì–´
+      space: ë””ìŠ¤í¬ ì‚¬ìš©ëŸ‰
+      title: ëŒ€ì‹œë³´ë“œ
+      total_users: ì´ ìœ ì € ìˆ˜
+      trends: íŠ¸ë Œë“œ
+      week_interactions: ì´ë²ˆ ì£¼ì˜ ìƒí˜¸ìž‘ìš©
+      week_users_active: ì´ë²ˆ ì£¼ì˜ í™œì„± ì‚¬ìš©ìž
+      week_users_new: ì´ë²ˆ ì£¼ì˜ ì‹ ê·œ ìœ ì €
     domain_blocks:
-      add_new: ì¶”ê°€í•˜ê¸°
+      add_new: ë„ë©”ì¸ ì°¨ë‹¨ ì¶”ê°€í•˜ê¸°
       created_msg: ë„ë©”ì¸ ì°¨ë‹¨ ì²˜ë¦¬ë¥¼ ì™„ë£Œí–ˆìŠµë‹ˆë‹¤
       destroyed_msg: ë„ë©”ì¸ ì°¨ë‹¨ì´ í•´ì œë˜ì—ˆìŠµë‹ˆë‹¤
       domain: ë„ë©”ì¸
@@ -224,11 +273,13 @@ ko:
         title: ìƒˆë¡œìš´ ë„ë©”ì¸ ì°¨ë‹¨
       reject_media: ë¯¸ë””ì–´ íŒŒì¼ ê±°ë¶€í•˜ê¸°
       reject_media_hint: ë¡œì»¬ì— ì €ìž¥ëœ ë¯¸ë””ì–´ íŒŒì¼ì„ ì‚ì œí•˜ê³ , ì´í›„ë¡œë„ ë‹¤ìš´ë¡œë“œë¥¼ ê±°ë¶€í•©ë‹ˆë‹¤. ì •ì§€ì™€ëŠ” ê´€ê³„ ì—†ìŠµë‹ˆë‹¤
-      severities:
-        noop: ì—†ìŒ
+      reject_reports: ì‹ ê³  ê±°ë¶€
+      reject_reports_hint: ì´ ë„ë©”ì¸ìœ¼ë¡œë¶€í„°ì˜ ëª¨ë“  ì‹ ê³ ë¥¼ ë¬´ì‹œí•©ë‹ˆë‹¤. ì •ì§€ì™€ëŠ” ë¬´ê´€í•©ë‹ˆë‹¤
+      rejecting_media: ë¯¸ë””ì–´ ê±°ë¶€
+      rejecting_reports: ì‹ ê³  ê±°ë¶€
+      severity:
         silence: ì¹¨ë¬µ
         suspend: ì •ì§€
-      severity: ì‹¬ê°ë„
       show:
         affected_accounts:
           one: ë°ì´í„°ë² ì´ìŠ¤ ì¤‘ 1ê°œì˜ ê³„ì •ì— ì˜í–¥ì„ ë¼ì¹©ë‹ˆë‹¤
@@ -238,8 +289,7 @@ ko:
           suspend: ì´ ë„ë©”ì¸ì— ì¡´ìž¬í•˜ëŠ” ëª¨ë“  ê³„ì •ì˜ ê³„ì • ì •ì§€ë¥¼ í•´ì œ
         title: "%{domain}ì˜ ë„ë©”ì¸ ì°¨ë‹¨ì„ í•´ì œ"
         undo: ì‹¤í–‰ ì·¨ì†Œ
-      title: ë„ë©”ì¸ ì°¨ë‹¨
-      undo: ì‹¤í–‰ ì·¨ì†Œ
+      undo: ë„ë©”ì¸ ì°¨ë‹¨ ì·¨ì†Œ
     email_domain_blocks:
       add_new: ìƒˆë¡œ ì¶”ê°€
       created_msg: ì´ë©”ì¼ ë„ë©”ì¸ ì°¨ë‹¨ ê·œì¹™ì„ ìƒì„±í–ˆìŠµë‹ˆë‹¤
@@ -250,19 +300,47 @@ ko:
         create: ì°¨ë‹¨ ê·œì¹™ ìƒì„±
         title: ìƒˆ ì´ë©”ì¼ ë„ë©”ì¸ ì°¨ë‹¨
       title: Email ë„ë©”ì¸ ì°¨ë‹¨
+    followers:
+      back_to_account: ê³„ì •ìœ¼ë¡œ ëŒì•„ê°€ê¸°
+      title: "%{acct}ì˜ íŒ”ë¡œì›Œ"
     instances:
-      account_count: ì•Œë ¤ì§„ ê³„ì •ì˜ ìˆ˜
-      domain_name: ë„ë©”ì¸ ì´ë¦„
-      reset: ë¦¬ì…‹
-      search: ê²€ìƒ‰
-      title: ì•Œë ¤ì§„ ì¸ìŠ¤í„´ìŠ¤ë“¤
+      delivery_available: ì „ì†¡ ê°€ëŠ¥
+      known_accounts:
+        one: ì•Œë ¤ì§„ ê³„ì • %{count}ê°œ
+        other: ì•Œë ¤ì§„ ê³„ì • %{count}ê°œ
+      moderation:
+        all: ëª¨ë‘
+        limited: ì œí•œë¨
+        title: ëª¨ë”ë ˆì´ì…˜
+      title: ì—°í•©
+      total_blocked_by_us: ìš°ë¦¬ì—ê²Œ ì°¨ë‹¨ ë¨
+      total_followed_by_them: ìš°ë¦¬ë¥¼ íŒ”ë¡œìš°
+      total_followed_by_us: ìš°ë¦¬ê°€ í•œ íŒ”ë¡œìš°
+      total_reported: ì´ë“¤ì— ëŒ€í•œ ì‹ ê³ 
+      total_storage: ë¯¸ë””ì–´ ì²¨ë¶€
     invites:
+      deactivate_all: ì „ë¶€ ë¹„í™œì„±í™”
       filter:
         all: ëª¨ë‘
         available: ì‚¬ìš©ê°€ëŠ¥
         expired: ë§Œë£Œë¨
         title: í•„í„°
       title: ì´ˆëŒ€
+    relays:
+      add_new: ë¦´ë ˆì´ ì¶”ê°€
+      delete: ì‚ì œ
+      description_html: "<strong>ì—°í•© ë¦´ë ˆì´</strong>ëŠ” ì„œë²„ë“¤ ì‚¬ì´ì—ì„œ ë§Žì€ ì–‘ì˜ ê³µê°œ íˆ¿ì„ êµ¬ë…í•˜ê³  ì¤‘ê°œí•˜ëŠ” ì„œë²„ìž…ë‹ˆë‹¤. <strong>ì´ê²ƒì€ ì¤‘ì†Œ ê·œëª¨ì˜ ì„œë²„ì—ì„œ ì—°í•©ìš°ì£¼ë¥¼ ë°œê²¬í•˜ëŠ” ë°ì— ë„ì›€ì„ ì¤„ ìˆ˜ ìžˆìŠµë‹ˆë‹¤</strong>, ì´ì œ ë¡œì»¬ ìœ ì €ë“¤ì´ ë‹¤ë¥¸ ì„œë²„ì˜ ìœ ì €ë“¤ì„ ìˆ˜ë™ìœ¼ë¡œ íŒ”ë¡œìš° í•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤."
+      disable: ë¹„í™œì„±í™”
+      disabled: ë¹„í™œì„±í™” ë¨
+      enable: í™œì„±í™”
+      enable_hint: í™œì„±í™” ë˜ë©´, ì´ ë¦´ë ˆì´ì˜ ëª¨ë“  ê³µê°œ íˆ¿ì„ êµ¬ë…í•˜ê³  ì´ ì„œë²„ì˜ ê³µê°œ íˆ¿ì„ ì „ì†¡í•˜ê²Œ ë©ë‹ˆë‹¤.
+      enabled: í™œì„±í™” ë¨
+      inbox_url: ë¦´ë ˆì´ URL
+      pending: ë¦´ë ˆì´ì˜ ìŠ¹ì¸ ëŒ€ê¸°ì¤‘
+      save_and_enable: ì €ìž¥í•˜ê³  í™œì„±í™”
+      setup: ë¦´ë ˆì´ ì—°ê²° ì„¤ì •
+      status: ìƒíƒœ
+      title: ë¦´ë ˆì´
     report_notes:
       created_msg: ë¦¬í¬íŠ¸ ë…¸íŠ¸ê°€ ì„±ê³µì ìœ¼ë¡œ ìž‘ì„±ë˜ì—ˆìŠµë‹ˆë‹¤!
       destroyed_msg: ë¦¬í¬íŠ¸ ë…¸íŠ¸ê°€ ì„±ê³µì ìœ¼ë¡œ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤!
@@ -277,7 +355,6 @@ ko:
       comment:
         none: ì—†ìŒ
       created_at: ë¦¬í¬íŠ¸ ì‹œê°
-      id: ID
       mark_as_resolved: í•´ê²° ì™„ë£Œ ì²˜ë¦¬
       mark_as_unresolved: ë¯¸í•´ê²°ë¡œ í‘œì‹œ
       notes:
@@ -288,20 +365,15 @@ ko:
         placeholder: ì´ ë¦¬í¬íŠ¸ì— ëŒ€í•œ ì¡°ì¹˜, ê¸°íƒ€ ê´€ë ¨ ëœ ì‚¬í•ì— ëŒ€í•´ ì„¤ëª…í•©ë‹ˆë‹¤â€¦
       reopen: ë¦¬í¬íŠ¸ ë‹¤ì‹œ ì—´ê¸°
       report: 'ì‹ ê³  #%{id}'
-      report_contents: ë‚´ìš©
       reported_account: ì‹ ê³  ëŒ€ìƒ ê³„ì •
       reported_by: ì‹ ê³ ìž
       resolved: í•´ê²°ë¨
       resolved_msg: ë¦¬í¬íŠ¸ê°€ ì„±ê³µì ìœ¼ë¡œ í•´ê²°ë˜ì—ˆìŠµë‹ˆë‹¤!
-      silence_account: ê³„ì •ì„ ì¹¨ë¬µ ì²˜ë¦¬
       status: ìƒíƒœ
-      suspend_account: ê³„ì •ì„ ì •ì§€
-      target: ëŒ€ìƒ
       title: ì‹ ê³ 
       unassign: í• ë‹¹ í•´ì œ
       unresolved: ë¯¸í•´ê²°
       updated_at: ì—…ë°ì´íŠ¸ ì‹œê°
-      view: í‘œì‹œ
     settings:
       activity_api_enabled:
         desc_html: ì£¼ë³„ ë¡œì»¬ì— ê²Œì‹œ ëœ ê¸€, í™œì„± ì‚¬ìš©ìž ë° ìƒˆë¡œìš´ ê°€ìž…ìž ìˆ˜
@@ -311,16 +383,25 @@ ko:
         title: ìƒˆ ìœ ì €ê°€ íŒ”ë¡œìš° í•  ê³„ì •ë“¤
       contact_information:
         email: ê³µê°œí•  ë©”ì¼ ì£¼ì†Œë¥¼ ìž…ë ¥
-        username: ì•„ì´ë””ë¥¼ ìž…ë ¥
+        username: ì—°ë½ ë°›ì„ ê´€ë¦¬ìž ìœ ì €ë„¤ìž„
+      custom_css:
+        desc_html: ëª¨ë“  íŽ˜ì´ì§€ì— ì ìš©í•  CSS
+        title: ì»¤ìŠ¤í…€ CSS
       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: í”„ë¡œí•„ ë””ë ‰í† ë¦¬ í™œì„±í™”
       registrations:
         closed_message:
           desc_html: ì‹ ê·œ ë“±ë¡ì„ ë°›ì§€ ì•Šì„ ë•Œ í”„ë¡ íŠ¸ íŽ˜ì´ì§€ì— í‘œì‹œë©ë‹ˆë‹¤. HTML íƒœê·¸ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
@@ -341,11 +422,14 @@ ko:
         desc_html: ìœ ì € íŽ˜ì´ì§€ì— ìŠ¤íƒœí”„ ë°°ì§€ë¥¼ í‘œì‹œí•©ë‹ˆë‹¤
         title: ìŠ¤íƒœí”„ ë°°ì§€ í‘œì‹œ
       site_description:
-        desc_html: íƒ‘ íŽ˜ì´ì§€ì™€ meta íƒœê·¸ì— ì‚¬ìš©ë©ë‹ˆë‹¤. HTML íƒœê·¸, ì£¼ë¡œ <code>&lt;a&gt;</code>, <code>&lt;em&gt;</code> ê°™ì€ ê²ƒì„ ì‚¬ìš© ê°€ëŠ¥í•©ë‹ˆë‹¤.
+        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: ì»¤ìŠ¤í…€ ì„œë¹„ìŠ¤ ì´ìš© ì•½ê´€
@@ -367,6 +451,7 @@ ko:
       media:
         title: ë¯¸ë””ì–´
       no_media: ë¯¸ë””ì–´ ì—†ìŒ
+      no_status_selected: ì•„ë¬´ ê²ƒë„ ì„ íƒ ë˜ì§€ ì•Šì•„ ì•„ë¬´ ê²ƒë„ ë°”ë€Œì§€ ì•Šì•˜ìŠµë‹ˆë‹¤
       title: ê³„ì • íˆ¿
       with_media: ë¯¸ë””ì–´ ìžˆìŒ
     subscriptions:
@@ -376,7 +461,21 @@ ko:
       last_delivery: ìµœì¢… ë°œì†¡
       title: WebSub
       topic: í† í”½
+    tags:
+      accounts: ê³„ì •ë“¤
+      hidden: ìˆ¨ê²¨ì§
+      hide: ë””ë ‰í† ë¦¬ì—ì„œ ìˆ¨ê¸°ê¸°
+      name: í•´ì‹œíƒœê·¸
+      title: í•´ì‹œíƒœê·¸
+      unhide: ë””ë ‰í† ë¦¬ì— í‘œì‹œ
+      visible: ë³´ì—¬ì§
     title: ê´€ë¦¬
+    warning_presets:
+      add_new: ìƒˆë¡œ ì¶”ê°€
+      delete: ì‚ì œ
+      edit: íŽ¸ì§‘
+      edit_preset: ê²½ê³  í‹€ ìˆ˜ì •
+      title: ê²½ê³  í‹€ ê´€ë¦¬
   admin_mailer:
     new_report:
       body: "%{reporter} ê°€ %{target} ë¥¼ ì‹ ê³ í–ˆìŠµë‹ˆë‹¤"
@@ -454,6 +553,16 @@ ko:
     success_msg: ê³„ì •ì´ ì„±ê³µì ìœ¼ë¡œ ì‚ì œë˜ì—ˆìŠµë‹ˆë‹¤
     warning_html: ì‚ì œê°€ ë³´ìž¥ë˜ëŠ” ê²ƒì€ ì´ ì¸ìŠ¤í„´ìŠ¤ ìƒì—ì„œì˜ ì»¨í…ì¸ ì— í•œí•©ë‹ˆë‹¤. íƒ€ ì¸ìŠ¤í„´ìŠ¤ ë“±, ì™¸ë¶€ì— ë©€ë¦¬ ê³µìœ ëœ ì»¨í…ì¸ ëŠ” í”ì ì´ ë‚¨ì•„ ì‚ì œë˜ì§€ ì•ŠëŠ” ê²½ìš°ë„ ìžˆìŠµë‹ˆë‹¤. ê·¸ë¦¬ê³  í˜„ìž¬ ì ‘ì†ì´ ë¶ˆê°€ëŠ¥í•œ ì„œë²„ë‚˜, ì—…ë°ì´íŠ¸ë¥¼ ë°›ì§€ ì•Šê²Œ ëœ ì„œë²„ì— ëŒ€í•´ì„œëŠ” ì‚ì œê°€ ë°˜ì˜ë˜ì§€ ì•Šì„ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.
     warning_title: ê³µìœ ëœ ì»¨í…ì¸ ì— ëŒ€í•´ì„œ
+  directories:
+    directory: í”„ë¡œí•„ ë””ë ‰í† ë¦¬
+    enabled: ë‹¹ì‹ ì€ ë””ë ‰í„°ë¦¬ì— í‘œì‹œ ë˜ê³  ìžˆìŠµë‹ˆë‹¤.
+    enabled_but_waiting: ë””ë ‰í„°ë¦¬ì— í‘œì‹œ ë˜ê¸° ìœ„í•´ì„œëŠ” ìˆ˜ë™ìœ¼ë¡œ ì°¸ì—¬í•´ì•¼ í•©ë‹ˆë‹¤, í•˜ì§€ë§Œ ë””ë ‰í„°ë¦¬ì— í‘œì‹œ ë˜ê¸° ìœ„í•œ ìµœì†Œ íŒ”ë¡œì›Œ(%{min_followers})ìˆ˜ì— ë¯¸ì¹˜ì§€ ëª»í–ˆìŠµë‹ˆë‹¤.
+    explanation: ê´€ì‹¬ì‚¬ì— ëŒ€í•œ ìœ ì €ë“¤ì„ ë°œê²¬í•©ë‹ˆë‹¤
+    explore_mastodon: "%{title} íƒì‚¬í•˜ê¸°"
+    how_to_enable: ì•„ì§ ë””ë ‰í„°ë¦¬ì— ì°¸ì—¬í•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ì•„ëž˜ì—ì„œ ì°¸ì—¬í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ë°”ì´ì˜¤ í…ìŠ¤íŠ¸ì— í•´ì‹œíƒœê·¸ë¥¼ ì‚¬ìš©í•´ íŠ¹ì • í•´ì‹œíƒœê·¸ ë””ë ‰í„°ë¦¬ì— í‘œì‹œ ë  ìˆ˜ ìžˆìŠµë‹ˆë‹¤!
+    people:
+      one: "%{count}ëª…"
+      other: "%{count}ëª…"
   errors:
     '403': ì´ íŽ˜ì´ì§€ë¥¼ í‘œì‹œí•  ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤.
     '404': ë‹¹ì‹ ì´ ì°¾ìœ¼ë ¤ëŠ” íŽ˜ì´ì§€ëŠ” ì¡´ìž¬í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤.
@@ -465,7 +574,7 @@ ko:
     '500':
       content: ì£„ì†¡í•©ë‹ˆë‹¤, ë”ê°€ ìž˜ëª» ë˜ì—ˆìŠµë‹ˆë‹¤.
       title: ì´ íŽ˜ì´ì§€ëŠ” ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤
-    noscript_html: ë§ˆìŠ¤í† ëˆì„ ì‚¬ìš©í•˜ê¸° ìœ„í•´ì„œëŠ” ìžë°”ìŠ¤í¬ë¦½íŠ¸ë¥¼ ì¼œ ì£¼ì‹ì‹œì˜¤. ì•„ë‹ˆë©´ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">ë„¤ì´í‹°ë¸Œ ì•±</a> ì¤‘ í•˜ë‚˜ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
+    noscript_html: ë§ˆìŠ¤í† ëˆì„ ì‚¬ìš©í•˜ê¸° ìœ„í•´ì„œëŠ” ìžë°”ìŠ¤í¬ë¦½íŠ¸ë¥¼ ì¼œ ì£¼ì‹ì‹œì˜¤. ì•„ë‹ˆë©´ <a href="%{apps_path}">ë„¤ì´í‹°ë¸Œ ì•±</a> ì¤‘ í•˜ë‚˜ë¥¼ ì‚¬ìš©í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
   exports:
     archive_takeout:
       date: ë‚ ì§œ
@@ -476,7 +585,9 @@ ko:
       size: í¬ê¸°
     blocks: ì°¨ë‹¨
     csv: CSV
+    domain_blocks: ë„ë©”ì¸ ì°¨ë‹¨
     follows: íŒ”ë¡œìš°
+    lists: ë¦¬ìŠ¤íŠ¸
     mutes: ë®¤íŠ¸
     storage: ë¯¸ë””ì–´
   filters:
@@ -507,9 +618,13 @@ ko:
     true_privacy_html: "<strong>í”„ë¼ì´ë²„ì‹œ ë³´í˜¸ëŠ” End-to-End ì•”í˜¸í™”ë¡œë§Œ ì´ë£¨ì–´ ì§ˆ ìˆ˜ ìžˆë‹¤ëŠ” ê²ƒì— ìœ ì˜</strong>í•´ ì£¼ì‹ì‹œì˜¤."
     unlocked_warning_html: ëˆ„êµ¬ë“  ì—¬ëŸ¬ë¶„ì„ íŒ”ë¡œìš° í•  ìˆ˜ ìžˆìœ¼ë©°, ì—¬ëŸ¬ë¶„ì˜ í”„ë¼ì´ë¹— íˆ¬ê³ ë¥¼ ë³¼ ìˆ˜ ìžˆìŠµë‹ˆë‹¤. íŒ”ë¡œìš° í•  ìˆ˜ ìžˆëŠ” ì‚¬ëžŒì„ ì œí•œí•˜ê³  ì‹¶ì€ ê²½ìš° %{lock_link}ì—ì„œ ì„¤ì •í•´ ì£¼ì‹ì‹œì˜¤.
     unlocked_warning_title: ì´ ê³„ì •ì€ ë¹„ê³µê°œë¡œ ì„¤ì •ë˜ì–´ ìžˆì§€ ì•ŠìŠµë‹ˆë‹¤
+  footer:
+    developers: ê°œë°œìž
+    more: ë” ë³´ê¸°â€¦
+    resources: ë¦¬ì†ŒìŠ¤
   generic:
     changes_saved_msg: ì •ìƒì ìœ¼ë¡œ ë³€ê²½ë˜ì—ˆìŠµë‹ˆë‹¤!
-    powered_by: "%{link}ì— ì˜í•´ ì œê³µ"
+    copy: ë³µì‚¬
     save_changes: ë³€ê²½ ì‚¬í•ì„ ì €ìž¥
     validation_errors:
       one: ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤. ì•„ëž˜ ì˜¤ë¥˜ë¥¼ í™•ì¸í•´ ì£¼ì‹ì‹œì˜¤
@@ -545,8 +660,6 @@ ko:
       expires_at: ë§Œë£Œ
       uses: ì‚¬ìš©ë¨
     title: ì´ˆëŒ€
-  landing_strip_html: "<strong>%{name}</strong> ë‹˜ì€ %{link_to_root_path} ì¸ìŠ¤í„´ìŠ¤ì˜ ì‚¬ìš©ìžìž…ë‹ˆë‹¤. ê³„ì •ì„ ê°€ì§€ê³  ìžˆë‹¤ë©´ íŒ”ë¡œìš° í•˜ê±°ë‚˜ ëŒ€í™”í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
-  landing_strip_signup_html: ì•„ì§ ê³„ì •ì´ ì—†ë‹¤ë©´ <a href="%{sign_up_path}">ì—¬ê¸°ì„œ</a> ë“±ë¡í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤.
   lists:
     errors:
       limit: ë¦¬ìŠ¤íŠ¸ ìµœëŒ€ì¹˜ì— ë„ë‹¬í–ˆìŠµë‹ˆë‹¤
@@ -618,15 +731,30 @@ ko:
     publishing: í¼ë¸”ë¦¬ì‹±
     web: ì›¹
   remote_follow:
-    acct: ì•„ì´ë””@ë„ë©”ì¸ì„ ìž…ë ¥í•´ ì£¼ì‹ì‹œì˜¤
+    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: 'ì´ íˆ¿ì— ë‹µìž¥ì„ í•˜ë ¤ í•©ë‹ˆë‹¤:'
   remote_unfollow:
     error: ì—ëŸ¬
     title: íƒ€ì´í‹€
     unfollowed: ì–¸íŒ”ë¡œìš°ë¨
+  scheduled_statuses:
+    over_daily_limit: ê·¸ ë‚ ì§œì— ëŒ€í•œ %{limit}ê°œì˜ ì˜ˆì•½ íˆ¿ ì œí•œì„ ì´ˆê³¼í•©ë‹ˆë‹¤
+    over_total_limit: ì˜ˆì•½ íˆ¿ ì œí•œ %{limit}ì„ ì´ˆê³¼í•©ë‹ˆë‹¤
+    too_soon: ì˜ˆì•½ ë‚ ì§œëŠ” ë¯¸ëž˜ì—¬ì•¼ í•©ë‹ˆë‹¤
   sessions:
     activity: ë§ˆì§€ë§‰ í™œë™
     browser: ë¸Œë¼ìš°ì €
@@ -706,6 +834,7 @@ ko:
       private: ë¹„ê³µê°œ íˆ¿ì€ ê³ ì •ë  ìˆ˜ ì—†ìŠµë‹ˆë‹¤
       reblog: ë¶€ìŠ¤íŠ¸ëŠ” ê³ ì •ë  ìˆ˜ ì—†ìŠµë‹ˆë‹¤
     show_more: ë” ë³´ê¸°
+    sign_in_to_participate: ë¡œê·¸ì¸ í•˜ì—¬ ì´ ëŒ€í™”ì— ì°¸ì—¬í•˜ê¸°
     title: '%{name}: "%{quote}"'
     visibilities:
       private: ë¹„ê³µê°œ
@@ -715,11 +844,91 @@ ko:
       unlisted: ê³µê°œ íƒ€ìž„ë¼ì¸ ë¹„ê³µê°œ
       unlisted_long: ëˆ„êµ¬ë‚˜ ë³¼ ìˆ˜ ìžˆì§€ë§Œ, ê³µê°œ íƒ€ìž„ë¼ì¸ì—ëŠ” í‘œì‹œë˜ì§€ ì•ŠìŠµë‹ˆë‹¤
   stream_entries:
-    click_to_show: í´ë¦í•´ì„œ í‘œì‹œ
     pinned: ê³ ì •ëœ íˆ¿
     reblogged: ë‹˜ì´ ë¶€ìŠ¤íŠ¸ í–ˆìŠµë‹ˆë‹¤
     sensitive_content: ë¯¼ê°í•œ ì»¨í…ì¸ 
   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: ê³ ëŒ€ë¹„
@@ -728,6 +937,7 @@ ko:
   time:
     formats:
       default: "%Yë…„ %mì›” %dì¼ %H:%M"
+      month: "%Yë…„ %b"
   two_factor_authentication:
     code_hint: í™•ì¸í•˜ê¸° ìœ„í•´ì„œ ì¸ì¦ ì• í”Œë¦¬ì¼€ì´ì…˜ì—ì„œ í‘œì‹œëœ ì½”ë“œë¥¼ ìž…ë ¥í•´ ì£¼ì‹ì‹œì˜¤
     description_html: "<strong>2ë‹¨ê³„ ì¸ì¦</strong>ì„ í™œì„±í™” í•˜ë©´ ë¡œê·¸ì¸ ì‹œ ì „í™”ë¡œ ì¸ì¦ ì½”ë“œë¥¼ ë°›ì„ í•„ìš”ê°€ ìžˆìŠµë‹ˆë‹¤."
@@ -749,6 +959,22 @@ ko:
       explanation: ë‹¹ì‹ ì´ ìš”ì²í•œ ê³„ì •ì˜ í’€ ë°±ì—…ì´ ì´ì œ ë‹¤ìš´ë¡œë“œ ê°€ëŠ¥í•©ë‹ˆë‹¤!
       subject: ë‹¹ì‹ ì˜ ì•„ì¹´ì´ë¸Œë¥¼ ë‹¤ìš´ë¡œë“œ ê°€ëŠ¥í•©ë‹ˆë‹¤
       title: ì•„ì¹´ì´ë¸Œ í…Œì´í¬ ì•„ì›ƒ
+    warning:
+      explanation:
+        disable: ë‹¹ì‹ ì˜ ê³„ì •ì´ ë™ê²° ëœ ë™ì•ˆ ë‹¹ì‹ ì˜ ê³„ì •ì€ ìœ ì§€ ë©ë‹ˆë‹¤. í•˜ì§€ë§Œ ìž ê¸ˆì´ í’€ë¦´ ë•Œê¹Œì§€ ë‹¹ì‹ ì€ ì•„ë¬´ ê²ƒë„ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.
+        silence: ë‹¹ì‹ ì˜ ê³„ì •ì´ ì œí•œ ëœ ë™ì•ˆì—” ë‹¹ì‹ ì˜ íŒ”ë¡œì›Œ ì´ì™¸ì—” íˆ¿ì„ ë°›ì•„ ë³¼ ìˆ˜ ì—†ê³  ê³µê°œ ë¦¬ìŠ¤íŒ…ì—ì„œ ì œì™¸ ë©ë‹ˆë‹¤. í•˜ì§€ë§Œ ë‹¤ë¥¸ ì‚¬ëžŒë“¤ì€ ì—¬ì „ížˆ ë‹¹ì‹ ì„ íŒ”ë¡œìš° ê°€ëŠ¥í•©ë‹ˆë‹¤.
+        suspend: ë‹¹ì‹ ì˜ ê³„ì •ì€ ì •ì§€ ë˜ì—ˆìœ¼ë©°, ëª¨ë“  íˆ¿ê³¼ ì—…ë¡œë“œ í•œ ë¯¸ë””ì–´ê°€ ì„œë²„ì—ì„œ ì‚ì œ ë˜ì–´ ë˜ëŒë¦´ ìˆ˜ ì—†ìŠµë‹ˆë‹¤.
+      review_server_policies: ì„œë²„ ì •ì±… ê²€í† í•˜ê¸°
+      subject:
+        disable: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ê°€ ë™ê²° ë˜ì—ˆìŠµë‹ˆë‹¤
+        none: "%{acct}ì—ê²Œì˜ ê²½ê³ "
+        silence: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ê°€ ì œí•œ ë˜ì—ˆìŠµë‹ˆë‹¤
+        suspend: ë‹¹ì‹ ì˜ ê³„ì • %{acct}ê°€ ì •ì§€ ë˜ì—ˆìŠµë‹ˆë‹¤
+      title:
+        disable: ê³„ì • ë™ê²° ë¨
+        none: ê²½ê³ 
+        silence: ê³„ì • ì œí•œ ë¨
+        suspend: ê³„ì • ì •ì§€ ë¨
     welcome:
       edit_profile_action: í”„ë¡œí•„ ì„¤ì •
       edit_profile_step: ì•„ë°”íƒ€, í—¤ë”ë¥¼ ì—…ë¡œë“œí•˜ê³ , ì‚¬ëžŒë“¤ì—ê²Œ í‘œì‹œ ë  ì´ë¦„ì„ ë°”ê¾¸ëŠ” ê²ƒìœ¼ë¡œ ë‹¹ì‹ ì˜ í”„ë¡œí•„ì„ ì»¤ìŠ¤í…€ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ì‚¬ëžŒë“¤ì´ ë‹¹ì‹ ì„ íŒ”ë¡œìš° í•˜ê¸° ì „ì— ë¦¬ë·°ë¥¼ ê±°ì¹˜ê²Œ í•˜ê³  ì‹¶ë‹¤ë©´ ê³„ì •ì„ ìž ê·¸ë©´ ë©ë‹ˆë‹¤.
@@ -760,7 +986,6 @@ ko:
       review_preferences_action: ì„¤ì • ë°”ê¾¸ê¸°
       review_preferences_step: ë‹¹ì‹ ì˜ ì„¤ì •ì„ í™•ì¸í•˜ì„¸ìš”. ì–´ë–¤ ì´ë©”ì¼ë¡œ ì•Œë¦¼ì„ ë°›ì„ ê²ƒì¸ì§€, ê¸°ë³¸ì ìœ¼ë¡œ ì–´ë–¤ í”„ë¼ì´ë²„ì‹œ ì„¤ì •ì„ ì‚¬ìš©í•  ê²ƒì¸ì§€, ë©€ë¯¸ê°€ ì—†ë‹¤ë©´ GIFë¥¼ ìžë™ ìž¬ìƒí•˜ë„ë¡ ì„¤ì •í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.
       subject: ë§ˆìŠ¤í† ëˆì— ì˜¤ì‹  ê²ƒì„ í™˜ì˜í•©ë‹ˆë‹¤
-      tip_bridge_html: ë§Œì•½ íŠ¸ìœ„í„°ì—ì„œ ì˜¤ì…¨ë‹¤ë©´ <a href="%{bridge_url}">ë¸Œë¦¬ì§€ ì•±</a>ì„ í†µí•´ ë§ˆìŠ¤í† ëˆì— ìžˆëŠ” ì¹œêµ¬ë“¤ì„ ì°¾ì„ ìˆ˜ ìžˆìŠµë‹ˆë‹¤. ì¹œêµ¬ë“¤ë„ ì´ ì•±ì„ ì‚¬ìš©í–ˆì„ ë•Œë§Œ ìž‘ë™í•©ë‹ˆë‹¤!
       tip_federated_timeline: ì—°í•© íƒ€ìž„ë¼ì¸ì€ ë§ˆìŠ¤í† ëˆ ë„¤íŠ¸ì›Œí¬ì˜ ì†Œë°©í˜¸ìŠ¤ìž…ë‹ˆë‹¤. ë‹¤ë§Œ ì—¬ê¸°ì—” ë‹¹ì‹ ì˜ ì´ì›ƒë“¤ì´ êµ¬ë… ì¤‘ì¸ ê²ƒë§Œ ëœ¹ë‹ˆë‹¤, ëª¨ë“  ê²ƒì´ ë‹¤ ì˜¤ëŠ” ê²ƒì€ ì•„ë‹ˆì˜ˆìš”.
       tip_following: ê¸°ë³¸ì ìœ¼ë¡œ ì„œë²„ì˜ ê´€ë¦¬ìžë¥¼ íŒ”ë¡œìš° í•˜ë„ë¡ ë˜ì–´ ìžˆìŠµë‹ˆë‹¤. í¥ë¯¸ë¡œìš´ ì‚¬ëžŒë“¤ì„ ë” ì°¾ìœ¼ë ¤ë©´ ë¡œì»¬ê³¼ ì—°í•© íƒ€ìž„ë¼ì¸ì„ í™•ì¸í•´ ë³´ì„¸ìš”.
       tip_local_timeline: ë¡œì»¬ íƒ€ìž„ë¼ì¸ì€ %{instance}ì˜ ì†Œë°©í˜¸ìŠ¤ìž…ë‹ˆë‹¤. ì—¬ê¸° ìžˆëŠ” ì‚¬ëžŒë“¤ì€ ë‹¹ì‹ ì˜ ì´ì›ƒë“¤ì´ì—ìš”!
@@ -768,8 +993,12 @@ ko:
       tips: íŒ
       title: í™˜ì˜í•©ë‹ˆë‹¤ %{name} ë‹˜!
   users:
+    follow_limit_reached: ë‹¹ì‹ ì€ %{limit}ëª…ì˜ ì‚¬ëžŒì„ ë„˜ì–´ì„œ íŒ”ë¡œìš° í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤
     invalid_email: ë©”ì¼ ì£¼ì†Œê°€ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤
     invalid_otp_token: 2ë‹¨ê³„ ì¸ì¦ ì½”ë“œê°€ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤
     otp_lost_help_html: ë§Œì•½ ì–‘ìª½ ëª¨ë‘ë¥¼ ìžƒì–´ë²„ë ¸ë‹¤ë©´ %{email}ì„ í†µí•´ ë³µêµ¬í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
     seamless_external_login: ì™¸ë¶€ ì„œë¹„ìŠ¤ë¥¼ ì´ìš©í•´ ë¡œê·¸ì¸ í–ˆìŠµë‹ˆë‹¤, íŒ¨ìŠ¤ì›Œë“œì™€ ì´ë©”ì¼ ì„¤ì •ì„ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.
     signed_in_as: 'ë‹¤ìŒê³¼ ê°™ì´ ë¡œê·¸ì¸ ì¤‘:'
+  verification:
+    explanation_html: 'ë‹¹ì‹ ì€ <strong>í”„ë¡œí•„ ë©”íƒ€ë°ì´í„°ì˜ ë§í¬ ì†Œìœ ìžìž„ì„ ê²€ì¦í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤</strong>. ì´ê²ƒì„ í•˜ê¸° ìœ„í•´ì„œëŠ”, ë§í¬ ëœ ì›¹ì‚¬ì´íŠ¸ì—ì„œ ë‹¹ì‹ ì˜ ë§ˆìŠ¤í† ëˆ í”„ë¡œí•„ì„ ì—ìœ¼ë¡œ ë§í¬í•´ì•¼ í•©ë‹ˆë‹¤. ì—ë§í¬ëŠ” <strong>ë°˜ë“œì‹œ</strong> <code>rel="me"</code> ì†ì„±ì„ ê°€ì§€ê³  ìžˆì–´ì•¼ í•©ë‹ˆë‹¤. ë§í¬ì˜ í…ìŠ¤íŠ¸ëŠ” ìƒê´€ì´ ì—†ìŠµë‹ˆë‹¤. ì—¬ê¸° ì˜ˆì‹œê°€ ìžˆìŠµë‹ˆë‹¤:'
+    verification: ê²€ì¦
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0967ef424bce6791893e9a57bb952f80fd536e93
--- /dev/null
+++ b/config/locales/lv.yml
@@ -0,0 +1 @@
+{}
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index 2eff09e1b33eaeec99a2e9e762e5e0bcf73a0d99..e3c901eff84856a8af490c4a9d7974da12a5853e 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1,6 +1,339 @@
 ---
 ms:
   about:
-    about_this: Mengenai
+    about_hashtag_html: Terdapat toot awam yang ditanda dengan <strong>#%{hashtag}</strong>. Anda boleh berinteraksi dengan mereka jika anda mempunyai akaun di mana-mana dunia persekutuan Mastodon.
+    about_mastodon_html: Mastodon ialah rangkaian sosial berasaskan protokol web terbuka dan perisian percuma bersumber terbuka. Ianya tak terpusat seperti emel.
+    about_this: Mengenai Kami
     administered_by: 'Ditadbir oleh:'
-    contact: Hubungi
+    api: API
+    apps: Aplikasi mudah alih
+    closed_registrations: Pendaftaran ditutup di tika ini. Tetapi! Anda boleh mencari tika lain untuk mencipta akaun dan capai ke rangkaian yang sama daripada sana.
+    contact: Hubungi kami
+    contact_missing: Tidak ditetapkan
+    contact_unavailable: Tidak tersedia
+    documentation: Pendokumenan
+    extended_description_html: |
+      <h3>Tempat sesuai untuk peraturan</h3>
+      <p>Kenyataan penuh masih belum ditetapkan.</p>
+    features:
+      humane_approach_body: Belajar daripada kegagalan rangkaian lain, Mastodon berazam untuk membuat pilihan reka cipta beretika untuk mengatasi penyalahgunaan media sosial.
+      humane_approach_title: Pendekatan yang lebih berperikemanusiaan
+      not_a_product_body: Mastodon bukannya rangkaian komersial. Tiada iklan, tiada perlombongan data, tiada kurungan atau tapisan. Tiada pihak berkuasa pusat.
+      not_a_product_title: Anda seorang manusia, bukannya sebuah produk
+      real_conversation_body: Dengan had 500 aksara dan sokongan kandungan berbutir serta pemberi amaran media, anda boleh meluahkan diri anda dengan cara yang anda inginkan.
+      real_conversation_title: Dibina untuk perbualan sebenar
+      within_reach_body: Pelbagai aplikasi untuk iOS, Android, dan platform lain telah dibangunkan dengan ekosistem API mesra-pembangun membolehkan anda terus berhubung dengan rakan anda di mana-mana sahaja.
+      within_reach_title: Sentiasa dalam jangkauan
+    generic_description: "%{domain} ialah salah sebuah pelayan dalam rangkaian Mastodon"
+    hosted_on: Mastodon dihoskan di %{domain}
+    learn_more: Ketahui lebih lanjut
+    other_instances: Senarai tika
+    privacy_policy: Polisi privasi
+    source_code: Kod sumber
+    status_count_after:
+      one: status
+      other: status
+    status_count_before: Telah menulis
+    terms: Terma perkhidmatan
+    user_count_after:
+      one: pengguna
+      other: pengguna
+    user_count_before: Rumah kepada
+    what_is_mastodon: Apakah itu Mastodon?
+  accounts:
+    choices_html: 'Pilihan %{name}:'
+    follow: Ikut
+    followers:
+      one: Pengikut
+      other: Pengikut
+    following: Mengikuti
+    joined: Sertai pada %{date}
+    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
+    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:
+      one: Toot
+      other: Toot
+    posts_tab_heading: Toot
+    posts_with_replies: Toot dan maklum balas
+    reserved_username: Nama pengguna ini terpelihara
+    roles:
+      admin: Admin
+      bot: Bot
+      moderator: Pengawal
+    unfollow: Nyahikut
+  admin:
+    account_moderation_notes:
+      create: Tinggalkan nota
+      created_msg: Nota kawalan telah berjaya dicipta!
+      delete: Padam
+      destroyed_msg: Nota kawalan telah berjaya dipadam!
+    accounts:
+      are_you_sure: Anda pasti?
+      avatar: Avatar
+      by_domain: Domain
+      change_email:
+        changed_msg: Emel akaun telah berjaya ditukar!
+        current_email: Emel Semasa
+        label: Tukar Emel
+        new_email: Emel Baru
+        submit: Tukar Emel
+        title: Tukar Emel untuk %{username}
+      confirm: Sahkan
+      confirmed: Disahkan
+      confirming: Mengesahkan
+      demote: Turunkan pangkat
+      disable: Lumpuhkan
+      disable_two_factor_authentication: Lumpuhkan 2FA
+      disabled: Dilumpuhkan
+      display_name: Nama paparan
+      domain: Domain
+      edit: Tukar
+      email: Emel
+      email_status: Status Emel
+      enable: Bolehkan
+      enabled: Dibolehkan
+      feed_url: Suapan URL
+      followers: Pengikut
+      followers_url: URL Pengikut
+      follows: Mengikuti
+      inbox_url: URL mesej masuk
+      ip: Alamat IP
+      location:
+        all: Semua
+        local: Tempatan
+        remote: Jarak Jauh
+        title: Kedudukan
+      login_status: Status log masuk
+      media_attachments: Lampiran media
+      memorialize: Tukarkan menjadi akaun peringatan
+      moderation:
+        all: Semua
+        silenced: Disenyapkan
+        suspended: Digantungkan
+        title: Kawalan
+      moderation_notes: Nota kawalan
+      most_recent_activity: Aktiviti terbaru
+      most_recent_ip: IP terbaru
+      no_limits_imposed: Tiada had dikuatkuasakan
+      not_subscribed: Tiada langganan
+      outbox_url: URL mesej keluar
+      perform_full_suspension: Gantung
+      profile_url: URL profil
+      promote: Naikkan pangkat
+      protocol: Protokol
+      public: Awam
+      push_subscription_expires: Langganan PuSH tamat tempoh
+      redownload: Segarkan semula avatar
+      remove_avatar: Buang avatar
+      resend_confirmation:
+        already_confirmed: Pengguna ini telah disahkan
+        send: Hantar semula emel pengesahan
+        success: Emel pengesahan telah berjaya dihantar!
+      reset: Set semula
+      reset_password: Set semula kata laluan
+      resubscribe: Langgan semula
+      role: Kebenaran
+      roles:
+        admin: Pentadbir
+        moderator: Pengawal
+        staff: Kakitangan
+        user: Pengguna
+      salmon_url: URL Salmon
+      search: Cari
+      shared_inbox_url: URL Peti Masuk Berkongsi
+      show:
+        created_reports: Laporan yang dicipta oleh akaun ini
+        targeted_reports: Laporan yang dicipta berkaitan akaun ini
+      silence: Senyap
+      silenced: Disenyapkan
+      statuses: Status
+      subscribe: Langgan
+      suspended: Digantung
+      title: Akaun
+      unconfirmed_email: Emel Belum Disahkan
+      undo_silenced: Buang senyap
+      undo_suspension: Buang penggantungan
+      unsubscribe: Buang langganan
+      username: Nama pengguna
+      web: Web
+    action_logs:
+      actions:
+        assigned_to_self_report: "%{name} memberikan laporan %{target} kepada diri mereka sendiri"
+        change_email_user: "%{name} menukar alamat emel pengguna %{target}"
+        confirm_user: "%{name} mengesahkan alamat emel pengguna %{target}"
+        create_custom_emoji: "%{name} memuat naik emoji baru %{target}"
+        create_domain_block: "%{name} menyekat domain %{target}"
+        create_email_domain_block: "%{name} menyenaraihitamkan domain emel %{target}"
+        demote_user: "%{name} menurunkan pangkat pengguna %{target}"
+        destroy_custom_emoji: "%{name} membuang emoji %{target}"
+        destroy_domain_block: "%{name} membuang sekatan domain %{target}"
+        destroy_email_domain_block: "%{name} menyenaraiputihkan domain emel %{target}"
+        destroy_status: "%{name} membuang status oleh %{target}"
+        disable_2fa_user: "%{name} melumpuhkan keperluan dua faktor untuk pengguna %{target}"
+        disable_custom_emoji: "%{name} melumpuhkan emoji %{target}"
+        disable_user: "%{name} melumpuhkan log masuk untuk pengguna %{target}"
+        enable_custom_emoji: "%{name} membolehkan emoji %{target}"
+        enable_user: "%{name} membolehkan log masuk untuk pengguna %{target}"
+        memorialize_account: "%{name} menukarkan akaun %{target} menjadi halaman peringatan"
+        promote_user: "%{name} menaikkan pangkat pengguna %{target}"
+        remove_avatar_user: "%{name} membuang avatar pengguna %{target}"
+        reopen_report: "%{name} membuka semula laporan %{target}"
+        reset_password_user: "%{name} set semula kata laluan pengguna %{target}"
+        resolve_report: "%{name} menyelesaikan laporan %{target}"
+        silence_account: "%{name} menyenyapkan akaun %{target}"
+        suspend_account: "%{name} menggantung akaun %{target}"
+        unassigned_report: "%{name} menyahtugaskan laporan %{target}"
+        unsilence_account: "%{name} menyahsenyapkan akaun %{target}"
+        unsuspend_account: "%{name} menyahgantungkan akaun %{target}"
+        update_custom_emoji: "%{name} mengemaskini emoji %{target}"
+        update_status: "%{name} mengemaskini status oleh %{target}"
+      deleted_status: "(status telah dipadam)"
+      title: Log audit
+    custom_emojis:
+      by_domain: Domain
+      copied_msg: Telah berjaya mencipta salinan tempatan emoji
+      copy: Salin
+      copy_failed_msg: Tidak dapat membuat salinan tempatan emoji tersebut
+      created_msg: Emoji berjaya dicipta!
+      delete: Padam
+      destroyed_msg: Emoji berjaya dipadam!
+      disable: Lumpuhkan
+      disabled_msg: Emoji tersebut berjaya dilumpuhkan
+      emoji: Emoji
+      enable: Bolehkan
+      enabled_msg: Emoji tersebut berjaya dibolehkan
+      image_hint: PNG, maksimum 50KB
+      listed: Disenaraikan
+      new:
+        title: Tambah emoji sendiri baru
+      overwrite: Tulis ganti
+      shortcode: Kod pendek
+      shortcode_hint: Sekurang-kurangnya 2 aksara, hanya aksara angka abjad dan garis bawah
+      title: Emoji sendiri
+      unlisted: Tidak disenaraikan
+      update_failed_msg: Tidak boleh mengemaskini emoji tersebut
+      updated_msg: Emoji berjaya dikemaskini!
+      upload: Muat naik
+    dashboard:
+      backlog: tugasan tunggakan
+      config: Tatarajah
+      feature_deletions: Pemadaman akaun
+      feature_invites: Pautan undangan
+      feature_registrations: Pendaftaran
+      feature_relay: Geganti persekutuan
+      features: Ciri-ciri
+      hidden_service: Persekutuan dengan perkhidmatan tersembunyi
+      open_reports: laporan belum selesai
+      recent_users: Pengguna terbaru
+      search: Carian teks penuh
+      single_user_mode: Mod pengguna tunggal
+      software: Perisian
+      space: Kegunaan ruang
+      title: Papan pemuka
+      total_users: pengguna keseluruhannya
+      trends: Trend
+      week_interactions: interaksi minggu ini
+      week_users_active: aktif minggu ini
+      week_users_new: pengguna minggu ini
+    domain_blocks:
+      add_new: Tambah
+      created_msg: Sekatan domain sedang diproses
+      destroyed_msg: Sekatan domain telah dibatalkan
+      domain: Domain
+      new:
+        create: Cipta sekatan
+        hint: Sekatan domain tidak akan menghindarkan penciptaan entri akaun dalam pangkalan data, tetapi akan diberikan kaedah kawalan khusus tertentu pada akaun-akaun tersebut secara retroaktif dan automatik.
+        severity:
+          desc_html: "<strong>Senyapkan</strong> akan membuatkan hantaran akaun tidak kelihatan kepada sesiapa yang tidak mengikut mereka. <strong>Gantungkan</strong> akan membuang semua kandungan, media, dan data profil akaun tersebut. Gunakan <strong>Tiada</strong> jika anda hanya ingin menolak fail media."
+          noop: Tiada
+          silence: Senyapkan
+          suspend: Gantungkan
+        title: Sekatan domain baru
+      reject_media: Tolak fail media
+      reject_media_hint: Buang fail media yang disimpan di sini dan menolak sebarang muat turun pada masa depan. Tidak berkaitan dengan penggantungan
+      reject_reports: Tolak laporan
+      reject_reports_hint: Abaikan semua laporan daripada domain ini. Tidak dikira untuk penggantungan
+      show:
+        affected_accounts:
+          one: Satu akaun dalam pangkalan data menerima kesan
+          other: "%{count} akaun dalam pangkalan data menerima kesan"
+        retroactive:
+          silence: Buang penyenyapan semua akaun sedia ada daripada domain ini
+          suspend: Buang penggantungan semua akaun sedia ada daripada domain ini
+        title: Buang sekatan domain %{domain}
+        undo: Buang
+      undo: Buang
+    email_domain_blocks:
+      add_new: Tambah
+      created_msg: Berjaya menambah domain emel ke dalam senarai hitam
+      delete: Padam
+      destroyed_msg: Berjaya memadam domain emel daripada senarai hitam
+      domain: Domain
+      new:
+        create: Tambah domain
+        title: Entri senarai hitam emel baru
+      title: Senarai hitam emel
+    instances:
+      title: Tika diketahui
+    invites:
+      deactivate_all: Nyahaktifkan semua
+      filter:
+        all: Semua
+        available: Tersedia
+        expired: Tamat tempoh
+        title: Tapis
+      title: Undangan
+    relays:
+      add_new: Tambah geganti baru
+      delete: Padam
+      description_html: "<strong>Geganti persekutuan</strong> ialah pelayan perantara yang saling menukar toot awam dalam jumlah yang banyak di antara pelayan yang melanggan ia dan menerbitkan kepada ia. <strong>Ia boleh bantu pelayan kecil dan sederhana untuk menemui kandungan daripada dunia persekutuan Mastodon</strong>, yang mana jika tidak digunakan akan memerlukan pengguna tempatan mengikut orang lain di pelayan jarak jauh secara manual."
+      disable: Lumpuhkan
+      disabled: Dilumpuhkan
+      enable: Bolehkan
+      enable_hint: Apabila dibolehkan, pelayan anda akan melanggan kesemua toot awam daripada geganti ini, dan akan mula menghantar toot awam pelayan ini kepada ia.
+      enabled: Dibolehkan
+      inbox_url: URL geganti
+      pending: Menunggu persetujuan geganti
+      save_and_enable: Simpan dan bolehkan
+      setup: Tetapkan sambungan geganti
+      status: Status
+      title: Geganti
+    report_notes:
+      created_msg: Nota laporan berjaya dicipta!
+      destroyed_msg: Nota laporan berjaya dipadam!
+    reports:
+      account:
+        note: nota
+        report: laporan
+      action_taken_by: Tindakan oleh
+      are_you_sure: Anda pasti?
+      assign_to_self: Berikan pada saya
+      assigned: Pengawal yang menerima
+      comment:
+        none: Tiada
+      created_at: Dilaporkan
+      mark_as_resolved: Tanda sebagai sudah selesai
+      mark_as_unresolved: Tanda sebagai belum selesai
+      notes:
+        create: Tambah nota
+        create_and_resolve: Selesaikan dengan nota
+        placeholder: Terangkan tindakan apa yang telah diambil, atau sebarang kemas kini lain yang berkaitan...
+  exports:
+    archive_takeout:
+      in_progress: Mengkompil arkib anda...
+  followers:
+    success:
+      one: Dalam proses menyekat-lembut pengikut daripada satu domain...
+      other: Dalam proses menyekat-lembut pengikut daripada %{count} domain...
+  notification_mailer:
+    digest:
+      title: Ketika anda tiada di sini...
+  users:
+    follow_limit_reached: Anda tidak boleh mengikut lebih daripada %{limit} orang
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 2704ce02075bf8bf9917950f3629b27e10546254..dd23304fe0ae8fa69749548c4d140f0e56d0e4c9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -5,13 +5,13 @@ nl:
     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
     administered_by: 'Beheerd door:'
+    api: API
+    apps: Mobiele apps
     closed_registrations: Registreren op deze server is momenteel niet mogelijk. Je kunt echter een andere server vinden om zo toegang te krijgen tot het netwerk.
     contact: Contact
     contact_missing: Niet ingesteld
     contact_unavailable: n.v.t
-    description_headline: Wat is %{domain}?
-    domain_count_after: andere servers
-    domain_count_before: Verbonden met
+    documentation: Documentatie
     extended_description_html: |
       <h3>Een goede plek voor richtlijnen</h3>
       <p>De uitgebreide omschrijving is nog niet ingevuld.</p>
@@ -28,25 +28,41 @@ nl:
     hosted_on: Mastodon op %{domain}
     learn_more: Meer leren
     other_instances: Andere servers
+    privacy_policy: Privacybeleid
     source_code: Broncode
-    status_count_after: toots
+    status_count_after:
+      one: toot
+      other: toots
     status_count_before: Zij schreven
-    user_count_after: gebruikers
+    terms: Gebruiksvoorwaarden
+    user_count_after:
+      one: gebruiker
+      other: gebruikers
     user_count_before: Thuisbasis van
     what_is_mastodon: Wat is Mastodon?
   accounts:
+    choices_html: 'Aanbevelingen van %{name}:'
     follow: Volgen
-    followers: Volgers
+    followers:
+      one: Volger
+      other: Volgers
     following: Volgend
+    joined: Geregistreerd in %{date}
+    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
     nothing_here: Hier is niets!
     people_followed_by: Mensen die %{name} volgen
     people_who_follow: Mensen die %{name} volgen
-    posts: Toots
+    pin_errors:
+      following: Je moet dit account wel al volgen, alvorens je het kan aanbevelen
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
     posts_with_replies: Toots en reacties
-    remote_follow: Extern volgen
     reserved_username: Deze gebruikersnaam is gereserveerd
     roles:
       admin: Beheerder
@@ -54,6 +70,9 @@ nl:
       moderator: Moderator
     unfollow: Ontvolgen
   admin:
+    account_actions:
+      action: Actie uitvoeren
+      title: Moderatieactie op %{acct} uitvoeren
     account_moderation_notes:
       create: Laat een opmerking achter
       created_msg: Aanmaken van opmerking voor moderatoren geslaagd!
@@ -73,6 +92,7 @@ nl:
       confirm: Bevestigen
       confirmed: Bevestigd
       confirming: Bevestiging
+      deleted: Verwijderd
       demote: Degraderen
       disable: Uitschakelen
       disable_two_factor_authentication: 2FA uitschakelen
@@ -81,15 +101,18 @@ nl:
       domain: Domein
       edit: Bewerken
       email: E-mail
-      email_status: E-mail Status
+      email_status: E-mailstatus
       enable: Inschakelen
       enabled: Ingeschakeld
       feed_url: Feed-URL
       followers: Volgers
       followers_url: Volgers-URL
       follows: Volgt
+      header: Omslagfoto
       inbox_url: Inbox-URL
+      invited_by: Uitgenodigd door
       ip: IP
+      joined: Geregistreerd in
       location:
         all: Alles
         local: Lokaal
@@ -99,6 +122,7 @@ nl:
       media_attachments: Mediabijlagen
       memorialize: In gedenkpagina veranderen
       moderation:
+        active: Actief
         all: Alles
         silenced: Genegeerd
         suspended: Opgeschort
@@ -106,20 +130,18 @@ nl:
       moderation_notes: Opmerkingen voor moderatoren
       most_recent_activity: Laatst actief
       most_recent_ip: Laatst gebruikt IP-adres
+      no_limits_imposed: Geen limieten ingesteld
       not_subscribed: Niet geabonneerd
-      order:
-        alphabetic: Alfabetisch
-        most_recent: Meest recent
-        title: Sorteren
       outbox_url: Outbox-URL
-      perform_full_suspension: Volledig opschorten
+      perform_full_suspension: Opschorten
       profile_url: Profiel-URL
       promote: Promoveren
       protocol: Protocol
       public: Openbaar
       push_subscription_expires: PuSH-abonnement verloopt op
-      redownload: Avatar vernieuwen
+      redownload: Profiel vernieuwen
       remove_avatar: Avatar verwijderen
+      remove_header: Omslagfoto verwijderen
       resend_confirmation:
         already_confirmed: Deze gebruiker is al bevestigd
         send: Verzend bevestigingsmail opnieuw
@@ -137,49 +159,54 @@ nl:
       search: Zoeken
       shared_inbox_url: Gedeelde inbox-URL
       show:
-        created_reports: Toots door dit account gerapporteerd
-        report: gerapporteerd
-        targeted_reports: Toots van dit account gerapporteerd
+        created_reports: Aangemaakte rapportages
+        targeted_reports: Door anderen gerapporteerd
       silence: Negeren
+      silenced: Genegeerd
       statuses: Toots
       subscribe: Abonneren
+      suspended: Opgeschort
       title: Accounts
       unconfirmed_email: Onbevestigd e-mailadres
       undo_silenced: Niet langer negeren
       undo_suspension: Niet langer opschorten
       unsubscribe: Opzeggen
       username: Gebruikersnaam
+      warn: Waarschuwen
       web: Webapp
     action_logs:
       actions:
-        assigned_to_self_report: "%{name} heeft gerapporteerde toot %{target} aan zichzelf toegewezen"
+        assigned_to_self_report: "%{name} heeft rapportage %{target} aan zichzelf toegewezen"
         change_email_user: "%{name} veranderde het e-mailadres van gebruiker %{target}"
         confirm_user: E-mailadres van gebruiker %{target} is door %{name} bevestigd
+        create_account_warning: "%{name} verzond een waarschuwing naar %{target}"
         create_custom_emoji: Nieuwe emoji %{target} is door %{name} geÃ¼pload
         create_domain_block: Domein %{target} is door %{name} geblokkeerd
         create_email_domain_block: E-maildomein %{target} is door %{name} op de zwarte lijst geplaatst
         demote_user: Gebruiker %{target} is door %{name} gedegradeerd
+        destroy_custom_emoji: "%{name} verwijderde emoji %{target}"
         destroy_domain_block: Domein %{target} is door %{name} gedeblokkeerd
         destroy_email_domain_block: E-maildomein %{target} is door %{name} op de witte lijst geplaatst
         destroy_status: Toot van %{target} is door %{name} verwijderd
         disable_2fa_user: Vereisten tweestapsverificatie van %{target} zijn door %{name} uitgeschakeld
         disable_custom_emoji: Emoji %{target} is door %{name} uitgeschakeld
-        disable_user: Aanmelden voor %{target} is door %{name} uitgeschakeld
+        disable_user: Inloggen voor %{target} is door %{name} uitgeschakeld
         enable_custom_emoji: Emoji %{target} is door %{name} ingeschakeld
         enable_user: Inloggen voor %{target} is door %{name} ingeschakeld
         memorialize_account: Account %{target} is door %{name} in een gedenkpagina veranderd
         promote_user: Gebruiker %{target} is door %{name} gepromoveerd
         remove_avatar_user: "%{name} verwijderde de avatar van %{target}"
-        reopen_report: "%{name} heeft gerapporteerde toot %{target} heropend"
+        reopen_report: "%{name} heeft rapportage %{target} heropend"
         reset_password_user: Wachtwoord van gebruiker %{target} is door %{name} opnieuw ingesteld
-        resolve_report: "%{name} heeft gerapporteerde toot %{target} opgelost"
+        resolve_report: "%{name} heeft rapportage %{target} opgelost"
         silence_account: Account %{target} is door %{name} genegeerd
         suspend_account: Account %{target} is door %{name} opgeschort
-        unassigned_report: "%{name} heeft het toewijzen van gerapporteerde toot %{target} ongedaan gemaakt"
+        unassigned_report: "%{name} heeft het toewijzen van rapportage %{target} ongedaan gemaakt"
         unsilence_account: Negeren van account %{target} is door %{name} opgeheven
         unsuspend_account: Opschorten van account %{target} is door %{name} opgeheven
         update_custom_emoji: Emoji %{target} is door %{name} bijgewerkt
         update_status: De toots van %{target} zijn door %{name} bijgewerkt
+      deleted_status: "(verwijderde toot}"
       title: Auditlog
     custom_emojis:
       by_domain: Domein
@@ -206,8 +233,30 @@ nl:
       update_failed_msg: Deze emoji kon niet worden bijgewerkt
       updated_msg: Bijwerken van emoji is geslaagd!
       upload: Uploaden
+    dashboard:
+      backlog: achterstallige taken
+      config: Configuratie
+      feature_deletions: Verwijderen van account
+      feature_invites: Uitnodigingen
+      feature_profile_directory: Gebruikersgids
+      feature_registrations: Registraties
+      feature_relay: Federatierelay
+      features: Functies
+      hidden_service: Federatie met verborgen diensten
+      open_reports: onopgeloste rapportages
+      recent_users: Recente gebruikers
+      search: In volledige tekst zoeken
+      single_user_mode: Modus voor Ã©Ã©n gebruiker
+      software: Software
+      space: Ruimtegebruik
+      title: Dashboard
+      total_users: gebruikers in totaal
+      trends: Trends
+      week_interactions: interacties deze week
+      week_users_active: actieve gebruikers deze week
+      week_users_new: nieuwe gebruikers deze week
     domain_blocks:
-      add_new: Nieuwe toevoegen
+      add_new: Nieuwe domeinblokkade toevoegen
       created_msg: Domeinblokkade wordt nu verwerkt
       destroyed_msg: Domeinblokkade is ongedaan gemaakt
       domain: Domein
@@ -220,13 +269,15 @@ nl:
           silence: Negeren
           suspend: Opschorten
         title: Nieuwe domeinblokkade
-      reject_media: Mediabestanden verwerpen
+      reject_media: Mediabestanden weigeren
       reject_media_hint: Verwijderd lokaal opgeslagen mediabestanden en weigert deze in de toekomst te downloaden. Irrelevant voor opgeschorte domeinen
-      severities:
-        noop: Geen
-        silence: Negeren
-        suspend: Opschorten
-      severity: Zwaarte
+      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
@@ -236,8 +287,7 @@ nl:
           suspend: Alle opgeschorte accounts van dit domein niet langer opschorten
         title: Domeinblokkade voor %{domain} ongedaan maken
         undo: Ongedaan maken
-      title: Domeinblokkades
-      undo: Ongedaan maken
+      undo: domeinblokkade ongedaan maken
     email_domain_blocks:
       add_new: Nieuwe toevoegen
       created_msg: Blokkeren e-maildomein geslaagd
@@ -248,26 +298,54 @@ nl:
         create: Blokkeren
         title: Nieuw e-maildomein blokkeren
       title: E-maildomeinen blokkeren
+    followers:
+      back_to_account: Terug naar account
+      title: Volgers van %{acct}
     instances:
-      account_count: Bekende accounts
-      domain_name: Domein
-      reset: Opnieuw
-      search: Zoeken
-      title: Bekende servers
+      delivery_available: Bezorging is mogelijk
+      known_accounts:
+        one: "%{count} bekend account"
+        other: "%{count} bekende accounts"
+      moderation:
+        all: Alles
+        limited: Beperkt
+        title: Moderatie
+      title: Andere domeinen
+      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
     invites:
+      deactivate_all: Alles deactiveren
       filter:
         all: Alles
         available: Beschikbaar
         expired: Verlopen
         title: Filter
       title: Uitnodigingen
+    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.
+      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.
+      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
+      status: Status
+      title: Relayservers
     report_notes:
-      created_msg: Opmerking bij gerapporteerde toot succesvol aangemaakt!
-      destroyed_msg: Opmerking bij gerapporteerde toot succesvol verwijderd!
+      created_msg: Opmerking bij rapportage succesvol aangemaakt!
+      destroyed_msg: Opmerking bij rapportage succesvol verwijderd!
     reports:
       account:
         note: opmerking
-        report: gerapporteerde toot
+        report: rapportage
       action_taken_by: Actie uitgevoerd door
       are_you_sure: Weet je het zeker?
       assign_to_self: Aan mij toewijzen
@@ -275,7 +353,6 @@ nl:
       comment:
         none: Geen
       created_at: Gerapporteerd op
-      id: ID
       mark_as_resolved: Markeer als opgelost
       mark_as_unresolved: Markeer als onopgelost
       notes:
@@ -284,22 +361,17 @@ nl:
         create_and_unresolve: Heropenen met opmerking
         delete: Verwijderen
         placeholder: Beschrijf welke acties zijn ondernomen of andere gerelateerde opmerkingenâ€¦
-      reopen: Gerapporteerde toot heropenen
-      report: 'Gerapporteerde toot #%{id}'
-      report_contents: Inhoud
+      reopen: Rapportage heropenen
+      report: 'Rapportage #%{id}'
       reported_account: Gerapporteerde account
       reported_by: Gerapporteerd door
       resolved: Opgelost
-      resolved_msg: Gerapporteerde toot succesvol opgelost!
-      silence_account: Account negeren
+      resolved_msg: Rapportage succesvol opgelost!
       status: Toot
-      suspend_account: Account opschorten
-      target: Gerapporteerde account
-      title: Gerapporteerde toots
+      title: Rapportages
       unassign: Niet langer toewijzen
       unresolved: Onopgelost
       updated_at: Bijgewerkt
-      view: Weergeven
     settings:
       activity_api_enabled:
         desc_html: Wekelijks overzicht van de hoeveelheid lokale toots, actieve gebruikers en nieuwe registraties
@@ -310,15 +382,24 @@ nl:
       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
       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 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
@@ -339,11 +420,14 @@ nl:
         desc_html: Medewerkersbadge op profielpagina tonen
         title: Medewerkersbadge tonen
       site_description:
-        desc_html: Dit wordt als een alinea op de voorpagina getoond en gebruikt als meta-tag in de paginabron.<br/>Je kan HTML gebruiken, zoals <code>&lt;a&gt;</code> en <code>&lt;em&gt;</code>.
+        desc_html: Dit wordt als een alinea op de voorpagina getoond. 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
       site_description_extended:
         desc_html: Wordt op de uitgebreide informatiepagina weergegeven<br>Je kan ook hier HTML gebruiken
         title: Uitgebreide omschrijving Mastodonserver
+      site_short_description:
+        desc_html: Dit wordt in de zijbalk getoond als en als metatag in de paginabron.  Beschrijf in Ã©Ã©n alinea wat Mastodon is en wat deze server speciaal maakt. De (langere) omschrijving van de Mastodonserver wordt gebruikt wanneer dit veld wordt leeg gelaten.
+        title: Korte omschrijving Mastodonserver
       site_terms:
         desc_html: Je kan hier jouw eigen privacybeleid, gebruiksvoorwaarden en ander juridisch jargon kwijt. Je kan HTML gebruiken
         title: Aangepaste gebruiksvoorwaarden
@@ -365,6 +449,7 @@ nl:
       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
       with_media: Met media
     subscriptions:
@@ -374,12 +459,26 @@ nl:
       last_delivery: Laatste bezorging
       title: WebSub
       topic: Account
+    tags:
+      accounts: Accounts
+      hidden: Verborgen
+      hide: Niet in gebruikersgids tonen
+      name: Hashtag
+      title: Hashtags
+      unhide: In gebruikersgids tonen
+      visible: Zichtbaar
     title: Beheer
+    warning_presets:
+      add_new: Nieuwe toevoegen
+      delete: Verwijderen
+      edit: Bewerken
+      edit_preset: Voorinstelling van waarschuwing bewerken
+      title: Voorinstellingen van waarschuwingen beheren
   admin_mailer:
     new_report:
       body: "%{reporter} heeft %{target} gerapporteerd"
       body_remote: Iemand van %{domain} heeft %{target} gerapporteerd
-      subject: Nieuwe toots gerapporteerd op %{instance} (#%{id})
+      subject: Nieuwe rapportage op %{instance} (#%{id})
   application_mailer:
     notification_preferences: E-mailvoorkeuren wijzigen
     salutation: "%{name},"
@@ -404,12 +503,12 @@ nl:
     didnt_get_confirmation: Geen bevestigingsinstructies ontvangen?
     forgot_password: Wachtwoord vergeten?
     invalid_reset_password_token: De code om jouw wachtwoord opnieuw in te stellen is verlopen. Vraag een nieuwe aan.
-    login: Aanmelden
-    logout: Afmelden
-    migrate_account: Naar een andere account verhuizen
+    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: of
-    or_log_in_with: Of aanmelden met
+    or_log_in_with: Of inloggen met
     providers:
       cas: CAS
       saml: SAML
@@ -452,6 +551,16 @@ nl:
     success_msg: Jouw account is succesvol verwijderd
     warning_html: We kunnen alleen garanderen dat jouw gegevens op deze server worden verwijderd. Berichten (toots), incl. media, die veel zijn gedeeld laten mogelijk sporen achter. Offline servers en servers die niet meer op jouw updates zijn geabonneerd zullen niet hun databases updaten.
     warning_title: Verwijdering gegevens op andere servers
+  directories:
+    directory: Gebruikersgids
+    enabled: Je staat momenteel in de gebruikersgids vermeldt.
+    enabled_but_waiting: Je hebt er voor gekozen om in de gebruikersgids te worden vermeldt, maar je hebt daarvoor nog niet het minimaal aantal volgers (%{min_followers}).
+    explanation: Ontdek gebruikers aan de hand van hun interesses
+    explore_mastodon: "%{title} verkennen"
+    how_to_enable: Je geeft momenteel geen toestemming om in de gebruikersgids te worden vermeldt. Je kunt hieronder toestemming geven. Gebruik hashtags in de tekst van jouw bio, om onder bepaalde hashtags te worden vermeldt!
+    people:
+      one: "%{count} gebruikers"
+      other: "%{count} gebruikers"
   errors:
     '403': Jij hebt geen toestemming om deze pagina te bekijken.
     '404': De pagina waarnaar jij op zoek bent bestaat niet.
@@ -463,7 +572,7 @@ nl:
     '500':
       content: Het spijt ons, er is aan onze kant iets fout gegaan.
       title: Er is iets mis
-    noscript_html: Schakel JavaScript in om de webapp van Mastodon te kunnen gebruiken. Als alternatief kan je een <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Mastodon-app</a> zoeken voor jouw platform.
+    noscript_html: Schakel JavaScript in om de webapp van Mastodon te kunnen gebruiken. Als alternatief kan je een <a href="%{apps_path}">Mastodon-app</a> zoeken voor jouw platform.
   exports:
     archive_takeout:
       date: Datum
@@ -474,7 +583,9 @@ nl:
       size: Omvang
     blocks: Jij blokkeert
     csv: CSV
+    domain_blocks: Domeinblokkades
     follows: Jij volgt
+    lists: Lijsten
     mutes: Jij negeert
     storage: Mediaopslag
   filters:
@@ -492,7 +603,7 @@ nl:
       delete: Verwijderen
       title: Filters
     new:
-      title: Nieuwe filter toevoegen
+      title: Nieuw filter toevoegen
   followers:
     domain: Domein
     explanation_html: Wanneer je de privacy van jouw toots wilt garanderen, moet je goed weten wie jouw volgers zijn. <strong>Toots die alleen aan jouw volgers zijn gericht, worden aan de Mastodonservers van jouw volgers afgeleverd.</strong> Daarom wil je ze misschien controleren en desnoods volgers verwijderen die zich op een Mastodonserver bevinden die jij niet vertrouwd. Bijvoorbeeld omdat de beheerder(s) of de software van zo'n server jouw privacy niet respecteert.
@@ -505,9 +616,13 @@ nl:
     true_privacy_html: Hou er wel rekening mee dat <strong>echte privacy alleen gegarandeerd kan worden met behulp van end-to-end-encryptie</strong>.
     unlocked_warning_html: Iedereen kan jou volgen en daarmee meteen toots zien die je alleen aan jouw volgers hebt gericht. %{lock_link} om volgers te kunnen beoordelen en desnoods te weigeren.
     unlocked_warning_title: Jouw account is niet besloten
+  footer:
+    developers: Ontwikkelaars
+    more: Meerâ€¦
+    resources: Hulpmiddelen
   generic:
     changes_saved_msg: Wijzigingen succesvol opgeslagen!
-    powered_by: wordt mogelijk gemaakt door %{link}
+    copy: KopiÃ«ren
     save_changes: Wijzigingen opslaan
     validation_errors:
       one: Er is iets niet helemaal goed! Bekijk onderstaande fout
@@ -543,8 +658,6 @@ nl:
       expires_at: Verloopt op
       uses: Aantal keer te gebruiken
     title: Mensen uitnodigen
-  landing_strip_html: "<strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je op Mastodon (of ergens anders in de fediverse) een account hebt."
-  landing_strip_signup_html: Als je dat niet hebt, kun je je <a href="%{sign_up_path}">hier registreren</a>.
   lists:
     errors:
       limit: Je hebt het maximaal aantal lijsten bereikt
@@ -572,8 +685,8 @@ nl:
         other: "%{count} nieuwe meldingen sinds jouw laatste bezoek \U0001F418"
       title: Tijdens jouw afwezigheid...
     favourite:
-      body: 'Jouw toot werd door %{name} als favoriet gemarkeerd:'
-      subject: "%{name} markeerde jouw toot als favoriet"
+      body: 'Jouw toot werd door %{name} aan hun favorieten toegevoegd:'
+      subject: "%{name} voegde jouw toot als favoriet toe"
       title: Nieuwe favoriet
     follow:
       body: "%{name} volgt jou nu!"
@@ -616,15 +729,30 @@ nl:
     publishing: Publiceren
     web: Webapp
   remote_follow:
-    acct: Geef jouw account@domein.tld op waarvandaan je wilt volgen
+    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 door om te volgen
+    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:'
   remote_unfollow:
     error: Fout
     title: Titel
     unfollowed: Ontvolgd
+  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
   sessions:
     activity: Laatst actief
     browser: Webbrowser
@@ -704,6 +832,7 @@ nl:
       private: Alleen openbare toots kunnen worden vastgezet
       reblog: Een boost kan niet worden vastgezet
     show_more: Meer tonen
+    sign_in_to_participate: Meld je aan om aan dit gesprek mee te doen
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Alleen volgers
@@ -713,7 +842,6 @@ nl:
       unlisted: Minder openbaar
       unlisted_long: Aan iedereen tonen, maar niet op openbare tijdlijnen
   stream_entries:
-    click_to_show: Klik om te tonen
     pinned: Vastgemaakte toot
     reblogged: boostte
     sensitive_content: Gevoelige inhoud
@@ -799,7 +927,7 @@ nl:
       <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"
+    title: Gebruiksvoorwaarden en privacybeleid van %{instance}
   themes:
     contrast: Hoog contrast
     default: Mastodon
@@ -807,17 +935,18 @@ nl:
   time:
     formats:
       default: "%d %B %Y om %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Voer de code in die door de authenticatie-app gegenereerd is
-    description_html: Na het instellen van <strong>tweestapsverificatie</strong>, kun jij je alleen aanmelden als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren aanmeldcode.
+    description_html: Na het instellen van <strong>tweestapsverificatie</strong>, kun je alleen inloggen als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren aanmeldcode.
     disable: Uitschakelen
     enable: Inschakelen
     enabled: Tweestapsverificatie is ingeschakeld
     enabled_success: Inschakelen tweestapsverificatie geslaagd
     generate_recovery_codes: Herstelcodes genereren
-    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 aanmeldcodes die je bij het aanmelden moet invoeren."
+    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 aanmeldcodes die je bij het inloggen moet invoeren."
     lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
-    manual_instructions: Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.
+    manual_instructions: Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren, vind je hieronder geheime code in gewone tekst.
     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.
@@ -828,6 +957,22 @@ nl:
       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
+    warning:
+      explanation:
+        disable: Zolang jouw account is bevroren blijven jouw accountgegevens intact, maar kun je geen handelingen uitvoeren totdat het account is vrijgegeven.
+        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.
+      review_server_policies: Serverbeleid bekijken
+      subject:
+        disable: Jouw account %{acct} is bevroren
+        none: Waarschuwing voor %{acct}
+        silence: Jouw account %{acct} is nu beperkt
+        suspend: Jouw account %{acct} is opgeschort
+      title:
+        disable: Account bevroren
+        none: Waarschuwing
+        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.
@@ -839,7 +984,6 @@ nl:
       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.
       subject: Welkom op Mastodon
-      tip_bridge_html: Wanneer je hiervoor op Twitter zat, kun je jouw vrienden op Mastodon vinden door gebruik te maken van de <a href="%{bridge_url}">bridge-app</a>. Het werkt echter alleen wanneer zij ook deze bridge-app hebben gebruikt!
       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!
@@ -847,8 +991,12 @@ nl:
       tips: Tips
       title: Welkom aan boord %{name}!
   users:
+    follow_limit_reached: Je kunt niet meer dan %{limit} accounts volgen
     invalid_email: E-mailadres is ongeldig
     invalid_otp_token: Ongeldige tweestaps-aanmeldcode
     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:'
+  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/no.yml b/config/locales/no.yml
index 7ce04f5108e233abca032dab69fd9de7104ffc03..5a85a7561198100a71c54f6b1669d53cdf1d53cd 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -8,9 +8,6 @@
     contact: Kontakt
     contact_missing: Ikke innstilt
     contact_unavailable: Ikke tilgjengelig
-    description_headline: Hva er %{domain}?
-    domain_count_after: andre instanser
-    domain_count_before: Koblet til
     extended_description_html: |
       <h3>En god plassering for regler</h3>
       <p>En utvidet beskrivelse er ikke satt opp ennÃ¥.</p>
@@ -44,7 +41,6 @@
     people_who_follow: Folk som fÃ¸lger %{name}
     posts: Poster
     posts_with_replies: Tuter med svar
-    remote_follow: FÃ¸lg fra andre instanser
     reserved_username: Brukernavnet er reservert
     roles:
       admin: Admin
@@ -96,10 +92,6 @@
       most_recent_activity: Nyligste aktivitet
       most_recent_ip: Nyligste IP
       not_subscribed: Ikke abonnÃ©rt
-      order:
-        alphabetic: Alfabetisk
-        most_recent: Nyligst
-        title: RekkefÃ¸lge
       outbox_url: Utboks URL
       perform_full_suspension: UtfÃ¸r full utvisning
       profile_url: Profil-URL
@@ -126,7 +118,6 @@
       shared_inbox_url: Delt Innboks URL
       show:
         created_reports: Rapporter laget av denne kontoen
-        report: rapport
         targeted_reports: Rapporter laget om denne kontoen
       silence: MÃ¥lbind
       statuses: Statuser
@@ -204,11 +195,6 @@
         title: Ny domeneblokkering
       reject_media: Avvis mediefiler
       reject_media_hint: Fjerner lokalt lagrede mediefiler og nekter Ã¥ laste dem ned i fremtiden. Irrelevant for utvisninger
-      severities:
-        noop: Ingen
-        silence: MÃ¥lbind
-        suspend: Utvis
-      severity: Alvorlighet
       show:
         affected_accounts:
           one: En konto i databasen pÃ¥virket
@@ -218,7 +204,6 @@
           suspend: Avutvis alle eksisterende kontoer fra dette domenet
         title: Angre domeneblokkering for %{domain}
         undo: Angre
-      title: Domeneblokkeringer
       undo: Angre
     email_domain_blocks:
       add_new: Lag ny
@@ -231,10 +216,6 @@
         title: Ny blokkeringsoppfÃ¸ring av e-postdomene
       title: Blokkering av e-postdomene
     instances:
-      account_count: Kjente kontoer
-      domain_name: Domene
-      reset: Tilbakestill
-      search: SÃ¸k
       title: Kjente instanser
     invites:
       filter:
@@ -248,20 +229,14 @@
       are_you_sure: Er du sikker?
       comment:
         none: Ingen
-      id: ID
       mark_as_resolved: Merk som lÃ¸st
       report: 'RapportÃ©r #%{id}'
-      report_contents: Innhold
       reported_account: Rapportert konto
       reported_by: Rapportert av
       resolved: LÃ¸st
-      silence_account: MÃ¥lbind konto
       status: Status
-      suspend_account: Utvis konto
-      target: MÃ¥l
       title: Rapporter
       unresolved: UlÃ¸st
-      view: Vis
     settings:
       activity_api_enabled:
         desc_html: Antall lokale statusposter, aktive brukere og nye registreringer i ukentlige oppdelinger
@@ -406,7 +381,7 @@
     '500':
       content: Beklager men noe gikk galt ved vÃ¥r ende.
       title: Denne siden er ikke korrekt
-    noscript_html: For Ã¥ bruke Mastodon webapplikasjon mÃ¥ du aktivere JavaScript. Alternativt kan du forsÃ¸ke en av de mange <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">integrerte appene</a> for Mastodon til din plattform.
+    noscript_html: For Ã¥ bruke Mastodon webapplikasjon mÃ¥ du aktivere JavaScript. Alternativt kan du forsÃ¸ke en av de mange <a href="%{apps_path}">integrerte appene</a> for Mastodon til din plattform.
   exports:
     blocks: Du blokkerer
     csv: CSV
@@ -427,7 +402,6 @@
     unlocked_warning_title: Din konto er ikke lÃ¥st
   generic:
     changes_saved_msg: Vellykket lagring av endringer!
-    powered_by: drevet av %{link}
     save_changes: Lagre endringer
     validation_errors:
       one: Noe er ikke helt riktig ennÃ¥. Vennligst se etter en gang til
@@ -461,8 +435,6 @@
       expires_at: UtlÃ¸per
       uses: Bruk
     title: Inviter personer
-  landing_strip_html: "<strong>%{name}</strong> er en bruker pÃ¥ %{link_to_root_path}. Du kan fÃ¸lge dem eller kommunisere med dem hvis du har en konto hvor som helst i fediverset."
-  landing_strip_signup_html: Hvis du ikke har en konto sÃ¥ kan du <a href="%{sign_up_path}">registrere deg her</a>.
   lists:
     errors:
       limit: Du har nÃ¥dd det maksimale antall lister
@@ -610,7 +582,6 @@
       unlisted: UoppfÃ¸rt
       unlisted_long: Synlig for alle, men ikke pÃ¥ offentlige tidslinjer
   stream_entries:
-    click_to_show: Klikk for Ã¥ vise
     pinned: Festet tut
     reblogged: fremhevde
     sensitive_content: FÃ¸lsomt innhold
@@ -649,7 +620,6 @@
       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_bridge_html: Hvis du kommer fra Twitter kan du finne dine venner pÃ¥ Mastodon ved Ã¥ bruke en <a href="%{bridge_url}">bro app</a>. Men det fungerer kun dersom de ogsÃ¥ bruker bro-appen!
       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!
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 8871da65322d720c673bc099495005de62ec6743..ef158074af9a92dae6102b52a8ae7354a197fa31 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -5,13 +5,13 @@ oc:
     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
     administered_by: 'Gerida perâ€¯:'
+    api: API
+    apps: Aplicacions per mobil
     closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instÃ ncia.
     contact: Contacte
     contact_missing: Pas parametrat
     contact_unavailable: Pas disponible
-    description_headline: QuÃ© es %{domain}â€¯?
-    domain_count_after: autras instÃ ncias
-    domain_count_before: Connectat a
+    documentation: Documentacion
     extended_description_html: |
       <h3>Una bona plaÃ§a per las rÃ¨glas</h3>
       <p>La descripcion longa es pas estada causida pel moment.</p>
@@ -28,25 +28,41 @@ oc:
     hosted_on: Mastodon albergat sus %{domain}
     learn_more: Ne saber mai
     other_instances: Lista dâ€™instÃ ncias
+    privacy_policy: Politica de confidencialitat
     source_code: CÃ²di font
-    status_count_after: estatuts
+    status_count_after:
+      one: estatut
+      other: estatuts
     status_count_before: quâ€™an escrich
-    user_count_after: personas
+    terms: Condicions dâ€™utilizacion
+    user_count_after:
+      one: utilizaire
+      other: utilizaires
     user_count_before: Ostal de
     what_is_mastodon: Quâ€™es Mastodonâ€¯?
   accounts:
+    choices_html: 'Recomandacions de %{name}Â :'
     follow: SÃ¨gre
-    followers: Seguidors
+    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
     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}
-    posts: Tuts
+    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
-    remote_follow: SÃ¨gre a distÃ ncia
     reserved_username: Aqueste nom dâ€™utilizaire es reservat
     roles:
       admin: Admin
@@ -54,6 +70,9 @@ oc:
       moderator: Moderador
     unfollow: Quitar de sÃ¨gre
   admin:
+    account_actions:
+      action: Realizar una accion
+      title: Realizar una accion de moderacion sus %{acct}
     account_moderation_notes:
       create: Crear una nÃ²ta
       created_msg: NÃ²ta de moderacion ben creadaâ€¯!
@@ -68,11 +87,12 @@ oc:
         current_email: AdreÃ§a actuala
         label: Cambiar dâ€™adreÃ§a
         new_email: NovÃ¨la adreÃ§a
-        submit: Cambiar
+        submit: Cambiar lâ€™adreÃ§a
         title: Cambiar lâ€™adreÃ§a a %{username}
       confirm: Confirmar
       confirmed: Confirmat
       confirming: Confirmacion
+      deleted: Suprimits
       demote: Retrogradar
       disable: Desactivar
       disable_two_factor_authentication: Desactivar 2FA
@@ -88,49 +108,50 @@ oc:
       followers: Seguidors
       followers_url: URL dels seguidors
       follows: Abonaments
+      header: BandiÃ¨ra
       inbox_url: URL de recepcion
+      invited_by: Convidat per
       ip: IP
+      joined: VenguÃ¨t
       location:
         all: Totes
         local: Locals
         remote: Alonhats
         title: EmplaÃ§ament
       login_status: Estat formulari de connexion
-      media_attachments: MÃ¨dias ajustats
+      media_attachments: MÃ¨dias enviats
       memorialize: Passar en memorial
       moderation:
-        all: Tot
-        silenced: Rescondut
-        suspended: Suspendut
+        active: Actius
+        all: Totes
+        silenced: Resconduts
+        suspended: Suspenduts
         title: Moderacion
       moderation_notes: NÃ²tas de moderacion
       most_recent_activity: Activitat mai recenta
       most_recent_ip: IP mai recenta
+      no_limits_imposed: Cap de limit impausat
       not_subscribed: Pas seguidor
-      order:
-        alphabetic: Alfabetic
-        most_recent: Mai recent
-        title: Ordre
       outbox_url: URL Outbox
-      perform_full_suspension: Botar en tren la suspension complÃ¨ta
+      perform_full_suspension: Suspendre
       profile_url: URL del perfil
       promote: PromÃ²ure
       protocol: ProtocÃ²l
       public: Public
       push_subscription_expires: Fin de lâ€™abonament PuSH
-      redownload: Actualizar los avatars
+      redownload: Actualizar lo perfil
       remove_avatar: Supriir lâ€™avatar
+      remove_header: Levar la bandiÃ¨ra
       resend_confirmation:
         already_confirmed: Aqueste utilizaire es ja confirmat
         send: Tornar mandar lo corriÃ¨l de confirmacion
-        success: CorriÃ¨l de confirmacion corrÃ¨ctament mandat !
+        success: CorriÃ¨l de confirmacion corrÃ¨ctament mandatâ€¯!
       reset: ReÃ¯nicializar
       reset_password: ReÃ¯nicializar lo senhal
       resubscribe: Se tornar abonar
       role: Permissions
       roles:
         admin: Administrator
-        bot: RobÃ²t
         moderator: Moderador
         staff: Personnal
         user: Uitlizaire
@@ -138,28 +159,32 @@ oc:
       search: Cercar
       shared_inbox_url: URL de recepcion partejada
       show:
-        created_reports: RapÃ²rts creat per aqueste compte
-        report: rapÃ²rt
-        targeted_reports: RapÃ²rts faches tocant aqueste compte
+        created_reports: Senhalaments creats
+        targeted_reports: Senhalaments dels autres
       silence: Silenci
+      silenced: Rescondut
       statuses: Estatuts
       subscribe: Sâ€™abonar
+      suspended: Suspendut
       title: Comptes
       unconfirmed_email: AdreÃ§a pas confirmada
       undo_silenced: Levar lo silenci
       undo_suspension: Levar la suspension
       unsubscribe: Se desabonar
       username: Nom dâ€™utilizaire
+      warn: Avisar
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} sâ€™assignÃ¨t lo rapÃ²rt %{target}"
         change_email_user: "%{name} cambiÃ¨t lâ€™adreÃ§a de corriÃ¨l de %{target}"
         confirm_user: "%{name} confirmÃ¨t lâ€™adreÃ§a a %{target}"
+        create_account_warning: "%{name} mandÃ¨t un avertiment a %{target}"
         create_custom_emoji: "%{name} mandÃ¨t un nÃ²u emoji %{target}"
         create_domain_block: "%{name} bloquÃ¨t lo domeni %{target}"
         create_email_domain_block: "%{name} botÃ¨t a la lista nÃ¨gra lo domeni de corriÃ¨l %{target}"
         demote_user: "%{name} retragradÃ¨t lâ€˜utilizaire %{target}"
+        destroy_custom_emoji: "%{name} destruguÃ¨t lâ€™emoji %{target}"
         destroy_domain_block: "%{name} desbloquÃ¨t lo domeni %{target}"
         destroy_email_domain_block: "%{name} botÃ¨t a la lista blanca lo domeni de corriÃ¨l %{target}"
         destroy_status: "%{name} levÃ¨t lâ€˜estatut a %{target}"
@@ -181,6 +206,7 @@ oc:
         unsuspend_account: "%{name} restabliguÃ¨t lo compte a %{target}"
         update_custom_emoji: "%{name} metÃ¨t a jorn lâ€™emoji %{target}"
         update_status: "%{name} metÃ¨t a jorn lâ€™estatut a %{target}"
+      deleted_status: "(estatut suprimit)"
       title: Audit dels jornals
     custom_emojis:
       by_domain: Domeni
@@ -207,8 +233,30 @@ oc:
       update_failed_msg: Mesa a jorn de lâ€™emoji fracasada
       updated_msg: Emoji ben mes a jornâ€¯!
       upload: Enviar
+    dashboard:
+      backlog: Accions en retard
+      config: Configuracion
+      feature_deletions: Supressions de comptes
+      feature_invites: Ligams convidat
+      feature_profile_directory: Annuari de perfils
+      feature_registrations: Inscripcions
+      feature_relay: Relai de federacion
+      features: Foncionalitats
+      hidden_service: Federacion amb servicis amagats
+      open_reports: Senhalaments dobÃ¨rts
+      recent_users: Utilizaires recents
+      search: RecÃ¨rca tÃ¨xte complÃ¨t
+      single_user_mode: MÃ²de sol utilizaire
+      software: Logicial
+      space: Utilizacion de lâ€™espaci
+      title: TablÃ¨u de bÃ²rd
+      total_users: total dels utilizaires
+      trends: TendÃ©ncias
+      week_interactions: interaccions aquesta setmana
+      week_users_active: actius aquesta setmana
+      week_users_new: utilizaires aquesta setmana
     domain_blocks:
-      add_new: Ajustar
+      add_new: Ajustar un novÃ¨l blocatge de domeni
       created_msg: Domeni blocat es a Ã¨sser tractat
       destroyed_msg: Lo blocatge del domeni es estat levat
       domain: Domeni
@@ -223,11 +271,13 @@ oc:
         title: NÃ²u blocatge domeni
       reject_media: Regetar los fichiÃ¨rs mÃ¨dias
       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
-      severities:
-        noop: Cap
-        silence: Silenci
-        suspend: Suspendre
-      severity: Severitat
+      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
@@ -237,7 +287,6 @@ oc:
           suspend: Levar la suspension de totes los comptes dâ€™aqueste domeni
         title: Restablir lo blocatge de domeni de %{domain}
         undo: Restablir
-      title: BlÃ²c de domeni
       undo: Restablir
     email_domain_blocks:
       add_new: Ajustar
@@ -249,19 +298,47 @@ oc:
         create: Crear un blocatge
         title: NÃ²u blocatge de domeni de corriÃ¨l
       title: Blocatge de domeni de corriÃ¨l
+    followers:
+      back_to_account: Tornar al compte
+      title: Seguidors de %{acct}
     instances:
-      account_count: Comptes coneguts
-      domain_name: Domeni
-      reset: ReÃ¯nicializar
-      search: Cercar
-      title: InstÃ ncias conegudas
+      delivery_available: Liurason disponibla
+      known_accounts:
+        one: "%{count} compte conegut"
+        other: "%{count} comptes coneguts"
+      moderation:
+        all: Totas
+        limited: Limitat
+        title: Moderacion
+      title: Federacion
+      total_blocked_by_us: AvÃ¨m blocat
+      total_followed_by_them: SÃ¨gon
+      total_followed_by_us: SeguÃ¨m
+      total_reported: Senhalament a prepaus dâ€™eles
+      total_storage: FichiÃ¨rs junts
     invites:
+      deactivate_all: O desactivar tot
       filter:
         all: Totes
         available: Disponibles
         expired: Expirats
         title: Filtre
       title: Convits
+    relays:
+      add_new: Ajustar un nÃ²u relai
+      delete: Suprimir
+      description_html: Un <strong> relai de federacion</strong> es un servidor intermediari quâ€™escÃ mbia de bÃ¨ls volumes de tuts publics entre servidors que son abonats e i publican.<strong>PÃ²t ajudar de pichons e mejans servidors a trobar de contenguts del fediverse estant</strong>, quâ€™autrament demandariÃ¡ als utilizaires locals de sâ€™abonar manualament a dâ€™autres monde marcats sus de servidors alonhats.
+      disable: Desactivar
+      disabled: Desactivat
+      enable: Activar
+      enable_hint: Un cÃ²p activat, vÃ²stre servidor sâ€™abonarÃ  a totes los tuts publics del relai estant, e comenÃ§arÃ  de mandar sos tuts publics a aqueste dâ€™enlÃ .
+      enabled: Activat
+      inbox_url: URL del relai
+      pending: En espÃ¨ra dâ€™aprovacion del relai
+      save_and_enable: Salvar e activar
+      setup: Configurar una connexion relai
+      status: Estatut
+      title: Relais
     report_notes:
       created_msg: NÃ²ta de moderacion corrÃ¨ctament creadaâ€¯!
       destroyed_msg: NÃ²ta de moderacion corrÃ¨ctament suprimidaâ€¯!
@@ -276,7 +353,6 @@ oc:
       comment:
         none: Pas cap
       created_at: Creacion
-      id: ID
       mark_as_resolved: Marcar coma resolgut
       mark_as_unresolved: Marcar coma pas resolgut
       notes:
@@ -287,42 +363,46 @@ oc:
         placeholder: Explicatz las accions que son estadas menadas o quicÃ²m de ligat al senhalamentâ€¦
       reopen: Tornar dobrir lo rapÃ²rt
       report: 'Senhalament #%{id}'
-      report_contents: Contengut
       reported_account: Compte senhalat
       reported_by: Senhalat per
       resolved: Resolgut
-      resolved_msg: RapÃ²rt corrÃ¨ctament resolgutâ€¯â€¯!
-      silence_account: Metre lo compte en silenci
+      resolved_msg: RapÃ²rt corrÃ¨ctament resolgutâ€¯!
       status: Estatut
-      suspend_account: Suspendre lo compte
-      target: Cibla
       title: Senhalament
       unassign: Levar
-      unresolved: Pas resolguts
+      unresolved: Pas resolgut
       updated_at: Actualizat
-      view: Veire
     settings:
       activity_api_enabled:
         desc_html: Nombre dâ€™estatuts publicats, dâ€™utilizaires actius e de novÃ¨las inscripcions en rapÃ²rt setmaniÃ¨r
-        title: Publica las estatisticas totalas de lâ€™activitat dels utilizaires
+        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
       hero:
         desc_html: Mostrat en primiÃ¨ra pagina. Almens 600x100px recomandat. Sâ€™es pas configurat lâ€™imatge de lâ€™instÃ ncia serÃ  mostrat
         title: Imatge de lâ€™erÃ²i
+      mascot:
+        desc_html: Mostrat sus mantun paginas. 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â€™aquesta instÃ ncia a trobats pel fediverse
-        title: Publica la lista de las instÃ ncias conegudas
+        title: Publicar la lista de las instÃ ncias conegudas
       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: Afichat sus las pagina dâ€™acuÃ¨lh quand las inscripcions son tampadas.<br>PodÃ¨tz utilizar de balisas HTML
+          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
@@ -340,11 +420,14 @@ oc:
         desc_html: Mostrar lo badge Personal sus la pagina de perfil
         title: Mostrar lo badge personal
       site_description:
-        desc_html: Afichada jos la forma de paragraf sus la pagina dâ€™acuÃ¨lh e utilizada coma balisa meta. PodÃ¨tz utilizar de balisas HTML, en particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
+        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 de lâ€™instÃ ncia
       site_description_extended:
         desc_html: Afichada sus la pagina dâ€™informacion complementÃ ria del site<br>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 de lâ€™instÃ ncia.
+        title: Descripcion corta de lâ€™instÃ ncia
       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
@@ -366,6 +449,7 @@ oc:
       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
       with_media: Amb mÃ¨dia
     subscriptions:
@@ -375,7 +459,21 @@ oc:
       last_delivery: DarriÃ¨ra distribucion
       title: WebSub
       topic: SubjÃ¨cte
+    tags:
+      accounts: Comptes
+      hidden: Amagat
+      hide: Amagar dins lâ€™annuari
+      name: Etiqueta
+      title: Etiquetas
+      unhide: AparÃ©isser dins lâ€™annuari
+      visible: Visible
     title: Administracion
+    warning_presets:
+      add_new: Nâ€™ajustar un nÃ²u
+      delete: Escafar
+      edit: Modificar
+      edit_preset: Modificar lo tÃ¨xt predefinit dâ€™avertiment
+      title: Gerir los tÃ¨xtes predefinits
   admin_mailer:
     new_report:
       body: "%{reporter} a senhalat %{target}"
@@ -465,7 +563,7 @@ oc:
     formats:
       default: "%e/%m/%Y"
       long: Lo %e %B de %Y
-      short: "%e %b. de %Y"
+      short: "%e %B de %Y"
     month_names:
     - None
     - de geniÃ¨r
@@ -489,7 +587,7 @@ oc:
       about_x_hours: "%{count} h"
       about_x_months: "%{count} meses"
       about_x_years: "%{count} ans"
-      almost_x_years: "%{count}ans"
+      almost_x_years: "%{count} ans"
       half_a_minute: Ara
       less_than_x_minutes: "%{count}â€¯min"
       less_than_x_seconds: Ara meteis
@@ -509,6 +607,16 @@ oc:
     success_msg: Compte ben suprimit
     warning_html: La supression del contengut dâ€™aquesta instÃ ncia es sola assegurada. Lo contengut fÃ²rÃ§a partejat daissarÃ  probablament de traÃ§as. Los servidors fÃ²ra-linha e los que vos sÃ¨gon pas mai aurÃ n pas la mesa a jorn de lor basa de donada.
     warning_title: Disponibilitat del contengut difusat
+  directories:
+    directory: Annuari de perfils
+    enabled: SÃ¨tz actualament listat dins l'annuari.
+    enabled_but_waiting: AvÃ¨tz causit d'Ã¨sser listat dins l'annuari mas avÃ¨tz pas encara lo nombre minimum de seguidors (%{min_followers}) per i Ã¨sser listat.
+    explanation: Trobar dâ€™utilizaires segon lor interÃ¨sses
+    explore_mastodon: Explorar %{title}
+    how_to_enable: SÃ¨tz pas actualament listat dins lâ€™annuari. PodÃ¨tz cambiar aquÃ² Ã§ai-jos. Utilizatz d'etiquetas dins vÃ²stre tÃ¨xt de bio per Ã¨sser listat amb dâ€™etiquetas especificasâ€¯!
+    people:
+      one: "%{count} persona"
+      other: "%{count} personas"
   errors:
     '403': AvÃ¨tz pas lâ€™autorizacion de veire aquesta pagina.
     '404': La pagina que recercatz existÃs pas.
@@ -520,7 +628,7 @@ oc:
     '500':
       content: Un quicomet a pas foncionat coma caliÃ¡.
       title: Aquesta pagina es pas corrÃ¨cta
-    noscript_html: Per utilizar lâ€™aplicacion web de Mastodon, mercÃ©s dâ€™activar JavaScript. O podÃ¨tz utilizar <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">una aplicacion</a> per vÃ²stra plataforma coma alernativa.
+    noscript_html: Per utilizar lâ€™aplicacion web de Mastodon, mercÃ©s dâ€™activar JavaScript. O podÃ¨tz utilizar <a href="%{apps_path}">una aplicacion</a> per vÃ²stra plataforma coma alernativa.
   exports:
     archive_takeout:
       date: Data
@@ -531,7 +639,9 @@ oc:
       size: Talha
     blocks: Personas que blocatz
     csv: CSV
+    domain_blocks: Blocatge de domenis
     follows: Personas que seguÃ¨tz
+    lists: Listas
     mutes: Personas rescondudas
     storage: MÃ¨dias gardats
   filters:
@@ -562,9 +672,13 @@ oc:
     true_privacy_html: MÃ¨fi que la <strong>vertadiÃ¨ra confidencialitat pÃ²t solament Ã¨sser amb un chiframent del cap a la fin (end-to-end)</strong>.
     unlocked_warning_html: Tot lo monde pÃ²t vos sÃ¨gre e veire sulpic vÃ²stres estatuts privats. %{lock_link} per poder repassar e regetar los seguidors.
     unlocked_warning_title: VÃ²stre compte es pas clavat
+  footer:
+    developers: Desvolopaires
+    more: Maiâ€¦
+    resources: Ressorsas
   generic:
     changes_saved_msg: Cambiaments ben realizatsâ€¯!
-    powered_by: propulsat per %{link}
+    copy: Copiar
     save_changes: Salvar los cambiaments
     validation_errors:
       one: I a quicÃ²m que trucaâ€¯! MercÃ©s de corregir lâ€™error Ã§ai-jos
@@ -595,13 +709,11 @@ oc:
       one: 1 persona
       other: "%{count} personas"
     max_uses_prompt: Cap de limit
-    prompt: Generatz e partejatz los ligams per donar accÃ¨s a aquesta instÃ ncia
+    prompt: Generar e partejar los ligams per donar accÃ¨s a aquesta instÃ ncia
     table:
       expires_at: Expirats
       uses: Usatges
     title: Convidar de mond
-  landing_strip_html: "<strong>%{name}</strong> utiliza %{link_to_root_path}. PodÃ¨tz lo/la sÃ¨gre o interagir amb el o ela sâ€™avÃ¨tz un compte ont que siasque sul fediverse."
-  landing_strip_signup_html: Sâ€™es pas lo cas, podÃ¨tz <a href="%{sign_up_path}">vos marcar aquÃ</a>.
   lists:
     errors:
       limit: AvÃ¨tz atengut lo maximum de listas
@@ -678,10 +790,25 @@ oc:
     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â€¯:'
   remote_unfollow:
     error: Error
     title: TÃtol
     unfollowed: Pas mai seguit
+  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
+    too_soon: La data planificada deu Ã¨sser dins lo futur
   sessions:
     activity: DarriÃ¨ra activitat
     browser: Navigator
@@ -761,6 +888,7 @@ oc:
       private: Se pÃ²t pas penjar los tuts pas publics
       reblog: Se pÃ²t pas penjar un tut partejat
     show_more: Ne veire mai
+    sign_in_to_participate: InscrivÃ¨tz-vos per participar a la conversacion
     title: '%{name}â€¯: "%{quote}"'
     visibilities:
       private: Seguidors solament
@@ -770,7 +898,6 @@ oc:
       unlisted: Pas listat
       unlisted_long: Tot lo monde pÃ²t veire mai serÃ  pas visible sul flux public
   stream_entries:
-    click_to_show: Clicatz per veire
     pinned: Tut penjat
     reblogged: a partejat
     sensitive_content: Contengut sensible
@@ -779,11 +906,12 @@ oc:
       <h2>Politica de confidencialitat</h2>
       <h3 id="collect">Quinas informacions reculhÃ¨mâ€¯?</h3>
 
-      <li>
-      <ul><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 vist 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â€™acion 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>
+        <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" />
@@ -795,8 +923,68 @@ oc:
       <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>Per enviar periodicament de corriÃ¨ls &mdash; 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>
+        <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: FÃ²rt contrast
@@ -805,6 +993,7 @@ oc:
   time:
     formats:
       default: Lo %d %b de %Y a %Ho%M
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Picatz lo cÃ²di generat per vÃ²stra aplicacion dâ€™autentificacion per confirmar
     description_html: Sâ€™activatz <strong> lâ€™autentificacion two-factor</strong>, vos caldrÃ  vÃ²stre mobil per vos connectar perque generarÃ  un geton per vos daissar dintrar.
@@ -826,6 +1015,22 @@ oc:
       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 mantunas listas publicas. 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.
+      review_server_policies: Repassar las politicas del servidor
+      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:
+        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.
@@ -837,7 +1042,6 @@ oc:
       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_bridge_html: Se venÃ¨tz de Twitter, podÃ¨tz trobar vÃ²stres amics sus Mastodon en utilizant lâ€˜<a href="%{bridge_url}">aplicacion de Pont</a>. AquÃ² fonciona pas que sâ€™utilizan lo Pont tanbenâ€¯!
       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â€¯!
@@ -845,8 +1049,12 @@ oc:
       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_email: Lâ€™adreÃ§a de corriÃ¨l es invalida
     invalid_otp_token: CÃ²di dâ€™autentificacion en dos temps 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â€¯:'
+  verification:
+    explanation_html: 'PodÃ¨tz <strong>verificar vosautres meteisses coma proprietari dels ligams per las metadonadas de vÃ²stre perfil</strong>. Per aquÃ² far, lo site Web ligat deu contÃ©ner un ligam cap a vÃ²stre perfil Mastodon. Lo ligam <strong>deu</strong> aver un atribut <code>rel="me"</code>. Lo contengut tÃ¨xte del ligam impÃ²rta pas. VaquÃ un exempleÂ :'
+    verification: Verificacion
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index a6e5241fc76fa062d30a6cc76020373541571ae0..5ce007ba9f88961de88f4f571f055393f532f40e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -5,13 +5,13 @@ pl:
     about_mastodon_html: Mastodon jest wolnÄ… i otwartÄ… sieciÄ… spoÅ‚ecznoÅ›ciowÄ…, zdecentralizowanÄ… alternatywÄ… dla zamkniÄ™tych, komercyjnych platform.
     about_this: O tej instancji
     administered_by: 'Administrowana przez:'
+    api: API
+    apps: Aplikacje
     closed_registrations: Rejestracja na tej instancji jest obecnie zamkniÄ™ta. MoÅ¼esz jednak zarejestrowaÄ‡ siÄ™ na innej instancji, uzyskujÄ…c dostÄ™p do tej samej sieci.
     contact: Kontakt
     contact_missing: Nie ustawiono
     contact_unavailable: Nie dotyczy
-    description_headline: Czym jest %{domain}?
-    domain_count_after: instancjami
-    domain_count_before: Serwer poÅ‚Ä…czony z
+    documentation: Dokumentacja
     extended_description_html: |
       <h3>Dobre miejsce na zasady uÅ¼ytkowania</h3>
       <p>Nie ustawiono jeszcze szczegÃ³Å‚owego opisu</p>
@@ -28,25 +28,49 @@ pl:
     hosted_on: Mastodon uruchomiony na %{domain}
     learn_more: Dowiedz siÄ™ wiÄ™cej
     other_instances: Lista instancji
+    privacy_policy: Polityka prywatnoÅ›ci
     source_code: Kod ÅºrÃ³dÅ‚owy
-    status_count_after: wpisÃ³w
+    status_count_after:
+      few: wpisÃ³w
+      many: wpisÃ³w
+      one: wpisu
+      other: wpisÃ³w
     status_count_before: SÄ… autorami
-    user_count_after: uÅ¼ytkownikÃ³w
+    terms: Zasady uÅ¼ytkowania
+    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?
   accounts:
+    choices_html: 'Polecani przez %{name}:'
     follow: ÅšledÅº
-    followers: ÅšledzÄ…cy
-    following: Åšledzeni
+    followers:
+      few: Å›ledzÄ…cych
+      many: Å›ledzÄ…cych
+      one: Å›ledzÄ…cy
+      other: ÅšledzÄ…cych
+    following: Åšledzonych
+    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
     nothing_here: Niczego tu nie ma!
     people_followed_by: Konta Å›ledzone przez %{name}
     people_who_follow: Osoby, ktÃ³re Å›ledzÄ… konto %{name}
-    posts: Wpisy
+    pin_errors:
+      following: Musisz Å›ledziÄ‡ 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
-    remote_follow: ÅšledÅº zdalnie
     reserved_username: Ta nazwa uÅ¼ytkownika jest zarezerwowana
     roles:
       admin: Administrator
@@ -54,6 +78,9 @@ pl:
       moderator: Moderator
     unfollow: PrzestaÅ„ Å›ledziÄ‡
   admin:
+    account_actions:
+      action: Wykonaj dziaÅ‚anie
+      title: Wykonaj dziaÅ‚anie moderacyjne na %{acct}
     account_moderation_notes:
       create: Pozostaw notatkÄ™
       created_msg: PomyÅ›lnie dodano notatkÄ™ moderacyjnÄ…!
@@ -73,6 +100,7 @@ pl:
       confirm: PotwierdÅº
       confirmed: Potwierdzono
       confirming: Potwierdzanie
+      deleted: UsuniÄ™to
       demote: Degraduj
       disable: Dezaktywuj
       disable_two_factor_authentication: WyÅ‚Ä…cz uwierzytelnianie dwuetapowe
@@ -88,8 +116,11 @@ pl:
       followers: ÅšledzÄ…cy
       followers_url: Adres Å›ledzÄ…cych
       follows: Åšledzeni
+      header: NagÅ‚Ã³wek
       inbox_url: Adres skrzynki
+      invited_by: Zaproszony(-a) przez
       ip: Adres IP
+      joined: DoÅ‚Ä…czyÅ‚(-a)
       location:
         all: Wszystkie
         local: Lokalne
@@ -99,6 +130,7 @@ pl:
       media_attachments: ZaÅ‚Ä…czniki multimedialne
       memorialize: PrzeÅ‚Ä…cz na â€žIn Memoriamâ€
       moderation:
+        active: Aktywne
         all: Wszystkie
         silenced: Wyciszone
         suspended: Zawieszone
@@ -106,20 +138,18 @@ pl:
       moderation_notes: Notatki moderacyjne
       most_recent_activity: Najnowsza aktywnoÅ›Ä‡
       most_recent_ip: Ostatnie IP
+      no_limits_imposed: Nie naÅ‚oÅ¼ono ograniczeÅ„
       not_subscribed: Nie zasubskrybowano
-      order:
-        alphabetic: Alfabetycznie
-        most_recent: Najnowsze
-        title: KolejnoÅ›Ä‡
       outbox_url: Adres skrzynki nadawczej
-      perform_full_suspension: CaÅ‚kowicie zawieÅ›
+      perform_full_suspension: ZawieÅ›
       profile_url: Adres profilu
       promote: PodnieÅ› uprawnienia
       protocol: ProtokÃ³Å‚
       public: Publiczne
       push_subscription_expires: Subskrypcja PuSH wygasa
-      redownload: OdÅ›wieÅ¼ awatar
+      redownload: OdÅ›wieÅ¼ profil
       remove_avatar: Usun awatar
+      remove_header: UsuÅ„ nagÅ‚Ã³wek
       resend_confirmation:
         already_confirmed: To konto zostaÅ‚o juÅ¼ potwierdzone
         send: WyÅ›lij ponownie e-mail z potwierdzeniem
@@ -138,48 +168,53 @@ pl:
       shared_inbox_url: Adres udostÄ™pnianej skrzynki
       show:
         created_reports: ZgÅ‚oszenia tego uÅ¼ytkownika
-        report: zgÅ‚oszeÅ„
         targeted_reports: ZgÅ‚oszenia dotyczÄ…ce tego uÅ¼ytkownika
       silence: Wycisz
+      silenced: Wyciszono
       statuses: Wpisy
       subscribe: Subskrybuj
+      suspended: Zawieszono
       title: Konta
       unconfirmed_email: Niepotwierdzony adres e-mail
       undo_silenced: Cofnij wyciszenie
       undo_suspension: Cofnij zawieszenie
       unsubscribe: PrzestaÅ„ subskrybowaÄ‡
       username: Nazwa uÅ¼ytkownika
+      warn: OstrzeÅ¼
       web: SieÄ‡
     action_logs:
       actions:
-        assigned_to_self_report: "%{name} przypisaÅ‚ sobie zgÅ‚oszenie %{target}"
-        change_email_user: "%{name} zmieniÅ‚ adres-email uÅ¼ytkownika %{target}"
-        confirm_user: "%{name} potwierdziÅ‚ adres e-mail uÅ¼ytkownika %{target}"
-        create_custom_emoji: "%{name} dodaÅ‚ nowe emoji %{target}"
-        create_domain_block: "%{name} zablokowaÅ‚ domenÄ™ %{target}"
-        create_email_domain_block: "%{name} dodaÅ‚ domenÄ™ e-mail %{target} na czarnÄ… listÄ™"
-        demote_user: "%{name} zdegradowaÅ‚ uÅ¼ytkownika %{target}"
-        destroy_domain_block: "%{name} odblokowaÅ‚ domenÄ™ %{target}"
-        destroy_email_domain_block: "%{name} usunÄ…Å‚ domenÄ™ e-mail %{target} z czarnej listy"
-        destroy_status: "%{name} usunÄ…Å‚ wpis uÅ¼ytkownika %{target}"
-        disable_2fa_user: "%{name} wyÅ‚Ä…czyÅ‚ uwierzytelnianie dwustopniowe uÅ¼ytkownikowi %{target}"
-        disable_custom_emoji: "%{name} wyÅ‚Ä…czyÅ‚ emoji %{target}"
-        disable_user: "%{name} zablokowaÅ‚ moÅ¼liwoÅ›Ä‡ logowania uÅ¼ytkownikowi %{target}"
-        enable_custom_emoji: "%{name} wÅ‚Ä…czyÅ‚ emoji %{target}"
-        enable_user: "%{name} przywrÃ³ciÅ‚ moÅ¼liwoÅ›Ä‡ logowania uÅ¼ytkownikowi %{target}"
-        memorialize_account: "%{name} nadaÅ‚ kontu %{target} status in memoriam"
-        promote_user: "%{name} podniÃ³sÅ‚ uprawnienia uÅ¼ytkownikowi %{target}"
-        remove_avatar_user: "%{name} usunÄ…Å‚ awatar uÅ¼ytkownikowi %{target}"
-        reopen_report: "%{name} otworzyÅ‚ ponownie zgÅ‚oszenie %{target}"
-        reset_password_user: "%{name} przywrÃ³ciÅ‚ hasÅ‚o uÅ¼ytkownikowi %{target}"
-        resolve_report: "%{name} rozwiÄ…zaÅ‚ zgÅ‚oszenie %{target}"
-        silence_account: "%{name} wyciszyÅ‚ konto %{target}"
-        suspend_account: "%{name} zawiesiÅ‚ konto %{target}"
-        unassigned_report: "%{name} cofnÄ…Å‚ przypisanie zgÅ‚oszenia %{target}"
-        unsilence_account: "%{name} cofnÄ…Å‚ wyciszenie konta %{target}"
-        unsuspend_account: "%{name} cofnÄ…Å‚ zawieszenie konta %{target}"
-        update_custom_emoji: "%{name} zaktualizowaÅ‚ emoji %{target}"
-        update_status: "%{name} zaktualizowaÅ‚ wpis uÅ¼ytkownika %{target}"
+        assigned_to_self_report: "%{name} przypisaÅ‚(a) sobie zgÅ‚oszenie %{target}"
+        change_email_user: "%{name} zmieniÅ‚(a) adres e-mail uÅ¼ytkownika %{target}"
+        confirm_user: "%{name} potwierdziÅ‚(a) adres e-mail uÅ¼ytkownika %{target}"
+        create_account_warning: "%{name} wysÅ‚aÅ‚(a) ostrzeÅ¼enie do %{target}"
+        create_custom_emoji: "%{name} dodaÅ‚(a) nowe emoji %{target}"
+        create_domain_block: "%{name} zablokowaÅ‚(a) domenÄ™ %{target}"
+        create_email_domain_block: "%{name} dodaÅ‚(a) domenÄ™ e-mail %{target} na czarnÄ… listÄ™"
+        demote_user: "%{name} zdegradowaÅ‚(a) uÅ¼ytkownika %{target}"
+        destroy_custom_emoji: "%{name} usunÄ…Å‚(-Ä™Å‚a) emoji %{target}"
+        destroy_domain_block: "%{name} odblokowaÅ‚(a) domenÄ™ %{target}"
+        destroy_email_domain_block: "%{name} usunÄ…Å‚(-Ä™Å‚a) domenÄ™ e-mail %{target} z czarnej listy"
+        destroy_status: "%{name} usunÄ…Å‚(-Ä™Å‚a) wpis uÅ¼ytkownika %{target}"
+        disable_2fa_user: "%{name} wyÅ‚Ä…czyÅ‚(a) uwierzytelnianie dwustopniowe uÅ¼ytkownikowi %{target}"
+        disable_custom_emoji: "%{name} wyÅ‚Ä…czyÅ‚(a) emoji %{target}"
+        disable_user: "%{name} zablokowaÅ‚(a) moÅ¼liwoÅ›Ä‡ logowania uÅ¼ytkownikowi %{target}"
+        enable_custom_emoji: "%{name} wÅ‚Ä…czyÅ‚(a) emoji %{target}"
+        enable_user: "%{name} przywrÃ³ciÅ‚(a) moÅ¼liwoÅ›Ä‡ logowania uÅ¼ytkownikowi %{target}"
+        memorialize_account: "%{name} nadaÅ‚(a) kontu %{target} status in memoriam"
+        promote_user: "%{name} podniÃ³sÅ‚(a) uprawnienia uÅ¼ytkownikowi %{target}"
+        remove_avatar_user: "%{name} usunÄ…Å‚(-Ä™Å‚a) awatar uÅ¼ytkownikowi %{target}"
+        reopen_report: "%{name} otworzyÅ‚(a) ponownie zgÅ‚oszenie %{target}"
+        reset_password_user: "%{name} przywrÃ³ciÅ‚(a) hasÅ‚o uÅ¼ytkownikowi %{target}"
+        resolve_report: "%{name} rozwiÄ…zaÅ‚(a) zgÅ‚oszenie %{target}"
+        silence_account: "%{name} wyciszyÅ‚(a) konto %{target}"
+        suspend_account: "%{name} zawiesiÅ‚(a) konto %{target}"
+        unassigned_report: "%{name} cofnÄ…Å‚(-Ä™Å‚a) przypisanie zgÅ‚oszenia %{target}"
+        unsilence_account: "%{name} cofnÄ…Å‚(-Ä™Å‚a) wyciszenie konta %{target}"
+        unsuspend_account: "%{name} cofnÄ…Å‚(-Ä™Å‚a) zawieszenie konta %{target}"
+        update_custom_emoji: "%{name} zaktualizowaÅ‚(a) emoji %{target}"
+        update_status: "%{name} zaktualizowaÅ‚(a) wpis uÅ¼ytkownika %{target}"
+      deleted_status: "(usuniÄ™ty wpis)"
       title: Dziennik dziaÅ‚aÅ„ administracyjnych
     custom_emojis:
       by_domain: Domeny
@@ -206,6 +241,28 @@ pl:
       update_failed_msg: Nie udaÅ‚o siÄ™ zaktualizowaÄ‡ emoji
       updated_msg: PomyÅ›lnie zaktualizowano emoji!
       upload: Dodaj
+    dashboard:
+      backlog: zalegÅ‚e zadania
+      config: Konfiguracja
+      feature_deletions: Usuwanie kont
+      feature_invites: Zaproszenia
+      feature_profile_directory: Katalog profilÃ³w
+      feature_registrations: Rejestracja
+      feature_relay: Przekazywanie federacji
+      features: MoÅ¼liwoÅ›ci
+      hidden_service: Federowanie z ukrytymi usÅ‚ugami
+      open_reports: otwarte zgÅ‚oszenia
+      recent_users: Ostatni uÅ¼ytkownicy
+      search: Wyszukiwanie peÅ‚nego tekstu
+      single_user_mode: Tryb jednego uÅ¼ytkownika
+      software: Oprogramowanie
+      space: UÅ¼ywana powierzchnia
+      title: Panel administracyjny
+      total_users: Å‚Ä…cznie uÅ¼ytkownikÃ³w
+      trends: Na czasie
+      week_interactions: interakcje w tym tygodniu
+      week_users_active: aktywni w tym tygodniu
+      week_users_new: rejestracje w tym tygodniu
     domain_blocks:
       add_new: Dodaj nowÄ…
       created_msg: Blokada domen jest przetwarzana
@@ -222,22 +279,24 @@ pl:
         title: Nowa blokada domen
       reject_media: Odrzucaj pliki multimedialne
       reject_media_hint: Usuwa przechowywane lokalnie pliki multimedialne i nie pozwala na ich pobieranie. Nieprzydatne przy zawieszeniu
-      severities:
-        noop: Nic nie rÃ³b
-        silence: Wycisz
-        suspend: ZawieÅ›
-      severity: Priorytet
+      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:
-          many: Dotyczy %{count} kont w bazie danych
-          one: Dotyczy jednego konta w bazie danych
-          other: Dotyczy %{count} kont w bazie danych
+          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
-      title: Zablokowane domeny
       undo: Cofnij
     email_domain_blocks:
       add_new: Dodaj nowÄ…
@@ -249,19 +308,49 @@ pl:
         create: UtwÃ³rz blokadÄ™
         title: Nowa blokada domeny e-mail
       title: Blokowanie domen e-mail
+    followers:
+      back_to_account: WrÃ³Ä‡ do konta
+      title: ÅšledzÄ…cy %{acct}
     instances:
-      account_count: Znane konta
-      domain_name: Domena
-      reset: PrzywrÃ³Ä‡
-      search: Szukaj
+      delivery_available: DorÄ™czanie jest dostÄ™pne
+      known_accounts:
+        few: "%{count} znane konta"
+        many: "%{count} znane konta"
+        one: "%{count} znane konto"
+        other: "%{count} znane konta"
+      moderation:
+        all: Wszystkie
+        limited: Ograniczone
+        title: Moderacja
       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_reported: ZgÅ‚oszenia dotyczÄ…ce ich
+      total_storage: ZaÅ‚Ä…czniki multimedialne
     invites:
+      deactivate_all: UniewaÅ¼nij wszystkie
       filter:
         all: Wszystkie
         available: DostÄ™pne
         expired: WygasÅ‚e
         title: Filtruj
       title: Zaproszenia
+    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."
+      disable: WyÅ‚Ä…cz
+      disabled: WyÅ‚Ä…czony
+      enable: WÅ‚Ä…cz
+      enable_hint: JeÅ¼eli wÅ‚Ä…czone, TwÃ³j serwer zasubskrybuje wszystkie publiczne wpisy z tego przekaÅºnika i zacznie wysyÅ‚aÄ‡ tam publiczne wpisy z tego serwera.
+      enabled: WÅ‚Ä…czony
+      inbox_url: Adres przekaÅºnika
+      pending: Oczekiwanie na przyjÄ™cie przez przekaÅºnik
+      save_and_enable: Zapisz i aktywuj
+      setup: Skonfiguruj poÅ‚Ä…czenie z przekaÅºnikiem
+      status: Stan
+      title: PrzekaÅºniki
     report_notes:
       created_msg: Pomyslnie utworzono notatkÄ™ moderacyjnÄ….
       destroyed_msg: PomyÅ›lnie usuniÄ™to notatkÄ™ moderacyjnÄ….
@@ -276,7 +365,6 @@ pl:
       comment:
         none: Brak
       created_at: ZgÅ‚oszono
-      id: ID
       mark_as_resolved: Oznacz jako rozwiÄ…zane
       mark_as_unresolved: Oznacz jako nierozwiÄ…zane
       notes:
@@ -287,20 +375,15 @@ pl:
         placeholder: Opisz wykonane akcje i inne szczegÃ³Å‚y dotyczÄ…ce tego zgÅ‚oszeniaâ€¦
       reopen: OtwÃ³rz ponownie
       report: 'ZgÅ‚oszenie #%{id}'
-      report_contents: ZawartoÅ›Ä‡
       reported_account: ZgÅ‚oszone konto
       reported_by: ZgÅ‚aszajÄ…cy
       resolved: RozwiÄ…zane
       resolved_msg: PomyÅ›lnie rozwiÄ…zano zgÅ‚oszenie.
-      silence_account: Wycisz konto
       status: Stan
-      suspend_account: ZawieÅ› konto
-      target: Cel
       title: ZgÅ‚oszenia
       unassign: Cofnij przypisanie
       unresolved: NierozwiÄ…zane
       updated_at: Zaktualizowano
-      view: WyÅ›wietl
     settings:
       activity_api_enabled:
         desc_html: Liczy publikowane lokalnie wpisy, aktywnych uÅ¼ytkownikÃ³w i nowe rejestracje w ciÄ…gu danego tygodnia
@@ -311,15 +394,24 @@ pl:
       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
       hero:
-        desc_html: WyÅ›wietlany na stronie gÅ‚Ã³wnej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. JeÅ¼eli nie ustawiony, zostanie uÅ¼yta miniatura instancji.
+        desc_html: WyÅ›wietlany na stronie gÅ‚Ã³wnej. Zalecany jest rozmiar przynajmniej 600x100 pikseli. JeÅ¼eli nie ustawiony, zostanie uÅ¼yta miniatura instancji
         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 ta instancja wchodziÅ‚a w interakcje
         title: Publikuj listÄ™ znanych instancji
       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
@@ -340,13 +432,16 @@ pl:
         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 i znacznikach meta. MoÅ¼esz korzystaÄ‡ z tagÃ³w HTML, w szczegÃ³lnoÅ›ci <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
+        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 instancji
       site_description_extended:
-        desc_html: Dobre miejsce na zasady uÅ¼ytkowania, wprowadzenie i inne rzeczy, ktÃ³re wyrÃ³Å¼niajÄ… tÄ™ instancjÄ™. MoÅ¼esz korzystaÄ‡ z tagÃ³w HTML
+        desc_html: Dobre miejsce na zasady uÅ¼ytkowania, wprowadzenie i inne rzeczy, ktÃ³re wyrÃ³Å¼niajÄ… tÄ™ instancjÄ™. 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, czym jest Mastodon i czym wyrÃ³Å¼nia siÄ™ ta instancja w jednym akapicie. JeÅ¼eli pusty, zostanie uÅ¼yty opis instancji.
+        title: KrÃ³tki opis instancji
       site_terms:
-        desc_html: Miejsce na wÅ‚asnÄ… politykÄ™ prywatnoÅ›ci, zasady uÅ¼ytkowania i inne unormowania prawne. MoÅ¼esz korzystaÄ‡ z tagÃ³w HTML
+        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 instancji
       thumbnail:
@@ -366,6 +461,7 @@ pl:
       media:
         title: Media
       no_media: Bez zawartoÅ›ci multimedialnej
+      no_status_selected: Å»aden wpis nie zostaÅ‚ zmieniony, bo Å¼aden nie zostaÅ‚ wybrany
       title: Wpisy konta
       with_media: Z zawartoÅ›ciÄ… multimedialnÄ…
     subscriptions:
@@ -375,11 +471,25 @@ pl:
       last_delivery: Ostatnio dorÄ™czono
       title: WebSub
       topic: Temat
+    tags:
+      accounts: Konta
+      hidden: Ukryte
+      hide: Ukryj w katalogu
+      name: Hashtag
+      title: Hashtagi
+      unhide: Pokazuj w katalogu
+      visible: Widoczne
     title: Administracja
+    warning_presets:
+      add_new: Dodaj nowy
+      delete: UsuÅ„
+      edit: Edytuj
+      edit_preset: Edytuj szablon ostrzeÅ¼enia
+      title: ZarzÄ…dzaj szablonami ostrzeÅ¼eÅ„
   admin_mailer:
     new_report:
-      body: UÅ¼ytkownik %{reporter} zgÅ‚osiÅ‚ %{target}
-      body_remote: UÅ¼ytkownik instancji %{domain} zgÅ‚osiÅ‚ %{target}
+      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})
   application_mailer:
     notification_preferences: ZmieÅ„ ustawienia e-maili
@@ -397,18 +507,18 @@ pl:
     warning: Przechowuj te dane ostroÅ¼nie. Nie udostÄ™pniaj ich nikomu!
     your_token: TwÃ³j token dostÄ™pu
   auth:
-    agreement_html: RejestrujÄ…c siÄ™, oÅ›wiadczasz, Å¼e zapoznaÅ‚eÅ› siÄ™ z <a href="%{rules_path}">informacjami o instancji</a> i <a href="%{terms_path}">zasadami korzystania z usÅ‚ugi</a>.
+    agreement_html: RejestrujÄ…c siÄ™, oÅ›wiadczasz, Å¼e zapoznaÅ‚eÅ›(-aÅ›) siÄ™ z <a href="%{rules_path}">informacjami o instancji</a> i <a href="%{terms_path}">zasadami korzystania z usÅ‚ugi</a>.
     change_password: HasÅ‚o
     confirm_email: PotwierdÅº adres e-mail
     delete_account: UsuniÄ™cie konta
     delete_account_html: JeÅ¼eli chcesz usunÄ…Ä‡ konto, <a href="%{path}">przejdÅº tutaj</a>. Otrzymasz proÅ›bÄ™ o potwierdzenie.
-    didnt_get_confirmation: Nie otrzymaÅ‚eÅ› instrukcji weryfikacji?
+    didnt_get_confirmation: Nie otrzymaÅ‚eÅ›(-aÅ›) instrukcji weryfikacji?
     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.
     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}">skonfigurowaÄ‡ to tutaj</a>.
+    migrate_account_html: JeÅ¼eli chcesz skonfigurowaÄ‡ przekierowanie z obecnego konta na inne, moÅ¼esz <a href="%{path}">zrobiÄ‡ to tutaj</a>.
     or: lub
     or_log_in_with: Lub zaloguj siÄ™ z uÅ¼yciem
     providers:
@@ -453,6 +563,15 @@ pl:
     success_msg: Twoje konto zostaÅ‚o pomyÅ›lnie usuniÄ™te
     warning_html: MoÅ¼emy usunÄ…Ä‡ zawartoÅ›Ä‡ jedynie w obrÄ™bie tej instancji. ZawartoÅ›Ä‡ udostÄ™pniona publicznie pozostawia trwaÅ‚e Å›lady. Serwery niepodÅ‚Ä…czone do sieci bÄ…dÅº nieÅ›ledzÄ…ce Twoich aktualizacji mogÄ… zachowaÄ‡ Twoje dane.
     warning_title: DostÄ™pnoÅ›Ä‡ usuniÄ™tej zawartoÅ›ci
+  directories:
+    directory: Katalog profilÃ³w
+    explanation: Poznaj profile na podstawie zainteresowaÅ„
+    explore_mastodon: Odkrywaj %{title}
+    people:
+      few: "%{count} osoby"
+      many: "%{count} osÃ³b"
+      one: "%{count} osoba"
+      other: "%{count} osÃ³b"
   errors:
     '403': Nie masz uprawnieÅ„, aby wyÅ›wietliÄ‡ tÄ™ stronÄ™.
     '404': Strona, ktÃ³rÄ… prÃ³bujesz odwiedziÄ‡, nie istnieje.
@@ -464,7 +583,7 @@ pl:
     '500':
       content: Przepraszamy, coÅ› poszÅ‚o nie tak, po naszej stronie.
       title: Ta strona jest nieprawidÅ‚owa
-    noscript_html: Aby korzystaÄ‡ z aplikacji Mastodon, wÅ‚Ä…cz JavaScript. MoÅ¼esz teÅ¼ skorzystaÄ‡ z jednej z <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">natywnych aplikacji</a> obsÅ‚ugujÄ…cej Twoje urzÄ…dzenie.
+    noscript_html: Aby korzystaÄ‡ z aplikacji Mastodon, wÅ‚Ä…cz JavaScript. MoÅ¼esz teÅ¼ skorzystaÄ‡ z jednej z <a href="%{apps_path}">natywnych aplikacji</a> obsÅ‚ugujÄ…cej Twoje urzÄ…dzenie.
   exports:
     archive_takeout:
       date: Data
@@ -475,7 +594,9 @@ pl:
       size: Rozmiar
     blocks: Zablokowani
     csv: CSV
+    domain_blocks: Blokady domen
     follows: Åšledzeni
+    lists: Listy
     mutes: Wyciszeni
     storage: UrzÄ…dzenie przechowujÄ…ce dane
   filters:
@@ -500,15 +621,16 @@ pl:
     followers_count: Liczba Å›ledzÄ…cych
     lock_link: Zablokuj swoje konto
     purge: PrzestaÅ„ Å›ledziÄ‡
-    success:
-      one: W trakcie usuwania Å›ledzÄ…cych z jednej domenyâ€¦
-      other: W trakcie usuwania Å›ledzÄ…cych z %{count} domenâ€¦
+    success: W trakcie usuwania Å›ledzÄ…cych z %{count} domenâ€¦
     true_privacy_html: PamiÄ™taj, Å¼e <strong>rzeczywista prywatnoÅ›Ä‡ moÅ¼e zostaÄ‡ uzyskana wyÅ‚Ä…cznie dziÄ™ki szyfrowaniu end-to-end</strong>.
     unlocked_warning_html: KaÅ¼dy moÅ¼e CiÄ™ Å›ledziÄ‡, dziÄ™ki czemu moÅ¼e zobaczyÄ‡ Twoje niepubliczne wpisy. %{lock_link} aby mÃ³c kontrolowaÄ‡, kto CiÄ™ Å›ledzi.
     unlocked_warning_title: Twoje konto nie jest zablokowane
+  footer:
+    developers: Dla programistÃ³w
+    more: WiÄ™cejâ€¦
+    resources: Zasoby
   generic:
     changes_saved_msg: Ustawienia zapisane!
-    powered_by: uruchomione na %{link}
     save_changes: Zapisz zmiany
     validation_errors:
       few: CoÅ› jest wciÄ…Å¼ nie tak! Przejrzyj %{count} poniÅ¼sze bÅ‚Ä™dy
@@ -536,7 +658,7 @@ pl:
       '86400': dobie
     expires_in_prompt: Nigdy
     generate: Wygeneruj
-    invited_by: 'ZostaÅ‚eÅ› zaproszony przez:'
+    invited_by: 'ZostaÅ‚eÅ›(-aÅ›) zaproszony(-a) przez:'
     max_uses:
       few: "%{count} uÅ¼ycia"
       many: "%{count} uÅ¼yÄ‡"
@@ -548,8 +670,6 @@ pl:
       expires_at: WygaÅ›nie po
       uses: UÅ¼ycia
     title: ZaproÅ› uÅ¼ytkownikÃ³w
-  landing_strip_html: "<strong>%{name}</strong> ma konto na %{link_to_root_path}. MoÅ¼esz je Å›ledziÄ‡ i wejÅ›Ä‡ z nim w interakcjÄ™ jeÅ›li masz konto gdziekolwiek w Fediwersum."
-  landing_strip_signup_html: JeÅ›li jeszcze go nie masz, moÅ¼esz <a href="%{sign_up_path}">stworzyÄ‡ konto</a>.
   lists:
     errors:
       limit: PrzekroczyÅ‚eÅ› maksymalnÄ… liczbÄ™ utworzonych list
@@ -590,13 +710,13 @@ pl:
       title: Nowy Å›ledzÄ…cy
     follow_request:
       action: ZarzÄ…dzaj proÅ›bami o moÅ¼liwoÅ›Ä‡ Å›ledzenia
-      body: "%{name} poprosiÅ‚ o moÅ¼liwoÅ›Ä‡ Å›ledzenia CiÄ™"
+      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
     mention:
       action: Odpowiedz
-      body: "%{name} wspomniaÅ‚ o Tobie w:"
-      subject: "%{name} wspomniaÅ‚ o Tobie"
+      body: "%{name} wspomniaÅ‚(a) o Tobie w:"
+      subject: "%{name} wspomniaÅ‚(a) o Tobie"
       title: Nowe wspomnienie o Tobie
     reblog:
       body: 'TwÃ³j wpis zostaÅ‚ podbity przez %{name}:'
@@ -625,7 +745,7 @@ pl:
     publishing: Publikowanie
     web: SieÄ‡
   remote_follow:
-    acct: Podaj swÃ³j adres (nazwa@domena), z ktÃ³rego chcesz Å›ledziÄ‡
+    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Åº
@@ -705,9 +825,7 @@ pl:
         other: "%{count} filmÃ³w"
     boosted_from_html: Podbito przez %{acct_link}
     content_warning: 'OstrzeÅ¼enie o zawartoÅ›ci: %{warning}'
-    disallowed_hashtags:
-      one: 'zawiera niedozwolony hashtag: %{tags}'
-      other: 'zawiera niedozwolone hashtagi: %{tags}'
+    disallowed_hashtags: 'zawiera niedozwolone hashtagi: %{tags}'
     language_detection: Automatycznie wykrywaj jÄ™zyk
     open_in_web: OtwÃ³rz w przeglÄ…darce
     over_character_limit: limit %{max} znakÃ³w przekroczony
@@ -717,6 +835,7 @@ pl:
       private: Nie moÅ¼esz przypiÄ…Ä‡ niepublicznego wpisu
       reblog: Nie moÅ¼esz przypiÄ…Ä‡ podbicia wpisu
     show_more: PokaÅ¼ wiÄ™cej
+    sign_in_to_participate: Zaloguj siÄ™, aby udzieliÄ‡ siÄ™ w tej konwersacji
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Tylko dla Å›ledzÄ…cych
@@ -726,7 +845,6 @@ pl:
       unlisted: Niewypisane
       unlisted_long: Widoczne dla wszystkich, ale nie wyÅ›wietlane na publicznych osiach czasu
   stream_entries:
-    click_to_show: NaciÅ›nij aby wyÅ›wietliÄ‡
     pinned: PrzypiÄ™ty wpis
     reblogged: podbiÅ‚
     sensitive_content: WraÅ¼liwa zawartoÅ›Ä‡
@@ -736,9 +854,9 @@ pl:
       <h3 id="collect">Jakie informacje zbieramy?</h3>
 
       <ul>
-        <li><em>Podstawowe informacje o koncie</em>: Podczas rejestracji na tym serwerze, moÅ¼esz zostaÄ‡ poproszony 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>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 wspimnianych. 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>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>
 
@@ -779,15 +897,15 @@ pl:
 
       <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 â€“ przypisanie jej do konta.</p>
+      <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Ä‡ preferencjÄ™ uÅ¼ytkownikÃ³w na przyszÅ‚e wizyty.</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 zaufanym dostawcom pomagajÄ…cym w prowadzeniu 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>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>
 
@@ -797,9 +915,9 @@ pl:
 
       <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Å› 16 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>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 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>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Å› 13 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 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>Wymogi mogÄ… byÄ‡ inne, jeÅ¼eli serwer znajduje siÄ™ w innym kraju.</p>
 
@@ -820,6 +938,7 @@ pl:
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Aby kontynuowaÄ‡, wprowadÅº kod wyÅ›wietlany przez aplikacjÄ™ uwierzytelniajÄ…cÄ…
     description_html: JeÅ›li wÅ‚Ä…czysz <strong>uwierzytelnianie dwuetapowe</strong>, logowanie siÄ™ bÄ™dzie wymagaÅ‚o podania tokenu wyÅ›wietlonego na Twoim telefonie.
@@ -838,9 +957,25 @@ pl:
     wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urzÄ…dzenia jest poprawny?
   user_mailer:
     backup_ready:
-      explanation: ZaÅ¼Ä…daÅ‚eÅ› peÅ‚nej kopii zapasowej konta na Mastodonie. Jest ono dostÄ™pne do pobrania
+      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
+    warning:
+      explanation:
+        disable: Kiedy Twoje konto jest wyÅ‚Ä…czone, Twoje dane pozostajÄ… na serwerze, ale nie moÅ¼esz wykonywaÄ‡ Å¼adnych dziaÅ‚aÅ„, zanim zostanie odblokowane.
+        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Ä™.
+      review_server_policies: Przejrzyj zasady serwera
+      subject:
+        disable: Twoje konto %{acct} zostaÅ‚o wyÅ‚Ä…czone
+        none: OstrzeÅ¼enie dla %{acct}
+        silence: Twoje konto %{acct} zostaÅ‚o ograniczone
+        suspend: Twoje konto %{acct} zostaÅ‚o zawieszone
+      title:
+        disable: Konto wyÅ‚Ä…czone
+        none: OstrzeÅ¼enie
+        silence: Konto ograniczone
+        suspend: Konto zawieszone
     welcome:
       edit_profile_action: Skonfiguruj profil
       edit_profile_step: MoÅ¼esz dostowaÄ‡ 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Ä‡.
@@ -850,9 +985,8 @@ pl:
       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 innej instancji.
       review_preferences_action: ZmieÅ„ ustawienia
-      review_preferences_step: Upewnij siÄ™, Å¼e zmieniÅ‚eÅ› 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.
+      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.
       subject: Witaj w Mastodonie
-      tip_bridge_html: JeÅ¼eli przybywasz z Twittera, moÅ¼esz znaleÅºÄ‡ znajomych na Mastodonie uÅ¼ywajÄ…c <a href="%{bridge_url}">aplikacji mostku</a>. DziaÅ‚a to tylko, jeÅ¼eli oni rÃ³wnieÅ¼ z niej korzystali!
       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!
@@ -860,8 +994,12 @@ pl:
       tips: WskazÃ³wki
       title: Witaj na pokÅ‚adzie, %{name}!
   users:
+    follow_limit_reached: Nie moÅ¼esz Å›ledziÄ‡ wiÄ™cej niÅ¼ %{limit} osÃ³b
     invalid_email: Adres e-mail jest niepoprawny
     invalid_otp_token: Kod uwierzytelniajÄ…cy jest niepoprawny
     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:'
+  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 d64150a954c414e18cebd32477f61c6f213cc46a..785860ed4911205390b3793b9c71f85e9cf71f1b 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -5,13 +5,13 @@ pt-BR:
     about_mastodon_html: Mastodon Ã© uma rede social baseada em protocolos abertos e software gratuito e de cÃ³digo aberto. Ã‰ descentralizada como e-mail.
     about_this: Sobre
     administered_by: 'Administrado por:'
+    api: API
+    apps: Apps
     closed_registrations: Os cadastros estÃ£o atualmente fechados nesta instÃ¢ncia. No entanto, vocÃª pode procurar uma instÃ¢ncia diferente na qual possa criar uma conta e acessar a mesma rede por lÃ¡.
     contact: Contato
     contact_missing: NÃ£o definido
-    contact_unavailable: N/A
-    description_headline: O que Ã© %{domain}?
-    domain_count_after: outras instÃ¢ncias
-    domain_count_before: Conectado a
+    contact_unavailable: NÃ£o disponÃvel
+    documentation: DocumentaÃ§Ã£o
     extended_description_html: |
       <h3>Um bom lugar para regras</h3>
       <p>A descriÃ§Ã£o da instÃ¢ncia ainda nÃ£o foi feita.</p>
@@ -28,25 +28,41 @@ pt-BR:
     hosted_on: Mastodon hospedado em %{domain}
     learn_more: Saiba mais
     other_instances: Lista de instÃ¢ncias
+    privacy_policy: PolÃtica de Privacidade
     source_code: CÃ³digo-fonte
-    status_count_after: publicaÃ§Ãµes
+    status_count_after:
+      one: status
+      other: status
     status_count_before: Autores de
-    user_count_after: usuÃ¡rios
+    terms: Termos de serviÃ§o
+    user_count_after:
+      one: usuÃ¡rio
+      other: usuÃ¡rios
     user_count_before: Casa de
     what_is_mastodon: O que Ã© Mastodon?
   accounts:
+    choices_html: 'Escolhas de %{name}:'
     follow: Seguir
-    followers: Seguidores
+    followers:
+      one: Seguidor
+      other: Seguidores
     following: Seguindo
+    joined: Participa desde %{date}
+    last_active: Ãºltima atividade
+    link_verified_on: A posse desse link foi checada em %{date}
     media: MÃdia
     moved_html: "%{name} se mudou para %{new_profile_link}:"
     network_hidden: Esta informaÃ§Ã£o nÃ£o estÃ¡ disponÃvel
     nothing_here: NÃ£o hÃ¡ nada aqui!
     people_followed_by: Pessoas que %{name} segue
     people_who_follow: Pessoas que seguem %{name}
-    posts: Toots
+    pin_errors:
+      following: VocÃª tem que estar seguindo a pessoa que vocÃª quer sugerir
+    posts:
+      one: Toot
+      other: Toots
+    posts_tab_heading: Toots
     posts_with_replies: Toots e respostas
-    remote_follow: Siga remotamente
     reserved_username: Este usuÃ¡rio estÃ¡ reservado
     roles:
       admin: Administrador
@@ -54,6 +70,9 @@ pt-BR:
       moderator: Moderador
     unfollow: Deixar de seguir
   admin:
+    account_actions:
+      action: Tomar uma aÃ§Ã£o
+      title: Realizar uma aÃ§Ã£o de moderaÃ§Ã£o em %{acct}
     account_moderation_notes:
       create: Criar uma advertÃªncia
       created_msg: Nota de moderaÃ§Ã£o criada com sucesso!
@@ -73,6 +92,7 @@ pt-BR:
       confirm: Confirmar
       confirmed: Confirmado
       confirming: Confirmando
+      deleted: ExcluÃdo
       demote: Rebaixar
       disable: Desativar
       disable_two_factor_authentication: Desativar 2FA
@@ -88,8 +108,11 @@ pt-BR:
       followers: Seguidores
       followers_url: URL de seguidores
       follows: Segue
+      header: CabeÃ§alho
       inbox_url: URL da caixa de entrada
+      invited_by: Convidado por
       ip: IP
+      joined: Se cadastrou
       location:
         all: Todos
         local: Local
@@ -99,6 +122,7 @@ pt-BR:
       media_attachments: MÃdia(s) anexada(s)
       memorialize: Tornar um memorial
       moderation:
+        active: Ativo
         all: Todos
         silenced: Silenciados
         suspended: Suspensos
@@ -106,20 +130,18 @@ pt-BR:
       moderation_notes: Notas de moderaÃ§Ã£o
       most_recent_activity: Atividade mais recente
       most_recent_ip: IP mais recente
+      no_limits_imposed: Nenhum limite imposto
       not_subscribed: NÃ£o estÃ¡ inscrito
-      order:
-        alphabetic: AlfabÃ©tica
-        most_recent: Mais recente
-        title: Ordem
       outbox_url: URL da caixa de saÃda
-      perform_full_suspension: Aplicar suspensÃ£o total
+      perform_full_suspension: Suspender
       profile_url: URL do perfil
       promote: Promover
       protocol: Protocolo
       public: PÃºblico
       push_subscription_expires: InscriÃ§Ã£o PuSH expira
-      redownload: Atualizar avatar
+      redownload: Atualizar perfil
       remove_avatar: Remover avatar
+      remove_header: Remover cabeÃ§alho
       resend_confirmation:
         already_confirmed: Este usuÃ¡rio jÃ¡ estÃ¡ confirmado
         send: Re-enviar o e-mail de confirmaÃ§Ã£o
@@ -138,27 +160,31 @@ pt-BR:
       shared_inbox_url: URL da caixa de entrada compartilhada
       show:
         created_reports: DenÃºncias criadas por esta conta
-        report: relatÃ³rios
         targeted_reports: DenÃºncias feitas sobre esta conta
       silence: Silenciar
+      silenced: Silenciado
       statuses: Postagens
       subscribe: Inscrever-se
+      suspended: Suspenso
       title: Contas
       unconfirmed_email: E-mail nÃ£o confirmado
       undo_silenced: Retirar silenciamento
       undo_suspension: Retirar suspensÃ£o
       unsubscribe: Desinscrever-se
       username: Nome de usuÃ¡rio
+      warn: Notificar
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name} designou a denÃºncia %{target} para si"
         change_email_user: "%{name} mudou o endereÃ§o de e-mail do usuÃ¡rio %{target}"
         confirm_user: "%{name} confirmou o endereÃ§o de e-mail do usuÃ¡rio %{target}"
+        create_account_warning: "%{name} enviou um aviso para %{target}"
         create_custom_emoji: "%{name} enviou o emoji novo %{target}"
         create_domain_block: "%{name} bloqueou o domÃnio %{target}"
         create_email_domain_block: "%{name} colocou o domÃnio de e-mail %{target} na lista negra"
         demote_user: "%{name} rebaixou o usuÃ¡rio %{target}"
+        destroy_custom_emoji: "%{name} destruiu emoji %{target}"
         destroy_domain_block: "%{name} desbloqueou o domÃnio %{target}"
         destroy_email_domain_block: "%{name} retirou o domÃnio de e-mail %{target} da lista negra"
         destroy_status: "%{name} removeu postagem feita por %{target}"
@@ -180,6 +206,7 @@ pt-BR:
         unsuspend_account: "%{name} desativou a suspensÃ£o de  %{target}"
         update_custom_emoji: "%{name} atualizou o emoji %{target}"
         update_status: "%{name} atualizou o estado de %{target}"
+      deleted_status: "(status deletado)"
       title: Auditar relatÃ³rio
     custom_emojis:
       by_domain: DomÃnio
@@ -206,8 +233,30 @@ pt-BR:
       update_failed_msg: NÃ£o foi possÃvel atualizar esse emoji
       updated_msg: Emoji atualizado com sucesso!
       upload: Enviar
+    dashboard:
+      backlog: tarefas na fila
+      config: ConfiguraÃ§Ã£o
+      feature_deletions: RemoÃ§Ã£o de contas
+      feature_invites: Convites
+      feature_profile_directory: DiretÃ³rio de perfis
+      feature_registrations: Cadastros
+      feature_relay: Repetidor da federaÃ§Ã£o
+      features: Funcionalidades
+      hidden_service: FederaÃ§Ã£o com serviÃ§os onion
+      open_reports: DenÃºncias em aberto
+      recent_users: UsuÃ¡rios recentes
+      search: Pesquisa em texto
+      single_user_mode: Modo de usuÃ¡rio Ãºnico
+      software: Software
+      space: Uso de espaÃ§o em disco
+      title: Painel de controle
+      total_users: usuÃ¡rios no total
+      trends: TendÃªncias
+      week_interactions: interaÃ§Ãµes essa semana
+      week_users_active: ativos essa semana
+      week_users_new: usuÃ¡rios essa semana
     domain_blocks:
-      add_new: Adicionar novo
+      add_new: Adicionar novo bloqueio de domÃnio
       created_msg: Bloqueio de domÃnio estÃ¡ sendo processado
       destroyed_msg: Bloqueio de domÃnio desfeito
       domain: DomÃnio
@@ -222,11 +271,13 @@ pt-BR:
         title: Novo bloqueio de domÃnio
       reject_media: Rejeitar arquivos de mÃdia
       reject_media_hint: Remove arquivos de mÃdia armazenados localmente e recusa quaisquer outros no futuro. Irrelevante para suspensÃµes
-      severities:
-        noop: Nenhum
-        silence: SilÃªncio
-        suspend: SuspensÃ£o
-      severity: Rigidez
+      reject_reports: Rejeitar denÃºncias
+      reject_reports_hint: Ignorar todas as denÃºncias vindas deste domÃno. Irrelevante para suspensÃµes
+      rejecting_media: rejeitando arquivos de mÃdia
+      rejecting_reports: rejeitando denÃºncias
+      severity:
+        silence: silenciado
+        suspend: suspenso
       show:
         affected_accounts:
           one: Uma conta no banco de dados foi afetada
@@ -236,8 +287,7 @@ pt-BR:
           suspend: Retirar suspensÃ£o de todas as contas neste domÃnio
         title: Retirar bloqueio de domÃnio de %{domain}
         undo: Retirar
-      title: Bloqueios de domÃnio
-      undo: Retirar
+      undo: Retirar bloqueio de domÃnio
     email_domain_blocks:
       add_new: Adicionar novo
       created_msg: Bloqueio de domÃnio de e-mail criado com sucesso
@@ -248,19 +298,47 @@ pt-BR:
         create: Adicionar domÃnio
         title: Novo bloqueio de domÃnio de e-mail
       title: Bloqueio de DomÃnio de E-mail
+    followers:
+      back_to_account: Voltar para a conta
+      title: Pessoas que seguem %{acct}
     instances:
-      account_count: Contas conhecidas
-      domain_name: DomÃnio
-      reset: Resetar
-      search: Buscar
-      title: InstÃ¢ncias conhecidas
+      delivery_available: Entrega estÃ¡ disponÃvel
+      known_accounts:
+        one: "%{count} conta conhecida"
+        other: "%{count} contas conhecidas"
+      moderation:
+        all: Todas
+        limited: Limitado
+        title: ModeraÃ§Ã£o
+      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
     invites:
+      deactivate_all: Desativar todos
       filter:
         all: Todos
         available: DisponÃveis
         expired: Expirados
         title: Filtro
       title: Convites
+    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 servidores que se inscrevem e publicam nele. <strong>O repetidor pode ser usado para ajudar servidores pequenos e mÃ©dios a descobrir conteÃºdo do fediverso</strong>, que normalmente precisariam que usuÃ¡rios locais manualmente seguissem outras pessoas em servidores remotos.
+      disable: Desativar
+      disabled: Desabilitar
+      enable: Habilitar
+      enable_hint: Uma vez habilitado, seu servidor vai se inscrever para receber todos os toots pÃºblicos desse repetidor; E vai comeÃ§ar a enviar todos os toots pÃºblicos desse servidor para o repetidor.
+      enabled: Habilitado
+      inbox_url: URL do repetidor
+      pending: Esperando pela aprovaÃ§Ã£o do repetidor
+      save_and_enable: Salvar e habilitar
+      setup: Configurar uma conexÃ£o de repetidor
+      status: Status
+      title: Repetidores
     report_notes:
       created_msg: Nota de denÃºncia criada com sucesso!
       destroyed_msg: Nota de denÃºncia excluÃda com sucesso!
@@ -275,7 +353,6 @@ pt-BR:
       comment:
         none: Nenhum
       created_at: Denunciado
-      id: ID
       mark_as_resolved: Marcar como resolvido
       mark_as_unresolved: Marcar como nÃ£o resolvido
       notes:
@@ -286,20 +363,15 @@ pt-BR:
         placeholder: Descreva que aÃ§Ãµes foram tomadas, ou quaisquer outras atualizaÃ§Ãµes relacionadasâ€¦
       reopen: Reabrir denÃºncia
       report: 'DenÃºncia #%{id}'
-      report_contents: ConteÃºdos
       reported_account: Conta denunciada
       reported_by: Denunciada por
       resolved: Resolvido
       resolved_msg: DenÃºncia resolvida com sucesso!
-      silence_account: Silenciar conta
       status: Status
-      suspend_account: Suspender conta
-      target: Alvo
       title: DenÃºncias
       unassign: Desatribuir
       unresolved: NÃ£o resolvido
       updated_at: Atualizado
-      view: Visualizar
     settings:
       activity_api_enabled:
         desc_html: Contagem de status postados localmente, usuÃ¡rios ativos e novos cadastros filtrados semanalmente
@@ -310,15 +382,24 @@ pt-BR:
       contact_information:
         email: E-mail
         username: Contate usuÃ¡rio
+      custom_css:
+        desc_html: Modificar o visual com CSS que Ã© carregado em todas as pÃ¡ginas
+        title: CSS customizado
       hero:
         desc_html: Aparece na pÃ¡gina inicial. Ao menos 600x100px Ã© recomendado. Se nÃ£o estiver definido, o thumbnail da instÃ¢ncia Ã© usado no lugar
         title: Imagem de capa
+      mascot:
+        desc_html: Mostrado em diversas pÃ¡ginas. Ao menos 293Ã—205px recomendado. Quando nÃ£o estÃ¡ configurado, 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Ã©-visualizaÃ§Ã£o 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Ã©-visualizaÃ§Ãµes OpenGraph
+      profile_directory:
+        desc_html: Permitir que usuÃ¡rios possam ser descobertos
+        title: Ativar diretÃ³rio de perfis
       registrations:
         closed_message:
           desc_html: Exibido na pÃ¡gina inicial quando cadastros estÃ£o fechados. VocÃª pode usar tags HTML
@@ -339,11 +420,14 @@ pt-BR:
         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 e em meta tags. VocÃª pode usar tags HTML, em especial <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
+        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 customizada
+      site_short_description:
+        desc_html: Aparece na barra lateral e nas meta tags. Descreva o que Ã© Mastodon e o que faz esse servidor especial em um Ãºnico parÃ¡grafo. Se nÃ£o for preenchido, Ã© 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 customizados
@@ -365,6 +449,7 @@ pt-BR:
       media:
         title: MÃdia
       no_media: NÃ£o hÃ¡ mÃdia
+      no_status_selected: Nenhum status foi modificado porque nenhum estava selecionado
       title: Postagens da conta
       with_media: Com mÃdia
     subscriptions:
@@ -374,7 +459,21 @@ pt-BR:
       last_delivery: Ãšltima entrega
       title: WebSub
       topic: TÃ³pico
+    tags:
+      accounts: Contas
+      hidden: Escondido
+      hide: Esconder do diretÃ³rio
+      name: Hashtag
+      title: Hashtags
+      unhide: Mostrar no diretÃ³rio
+      visible: VisÃvel
     title: AdministraÃ§Ã£o
+    warning_presets:
+      add_new: Adicionar um novo
+      delete: Excluir
+      edit: Editar
+      edit_preset: Editar o aviso prÃ©-definido
+      title: Gerenciar os avisos prÃ©-definidos
   admin_mailer:
     new_report:
       body: "%{reporter} denunciou %{target}"
@@ -452,6 +551,13 @@ pt-BR:
     success_msg: A sua conta foi excluÃda com sucesso
     warning_html: Apenas a exclusÃ£o de conteÃºdo desta instÃ¢ncia em particular Ã© garantida. ConteÃºdo que tenha sido largamente compartilhado muito provavelmente deixarÃ¡ traÃ§os. Servidores offline e servidores que se desinscreveram de suas atualizaÃ§Ãµes nÃ£o irÃ£o atualizar as suas bases de dados.
     warning_title: Disponibilidade de conteÃºdo disseminado
+  directories:
+    directory: DiretÃ³rio de perfis
+    explanation: Descobrir usuÃ¡rios baseado em seus interesses
+    explore_mastodon: Explorar %{title}
+    people:
+      one: "%{count} pessoa"
+      other: "%{count} pessoas"
   errors:
     '403': VocÃª nÃ£o tem permissÃ£o para ver esta pÃ¡gina.
     '404': A pÃ¡gina pela qual vocÃª estÃ¡ procurando nÃ£o existe.
@@ -463,7 +569,7 @@ pt-BR:
     '500':
       content: Desculpe, algo deu errado.
       title: Esta pÃ¡gina nÃ£o estÃ¡ certa
-    noscript_html: Para usar o aplicativo web do Mastodon, por favor ative o JavaScript. Ou, se quiser, experimente um dos <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">apps nativos</a> para o Mastodon em sua plataforma.
+    noscript_html: Para usar o aplicativo web do Mastodon, por favor ative o JavaScript. Ou, se quiser, experimente um dos <a href="%{apps_path}">apps nativos</a> para o Mastodon em sua plataforma.
   exports:
     archive_takeout:
       date: Data
@@ -474,7 +580,9 @@ pt-BR:
       size: Tamanho
     blocks: VocÃª bloqueou
     csv: CSV
+    domain_blocks: Bloqueios de domÃnio
     follows: VocÃª segue
+    lists: Listas
     mutes: VocÃª silenciou
     storage: Armazenamento de mÃdia
   filters:
@@ -505,9 +613,13 @@ pt-BR:
     true_privacy_html: Lembre-se de que <strong>a verdadeira privacidade sÃ³ pode ser alcanÃ§ada atravÃ©s de encriptaÃ§Ã£o ponto-a-ponto</strong>.
     unlocked_warning_html: Qualquer pessoa pode te seguir e ver as suas postagens privadas. %{lock_link} para ser capaz de revisar e rejeitar seguidores.
     unlocked_warning_title: A sua conta nÃ£o estÃ¡ trancada
+  footer:
+    developers: Desenvolvedores
+    more: Maisâ€¦
+    resources: Recursos
   generic:
     changes_saved_msg: MudanÃ§as salvas com sucesso!
-    powered_by: graÃ§as a tecnologia de %{link}
+    copy: Copiar
     save_changes: Salvar mudanÃ§as
     validation_errors:
       one: Algo nÃ£o estÃ¡ certo! Por favor, reveja o erro abaixo
@@ -543,8 +655,6 @@ pt-BR:
       expires_at: Expira em
       uses: Usos
     title: Convidar pessoas
-  landing_strip_html: "<strong>%{name}</strong> Ã© um usuÃ¡rio no %{link_to_root_path}. VocÃª pode segui-lo ou interagir com ele se vocÃª tiver uma conta em qualquer lugar no fediverso."
-  landing_strip_signup_html: Se nÃ£o, vocÃª pode <a href="%{sign_up_path}">se cadastrar aqui</a>.
   lists:
     errors:
       limit: VocÃª alcanÃ§ou o nÃºmero mÃ¡ximo de listas
@@ -616,15 +726,30 @@ pt-BR:
     publishing: PublicaÃ§Ã£o
     web: Web
   remote_follow:
-    acct: Insira o seu usuÃ¡rio@domÃnio do qual vocÃª quer seguir
+    acct: Insira o seu usuÃ¡rio@domÃnio a partir do qual vocÃª deseja agir
     missing_resource: NÃ£o foi possÃvel encontrar a URL de direcionamento para a sua conta
     no_account_html: NÃ£o tem uma conta? VocÃª pode <a href='%{sign_up_path}' target='_blank'>cadastrar-se aqui</a>
     proceed: Prosseguir para seguir
     prompt: 'VocÃª irÃ¡ seguir:'
+    reason_html: "<strong>Por que esse passo Ã© necessÃ¡rio?</strong> <code>%{instance}</code> pode nÃ£o ser o servidor onde vocÃª se registrou, entÃ£o precisamos redirecionar vocÃª para o seu servidor primeiro."
+  remote_interaction:
+    favourite:
+      proceed: Proceder para favoritar
+      prompt: 'VocÃª quer favoritar este toot:'
+    reblog:
+      proceed: Proceder para compartilhar
+      prompt: 'VocÃª quer compartilhar esse toot:'
+    reply:
+      proceed: Proceder para responder
+      prompt: 'VocÃª quer responder Ã  esse toot:'
   remote_unfollow:
     error: Erro
     title: TÃtulo
     unfollowed: Deixou de seguir
+  scheduled_statuses:
+    over_daily_limit: VocÃª excedeu o limite de %{limit} toots planejados para esse dia
+    over_total_limit: VocÃª excedeu o limite de %{limit} toots planejados
+    too_soon: A data planejada precisa ser no futuro
   sessions:
     activity: Ãšltima atividade
     browser: Navegador
@@ -704,6 +829,7 @@ pt-BR:
       private: Toot nÃ£o-pÃºblico nÃ£o pode ser fixado
       reblog: Um compartilhamento nÃ£o pode ser fixado
     show_more: Mostrar mais
+    sign_in_to_participate: Entre para participar dessa conversa
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Apenas seguidores
@@ -713,7 +839,6 @@ pt-BR:
       unlisted: NÃ£o listado
       unlisted_long: Todos podem ver, porÃ©m nÃ£o serÃ¡ postado nas timelines pÃºblicas
   stream_entries:
-    click_to_show: Clique para mostrar
     pinned: Toot fixado
     reblogged: compartilhou
     sensitive_content: ConteÃºdo sensÃvel
@@ -807,6 +932,7 @@ pt-BR:
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%B de %Y"
   two_factor_authentication:
     code_hint: Insira o cÃ³digo gerado pelo seu aplicativo auteticador para confirmar
     description_html: Se vocÃª ativar a <strong>autenticaÃ§Ã£o em dois passos</strong>, o acesso Ã  sua conta exigirÃ¡ posse de seu celular, que irÃ¡ gerar tokens para validaÃ§Ã£o.
@@ -828,6 +954,22 @@ pt-BR:
       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
+    warning:
+      explanation:
+        disable: Enquanto sua conta estÃ¡ congelada, seus dados estÃ£o intactos, mas vocÃª nÃ£o pode realizar nenhuma aÃ§Ã£o atÃ© que sua conta seja desbloqueada.
+        silence: Enquanto sua conta estÃ¡ limitada, somente pessoas que jÃ¡ estÃ£o seguindo vocÃª poderÃ£o ver seus toots nesse servidor, e vocÃª pode ser excluÃdo de diversas listagens pÃºblicas. No entanto, outros ainda podem seguir vocÃª manualmente.
+        suspend: Sua conta estÃ¡ suspensa e todos os seus toots e mÃdias foram irreversivelmente removidas desse servidor e de servidores onde vocÃª tinha seguidores.
+      review_server_policies: Revisar as polÃticas do servidor
+      subject:
+        disable: Sua conta %{acct} foi congelada
+        none: Aviso para %{acct}
+        silence: Sua conta %{acct} foi limitada
+        suspend: Sua conta %{acct} foi suspensa
+      title:
+        disable: Conta congelada
+        none: Aviso
+        silence: Conta limitada
+        suspend: Conta suspensa
     welcome:
       edit_profile_action: Configurar perfil
       edit_profile_step: VocÃª pode customizar o seu perfil enviando um avatar, uma imagem de topo, mudando seu nome de exibiÃ§Ã£o, dentre outros. Se vocÃª gostaria de aprovar novos seguidores antes que eles possam seguir vocÃª, vocÃª pode trancar a sua conta.
@@ -839,7 +981,6 @@ pt-BR:
       review_preferences_action: Mudar as 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 posts tenham por padrÃ£o. Se vocÃª nÃ£o sofre de enjÃ´o com movimento, vocÃª pode habilitar GIFs animando automaticamente.
       subject: Boas-vindas ao Mastodon
-      tip_bridge_html: Se vocÃª estÃ¡ vindo do Twitter, vocÃª pode encontrar pessoas conhecidas que estÃ£o no Mastodon usando <a href="%{bridge_url}">app de associaÃ§Ã£o</a>. Mas sÃ³ funciona se as pessoas tambÃ©m estiverem usando o app!
       tip_federated_timeline: A timeline global Ã© uma visÃ£o contÃnua da rede do Mastodon. Mas ela sÃ³ inclui pessoas que outras pessoas da sua instÃ¢ncia estÃ£o seguindo, 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 timelines local e global.
       tip_local_timeline: A timeline local Ã© uma visÃ£o contÃnua das pessoas que estÃ£o em %{instance}. Esses sÃ£o seus vizinhos prÃ³ximos!
@@ -847,8 +988,12 @@ pt-BR:
       tips: Dicas
       title: Boas-vindas a bordo, %{name}!
   users:
+    follow_limit_reached: VocÃª nÃ£o pode seguir mais que %{limit} pessoas
     invalid_email: O endereÃ§o de e-mail Ã© invÃ¡lido
     invalid_otp_token: CÃ³digo de autenticaÃ§Ã£o invÃ¡lido
     otp_lost_help_html: Se vocÃª perder o acesso Ã  ambos, vocÃª pode entrar em contato com %{email}
     seamless_external_login: VocÃª estÃ¡ logado usando um serviÃ§o externo, entÃ£o configuraÃ§Ãµes de e-mail e senha nÃ£o estÃ£o disponÃveis.
     signed_in_as: 'Acesso como:'
+  verification:
+    explanation_html: 'VocÃª pode <strong>verificar-se como tendo posse dos links nos metadados do seu perfil</strong>. Para isso, o site conectado 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
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index e113e67827a46512a610fdc387c77f4ea2c0dc0a..00f45588b67ab35ebf9a755235f1f601060ea564 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -8,9 +8,6 @@ pt:
     contact: Contacto
     contact_missing: NÃ£o configurado
     contact_unavailable: n.d.
-    description_headline: O que Ã© o %{domain}?
-    domain_count_after: outras instÃ¢ncias
-    domain_count_before: Ligado a
     extended_description_html: |
       <h3>Um bom lugar para regras</h3>
       <p>A descriÃ§Ã£o estendida ainda nÃ£o foi configurada.</p>
@@ -44,7 +41,6 @@ pt:
     people_who_follow: Pessoas que seguem %{name}
     posts: Posts
     posts_with_replies: Posts e Respostas
-    remote_follow: Seguir remotamente
     reserved_username: Este nome de utilizadores Ã© reservado
     roles:
       admin: Administrador
@@ -96,10 +92,6 @@ pt:
       most_recent_activity: Actividade mais recente
       most_recent_ip: IP mais recente
       not_subscribed: NÃ£o inscrito
-      order:
-        alphabetic: AlfabÃ©tica
-        most_recent: Mais recente
-        title: Ordem
       outbox_url: URL da caixa de saÃda
       perform_full_suspension: Fazer suspensÃ£o completa
       profile_url: URL do perfil
@@ -126,7 +118,6 @@ pt:
       shared_inbox_url: URL da caixa de entrada compartilhada
       show:
         created_reports: RelatÃ³rios gerados por esta conta
-        report: relatÃ³rios
         targeted_reports: RelatÃ³rios feitos sobre esta conta
       silence: SilÃªncio
       statuses: Status
@@ -154,7 +145,7 @@ pt:
         enable_user: "%{name} ativou o acesso para o utilizador %{target}"
         memorialize_account: "%{name} transformou a conta de %{target} em um memorial"
         promote_user: "%{name} promoveu o utilizador %{target}"
-        reset_password_user: "%{name} restabeleceu a palavra-passe do utilizador %{target"
+        reset_password_user: "%{name} restabeleceu a palavra-passe do utilizador %{target}"
         resolve_report: "%{name} recusou o relatÃ³rio %{target}"
         silence_account: "%{name} silenciou a conta de %{target}"
         suspend_account: "%{name} suspendeu a conta de %{target}"
@@ -204,11 +195,6 @@ pt:
         title: Novo bloqueio de domÃnio
       reject_media: Rejeitar ficheiros de media
       reject_media_hint: Remove localmente arquivos armazenados e rejeita fazer guardar novos no futuro. Irrelevante na suspensÃ£o
-      severities:
-        noop: Nenhum
-        silence: Silenciar
-        suspend: Suspender
-      severity: Severidade
       show:
         affected_accounts:
           one: Uma conta na base de dados afectada
@@ -218,7 +204,6 @@ pt:
           suspend: NÃ£o suspender todas as contas existentes nesse domÃnio
         title: Remover o bloqueio de domÃnio de %{domain}
         undo: Anular
-      title: Bloqueio de domÃnio
       undo: Anular
     email_domain_blocks:
       add_new: Adicionar novo
@@ -231,10 +216,6 @@ pt:
         title: Novo bloqueio de domÃnio de email
       title: Bloqueio de DomÃnio de Email
     instances:
-      account_count: Contas conhecidas
-      domain_name: DomÃnio
-      reset: Restaurar
-      search: Pesquisar
       title: InstÃ¢ncias conhecidas
     invites:
       filter:
@@ -248,20 +229,14 @@ pt:
       are_you_sure: Tens a certeza?
       comment:
         none: Nenhum
-      id: ID
       mark_as_resolved: Marcar como resolvido
       report: 'DenÃºncia #%{id}'
-      report_contents: ConteÃºdos
       reported_account: Conta denunciada
       reported_by: DenÃºnciada por
       resolved: Resolvido
-      silence_account: Conta silenciada
       status: Estado
-      suspend_account: Conta suspensa
-      target: Alvo
       title: DenÃºncias
       unresolved: Por resolver
-      view: Ver
     settings:
       activity_api_enabled:
         desc_html: Contagem semanais de publicaÃ§Ãµes locais, utilizadores activos e novos registos
@@ -409,7 +384,7 @@ pt:
     '500':
       content: Desculpe, mas algo correu mal.
       title: Esta pÃ¡gina nÃ£o estÃ¡ correta
-    noscript_html: Para usar o aplicativo web do Mastodon, por favor ativa o JavaScript. Alternativamente, experimenta um dos <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">apps nativos</a> para o Mastodon na sua plataforma.
+    noscript_html: Para usar o aplicativo web do Mastodon, por favor ativa o JavaScript. Alternativamente, experimenta um dos <a href="%{apps_path}">apps nativos</a> para o Mastodon na sua plataforma.
   exports:
     blocks: Bloqueaste
     csv: CSV
@@ -430,7 +405,6 @@ pt:
     unlocked_warning_title: A tua conta nÃ£o estÃ¡ bloqueada
   generic:
     changes_saved_msg: AlteraÃ§Ãµes guardadas!
-    powered_by: fornecido por %{link}
     save_changes: Guardar alteraÃ§Ãµes
     validation_errors:
       one: Algo nÃ£o estÃ¡ correcto. Por favor vÃª o erro abaixo
@@ -464,8 +438,6 @@ pt:
       expires_at: Expira
       uses: Usos
     title: Convidar pessoas
-  landing_strip_html: "<strong>%{name}</strong> Ã© um utilizador em %{link_to_root_path}. Podes segui-lo ou interagir com ele se tiveres uma conta em qualquer lugar no fediverso."
-  landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   lists:
     errors:
       limit: NÃºmero mÃ¡ximo de listas alcanÃ§ado
@@ -612,7 +584,6 @@ pt:
       unlisted: PÃºblico, mas nÃ£o mostre no timeline pÃºblico
       unlisted_long: Todos podem ver, porÃ©m nÃ£o serÃ¡ postado nas timelines pÃºblicas
   stream_entries:
-    click_to_show: Clique pra mostrar
     pinned: Toot fixado
     reblogged: boosted
     sensitive_content: ConteÃºdo sensÃvel
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
new file mode 100644
index 0000000000000000000000000000000000000000..aa4d3c967c485039b4248d30a6bad8ddd2e662d5
--- /dev/null
+++ b/config/locales/ro.yml
@@ -0,0 +1,121 @@
+---
+ro:
+  about:
+    features:
+      not_a_product_title: EÈ™ti o persoanÄƒ, nu un produs
+    hosted_on: Mastodon gÄƒzduit de %{domain}
+  accounts:
+    posts:
+      few: Toots
+      one: Toot
+      other: Toots
+  auth:
+    agreement_html: Prin apÄƒsarea butonului ÃŽnscriere de mai jos eÈ™ti deacord cu <a href="%{rules_path}">regulile acestei instanÈ›e</a> È™i <a href="%{terms_path}">termenii de utilizare al acestui serviciu</a>.
+    change_password: ParolÄƒ
+    confirm_email: ConfirmÄƒ email
+    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.
+    didnt_get_confirmation: Nu ai primit instrucÈ›iunile de confirmare?
+    forgot_password: Ai uitat parola?
+    invalid_reset_password_token: AceastÄƒ cerere este invalidÄƒ sau a expirat. ÃŽncearcÄƒ resetarea parolei din nou.
+    login: Conectare
+    logout: Deconectare
+    migrate_account: Transfer cÄƒtre un alt cont
+    migrate_account_html: DacÄƒ doreÈ™ti sÄƒ redirecÈ›ionezi acest cont cÄƒtre un altul, poÈ›i <a href="%{path}">configura asta aici</a>.
+    or: sau
+    or_log_in_with: Sau conecteazÄƒ-te cu
+    providers:
+      cas: CAS
+      saml: SAML
+    register: ÃŽnregistrare
+    register_elsewhere: ÃŽnregistreazÄƒ-te pe un alt server
+    resend_confirmation: Retrimite instrucÈ›iunile de confirmare
+    reset_password: Resetare parolÄƒ
+    security: Securitate
+    set_new_password: SeteazÄƒ o nouÄƒ parolÄƒ
+  authorize_follow:
+    already_following: UrmÄƒreÈ™ti deja acest cont
+    error: Din pÄƒcate a apÄƒrut o eroare
+    follow: UrmÄƒreÈ™te
+    follow_request: 'Ai trimis o cerere de urmÄƒrire cÄƒtre:'
+    following: 'Gata! De acum urmÄƒreÈ™ti:'
+    post_follow:
+      close: Sau, poÈ›i Ã®nchide aceastÄƒ fereastrÄƒ.
+      return: AratÄƒ profilul utilizatorului
+      web: Mergi la web
+    title: UrmÄƒreÈ™te %{acct}
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}o"
+      about_x_months: "%{count}l"
+      about_x_years: "%{count}ani"
+      almost_x_years: "%{count}ani"
+      half_a_minute: Chiar acum
+      less_than_x_minutes: "%{count}l"
+      less_than_x_seconds: Chiar acum
+      over_x_years: "%{count}ani"
+      x_days: "%{count}z"
+      x_minutes: "%{count}m"
+      x_months: "%{count}l"
+      x_seconds: "%{count}s"
+  deletes:
+    bad_password_msg: BunÄƒ Ã®ncercare, hackere! ParolÄƒ incorectÄƒ
+    confirm_password: Introdu parola curentÄƒ pentru a-È›i verifica identitatea
+    description_html: AceastÄƒ acÈ›iune este <strong>permanentÄƒ È™i ireversibilÄƒ,</strong> eliminÄƒ conÈ›inutul È™i dezactiveazÄƒ contul tÄƒu. Acest username va rÄƒmÃ¢ne permanent rezervat pentru a evita furtul de identitate.
+    proceed: È˜terge contul
+    success_msg: Contul tÄƒu a fost È™terg. Nu mai poate fi recuperat :D
+    warning_html: Doar È™tergerea conÈ›inutului de pe acest server este garantatÄƒ. ConÈ›inutul tÄƒu care a fost redistribuit Ã®n alte instaÈ›e e posibil sÄƒ lase urme. Serverele deconecate sau care nu mai sunt abonate la actualizÄƒrile contului tÄƒu nu Ã®È™i vor mai actualiza baza de date.
+  directories:
+    explanation: DescoperÄƒ oameni È™i companii Ã®n funcÈ›ie de interesele lor
+    explore_mastodon: ExploreazÄƒ %{title}
+    people:
+      few: "%{count} persoanÄƒ"
+      one: "%{count} persoanÄƒ"
+      other: "%{count} oameni"
+  errors:
+    '403': Nu ai permisiunea sÄƒ vizitezi aceastÄƒ paginÄƒ.
+    '404': Pagina pe care o cauÈ›i nu existÄƒ.
+    '410': Pagina pe care o cauÈ›i nu mai existÄƒ.
+    '422':
+      content: Verificarea securitÄƒÈ›ii a eÈ™uat. Ai blocat cookiurile?
+      title: Verificarea securitÄƒÈ›ii a eÈ™uat
+    '429': Strangulat
+    '500':
+      content: Ne pare rÄƒu, dar ceva a funcÈ›ionat greÈ™it. ÃŽncercaÈ›i din nou!?
+      title: AceastÄƒ paginÄƒ nu este corectÄƒ
+    noscript_html: Pentru a utiliza o aplicaÈ›ie web Mastodon, te rog activeazÄƒ JavaScript. Alternativ, Ã®ncearcÄƒ una din <a href="%{apps_path}">aplicaÈ›iile native</a> Mastodon pentru platforma ta.
+  exports:
+    archive_takeout:
+      date: Data
+      download: DescarcÄƒ arhiva contului tÄƒu
+      hint_html: PoÈ›i solicita arhiva<strong>postÄƒrilor È™i conÈ›inutul media</strong> a contului tÄƒu. Datele furnizate sunt Ã®n formatul ActivityPub. PoÈ›i solicita cate o arhivÄƒ la 7 zile.
+      in_progress: PregÄƒtim arhiva ta...
+      request: Cere arhiva ta
+      size: Dimensiune
+    blocks: BlocaÈ›i
+    csv: CSV
+    follows: Tu urmÄƒreÈ™ti
+    mutes: OpriÈ›i
+    storage: Depozitare media
+  filters:
+    contexts:
+      home: Fluxul AcasÄƒ
+      notifications: NotificÄƒri
+      public: Fluxul public
+      thread: ConversaÈ›ii
+    edit:
+      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
+    new:
+      title: AdaugÄƒ un filtru nou
+  followers:
+    domain: Domeniu
+    explanation_html: DacÄƒ vrei sÄƒ fi sigur de confidenÈ›ialitatea statusurilor tale, ar trebui sÄƒ fi conÈ™tient de cine te urmÄƒreÈ™te. <strong>Statusurile tale private sunt livrate cÄƒtre toate instanÈ›ele unde ai urmÄƒritori</strong>. Este recomandabil sÄƒ verifici È™i sÄƒ È™tergi urmÄƒritorii Ã®n care nu ai Ã®ncredere cÄƒ Ã®È›i vor respecta intimitatea.
+    followers_count: NumÄƒrul de urmÄƒritori
+    lock_link: PriveazÄƒ contul tÄƒu
+    purge: EliminÄƒ de la urmÄƒritori
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f6bbfd7fb1bcfd0db11807c9f8feb9ebf3fc54e5..40765447b5624ae39d5142171b9605f0b79a4e40 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -5,13 +5,12 @@ ru:
     about_mastodon_html: Mastodon - ÑÑ‚Ð¾ <em>ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ</em> ÑÐ¾Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð°Ñ ÑÐµÑ‚ÑŒ Ñ <em>Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ Ð¸ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¼ ÐºÐ¾Ð´Ð¾Ð¼</em>. ÐšÐ°Ðº <em>Ð´ÐµÑ†ÐµÐ½Ñ‚Ñ€Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ð°Ñ</em> Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð° ÐºÐ¾Ð¼Ð¼ÐµÑ€Ñ‡ÐµÑÐºÐ¸Ð¼ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ð¼, Mastodon Ð¿Ñ€ÐµÐ´Ð¾Ñ‚Ð²Ñ€Ð°Ñ‰Ð°ÐµÑ‚ Ñ€Ð¸ÑÐº Ð¼Ð¾Ð½Ð¾Ð¿Ð¾Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸ Ð’Ð°ÑˆÐµÐ³Ð¾ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð¹ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸ÐµÐ¹. Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÐµÑ€Ð²ÐµÑ€, ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð¼Ñƒ Ð’Ñ‹ Ð´Ð¾Ð²ÐµÑ€ÑÐµÑ‚Ðµ &mdash; Ñ‡Ñ‚Ð¾ Ð±Ñ‹ Ð’Ñ‹ Ð½Ð¸ Ð²Ñ‹Ð±Ñ€Ð°Ð»Ð¸, Ð’Ñ‹ ÑÐ¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ð±Ñ‰Ð°Ñ‚ÑŒÑÑ ÑÐ¾ Ð²ÑÐµÐ¼Ð¸ Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ð¼Ð¸. Ð›ÑŽÐ±Ð¾Ð¹ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ñ‹Ð¹ ÑƒÐ·ÐµÐ» Mastodon Ð¸ ÑƒÑ‡Ð°ÑÑ‚Ð²Ð¾Ð²Ð°Ñ‚ÑŒ Ð² <em>ÑÐ¾Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾Ð¹ ÑÐµÑ‚Ð¸</em> ÑÐ¾Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ð¾ Ð±ÐµÑÑˆÐ¾Ð²Ð½Ð¾.
     about_this: ÐžÐ± ÑÑ‚Ð¾Ð¼ ÑƒÐ·Ð»Ðµ
     administered_by: 'ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ ÑƒÐ·Ð»Ð°:'
-    closed_registrations: Ð’ Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑƒÐ·Ð»Ðµ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð°.
+    api: API
+    apps: ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
+    closed_registrations: Ð’ Ð´Ð°Ð½Ð½Ñ‹Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑƒÐ·Ð»Ðµ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð°. ÐÐ¾ Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ð¹Ñ‚Ð¸ Ð´Ñ€ÑƒÐ³Ð¾Ð¹ ÑƒÐ·ÐµÐ», ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð½Ð° Ð½Ñ‘Ð¼ ÑƒÑ‡Ñ‘Ñ‚Ð½ÑƒÑŽ Ð·Ð°Ð¿Ð¸ÑÑŒ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ‚Ð¾Ð¹ Ð¶Ðµ ÑÐµÑ‚Ð¸ Ð¾Ñ‚Ñ‚ÑƒÐ´Ð°.
     contact: Ð¡Ð²ÑÐ·Ð°Ñ‚ÑŒÑÑ
     contact_missing: ÐÐµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾
     contact_unavailable: ÐÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½
-    description_headline: Ð§Ñ‚Ð¾ Ñ‚Ð°ÐºÐ¾Ðµ %{domain}?
-    domain_count_after: Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ ÑƒÐ·Ð»Ð°Ð¼Ð¸
-    domain_count_before: Ð¡Ð²ÑÐ·Ð°Ð½ Ñ
     extended_description_html: |
       <h3>Ð¥Ð¾Ñ€Ð¾ÑˆÐµÐµ Ð¼ÐµÑÑ‚Ð¾ Ð´Ð»Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»</h3>
       <p>Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÐµÑ‰Ðµ Ð½Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð¾.</p>
@@ -28,25 +27,47 @@ ru:
     hosted_on: Mastodon Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½ Ð½Ð° %{domain}
     learn_more: Ð£Ð·Ð½Ð°Ñ‚ÑŒ Ð±Ð¾Ð»ÑŒÑˆÐµ
     other_instances: Ð”Ñ€ÑƒÐ³Ð¸Ðµ ÑƒÐ·Ð»Ñ‹
+    privacy_policy: ÐŸÐ¾Ð»Ð¸Ñ‚Ð¸ÐºÐ° ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚Ð¸
     source_code: Ð˜ÑÑ…Ð¾Ð´Ð½Ñ‹Ð¹ ÐºÐ¾Ð´
-    status_count_after: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
+    status_count_after:
+      few: ÑÑ‚Ð°Ñ‚ÑƒÑÐ°
+      many: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
+      one: ÑÑ‚Ð°Ñ‚ÑƒÑ
+      other: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
     status_count_before: ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾
-    user_count_after: Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
+    terms: Ð£ÑÐ»Ð¾Ð²Ð¸Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ
+    user_count_after:
+      few: Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ
+      many: Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
+      one: Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ
+      other: Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
     user_count_before: Ð—Ð´ÐµÑÑŒ Ð¶Ð¸Ð²ÐµÑ‚
     what_is_mastodon: Ð§Ñ‚Ð¾ Ñ‚Ð°ÐºÐ¾Ðµ Mastodon?
   accounts:
+    choices_html: "%{name} Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚:"
     follow: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ
-    followers: ÐŸÐ¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸
-    following: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½(Ð°)
-    media: ÐœÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
+    followers:
+      few: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ°
+      many: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²
+      one: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸Ðº
+      other: Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²
+    following: Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸
+    joined: 'Ð”Ð°Ñ‚Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸: %{date}'
+    media: ÐœÐµÐ´Ð¸Ð°
     moved_html: "%{name} Ð¿ÐµÑ€ÐµÐµÑ…Ð°Ð»(Ð°) Ð½Ð° %{new_profile_link}:"
     network_hidden: ÐÑ‚Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°
     nothing_here: Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚!
     people_followed_by: Ð›ÑŽÐ´Ð¸, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½(Ð°) %{name}
     people_who_follow: ÐŸÐ¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸ %{name}
-    posts: ÐŸÐ¾ÑÑ‚Ñ‹
+    pin_errors:
+      following: Ð§Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ¾Ð³Ð¾-Ñ‚Ð¾, Ð½Ð°Ð´Ð¾ ÑÐ½Ð°Ñ‡Ð°Ð»Ð° Ð½Ð° Ð½Ð¸Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ
+    posts:
+      few: ÑÑ‚Ð°Ñ‚ÑƒÑÐ°
+      many: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
+      one: ÑÑ‚Ð°Ñ‚ÑƒÑ
+      other: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
+    posts_tab_heading: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÑ‹
     posts_with_replies: ÐŸÐ¾ÑÑ‚Ñ‹ Ñ Ð¾Ñ‚Ð²ÐµÑ‚Ð°Ð¼Ð¸
-    remote_follow: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¼ ÑƒÐ·Ð»Ðµ
     reserved_username: Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾
     roles:
       admin: ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€
@@ -107,10 +128,6 @@ ru:
       most_recent_activity: ÐŸÐ¾ÑÐ»ÐµÐ´Ð½ÑÑ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚ÑŒ
       most_recent_ip: ÐŸÐ¾ÑÐ»ÐµÐ´Ð½Ð¸Ð¹ IP
       not_subscribed: ÐÐµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹
-      order:
-        alphabetic: ÐŸÐ¾ Ð°Ð»Ñ„Ð°Ð²Ð¸Ñ‚Ñƒ
-        most_recent: ÐŸÐ¾ Ð´Ð°Ñ‚Ðµ
-        title: ÐŸÐ¾Ñ€ÑÐ´Ð¾Ðº
       outbox_url: URL Ð¸ÑÑ…Ð¾Ð´ÑÑ‰Ð¸Ñ…
       perform_full_suspension: ÐŸÐ¾Ð»Ð½Ð°Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ°
       profile_url: URL Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ
@@ -138,7 +155,6 @@ ru:
       shared_inbox_url: URL Ð¾Ð±Ñ‰Ð¸Ñ… Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ…
       show:
         created_reports: Ð–Ð°Ð»Ð¾Ð±Ñ‹, Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ðµ ÑÑ‚Ð¸Ð¼ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð¼
-        report: Ð¶Ð°Ð»Ð¾Ð±Ð°
         targeted_reports: Ð–Ð°Ð»Ð¾Ð±Ñ‹ Ð½Ð° ÑÑ‚Ð¾Ñ‚ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
       silence: Ð“Ð»ÑƒÑˆÐµÐ½Ð¸Ðµ
       statuses: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÑ‹
@@ -180,11 +196,12 @@ ru:
         unsuspend_account: "%{name} Ñ€Ð°Ð·Ð¼Ð¾Ñ€Ð¾Ð·Ð¸Ð»(Ð°) Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ %{target}"
         update_custom_emoji: "%{name} Ð¾Ð±Ð½Ð¾Ð²Ð¸Ð»(Ð°) ÑÐ¼Ð¾Ð´Ð·Ð¸ %{target}"
         update_status: "%{name} Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð»(Ð°) ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ %{target}"
+      deleted_status: "(ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ ÑÑ‚Ð°Ñ‚ÑƒÑ)"
       title: Ð–ÑƒÑ€Ð½Ð°Ð» ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ð¹
     custom_emojis:
       by_domain: Ð”Ð¾Ð¼ÐµÐ½
       copied_msg: Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ ÑÐ¼Ð¾Ð´Ð·Ð¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð°
-      copy: Ð¡ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚
+      copy: ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ
       copy_failed_msg: ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ ÑÐ¼Ð¾Ð´Ð·Ð¸
       created_msg: ÐÐ¼Ð¾Ð´Ð·Ð¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾!
       delete: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ
@@ -206,6 +223,27 @@ ru:
       update_failed_msg: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ ÑÐ¼Ð¾Ð´Ð·Ð¸
       updated_msg: ÐÐ¼Ð¾Ð´Ð·Ð¸ Ð¾Ð±Ð½Ð¾Ð²Ð»Ñ‘Ð½!
       upload: Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ
+    dashboard:
+      backlog: Ð·Ð°Ð´Ð°Ñ‡Ð¸
+      config: ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ
+      feature_deletions: Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²
+      feature_invites: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑÐ¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ðµ ÑÑÑ‹Ð»ÐºÐ¸
+      feature_registrations: Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ
+      feature_relay: Ð ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ñ‹
+      features: Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸
+      hidden_service: Ð¤ÐµÐ´ÐµÑ€Ð°Ñ†Ð¸Ñ ÑÐ¾ ÑÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼Ð¸ ÑÐµÑ€Ð²Ð¸ÑÐ°Ð¼Ð¸
+      open_reports: Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ñ… Ð¶Ð°Ð»Ð¾Ð±
+      recent_users: ÐÐµÐ´Ð°Ð²Ð½Ð¸Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸
+      search: ÐŸÐ¾Ð»Ð½Ð¾Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ñ‹Ð¹ Ð¿Ð¾Ð¸ÑÐº
+      single_user_mode: ÐžÐ´Ð½Ð¾Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¸Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼
+      software: ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ðµ
+      space: Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¾ Ð¼ÐµÑÑ‚Ð°
+      title: ÐŸÐ°Ð½ÐµÐ»ÑŒ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ
+      total_users: Ð²ÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹
+      trends: Ð¢Ñ€ÐµÐ½Ð´Ñ‹
+      week_interactions: Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ð¹ Ð½Ð° ÑÑ‚Ð¾Ð¹ Ð½ÐµÐ´ÐµÐ»Ðµ
+      week_users_active: Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ Ð½Ð° ÑÑ‚Ð¾Ð¹ Ð½ÐµÐ´ÐµÐ»Ðµ
+      week_users_new: Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð½Ð° ÑÑ‚Ð¾Ð¹ Ð½ÐµÐ´ÐµÐ»Ðµ
     domain_blocks:
       add_new: Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð½Ð¾Ð²ÑƒÑŽ
       created_msg: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð° Ð¾Ð±Ñ€Ð°Ð±Ð°Ñ‚Ñ‹Ð²Ð°ÐµÑ‚ÑÑ
@@ -221,12 +259,7 @@ ru:
           suspend: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ°
         title: ÐÐ¾Ð²Ð°Ñ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð°Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ°
       reject_media: Ð—Ð°Ð¿Ñ€ÐµÑ‚Ð¸Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
-      reject_media_hint: Ð£Ð´Ð°Ð»ÑÐµÑ‚ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾ Ñ…Ñ€Ð°Ð½Ð¸Ð¼Ñ‹Ð¹ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð¸ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ð°ÐµÑ‚ ÐµÐ³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ Ð² Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ¼. ÐÐµ Ð¸Ð¼ÐµÐµÑ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² ÑÐ»ÑƒÑ‡Ð°Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸.
-      severities:
-        noop: ÐÐ¸Ñ‡ÐµÐ³Ð¾
-        silence: Ð“Ð»ÑƒÑˆÐµÐ½Ð¸Ðµ
-        suspend: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ°
-      severity: Ð¡Ñ‚Ñ€Ð¾Ð³Ð¾ÑÑ‚ÑŒ
+      reject_media_hint: Ð£Ð´Ð°Ð»ÑÐµÑ‚ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾ Ñ…Ñ€Ð°Ð½Ð¸Ð¼Ñ‹Ð¹ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð¸ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ð°ÐµÑ‚ ÐµÐ³Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ Ð² Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ¼. ÐÐµ Ð¸Ð¼ÐµÐµÑ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² ÑÐ»ÑƒÑ‡Ð°Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸
       show:
         affected_accounts:
           few: Ð’Ð»Ð¸ÑÐµÑ‚ Ð½Ð° %{count} Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° Ð² Ð±Ð°Ð·Ðµ Ð´Ð°Ð½Ð½Ñ‹Ñ…
@@ -238,7 +271,6 @@ ru:
           suspend: Ð¡Ð½ÑÑ‚ÑŒ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ ÑÐ¾ Ð²ÑÐµÑ… ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð² ÑÑ‚Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ð°
         title: Ð¡Ð½ÑÑ‚ÑŒ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÑƒ Ñ Ð´Ð¾Ð¼ÐµÐ½Ð° %{domain}
         undo: ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ
-      title: Ð”Ð¾Ð¼ÐµÐ½Ð½Ñ‹Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ¸
       undo: ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ
     email_domain_blocks:
       add_new: Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð½Ð¾Ð²ÑƒÑŽ
@@ -251,18 +283,25 @@ ru:
         title: ÐÐ¾Ð²Ð°Ñ Ð´Ð¾Ð¼ÐµÐ½Ð½Ð°Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° Ðµmail
       title: Ð”Ð¾Ð¼ÐµÐ½Ð½Ð°Ñ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²ÐºÐ° email
     instances:
-      account_count: Ð˜Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ñ… Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²
-      domain_name: Ð”Ð¾Ð¼ÐµÐ½
-      reset: Ð¡Ð±Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ
-      search: ÐŸÐ¾Ð¸ÑÐº
       title: Ð˜Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ðµ ÑƒÐ·Ð»Ñ‹
     invites:
+      deactivate_all: ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð²ÑÐµ
       filter:
         all: Ð’ÑÐµ
         available: ÐÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ðµ
         expired: Ð˜ÑÑ‚Ñ‘ÐºÑˆÐ¸Ðµ
         title: Ð¤Ð¸Ð»ÑŒÑ‚Ñ€
       title: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ
+    relays:
+      add_new: Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€
+      description_html: "<strong>Ð¤ÐµÐ´ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ð¹ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€</strong> â€“ ÑÑ‚Ð¾ Ð¿Ñ€Ð¾Ð¼ÐµÐ¶ÑƒÑ‚Ð¾Ñ‡Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‘Ñ‚ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ðµ Ð¾Ð±ÑŠÑ‘Ð¼Ñ‹ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð² Ð¼ÐµÐ¶Ð´Ñƒ ÑÐµÑ€Ð²ÐµÑ€Ð°Ð¼Ð¸, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°ÑŽÑ‚ÑÑ Ð¸ Ð¿ÑƒÐ±Ð»Ð¸ÐºÑƒÑŽÑ‚ Ñ‚ÑƒÐ´Ð°. <strong>ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ð¼Ð¾Ñ‡ÑŒ Ð½ÐµÐ±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ Ð¸ ÑÑ€ÐµÐ´Ð½Ð¸Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð°Ð¼ Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐ¾ Ð²ÑÐµÐ¹ Ñ„ÐµÐ´ÐµÑ€Ð°Ñ†Ð¸Ð¸</strong>, Ð²ÐµÐ´ÑŒ Ð² Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð½Ð¾Ð¼ ÑÐ»ÑƒÑ‡Ð°Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑÐ¼ Ð½ÑƒÐ¶Ð½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒÑÑ Ð½Ð° Ð»ÑŽÐ´ÐµÐ¹ Ñ ÑƒÐ´Ð°Ð»Ñ‘Ð½Ð½Ñ‹Ñ… ÑƒÐ·Ð»Ð¾Ð²."
+      enable_hint: Ð•ÑÐ»Ð¸ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾, Ð²Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð½Ð° Ð²ÑÐµ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹ Ñ ÑÑ‚Ð¾Ð³Ð¾ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð° Ð¸ Ð½Ð°Ñ‡Ð½Ñ‘Ñ‚ Ñ‚ÑƒÐ´Ð° Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹ ÑÐ¾ ÑÐ²Ð¾ÐµÐ³Ð¾ ÑƒÐ·Ð»Ð°.
+      inbox_url: URL Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°
+      pending: ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°
+      save_and_enable: Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ
+      setup: ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ñ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð¾Ð¼
+      status: Ð¡Ð¾ÑÑ‚Ð¾ÑÐ½Ð¸Ðµ
+      title: Ð ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ñ‹
     report_notes:
       created_msg: ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ Ð¶Ð°Ð»Ð¾Ð±Ñ‹ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾!
       destroyed_msg: ÐŸÑ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸Ðµ Ð¶Ð°Ð»Ð¾Ð±Ñ‹ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾!
@@ -277,31 +316,25 @@ ru:
       comment:
         none: ÐÐµÑ‚
       created_at: Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¾
-      id: ID
       mark_as_resolved: ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ÐºÐ°Ðº Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½ÑƒÑŽ
       mark_as_unresolved: ÐžÑ‚Ð¼ÐµÑ‚Ð¸Ñ‚ÑŒ ÐºÐ°Ðº Ð½ÐµÑ€Ð°Ð·Ñ€ÐµÑˆÑ‘Ð½Ð½ÑƒÑŽ
       notes:
         create: Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð·Ð°Ð¼ÐµÑ‚ÐºÑƒ
-        create_and_resolve: Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ¾Ð¹
-        create_and_unresolve: ÐŸÐµÑ€ÐµÐ¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ Ð·Ð°Ð¼ÐµÑ‚ÐºÐ¾Ð¹
+        create_and_resolve: Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸ÐµÐ¼
+        create_and_unresolve: ÐŸÐµÑ€ÐµÐ¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ‡Ð°Ð½Ð¸ÐµÐ¼
         delete: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ
         placeholder: ÐžÐ¿Ð¸ÑˆÐ¸Ñ‚Ðµ, ÐºÐ°ÐºÐ¸Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð±Ñ‹Ð»Ð¸ Ð¿Ñ€Ð¸Ð½ÑÑ‚Ñ‹, Ð¸Ð»Ð¸ Ð»ÑŽÐ±Ñ‹Ðµ Ð´Ñ€ÑƒÐ³Ð¸Ðµ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ÑÑ‚Ð¸â€¦
       reopen: ÐŸÐµÑ€ÐµÐ¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¶Ð°Ð»Ð¾Ð±Ñƒ
       report: 'Ð–Ð°Ð»Ð¾Ð±Ð° #%{id}'
-      report_contents: Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð¸Ð¼Ð¾Ðµ
       reported_account: ÐÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð°Ñ€ÑƒÑˆÐ¸Ñ‚ÐµÐ»Ñ
       reported_by: ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÐµÐ»ÑŒ Ð¶Ð°Ð»Ð¾Ð±Ñ‹
       resolved: Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¾
       resolved_msg: Ð–Ð°Ð»Ð¾Ð±Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð°!
-      silence_account: Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
       status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ
-      suspend_account: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
-      target: Ð¦ÐµÐ»ÑŒ
       title: Ð–Ð°Ð»Ð¾Ð±Ñ‹
       unassign: Ð¡Ð½ÑÑ‚ÑŒ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ
       unresolved: ÐÐµÑ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ñ‹Ðµ
       updated_at: ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°
-      view: ÐŸÑ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ÐµÑ‚ÑŒ
     settings:
       activity_api_enabled:
         desc_html: ÐŸÐ¾Ð´ÑÑ‡Ñ‘Ñ‚ ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð° Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð², Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ‹Ñ… Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð½Ð¾Ð²Ñ‹Ñ… Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¹ Ð½Ð° ÐµÐ¶ÐµÐ½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð¾ÑÐ½Ð¾Ð²Ðµ
@@ -312,12 +345,18 @@ ru:
       contact_information:
         email: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ e-mail
         username: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ
+      custom_css:
+        desc_html: Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ Ð²Ð¸Ð´ Ñ CSS, Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ñ‹Ð¼ Ð½Ð° ÐºÐ°Ð¶Ð´Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ
+        title: ÐžÑÐ¾Ð±Ñ‹Ð¹ CSS
       hero:
         desc_html: ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð½Ð° Ð³Ð»Ð°Ð²Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ. Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¼ÐµÐ½ÐµÐµ 600Ñ…100px. Ð•ÑÐ»Ð¸ Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ðµ ÑƒÐ·Ð»Ð°
         title: Ð‘Ð°Ð½Ð½ÐµÑ€ ÑƒÐ·Ð»Ð°
       peers_api_enabled:
         desc_html: Ð”Ð¾Ð¼ÐµÐ½Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð±Ñ‹Ð»Ð¸ Ð·Ð°Ð¼ÐµÑ‡ÐµÐ½Ñ‹ ÑÑ‚Ð¸Ð¼ ÑƒÐ·Ð»Ð¾Ð¼ ÑÑ€ÐµÐ´Ð¸ Ð²ÑÐµÐ¹ Ñ„ÐµÐ´ÐµÑ€Ð°Ñ†Ð¸Ð¸
         title: ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ ÑÐ¿Ð¸ÑÐºÐ° Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð½Ñ‹Ñ… ÑƒÐ·Ð»Ð¾Ð²
+      preview_sensitive_media:
+        desc_html: ÐŸÑ€ÐµÐ´Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€ ÑÑÑ‹Ð»Ð¾Ðº Ñ Ð¾ÑÑ‚Ð°Ð»ÑŒÐ½Ñ‹Ñ… Ð²ÐµÐ±-ÑÐ°Ð¹Ñ‚Ð¾Ð² Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½ Ð´Ð°Ð¶Ðµ ÐµÑÐ»Ð¸ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½ ÐºÐ°Ðº Ñ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹
+        title: ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ñ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð² Ð¿Ñ€ÐµÐ´Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ðµ OpenGraph
       registrations:
         closed_message:
           desc_html: ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð½Ð° Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ, ÐºÐ¾Ð³Ð´Ð° Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ<br>ÐœÐ¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ HTML-Ñ‚ÐµÐ³Ð¸
@@ -327,7 +366,7 @@ ru:
           title: Ð Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð²
         min_invite_role:
           disabled: ÐÐ¸ÐºÐ¾Ð³Ð¾
-          title: Ð Ð°Ð·Ñ€ÐµÑˆÐ°ÐµÑ‚ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð¾Ñ‚
+          title: Ð Ð°Ð·Ñ€ÐµÑˆÐ°Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð¾Ñ‚
         open:
           desc_html: ÐŸÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ Ð»ÑŽÐ±Ð¾Ð¼Ñƒ ÑÐ¾Ð·Ð´Ð°Ð²Ð°Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
           title: ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸ÑŽ
@@ -342,9 +381,12 @@ ru:
         title: ÐžÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑÐ°Ð¹Ñ‚Ð°
       site_description_extended:
         desc_html: ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸<br>ÐœÐ¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ HTML-Ñ‚ÐµÐ³Ð¸
-        title: Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑÐ°Ð¹Ñ‚Ð°
+        title: Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑƒÐ·Ð»Ð°
+      site_short_description:
+        desc_html: ÐžÑ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ Ð² Ð±Ð¾ÐºÐ¾Ð²Ð¾Ð¹ Ð¿Ð°Ð½ÐµÐ»Ð¸ Ð¸ Ð² Ñ‚ÐµÐ³Ð°Ñ…. ÐžÐ¿Ð¸ÑˆÐ¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾ Ñ‚Ð°ÐºÐ¾Ðµ Mastodon Ð¸ Ñ‡Ñ‚Ð¾ Ð´ÐµÐ»Ð°ÐµÑ‚ Ð¸Ð¼ÐµÐ½Ð½Ð¾ ÑÑ‚Ð¾Ñ‚ ÑƒÐ·ÐµÐ» Ð¾ÑÐ¾Ð±ÐµÐ½Ð½Ñ‹Ð¼. Ð•ÑÐ»Ð¸ Ð¿ÑƒÑÑ‚Ð¾, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚ÑÑ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑƒÐ·Ð»Ð° Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ.
+        title: ÐšÑ€Ð°Ñ‚ÐºÐ¾Ðµ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÑƒÐ·Ð»Ð°
       site_terms:
-        desc_html: Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÑŽÐ´Ð° ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½ÑƒÑŽ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÑƒ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚Ð¸, Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ‹. ÐœÐ¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐ³Ð¸ HTML.
+        desc_html: Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ÑÑŽÐ´Ð° ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½ÑƒÑŽ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÑƒ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚Ð¸, Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ðµ Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ‹. ÐœÐ¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐ³Ð¸ HTML
         title: Ð£ÑÐ»Ð¾Ð²Ð¸Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ
       site_title: ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ñ‚Ð°
       thumbnail:
@@ -364,6 +406,7 @@ ru:
       media:
         title: ÐœÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
       no_media: Ð‘ÐµÐ· Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ð°
+      no_status_selected: ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ Ð½Ð¸ Ð¾Ð´Ð¸Ð½ ÑÑ‚Ð°Ñ‚ÑƒÑ, Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾
       title: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÑ‹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°
       with_media: Ð¡ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ð¾Ð¼
     subscriptions:
@@ -457,12 +500,12 @@ ru:
     '410': Ð¡Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€ÑƒÑŽ Ð’Ñ‹ Ð¸ÑÐºÐ°Ð»Ð¸, Ð±Ð¾Ð»ÑŒÑˆÐµ Ð½Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚.
     '422':
       content: ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ. Ð’Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾, Ð’Ñ‹ Ð±Ð»Ð¾ÐºÐ¸Ñ€ÑƒÐµÑ‚Ðµ cookies?
-      title: ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ.
+      title: ÐŸÑ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð½Ðµ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ
     '429': Ð¡Ð»Ð¸ÑˆÐºÐ¾Ð¼ Ð¼Ð½Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ñ€Ð¾ÑÐ¾Ð²
     '500':
       content: ÐŸÑ€Ð¸Ð½Ð¾ÑÐ¸Ð¼ Ð¸Ð·Ð²Ð¸Ð½ÐµÐ½Ð¸Ñ, Ð½Ð¾ Ð½Ð° Ð½Ð°ÑˆÐµÐ¹ ÑÑ‚Ð¾Ñ€Ð¾Ð½Ðµ Ñ‡Ñ‚Ð¾-Ñ‚Ð¾ Ð¿Ð¾ÑˆÐ»Ð¾ Ð½Ðµ Ñ‚Ð°Ðº.
       title: Ð¡Ñ‚Ñ€Ð°Ð½Ð¸Ñ†Ð° Ð½ÐµÐ²ÐµÑ€Ð½Ð°
-    noscript_html: Ð”Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Mastodon, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ JavaScript. ÐšÑ€Ð¾Ð¼Ðµ Ñ‚Ð¾Ð³Ð¾, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð· <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹</a> Mastodon Ð´Ð»Ñ Ð’Ð°ÑˆÐµÐ¹ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ñ‹.
+    noscript_html: Ð”Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Mastodon, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ JavaScript. ÐšÑ€Ð¾Ð¼Ðµ Ñ‚Ð¾Ð³Ð¾, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ð´Ð½Ð¾ Ð¸Ð· <a href="%{apps_path}">Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹</a> Mastodon Ð´Ð»Ñ Ð’Ð°ÑˆÐµÐ¹ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ñ‹.
   exports:
     archive_takeout:
       date: Ð”Ð°Ñ‚Ð°
@@ -476,6 +519,22 @@ ru:
     follows: ÐŸÐ¾Ð´Ð¿Ð¸ÑÐºÐ¸
     mutes: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð³Ð»ÑƒÑˆÐµÐ½Ð¸Ñ
     storage: Ð’Ð°Ñˆ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
+  filters:
+    contexts:
+      home: Ð”Ð¾Ð¼Ð°ÑˆÐ½ÑÑ Ð»ÐµÐ½Ñ‚Ð°
+      notifications: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ
+      public: ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ Ð»ÐµÐ½Ñ‚Ñ‹
+      thread: Ð”Ð¸Ð°Ð»Ð¾Ð³Ð¸
+    edit:
+      title: Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€
+    errors:
+      invalid_context: ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¹ ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚ Ð¸Ð»Ð¸ Ð½Ð¸Ñ‡ÐµÐ³Ð¾
+      invalid_irreversible: ÐÐµÐ¾Ð±Ñ€Ð°Ñ‚Ð¸Ð¼Ð°Ñ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ Ð»ÐµÐ½Ñ‚Ð¾Ð¹ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹ Ð¸ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ Ð»ÐµÐ½Ñ‚Ð¾Ð¹
+    index:
+      delete: Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ
+      title: Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹
+    new:
+      title: Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€
   followers:
     domain: Ð”Ð¾Ð¼ÐµÐ½
     explanation_html: Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹ Ð² Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸ Ð’Ð°ÑˆÐ¸Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð², Ð’Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð¸Ð¼ÐµÑ‚ÑŒ Ñ‡ÐµÑ‚ÐºÐ¾Ðµ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¾ Ñ‚Ð¾Ð¼, ÐºÑ‚Ð¾ Ð½Ð° Ð’Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½. <strong>Ð’Ð°ÑˆÐ¸ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‚ÑÑ Ð²ÑÐµÐ¼ ÑƒÐ·Ð»Ð°Ð¼, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ñƒ Ð’Ð°Ñ ÐµÑÑ‚ÑŒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¸</strong>. Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÐ¼ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ Ð¸Ð· Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð² Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ ÑƒÐ·Ð»Ð¾Ð², Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð¾Ð¼Ñƒ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸ÑŽ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð’Ñ‹ Ð½Ðµ Ð´Ð¾Ð²ÐµÑ€ÑÐµÑ‚Ðµ.
@@ -490,9 +549,12 @@ ru:
     true_privacy_html: ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð·Ð°Ð¼ÐµÑ‚ÑŒÑ‚Ðµ, Ñ‡Ñ‚Ð¾ <strong>Ð½Ð°ÑÑ‚Ð¾ÑÑ‰Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð´ÐµÐ½Ñ†Ð¸Ð°Ð»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚Ð¸Ð³Ð½ÑƒÑ‚Ð° Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ end-to-end ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ</strong>.
     unlocked_warning_html: ÐšÑ‚Ð¾ ÑƒÐ³Ð¾Ð´Ð½Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° Ð’Ð°Ñ Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ñ€Ð¾ÑÐ¼Ð¾Ñ‚Ñ€Ñƒ Ð’Ð°ÑˆÐ¸Ñ… Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ‹Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð². %{lock_link}, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ Ñ€Ð°ÑÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒ Ð¸ Ð²Ñ€ÑƒÑ‡Ð½ÑƒÑŽ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´Ð°Ñ‚ÑŒ Ð·Ð°Ð¿Ñ€Ð¾ÑÑ‹ Ð¾ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐµ.
     unlocked_warning_title: Ð’Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ðµ Ð·Ð°ÐºÑ€Ñ‹Ñ‚ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸
+  footer:
+    developers: Ð Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ°Ð¼
+    more: Ð•Ñ‰Ñ‘â€¦
+    resources: Ð¡ÑÑ‹Ð»ÐºÐ¸
   generic:
     changes_saved_msg: Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ñ‹!
-    powered_by: Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ð½Ð° %{link}
     save_changes: Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
     validation_errors:
       few: Ð§Ñ‚Ð¾-Ñ‚Ð¾ Ð·Ð´ÐµÑÑŒ Ð½Ðµ Ñ‚Ð°Ðº! ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ Ð¾ %{count} Ð¾ÑˆÐ¸Ð±ÐºÐ°Ñ… Ð½Ð¸Ð¶Ðµ
@@ -523,16 +585,14 @@ ru:
     max_uses:
       few: "%{count} Ð¸ÑÐ¿."
       many: "%{count} Ð¸ÑÐ¿."
-      one: 1 Ð¸ÑÐ¿.
-      other: "%{count} Ð¸ÑÐ¿."
+      one: 1 Ð¸ÑÐ¿
+      other: "%{count} Ð¸ÑÐ¿"
     max_uses_prompt: Ð‘ÐµÐ· Ð»Ð¸Ð¼Ð¸Ñ‚Ð°
-    prompt: Ð“ÐµÐ½ÐµÑ€Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ Ð¸ Ð´ÐµÐ»Ð¸Ñ‚ÐµÑÑŒ ÑÑÑ‹Ð»ÐºÐ°Ð¼Ð¸ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÑ‚Ð¾Ð¼Ñƒ ÑƒÐ·Ð»Ñƒ.
+    prompt: Ð“ÐµÐ½ÐµÑ€Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ Ð¸ Ð´ÐµÐ»Ð¸Ñ‚ÐµÑÑŒ ÑÑÑ‹Ð»ÐºÐ°Ð¼Ð¸ Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº ÑÑ‚Ð¾Ð¼Ñƒ ÑƒÐ·Ð»Ñƒ
     table:
       expires_at: Ð˜ÑÑ‚ÐµÐºÐ°ÐµÑ‚
       uses: Ð˜ÑÐ¿.
     title: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑÐ¸Ñ‚ÑŒ Ð»ÑŽÐ´ÐµÐ¹
-  landing_strip_html: "<strong>%{name}</strong> - Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð½Ð° %{link_to_root_path}. Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° Ð½ÐµÐ³Ð¾/Ð½ÐµÐµ Ð¸ Ð¾Ð±Ñ‰Ð°Ñ‚ÑŒÑÑ Ñ Ð½Ð¸Ð¼/Ð½ÐµÐ¹, ÐµÑÐ»Ð¸ Ñƒ Ð’Ð°Ñ ÐµÑÑ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð° Ð»ÑŽÐ±Ð¾Ð¼ ÑƒÐ·Ð»Ðµ Ð¾Ð±Ñ‰ÐµÐ¹ ÑÐµÑ‚Ð¸."
-  landing_strip_signup_html: Ð•ÑÐ»Ð¸ Ñƒ Ð’Ð°Ñ ÐµÐ³Ð¾ Ð½ÐµÑ‚, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href="%{sign_up_path}">Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð·Ð´ÐµÑÑŒ</a>.
   lists:
     errors:
       limit: Ð’Ñ‹ Ð´Ð¾ÑÑ‚Ð¸Ð³Ð»Ð¸ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ñ‡Ð¸ÑÐ»Ð° ÑÐ¿Ð¸ÑÐºÐ¾Ð²
@@ -608,8 +668,9 @@ ru:
     publishing: ÐŸÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ
     web: WWW
   remote_follow:
-    acct: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ username@domain, Ð¾Ñ‚ÐºÑƒÐ´Ð° Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ
+    acct: Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ð¹ username@domain Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ
     missing_resource: ÐŸÐ¾Ð¸ÑÐº Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ URL Ð´Ð»Ñ Ð’Ð°ÑˆÐµÐ³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡ÐµÐ¹
+    no_account_html: ÐÐµÑ‚ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ Ð·Ð°Ð¿Ð¸ÑÐ¸? Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href='%{sign_up_path}' target='_blank'>Ð·Ð°Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð·Ð´ÐµÑÑŒ</a>
     proceed: ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑƒ
     prompt: 'Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð°:'
   remote_unfollow:
@@ -692,6 +753,7 @@ ru:
       many: 'ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð»Ð¸ÑÑŒ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½Ð½Ñ‹Ðµ Ñ…ÑÑˆÑ‚ÐµÐ³Ð¸: %{tags}'
       one: 'ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð»ÑÑ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½Ð½Ñ‹Ð¹ Ñ…ÑÑˆÑ‚ÐµÐ³: %{tags}'
       other: 'ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð»Ð¸ÑÑŒ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½Ð½Ñ‹Ðµ Ñ…ÑÑˆÑ‚ÐµÐ³Ð¸: %{tags}'
+    language_detection: ÐžÐ¿Ñ€ÐµÐ´ÐµÐ»ÑÑ‚ÑŒ ÑÐ·Ñ‹Ðº Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸
     open_in_web: ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð² WWW
     over_character_limit: Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐµÐ½ Ð»Ð¸Ð¼Ð¸Ñ‚ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² (%{max})
     pin_errors:
@@ -699,7 +761,8 @@ ru:
       ownership: ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÑ€ÐµÐ¿Ð¸Ñ‚ÑŒ Ñ‡ÑƒÐ¶Ð¾Ð¹ ÑÑ‚Ð°Ñ‚ÑƒÑ
       private: ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÑ€ÐµÐ¿Ð¸Ñ‚ÑŒ Ð½ÐµÐ¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ð¹ ÑÑ‚Ð°Ñ‚ÑƒÑ
       reblog: ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÑ€ÐµÐ¿Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÑ‚Ñ‹Ð¹ ÑÑ‚Ð°Ñ‚ÑƒÑ
-    show_more: ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½ÐµÐµ
+    show_more: Ð•Ñ‰Ñ‘
+    sign_in_to_participate: Ð’Ð¾Ð¹Ð´Ð¸Ñ‚Ðµ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ Ð¿Ñ€Ð¸Ð½ÑÑ‚ÑŒ ÑƒÑ‡Ð°ÑÑ‚Ð¸Ðµ Ð² Ð´Ð¸ÑÐºÑƒÑÑÐ¸Ð¸
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Ð”Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²
@@ -709,8 +772,7 @@ ru:
       unlisted: Ð¡ÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¸Ð· Ð»ÐµÐ½Ñ‚
       unlisted_long: ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð²ÑÐµÐ¼, Ð½Ð¾ Ð½Ðµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚ÑŒ Ð² Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… Ð»ÐµÐ½Ñ‚Ð°Ñ…
   stream_entries:
-    click_to_show: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ
-    pinned: Ð—Ð°ÐºÑ€ÐµÐ¿Ð»Ñ‘Ð½Ð½Ð¾Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ
+    pinned: Ð—Ð°ÐºÑ€ÐµÐ¿Ð»Ñ‘Ð½Ð½Ñ‹Ð¹ ÑÑ‚Ð°Ñ‚ÑƒÑ
     reblogged: Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÐ»(Ð°)
     sensitive_content: Ð§ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
   terms:
@@ -831,7 +893,6 @@ ru:
       review_preferences_action: Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸
       review_preferences_step: ÐŸÑ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð²ÑÐµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, ÐºÐ°ÐºÐ¸Ðµ Ð¿Ð¸ÑÑŒÐ¼Ð° Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ñ‚ÑŒ Ð¸Ð»Ð¸ ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð² Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ. Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð½Ðµ ÑÑ‚Ñ€Ð°Ð´Ð°ÐµÑ‚Ðµ Ð¼Ð¾Ñ€ÑÐºÐ¾Ð¹ Ð±Ð¾Ð»ÐµÐ·Ð½ÑŒ, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð°Ð²Ñ‚Ð¾Ð²Ð¾ÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ðµ GIF.
       subject: Ð”Ð¾Ð±Ñ€Ð¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°Ñ‚ÑŒ Ð² Mastodon
-      tip_bridge_html: Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð¿Ñ€Ð¸ÑˆÐ»Ð¸ Ð¸Ð· Twitter, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¾Ð¸ÑÐºÐ°Ñ‚ÑŒ ÑÐ²Ð¾Ð¸Ñ… Ð´Ñ€ÑƒÐ·ÐµÐ¹ Ð² Mastodon, Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ <a href="%{bridge_url}">Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ-Ð¼Ð¾ÑÑ‚</a>. ÐÐ¾ ÑÑ‚Ð¾ Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÐµÑÐ»Ð¸ Ð¾Ð½Ð¸ Ñ‚Ð¾Ð¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð»Ð¸ ÑÑ‚Ð¾ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ!
       tip_federated_timeline: Ð’ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¾Ð¹ Ð»ÐµÐ½Ñ‚Ðµ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶Ð°ÐµÑ‚ÑÑ ÑÐµÑ‚ÑŒ Mastodon. ÐÐ¾ Ð² Ð½ÐµÐ¹ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ‹ Ð¿Ð¾ÑÑ‚Ñ‹ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ñ‚ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð’Ñ‹ Ð¸ Ð’Ð°ÑˆÐ¸ ÑÐ¾ÑÐµÐ´Ð¸, Ð¿Ð¾ÑÑ‚Ð¾Ð¼Ñƒ Ð»ÐµÐ½Ñ‚Ð° Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð½ÐµÐ¿Ð¾Ð»Ð½Ð¾Ð¹.
       tip_following: ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð’Ñ‹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°(-Ð¾Ð²) Ð’Ð°ÑˆÐµÐ³Ð¾ ÑƒÐ·Ð»Ð°. Ð§Ñ‚Ð¾Ð±Ñ‹ Ð½Ð°Ð¹Ñ‚Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ñ… Ð¸Ð½Ñ‚ÐµÑ€ÐµÑÐ½Ñ‹Ñ… Ð»ÑŽÐ´ÐµÐ¹, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½ÑƒÑŽ Ð¸ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½ÑƒÑŽ Ð»ÐµÐ½Ñ‚Ñ‹.
       tip_local_timeline: Ð’ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾Ð¹ Ð»ÐµÐ½Ñ‚Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ‹ Ð¿Ð¾ÑÑ‚Ñ‹ Ð¾Ñ‚ Ð»ÑŽÐ´ÐµÐ¹ Ñ %{instance}. ÐÑ‚Ð¾ Ð’Ð°ÑˆÐ¸ Ð½ÐµÐ¿Ð¾ÑÑ€ÐµÐ´ÑÑ‚Ð²ÐµÐ½Ð½Ñ‹Ðµ ÑÐ¾ÑÐµÐ´Ð¸!
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 5c0c0a57c820d3fbdf4c8b55c211832a844a13a4..ef1d269eeadb7626ad447d130c93287515d716e4 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -2,28 +2,37 @@
 ar:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Ø¨Ø¥Ù…ÙƒØ§Ù†Ùƒ Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù†ÙØ³ Ø§Ù„Ù‚ÙˆØ§Ø¹Ø¯ Ø§Ù„ØªÙŠ Ù†Ø¬Ø¯Ù‡Ø§ ÙÙŠ Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª ÙƒØ¹Ù†Ø§ÙˆÙŠÙ† Ø§Ù„Ø±ÙˆØ§Ø¨Ø· ÙˆØ§Ù„ÙˆØ³ÙˆÙ… ÙˆØ§Ù„Ø¥Ø´Ø§Ø±Ø§Øª
+      admin_account_action:
+        send_email_notification: Ø³ÙˆÙ ÙŠØªÙ„Ù‚Ù‰ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø±Ø³Ø§Ù„Ø© ØªÙÙØ³Ù‘ÙØ± Ù…Ø§ ØØ¯Ø« Ø¹Ù„Ù‰ ØØ³Ø§Ø¨Ù‡
+        type_html: Ø§Ø®ØªØ± Ù…Ø§ ØªÙˆØ¯ Ø¥Ø¬Ø±Ø§Ø¤Ù‡ Ø¹Ù„Ù‰ <strong>%{acct}</strong>
+        warning_preset_id: Ø§Ø®ØªÙŠØ§Ø±ÙŠ. ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø¶Ø§ÙØ© Ù†Øµ Ù…Ø®ØµØµ Ø¥Ù„Ù‰ Ù†Ù‡Ø§ÙŠØ© Ø§Ù„Ù†Ù…ÙˆØ°Ø¬
       defaults:
         autofollow: Ø³ÙˆÙ ÙŠØªØ§Ø¨Ø¹Ùƒ ØªÙ„Ù‚Ø§Ø¦ÙŠÙ‹Ø§ Ø§Ù„Ø£Ø´Ø®Ø§Øµ Ø§Ù„Ø°ÙŠÙ† ÙŠÙ‚ÙˆÙ…ÙˆÙ† Ø¨Ø§Ù„ØªØ³Ø¬ÙŠÙ„ Ù…Ù† Ø®Ù„Ø§Ù„ Ø§Ù„Ø¯Ø¹ÙˆØ©
-        avatar: Ù…Ù„Ù PNG Ø£Ùˆ GIF Ø£Ùˆ JPG. ØØ¬Ù…Ù‡ Ø¹Ù„Ù‰ Ø£Ù‚ØµÙ‰ ØªØµØ¯ÙŠØ± 2MB. Ø³ÙŠØªÙ… ØªØµØºÙŠØ±Ù‡ Ø¥Ù„Ù‰ 400x400px
+        avatar: Ù…Ù„Ù PNG Ø£Ùˆ GIF Ø£Ùˆ JPG. ØØ¬Ù…Ù‡ Ø¹Ù„Ù‰ Ø£Ù‚ØµÙ‰ ØªØµØ¯ÙŠØ± %{size}. Ø³ÙŠØªÙ… ØªØµØºÙŠØ±Ù‡ Ø¥Ù„Ù‰ %{dimensions}px
         bot: ÙŠÙØ¹Ù„ÙÙ… Ø£Ù†Ù‘ Ù‡Ø°Ø§ Ø§Ù„ØØ³Ø§Ø¨ Ù„Ø§ ÙŠÙ…Ø«Ù„ Ø´Ø®ØµÙ‹Ø§
         context: ÙˆØ§ØØ¯ Ø£Ùˆ Ø£ÙƒØ«Ø± Ù…Ù† Ø§Ù„Ø³ÙŠØ§Ù‚Ø§Øª Ø§Ù„ØªÙŠ ÙŠØ¬Ø¨ Ø£Ù† ÙŠÙ†Ø·Ø¨Ù‚ Ø¹Ù„ÙŠÙ‡Ø§ Ø¹Ø§Ù…Ù„ Ø§Ù„ØªØµÙÙŠØ©
         digest: ØªÙØ±Ø³ÙŽÙ„ Ø¥Ù„ÙŠÙƒ Ø¨Ø¹Ø¯ Ù…ÙØ¶ÙŠÙ‘ Ù…Ø¯Ø© Ù…ÙÙ† Ø®Ù…ÙˆÙ„ Ù†Ø´Ø§Ø·Ùƒ Ùˆ ÙÙ‚Ø· Ø¥Ø°Ø§ Ù…Ø§ ØªÙ„Ù‚ÙŠØª Ø±Ø³Ø§Ø¦Ù„ Ø´Ø®ØµÙŠØ© Ù…Ø¨Ø§Ø´ÙØ±Ø© Ø£Ø«Ù†Ø§Ø¡ ÙØªØ±Ø© ØºÙŠØ§Ø¨Ùƒ Ù…ÙÙ† Ø§Ù„Ø´Ø¨ÙƒØ©
-        display_name:
-          one: <span class="name-counter">1</span> ØØ±Ù Ø¨Ø§Ù‚
-          other: <span class="name-counter">%{count}</span> ØØ±Ù Ø¨Ø§Ù‚
+        email: Ø³ÙˆÙ ØªØªÙ„Ù‚Ù‰ Ø±Ø³Ø§Ù„Ø© Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠØ© Ù„Ù„ØªØ£ÙƒÙŠØ¯
         fields: ÙŠÙÙ…ÙƒÙ†Ùƒ Ø¹Ø±Ø¶ 4 Ø¹Ù†Ø§ØµØ± Ø¹Ù„Ù‰ Ø´ÙƒÙ„ Ø¬Ø¯ÙˆÙ„ ÙÙŠ Ù…Ù„ÙÙƒ Ø§Ù„Ø´Ø®ØµÙŠ
-        header: Ù…Ù„Ù PNG Ø£Ùˆ GIF Ø£Ùˆ JPG. ØØ¬Ù…Ù‡ Ø¹Ù„Ù‰ Ø£Ù‚ØµÙ‰ ØªØµØ¯ÙŠØ± 2MB. Ø³ÙŠØªÙ… ØªØµØºÙŠØ±Ù‡ Ø¥Ù„Ù‰ 700x335px
+        header: Ù…Ù„Ù PNG Ø£Ùˆ GIF Ø£Ùˆ JPG. ØØ¬Ù…Ù‡ Ø¹Ù„Ù‰ Ø£Ù‚ØµÙ‰ ØªØµØ¯ÙŠØ± %{size}. Ø³ÙŠØªÙ… ØªØµØºÙŠØ±Ù‡ Ø¥Ù„Ù‰ %{dimensions}px
+        inbox_url: Ù†Ø³Ø® Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯ Ø§Ø³ØªØ®Ø¯Ø§Ù…Ù‡ Ù…ÙÙ† ØµÙØØ© Ø§Ù„Ø¥Ø³ØªÙ‚Ø¨Ø§Ù„ Ù„Ù„Ù…ÙØ±ØÙ‘ÙŽÙ„
         irreversible: Ø§Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ø§Ù„ØªÙŠ ØªÙ… ØªØµÙÙŠØªÙ‡Ø§ Ø³ØªØ®ØªÙÙŠ Ù„Ø§ Ù…ØØ§Ù„Ø© ØØªÙ‰ Ùˆ Ø¥Ù† ØªÙ…Øª Ø¥Ø²Ø§Ù„Ø© Ø¹Ø§Ù…ÙÙ„ Ø§Ù„ØªØµÙÙŠØ© Ù„Ø§ØÙ‚Ù‹Ø§
         locale: Ù„ØºØ© ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ùˆ Ø§Ù„Ø±Ø³Ø§Ø¦Ù„ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠØ© Ùˆ Ø§Ù„Ø¥Ø´Ø¹Ø§Ø±Ø§Øª
         locked: ÙŠØªØ·Ù„Ø¨ Ù…Ù†Ùƒ Ø§Ù„Ù…ÙˆØ§ÙÙ‚Ø© ÙŠØ¯ÙˆÙŠØ§ Ø¹Ù„Ù‰ Ø·Ù„Ø¨Ø§Øª Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©
-        note:
-          one: <span class="note-counter">1</span> ØØ±Ù Ø¨Ø§Ù‚
-          other: <span class="note-counter">%{count}</span> ØØ±Ù Ø¨Ø§Ù‚
+        password: ÙŠÙÙ†ØµØ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù… 8 Ø£ØØ±Ù Ø¹Ù„Ù‰ Ø§Ù„Ø£Ù‚Ù„
+        phrase: Ø³ÙˆÙ ÙŠØªÙ… Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„ÙŠÙ‡ Ù…Ù‡Ù…Ø§ ÙƒØ§Ù† Ù†ÙˆØ¹ Ø§Ù„Ù†Øµ Ø£Ùˆ ØØªÙ‰ Ùˆ Ø¥Ù† ÙƒØ§Ù† Ø¯Ø§Ø®Ù„ Ø§Ù„ÙˆÙŠØ¨ ÙÙŠÙ‡ ØªØØ°ÙŠØ± Ø¹Ù† Ø§Ù„Ù…ØØªÙˆÙ‰
         scopes: Ù…Ø§ Ù‡ÙŠ Ø§Ù„Ù…Ø¬Ø§Ù„Ø§Øª Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¨Ù‡Ø§ ÙÙŠ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ ØŸ Ø¥Ù† Ù‚Ù…Øª Ø¨Ø§Ø®ØªÙŠØ§Ø± Ø£Ø¹Ù„Ù‰ Ø§Ù„Ù…Ø¬Ø§Ù„Ø§Øª ÙÙŠÙ…ÙƒÙ†Ùƒ Ø§Ù„Ø¥Ø³ØªØºÙ†Ø§Ø¡ Ø¹Ù† Ø§Ù„Ø®ÙŽÙŠØ§Ø± Ø§Ù„ÙŠØ¯ÙˆÙŠ.
+        setting_aggregate_reblogs: Ù„Ø§ ØªÙ‚Ù… Ø¨Ø¹Ø±Ø¶ Ø§Ù„Ù…Ø´Ø§Ø±ÙŽÙƒØ§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© Ù„ØªØ¨ÙˆÙŠÙ‚Ø§Øª Ù‚Ø¯ Ù‚ÙÙ…ØªÙŽ Ø¨Ù…Ø´Ø§Ø±ÙƒØªÙ‡Ø§ Ø³Ø§Ø¨Ù‚Ø§ (Ù‡Ø°Ø§ Ø§Ù„Ø¥Ø¬Ø±Ø§Ø¡ ÙŠØ¹Ù†ÙŠ Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ§Øª Ø§Ù„Ø¬Ø¯ÙŠØ¯Ø© ÙÙ‚Ø· Ø§Ù„ØªÙŠ ØªÙ„Ù‚ÙŠØªÙŽÙ‡Ø§)
         setting_default_language: ÙŠÙ…ÙƒÙ† Ø§Ù„ÙƒØ´Ù Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ Ù„Ù„Ù‘ØºØ© Ø§Ù„Ù„ØªÙŠ Ø§Ø³ØªØ®Ø¯Ù…ØªÙ‡Ø§ ÙÙŠ ØªØØ±ÙŠØ± ØªØ¨ÙˆÙŠÙ‚Ø§ØªÙƒ ØŒ ØºÙŠØ±ÙŽ Ø£Ù†Ù‘ Ø§Ù„Ø¹Ù…Ù„ÙŠØ© Ù„ÙŠØ³Øª Ø¯Ø§Ø¦Ù…Ø§ Ø¯Ù‚ÙŠÙ‚Ø©
+        setting_display_media_default: Ø¥Ø®ÙØ§Ø¡ Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„Ù…ÙØ¹ÙŠÙ‘ÙŽÙ†Ø© ÙƒØØ³Ø§Ø³Ø©
+        setting_display_media_hide_all: Ø¥Ø®ÙØ§Ø¡ ÙƒØ§ÙØ© Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø¯Ø§Ø¦Ù…Ù‹Ø§
+        setting_display_media_show_all: Ø¯Ø§Ø¦Ù…Ù‹Ø§ Ø¹Ø±Ø¶ Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„Ù…ÙØ¹ÙŠÙ‘ÙŽÙ†Ø© ÙƒØØ³Ø§Ø³Ø©
         setting_hide_network: Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„ØªÙŠ ØªÙØªØ§Ø¨Ø¹Ù‡Ø§ Ùˆ Ø§Ù„ØªÙŠ ØªÙØªØ§Ø¨ÙØ¹Ùƒ Ø¹Ù„Ù‰ ØØ¯ Ø³ÙˆØ§Ø¡ Ù„Ù† ØªÙØ¹Ø±ÙŽØ¶ Ø¹Ù„Ù‰ ØµÙØØªÙƒ Ø§Ù„Ø´Ø®ØµÙŠØ©
         setting_noindex: Ø°Ù„Ùƒ ÙŠØ¤Ø«Ø± Ø¹Ù„Ù‰ ØØ§Ù„Ø© Ù…Ù„ÙÙƒ Ø§Ù„Ø´Ø®ØµÙŠ Ùˆ ØµÙØØ§ØªÙƒ
         setting_theme: Ø°Ù„Ùƒ ÙŠØ¤Ø«Ø± Ø¹Ù„Ù‰ Ø§Ù„Ø´ÙƒÙ„ Ø§Ù„Ø°ÙŠ Ø³ÙŠØ¨Ø¯Ùˆ Ø¹Ù„ÙŠÙ‡ Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¹Ù†Ø¯Ù…Ø§ ØªÙ‚ÙˆÙ… Ø¨Ø§Ù„Ø¯Ø®ÙˆÙ„ Ù…ÙÙ† Ø£ÙŠ Ø¬Ù‡Ø§Ø².
+        username: Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø§Ù„Ø®Ø§Øµ Ø¨Ùƒ Ø³ÙˆÙ ÙŠÙƒÙˆÙ† ÙØ±ÙŠØ¯Ø§ Ù…ÙÙ† Ù†ÙˆØ¹Ù‡ Ø¹Ù„Ù‰ %{domain}
       imports:
         data: Ù…Ù„Ù CSV ØªÙ… ØªØµØ¯ÙŠØ±Ù‡ Ù…ÙÙ† Ù…Ø«ÙŠÙ„ Ø®Ø§Ø¯ÙˆÙ… Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¢Ø®Ø±
       sessions:
@@ -35,6 +44,18 @@ ar:
         fields:
           name: Ø§Ù„ØªØ³Ù…ÙŠØ©
           value: Ø§Ù„Ù…ØØªÙˆÙ‰
+      account_warning_preset:
+        text: Ù†Ù…ÙˆØ°Ø¬ Ù†ØµÙŠ
+      admin_account_action:
+        send_email_notification: Ø¥Ø´Ø¹Ø§Ø± Ø§Ù„Ù…Ø³ØªØ®Ø¯ÙÙ… Ø¹Ø¨Ø± Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
+        text: ØªØØ°ÙŠØ± Ù…Ø®ØµØµ
+        type: Ø§Ù„Ø¥Ø¬Ø±Ø§Ø¡
+        types:
+          disable: ØªØ¹Ø·ÙŠÙ„
+          none: Ù„Ø§ ØªÙØ¹Ù„ Ø´ÙŠØ¦Ø§
+          silence: ÙƒØªÙ…
+          suspend: ØªØ¹Ù„ÙŠÙ‚ Ùˆ ØØ°Ù ÙƒØ§ÙØ© Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ØØ³Ø§Ø¨
+        warning_preset_id: Ø§Ø³ØªØ®Ø¯Ù… Ù†Ù…ÙˆØ°Ø¬ ØªÙ†Ø¨ÙŠÙ‡
       defaults:
         autofollow: Ø¥Ø±Ø³Ø§Ù„ Ø¯Ø¹ÙˆØ© Ù„Ù…ØªØ§Ø¨Ø¹Ø© ØØ³Ø§Ø¨Ùƒ
         avatar: Ø§Ù„ØµÙˆØ±Ø© Ø§Ù„Ø±Ù…Ø²ÙŠØ©
@@ -45,11 +66,13 @@ ar:
         context: ØªØµÙÙŠØ© Ø§Ù„Ø³ÙŠØ§Ù‚Ø§Øª
         current_password: ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ø§Ù„ØØ§Ù„ÙŠØ©
         data: Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª
+        discoverable: Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ø¥Ø¯Ø±Ø§Ø¬ Ù‡Ø°Ø§ Ø§Ù„ØØ³Ø§Ø¨ ÙÙŠ Ù‚Ø§Ø¦Ù…Ø© Ø¯Ù„ÙŠÙ„ Ø§Ù„ØØ³Ø§Ø¨Ø§Øª
         display_name: Ø§Ù„Ø¥Ø³Ù… Ø§Ù„Ù…Ø¹Ø±ÙˆØ¶
         email: Ø¹Ù†ÙˆØ§Ù† Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ
         expires_in: ØªÙ†ØªÙ‡ÙŠ Ù…Ø¯Ø© ØµÙ„Ø§ØÙŠØªÙ‡ Ø¨Ø¹Ø¯
-        fields: ÙˆØ§ØµÙØ§Øª Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø´Ø®ØµÙŠ
+        fields: Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„ÙˆØµÙÙŠØ© Ù„Ù„ØµÙØØ© Ø§Ù„Ø´Ø®ØµÙŠØ©
         header: Ø§Ù„Ø±Ø£Ø³ÙŠØ©
+        inbox_url: Ø¹Ù†ÙˆØ§Ù† Ø±Ø§Ø¨Ø· ØµÙ†Ø¯ÙˆÙ‚ Ø§Ù„Ù…ÙØ±ÙŽØÙ‘ÙÙ„
         irreversible: Ø¥Ø³Ù‚Ø§Ø· Ø¨Ø¯Ù„Ø§ Ù…Ù† Ø¥Ø®ÙØ§Ø¦Ù‡Ø§
         locale: Ù„ØºØ© Ø§Ù„ÙˆØ§Ø¬Ù‡Ø©
         locked: ØªØ¬Ù…ÙŠØ¯ Ø§Ù„ØØ³Ø§Ø¨
@@ -59,13 +82,18 @@ ar:
         otp_attempt: Ø±Ù…Ø² Ø§Ù„Ù…ØµØ§Ø¯Ù‚Ø© Ø¨Ø®Ø·ÙˆØªÙŠÙ†
         password: ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±
         phrase: ÙƒÙ„Ù…Ø© Ù…ÙØªØ§Ø Ø£Ùˆ Ø¹Ø¨Ø§Ø±Ø©
+        setting_aggregate_reblogs: Ø¬Ù…Ø¹ Ø§Ù„ØªØ±Ù‚ÙŠØ§Øª ÙÙŠ Ø®ÙŠÙˆØ· Ø²Ù…Ù†ÙŠØ©
         setting_auto_play_gif: ØªØ´ØºÙŠÙ„ ØªÙ„Ù‚Ø§Ø¦ÙŠ Ù„ÙÙˆÙŽØ³Ø§Ø¦Ø· Ø¬ÙŠÙ Ø§Ù„Ù…ØªØØ±ÙƒØ©
         setting_boost_modal: Ø¥Ø¸Ù‡Ø§Ø± Ù…Ø±Ø¨Ø¹ ØÙˆØ§Ø± Ù„Ù„ØªØ£ÙƒÙŠØ¯ Ù‚Ø¨Ù„ ØªØ±Ù‚ÙŠØ© Ø£ÙŠ ØªØ¨ÙˆÙŠÙ‚
         setting_default_language: Ù„ØºØ© Ø§Ù„Ù†Ø´Ø±
         setting_default_privacy: Ø®ØµÙˆØµÙŠØ© Ø§Ù„Ù…Ù†Ø´ÙˆØ±
         setting_default_sensitive: Ø¥Ø¹ØªØ¨Ø± Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø¯Ø§Ø¦Ù…Ø§ ÙƒÙ…ØØªÙˆÙ‰ ØØ³Ø§Ø³
         setting_delete_modal: Ø¥Ø¸Ù‡Ø§Ø± Ù…Ø±Ø¨Ø¹ ØÙˆØ§Ø± Ù„Ù„ØªØ£ÙƒÙŠØ¯ Ù‚Ø¨Ù„ ØØ°Ù Ø£ÙŠ ØªØ¨ÙˆÙŠÙ‚
-        setting_display_sensitive_media: Ø¯Ø§Ø¦Ù…Ù‹Ø§ Ø¥Ø¸Ù‡Ø§Ø± Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„ØØ³Ø§Ø³Ø©
+        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: ØªØ®ÙÙŠØ¶ Ø¹Ø¯Ø¯ Ø§Ù„ØµÙˆØ± ÙÙŠ Ø§Ù„ÙˆØ³Ø§Ø¦Ø· Ø§Ù„Ù…ØªØØ±ÙƒØ©
@@ -76,6 +104,7 @@ ar:
         type: ØµÙŠØºØ© Ø§Ù„Ø¥Ø³ØªÙŠØ±Ø§Ø¯
         username: Ø¥Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…
         username_or_email: Ø¥Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø£Ùˆ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±
+        whole_word: Ø§Ù„ÙƒÙ„Ù…Ø© ÙƒØ§Ù…Ù„Ø©
       interactions:
         must_be_follower: ØØ¸Ø± Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ø§Ù„Ù‚Ø§Ø¯Ù…Ø© Ù…Ù† ØØ³Ø§Ø¨Ø§Øª Ù„Ø§ ØªØªØ¨Ø¹Ùƒ
         must_be_following: ØØ¸Ø± Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª Ø§Ù„Ù‚Ø§Ø¯Ù…Ø© Ù…Ù† Ø§Ù„ØØ³Ø§Ø¨Ø§Øª Ø§Ù„ØªÙŠ Ù„Ø§ ØªØªØ§Ø¨Ø¹Ù‡Ø§
@@ -87,6 +116,7 @@ ar:
         follow_request: Ø¥Ø¨Ø¹Ø« Ø¨Ø±ÙŠØ¯Ø§ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠØ§ Ø¹Ù†Ø¯Ù…Ø§ ÙŠÙ‚ÙˆÙ… Ø£ØØ¯Ù‡Ù… Ø¨Ø¥Ø±Ø³Ø§Ù„ Ø·Ù„Ø¨ Ø¨Ø§Ù„Ù…ØªØ§Ø¨Ø¹Ø©
         mention: Ø¥Ø¨Ø¹Ø« Ø¨Ø±ÙŠØ¯Ø§Ù‹ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠÙ‹Ø§ Ø¹Ù†Ø¯Ù…Ø§ ÙŠÙØ´ÙŠØ± Ø¥Ù„ÙŠÙƒ Ø£Ùˆ ÙŠØ°ÙƒÙØ±Ùƒ Ø£ØØ¯Ù‡Ù…
         reblog: Ø¥Ø¨Ø¹Ø« Ø¨Ø±ÙŠØ¯Ø§Ù‹ Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠÙ‹Ø§ Ø¹Ù†Ø¯Ù…Ø§ ÙŠÙ‚ÙˆÙ… Ø£ØØ¯Ù‡Ù… Ø¨ØªØ±Ù‚ÙŠØ© Ù…Ù†Ø´ÙˆØ±Ùƒ
+        report: Ø¥Ø±Ø³Ø§Ù„ Ø±Ø³Ø§Ù„Ø© Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠØ© Ø¹Ù†Ø¯ ØªÙ„Ù‚Ù‘ÙŠ Ø¥Ø¨Ù„Ø§Øº Ø¬Ø¯ÙŠØ¯
     'no': Ù„Ø§
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b91d5780a9d977087e51fd78d4c07281fa4a8ef8
--- /dev/null
+++ b/config/locales/simple_form.ast.yml
@@ -0,0 +1,66 @@
+---
+ast:
+  simple_form:
+    hints:
+      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 tres un periodu llargu d'inactividÃ¡ y namÃ¡i si recibiesti cualesquier mensaxe personal na to ausencia
+        email: Vamos unviate un corrÃ©u de confirmaciÃ³n
+        irreversible: Los toots 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_theme: Afeuta al aspeutu de Mastodon cuando anicies sesiÃ³n dende cualesquier presÃ©u.
+        username: El nome d'usuariu va ser Ãºnicu en %{domain}
+      imports:
+        data: El ficheru CSV esportÃ¡u dende otra instancia de Mastodon
+    labels:
+      account:
+        fields:
+          name: Etiqueta
+          value: ContenÃu
+      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
+        current_password: ContraseÃ±a actual
+        data: Datos
+        display_name: Nome a amosar
+        email: DireiciÃ³n de corrÃ©u
+        expires_in: Caduca tres
+        fields: Datos meta del perfil
+        header: Testera
+        irreversible: Escartar en cuentes d'anubrir
+        locale: Llingua de la interfaz
+        locked: Bloquiar cuenta
+        max_uses: NÃºmberu mÃ¡ximu d'usos
+        new_password: ContraseÃ±a nueva
+        note: Bio
+        otp_attempt: CÃ³digu de verificaciÃ³n en dos pasos
+        password: ContraseÃ±a
+        phrase: Pallabra clave o fras
+        setting_auto_play_gif: Reproducir GIFs automÃ¡ticamente
+        setting_default_language: Llingua de les espublizaciones
+        setting_default_privacy: PrivacidÃ¡ d'espublizaciones
+        setting_delete_modal: Amosar el diÃ¡logu de confirmaciÃ³n enantes de desaniciar un toot
+        setting_system_font_ui: Usar la fonte predeterminada del sistema
+        setting_unfollow_modal: Amosar el diÃ¡logu de confirmaciÃ³n enantes de dexar de siguir a daquiÃ©n
+        severity: SeveridÃ¡
+        type: Triba de la importaciÃ³n
+        username: Nome d'usuariu
+        username_or_email: Nome d'usuariu o corrÃ©u
+      interactions:
+        must_be_follower: Bloquiar avisos de persones que nun son siguidores
+        must_be_following: Bloquiar avisos de persones que nun sigues
+        must_be_following_dm: Bloquiar mensaxes direutos de persones que nun sigues
+      notification_emails:
+        favourite: Unviar un corrÃ©u cuando daquiÃ©n conseÃ±e como favoritu los tos estaos
+        follow: Unviar un corrÃ©u cuando daquiÃ©n te siga
+        follow_request: Unviar un corrÃ©u cuando daquiÃ©n solicite siguite
+        mention: Unviar un corrÃ©u cuando daquiÃ©n te mente
+    'no': Non
+    required:
+      mark: "*"
+      text: rÃquese
+    'yes': SÃ
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 4c96ebc8633ef52ac6ccdb8761fd7b2ed32443ae..9441e53b3748ba62ce66b694f0c5b926cad00555 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -3,11 +3,9 @@ bg:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF Ð¸Ð»Ð¸ JPG. Ð”Ð¾ 2MB. Ð©Ðµ Ð±ÑŠÐ´Ðµ ÑÐ¼Ð°Ð»ÐµÐ½Ð° Ð´Ð¾ 400x400 Ð¿Ð¸ÐºÑÐµÐ»Ð°
-        display_name: Ð”Ð¾ 30 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°
-        header: PNG, GIF Ð¸Ð»Ð¸ JPG. Ð”Ð¾ 2MB. Ð©Ðµ Ð±ÑŠÐ´Ðµ ÑÐ¼Ð°Ð»ÐµÐ½Ð° Ð´Ð¾ 700x335 Ð¿Ð¸ÐºÑÐµÐ»Ð°
+        avatar: PNG, GIF Ð¸Ð»Ð¸ JPG. Ð”Ð¾ %{size}. Ð©Ðµ Ð±ÑŠÐ´Ðµ ÑÐ¼Ð°Ð»ÐµÐ½Ð° Ð´Ð¾ %{dimensions} Ð¿Ð¸ÐºÑÐµÐ»Ð°
+        header: PNG, GIF Ð¸Ð»Ð¸ JPG. Ð”Ð¾ %{size}. Ð©Ðµ Ð±ÑŠÐ´Ðµ ÑÐ¼Ð°Ð»ÐµÐ½Ð° Ð´Ð¾ %{dimensions} Ð¿Ð¸ÐºÑÐµÐ»Ð°
         locked: Ð˜Ð·Ð¸ÑÐºÐ²Ð° Ñ€ÑŠÑ‡Ð½Ð¾ Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸Ñ‚Ðµ. ÐŸÐ¾ Ð¿Ð¾Ð´Ñ€Ð°Ð·Ð±Ð¸Ñ€Ð°Ð½Ðµ, Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸Ñ‚Ðµ ÑÐ° Ð´Ð¾ÑÑ‚ÑŠÐ¿Ð½Ð¸ ÑÐ°Ð¼Ð¾ Ð´Ð¾ Ð¿Ð¾ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸.
-        note: Ð”Ð¾ 65535 ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°
       imports:
         data: CSV Ñ„Ð°Ð¹Ð», ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð°Ð½ Ð¾Ñ‚ Ð´Ñ€ÑƒÐ³Ð° Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸Ñ Ð½Ð° Mastodon
     labels:
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 482ddd7bebccbdb1d51ac482c983b8366da55479..4c2b1636dcb535e5064dc8e60ee9dce8e30141ea 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -2,28 +2,40 @@
 ca:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Pots utilitzar totes les sintaxi com ara URL, etiquetes i mencions
+      admin_account_action:
+        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
+        type_html: Tria quÃ¨ fer amb <strong>%{acct}</strong>
+        warning_preset_id: Opcional. Encara pots afegir text personalitzat al final de la configuraciÃ³ predefinida
       defaults:
         autofollow: Les persones que es registrin a travÃ©s de la invitaciÃ³ et seguiran automÃ ticament
-        avatar: PNG, GIF o JPG. MÃ xim 2MB. S'escalarÃ  a 400x400px
+        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
         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
-        display_name:
-          one: <span class="name-counter">1</span> cÃ racter restant
-          other: <span class="name-counter">%{count}</span> cÃ racters restans
+        discoverable_html: El <a href="%{path}" target="_blank">directori</a> permet trobar usuaris en funciÃ³ dels interessos i activitat. Requereix almenys %{min_followers} seguidors
+        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 2MB. S'escalarÃ  a 700x335px
+        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 nodes 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
-        note:
-          one: <span class="note-counter">1</span> cÃ racter restant
-          other: <span class="note-counter">%{count}</span> carÃ cters restants
+        password: Utilitza com a mÃnim 8 carÃ cters
         phrase: Es combinarÃ  independentment del format en el text o l'avÃs de contingut d'un toot
+        scopes: A quines API es permetrÃ  l'accÃ©s a l'aplicaciÃ³. Si selecciones un Ã mbit d'alt nivell, no cal que seleccionis un d'individual.
+        setting_aggregate_reblogs: No mostra els nous impulsos dels toots que ja s'han impulsat recentment (nomÃ©s afecta als impulsos nous rebuts)
         setting_default_language: La llengua dels teus toots pot ser detectada automÃ ticament perÃ² no sempre acuradament
+        setting_display_media_default: Amaga els multimÃ¨dia marcats com a sensibles
+        setting_display_media_hide_all: Sempre oculta tots els 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_noindex: Afecta el teu perfil pÃºblic i les pÃ gines d'estat
         setting_theme: Afecta l'aspecte de Mastodon quan es visita des de qualsevol dispositiu.
+        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
       imports:
         data: Fitxer CSV exportat des de una altra instÃ ncia de Mastodon
       sessions:
@@ -35,6 +47,18 @@ ca:
         fields:
           name: Etiqueta
           value: Contingut
+      account_warning_preset:
+        text: Text predefinit
+      admin_account_action:
+        send_email_notification: Notifica l'usuari per correu electrÃ²nic
+        text: AvÃs personalitzat
+        type: AcciÃ³
+        types:
+          disable: Inhabilita
+          none: No fer res
+          silence: Silenci
+          suspend: SuspÃ¨n i elimina irreversiblement les dades del compte
+        warning_preset_id: Utilitza una configuraciÃ³ predefinida d'avÃs
       defaults:
         autofollow: Convida a seguir el teu compte
         avatar: Avatar
@@ -45,11 +69,13 @@ ca:
         context: Filtre els contextos
         current_password: Contrasenya actual
         data: InformaciÃ³
+        discoverable: Mostra aquest compte en el directori
         display_name: Nom visible
         email: AdreÃ§a de correu electrÃ²nic
         expires_in: Expira desprÃ©s
         fields: Metadades del perfil
         header: CapÃ§alera
+        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
@@ -59,13 +85,18 @@ ca:
         otp_attempt: Codi de dos factors
         password: Contrasenya
         phrase: Paraula clau o frase
+        setting_aggregate_reblogs: Agrupa impulsos en les lÃnies de temps
         setting_auto_play_gif: ReproducciÃ³ automÃ tica de GIFs animats
-        setting_boost_modal: Mostra la finestra de confirmaciÃ³ abans d'un retoot
+        setting_boost_modal: Mostra la finestra de confirmaciÃ³ abans d'impulsar
         setting_default_language: Llengua de les publicacions
         setting_default_privacy: Privacitat de les publicacions
         setting_default_sensitive: Marca sempre els elements multimÃ¨dia com a sensibles
         setting_delete_modal: Mostra la finestra de confirmaciÃ³ abans de suprimir un toot
-        setting_display_sensitive_media: Mostra sempre els elements multimÃ¨dia marcats com a sensibles
+        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 toots marcats 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
@@ -76,6 +107,7 @@ ca:
         type: Importa el tipus
         username: Nom d'usuari
         username_or_email: Nom d'usuari o adreÃ§a electrÃ²nica
+        whole_word: Paraula sencera
       interactions:
         must_be_follower: Blocar les notificacions de persones que no et segueixen
         must_be_following: Bloca les notificacions de persones que no segueixes
@@ -87,6 +119,7 @@ ca:
         follow_request: Envia un correu electrÃ²nic si algÃº solÂ·licita seguir-te
         mention: Envia un correu electrÃ²nic si algÃº et menciona
         reblog: Envia un correu electrÃ²nic si algÃº comparteix el teu estat
+        report: Envia un correu electrÃ²nic quan s'enviÃ¯ un nou informe
     'no': 'No'
     required:
       mark: "*"
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index ac8b89a7bb151106f8f0877e9395258b2ef087d7..2fb035556934c2153d0722f559e49a9e835df9d6 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -2,56 +2,101 @@
 co:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Pudete utilizÃ  a sintassa di i statuti, per esempiu l'URL, hashtag, minzione
+      admin_account_action:
+        send_email_notification: L'utilizatore hÃ  da riceve una spiegazione di cio chÃ¬ hÃ¨ accadutu Ã  u so contu
+        text_html: In uzzione. Pudete utilizÃ  a sintassa di i statuti. Pudete ancu <a href="%{path}">aghjustÃ  preselezzione d'avertimentu</a> per pigliÃ  tempu
+        type_html: Sceglie chÃ¬ fÃ  cÃ¹ <strong>%{acct}</strong>
+        warning_preset_id: In uzzione. Pudete sempre aghjustÃ  un testu persunalizatu Ã  a fine di a preselezzione
       defaults:
-        avatar: Furmatu PNG, GIF o JPG. 2Mo o menu. SarÃ  ridottu Ã  400x400px
+        autofollow: QuelliÂ·e chÃ¬ s'arregistranu cÃ¹ l'invitazione saranu autumaticamente abbunatiÂ·e Ã  voi
+        avatar: Furmatu PNG, GIF o JPG. %{size} o menu. SarÃ  ridottu Ã  %{dimensions}px
         bot: Stu contu hÃ¨ autumatizatu Ã¨ Ã¹n hÃ¨ forse micca survegliatu
+        context: CuntestuÂ·i induve u filtru deve esse applicatu
         digest: Solu mandatu dopu Ã  una longa perioda dâ€™inattivitÃ , Ã¨ solu sâ€™elli ci sÃ² novi missaghji diretti
-        display_name:
-          one: Ci ferma <span class="name-counter">1</span> caratteru
-          other: Ci fermanu <span class="name-counter">%{count}</span> caratteri
+        discoverable_html: L'<a href="%{path}" target="_blank">annuariu</a> permette Ã  a ghjente di truvÃ  conti Ã  partesi d'interessi Ã¨ d'attivitÃ . Ci vole Ã  avÃ¨ almenu %{min_followers} abbunati
+        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. 2Mo o menu. SarÃ  ridottu Ã  700x335px
+        header: Furmatu PNG, GIF o JPG. %{size} o menu. SarÃ  ridottu Ã  %{dimensions}px
+        inbox_url: Cupiate l'URL di a pagina d'accolta di u ripetitore chÃ¬ vulete utilizÃ 
+        irreversible: I statuti filtrati saranu sguassati di manera irreversibile, ancu s'ellu hÃ¨ toltu u filtru
+        locale: A lingua di l'interfaccia utilizatore, di l'e-mail Ã¨ di e nutificazione push
         locked: Duvarete appruvÃ  e dumande dâ€™abbunamentu
-        note:
-          one: Ci ferma <span class="name-counter">1</span> caratteru
-          other: Ci fermanu <span class="name-counter">%{count}</span> caratteri
+        password: Ci volenu almenu 8 caratteri
+        phrase: SarÃ  trovu senza primura di e maiuscule o di l'avertimenti
+        scopes: L'API Ã  quelle l'applicazione averÃ  accessu. S'Ã¨ voi selezziunate un parametru d'altu livellu, un c'hÃ¨ micca bisognu di selezziunÃ  quell'individuali.
+        setting_aggregate_reblogs: Ã™n mustrÃ  micca e nove spartere per i statuti chÃ¬ sÃ² stati spartuti da pocu (tocca solu e spartere piÃ¹ ricente)
+        setting_default_language: A lingua di i vostri statuti pÃ² esse induvinata autumaticamente, mÃ  Ã¹n marchja micca sempre bÃ¨
+        setting_display_media_default: PiattÃ  i media marcati cum'Ã¨ sensibili
+        setting_display_media_hide_all: Sempre piattÃ  tutti i media
+        setting_display_media_show_all: Sempre affissÃ  i media marcati cum'Ã¨ sensibili
         setting_hide_network: I vostri abbunati Ã¨ abbunamenti Ã¹n saranu micca mustrati nantâ€™Ã  u vostru prufile
         setting_noindex: Tocca Ã  u vostru prufile pubblicu Ã¨ i vostri statuti
         setting_theme: Tocca Ã  lâ€™apparenza di Mastodon quandu site cunnettatuÂ·a da qualchâ€™apparechju.
+        username: U vostru cugnome sarÃ  unicu nant'Ã  %{domain}
+        whole_word: Quandu a parolla o a frasa sana hÃ¨ alfanumerica, sarÃ  applicata solu s'ella currisponde Ã  a parolla sana
       imports:
         data: Un fugliale CSV da unâ€™altrâ€™istanza di Mastodon
       sessions:
         otp: 'Entrate u codice dâ€™identificazione Ã  dui fattori nantâ€™Ã  u vostru telefuninu, o unu di i vostri codici di ricuperazione:'
+      user:
+        chosen_languages: Soli i statuti scritti in e lingue selezziunate saranu mustrati indÃ¨ e linee pubbliche
     labels:
       account:
         fields:
           name: Label
           value: Cuntinutu
+      account_warning_preset:
+        text: Testu preselezziunatu
+      admin_account_action:
+        send_email_notification: NutificÃ  l'utilizatore cÃ¹ un'e-mail
+        text: Avertimentu persunalizatu
+        type: Azzione
+        types:
+          disable: DisattivÃ 
+          none: Ã™n fÃ  nunda
+          silence: SilenzÃ 
+          suspend: Suspende Ã¨ sguassÃ  i dati di u contu di manera irreversibile
+        warning_preset_id: UtilizÃ  un'avertimentu preselezziunatu
       defaults:
+        autofollow: InvitÃ  Ã  siguitÃ  u vostru contu
         avatar: Ritrattu di prufile
         bot: Stu contu hÃ¨ un bot
+        chosen_languages: FiltrÃ  lingue
         confirm_new_password: CunfirmÃ  a nova chjave dâ€™accessu
         confirm_password: CunfirmÃ  a chjave dâ€™accessu
+        context: Cuntesti di u filtru
         current_password: Chjave dâ€™accessu attuale
         data: Dati
+        discoverable: ArregistrÃ  stu contu indÃ¨ l'annuariu
         display_name: Nome pubblicu
         email: Indirizzu e-mail
         expires_in: Spira dopu Ã 
         fields: Metadata di u prufile
         header: Ritrattu di cuprendula
-        locale: Lingua
+        inbox_url: URL di l'inbox di u ripetitore
+        irreversible: SguassÃ  invece di piattÃ 
+        locale: Lingua di l'interfaccia
         locked: PrivatizÃ  u contu
         max_uses: Numeru massimale dâ€™utilizazione
         new_password: Nova chjave dâ€™accessu
         note: Descrizzione
         otp_attempt: Codice dâ€™identificazione Ã  dui fattori
         password: Chjave dâ€™accessu
+        phrase: Parolla-chjave o frasa
+        setting_aggregate_reblogs: GruppÃ  e spartere indÃ¨ e linee
         setting_auto_play_gif: Lettura autumatica di i GIF animati
         setting_boost_modal: MustrÃ  una cunfirmazione per sparte un statutu
+        setting_default_language: Lingua di pubblicazione
         setting_default_privacy: CunfidenzialitÃ  di i statuti
         setting_default_sensitive: Sempre cunsiderÃ  media cumâ€™Ã¨ sensibili
         setting_delete_modal: MustrÃ  une cunfirmazione per toglie un statutu
-        setting_display_sensitive_media: Sempre mustrÃ  media marcati cumâ€™Ã¨ sensibili
+        setting_display_media: Affissera di i media
+        setting_display_media_default: Predefinitu
+        setting_display_media_hide_all: PiattÃ  tuttu
+        setting_display_media_show_all: AffissÃ  tuttu
+        setting_expand_spoilers: Sempre slibrÃ  i statutu marcati cÃ¹ un'avertimentu CW
         setting_hide_network: PiattÃ  a vostra rete
         setting_noindex: DumandÃ  Ã  i motori di ricerca internet dâ€™un pudÃ¨ micca esse truvatuÂ·a cusÃ¬
         setting_reduce_motion: FÃ  chÃ¬ lâ€™animazione vanu piÃ¹ pianu
@@ -62,6 +107,7 @@ co:
         type: Tippu dâ€™impurtazione
         username: Cugnome
         username_or_email: Cugnome o Email
+        whole_word: Parolla sana
       interactions:
         must_be_follower: PiattÃ  e nutificazione di quelliÂ·e châ€™Ã¹n vi seguitanu
         must_be_following: PiattÃ  e nutificazione di quelliÂ·e châ€™Ã¹n seguitate
@@ -73,6 +119,7 @@ co:
         follow_request: MandÃ  unâ€™e-mail quandu qualchâ€™unu vole seguitami
         mention: MandÃ  unâ€™e-mail quandu qualchâ€™unu mi mintuva
         reblog: MandÃ  unâ€™e-mail quandu qualchâ€™unu sparte i mo statuti
+        report: MandÃ  un'e-mail quandu c'hÃ¨ un novu signalamentu
     'no': NÃ²
     required:
       mark: "*"
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index e8e7628f360a84ac182020a4bee259d7c4599854..0e255e4dc10eb2c0850b672f8ca291a7396df67a 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -2,9 +2,126 @@
 cs:
   simple_form:
     hints:
+      account_warning_preset:
+        text: MÅ¯Å¾ete pouÅ¾Ãvat syntaxi tootÅ¯, jako napÅ™Ãklad URL, hashtagy a zmÃnky
+      admin_account_action:
+        send_email_notification: UÅ¾ivatel obdrÅ¾Ã vysvÄ›tlenÃ toho, co se stalo s jeho ÃºÄtem
+        text_html: VolitelnÃ©. MÅ¯Å¾ete pouÅ¾Ãvat syntaxi tootÅ¯. Pro uÅ¡etÅ™enÃ Äasu si mÅ¯Å¾ete <a href="%{path}">pÅ™idat pÅ™ednastavenÃ pro varovÃ¡nÃ</a>
+        type_html: Vyberte, co chcete udÄ›lat s ÃºÄtem <strong>%{acct}</strong>
+        warning_preset_id: VolitelnÃ©. MÅ¯Å¾ete stÃ¡le vloÅ¾it na konec pÅ™ednastavenÃ vlastnÃ text
       defaults:
-        avatar: PNG, GIF Äi JPG. MaximÃ¡lnÄ› 2 MB. Bude zmenÅ¡ena na 400x400px
-        bot: Tento ÃºÄet provÃ¡dÃ hlavnÄ› automatizovanÃ© akce a nemusÃ bÃ½t spravovÃ¡n.
-        display_name:
-          one: ZbÃ½vÃ¡ <span class="name-counter">1</span> znak
-          other: ZbÃ½vÃ¡ <span class="name-counter">%{count}</span> znakÅ¯
+        autofollow: LidÃ©, kteÅ™Ã se zaregistrujÃ pÅ™es pozvÃ¡nÃ, vÃ¡s budou automaticky sledovat
+        avatar: PNG, GIF Äi JPG. MaximÃ¡lnÄ› %{size}. Bude zmenÅ¡en na %{dimensions} px
+        bot: Tento ÃºÄet provÃ¡dÃ hlavnÄ› automatizovanÃ© akce a nemusÃ bÃ½t spravovÃ¡n
+        context: Jedno Äi vÃce kontextÅ¯, ve kterÃ½ch mÃ¡ bÃ½t filtr uplatnÄ›n
+        digest: OdesÃlÃ¡no pouze po dlouhÃ© dobÄ› neÄinnosti a pouze, pokud jste pÅ™i svÃ© nepÅ™Ãtomnosti obdrÅ¾el/a osobnÃ zprÃ¡vy
+        discoverable_html: <a href="%{path}" target="_blank">AdresÃ¡Å™</a> dovoluje lidem najÃt ÃºÄty podle zÃ¡jmÅ¯ a aktivity. VyÅ¾aduje alespoÅˆ %{min_followers} sledovatelÅ¯
+        email: Bude vÃ¡m poslÃ¡n potvrzovacÃ e-mail
+        fields: Na profilu mÅ¯Å¾ete mÃt aÅ¾ 4 poloÅ¾ky zobrazenÃ© jako tabulka
+        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Ã© tooty nenÃ¡vratnÄ› zmizÃ, i pokud bude filtr pozdÄ›ji odstranÄ›n
+        locale: Jazyk uÅ¾ivatelskÃ©ho rozhranÃ, e-mailÅ¯ a oznÃ¡menÃ push
+        locked: VyÅ¾aduje manuÃ¡lnÃ schvalovÃ¡nÃ sledovatelÅ¯
+        password: PouÅ¾ijte alespoÅˆ 8 znakÅ¯
+        phrase: Shoda bude nalezena bez ohledu na velikost pÃsmen v tÄ›le tootu Äi varovÃ¡nÃ o obsahu
+        scopes: KterÃ© API bude aplikace povolena pouÅ¾Ãvat. Pokud vyberete rozsah nejvyÅ¡Å¡Ãho stupnÄ›, nebudete je muset vybÃrat po jednom.
+        setting_aggregate_reblogs: Nezobrazovat novÃ© boosty pro tooty, kterÃ© byly nedÃ¡vno boostnuty (ovlivÅˆuje pouze novÄ› pÅ™ijatÃ© boosty)
+        setting_default_language: Jazyk vaÅ¡ich tootÅ¯ mÅ¯Å¾e bÃ½t detekovÃ¡n automaticky, nenÃ to vÅ¡ak vÅ¾dy pÅ™esnÃ©
+        setting_display_media_default: SkrÃ½vat mÃ©dia oznaÄenÃ¡ jako citlivÃ¡
+        setting_display_media_hide_all: VÅ¾dy skrÃ½vat vÅ¡echna mÃ©dia
+        setting_display_media_show_all: VÅ¾dy zobrazovat mÃ©dia oznaÄenÃ¡ jako citlivÃ¡
+        setting_hide_network: Koho sledujete a kdo sleduje vÃ¡s nebude zobrazeno na vaÅ¡em profilu
+        setting_noindex: OvlivÅˆuje vÃ¡Å¡ veÅ™ejnÃ½ profil a strÃ¡nky pÅ™ÃspÄ›vkÅ¯
+        setting_theme: OvlivÅˆuje jak Mastodon vypadÃ¡, jste-li pÅ™ihlÃ¡Å¡en na libovolnÃ©m zaÅ™ÃzenÃ.
+        username: VaÅ¡e uÅ¾ivatelskÃ© jmÃ©no bude na %{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
+      imports:
+        data: Soubor CSV exportovÃ¡n z jinÃ© instance Mastodon
+      sessions:
+        otp: 'NapiÅ¡te dvoufaktorovÃ½ kÃ³d vygenerovanÃ½ vaÅ¡Ã mobilnÃ aplikacÃ, nebo pouÅ¾ijte jeden z vaÅ¡ich zÃ¡loÅ¾nÃch kÃ³dÅ¯:'
+      user:
+        chosen_languages: Je-li tohle zaÅ¡krtnuto, budou ve veÅ™ejnÃ½ch ÄasovÃ½ch osÃ¡ch zobrazeny pouze tooty ve zvolenÃ½ch jazycÃch
+    labels:
+      account:
+        fields:
+          name: OznaÄenÃ
+          value: Obsah
+      account_warning_preset:
+        text: Text pÅ™ednastavenÃ
+      admin_account_action:
+        send_email_notification: Informovat uÅ¾ivatele e-mailem
+        text: VlastnÃ varovÃ¡nÃ
+        type: Akce
+        types:
+          disable: Deaktivovat
+          none: Nic nedÄ›lat
+          silence: UtiÅ¡it
+          suspend: Pozastavit a nenÃ¡vratnÄ› smazat data ÃºÄtu
+        warning_preset_id: PouÅ¾Ãt pÅ™ednastavenÃ pro varovÃ¡nÃ
+      defaults:
+        autofollow: Pozvat ke sledovÃ¡nÃ vaÅ¡eho ÃºÄtu
+        avatar: Avatar
+        bot: Tohle je ÃºÄet robota
+        chosen_languages: Filtrovat jazyky
+        confirm_new_password: PotvrÄte novÃ© heslo
+        confirm_password: Potvrdit heslo
+        context: Kontexty filtrÅ¯
+        current_password: SouÄasnÃ© heslo
+        data: Data
+        discoverable: ZveÅ™ejnit tento ÃºÄet v adresÃ¡Å™i
+        display_name: ZobrazovanÃ© jmÃ©no
+        email: E-mailovÃ¡ adresa
+        expires_in: Expirovat po
+        fields: Metadata profilu
+        header: HlaviÄkovÃ½ obrÃ¡zek
+        inbox_url: URL schrÃ¡nky mostu
+        irreversible: Zahodit mÃsto skrytÃ
+        locale: Jazyk rozhranÃ
+        locked: Zamknout ÃºÄet
+        max_uses: MaximÃ¡lnÃ poÄet pouÅ¾itÃ
+        new_password: NovÃ© heslo
+        note: O vÃ¡s
+        otp_attempt: DvoufaktorovÃ½ kÃ³d
+        password: Heslo
+        phrase: KlÃÄovÃ© slovo Äi frÃ¡ze
+        setting_aggregate_reblogs: Seskupovat boosty v ÄasovÃ½ch osÃ¡ch
+        setting_auto_play_gif: Automaticky pÅ™ehrÃ¡vat animace GIF
+        setting_boost_modal: Zobrazovat pÅ™ed boostnutÃm potvrzovacÃ okno
+        setting_default_language: Jazyk pÅ™ÃspÄ›vkÅ¯
+        setting_default_privacy: SoukromÃ pÅ™ÃspÄ›vkÅ¯
+        setting_default_sensitive: VÅ¾dy oznaÄovat mÃ©dia jako citlivÃ¡
+        setting_delete_modal: Zobrazovat pÅ™ed smazÃ¡nÃm tootu potvrzovacÃ okno
+        setting_display_media: ZobrazovÃ¡nÃ mÃ©diÃ
+        setting_display_media_default: VÃ½chozÃ
+        setting_display_media_hide_all: SkrÃ½t vÅ¡e
+        setting_display_media_show_all: Zobrazit vÅ¡e
+        setting_expand_spoilers: VÅ¾dy rozbalit tooty oznaÄenÃ© varovÃ¡nÃmi o obsahu
+        setting_hide_network: SkrÃ½t svou sÃÅ¥
+        setting_noindex: Neindexovat svÅ¯j profil vyhledÃ¡vaÄi
+        setting_reduce_motion: Redukovat pohyb v animacÃch
+        setting_system_font_ui: PouÅ¾Ãt vÃ½chozÃ pÃsmo systÃ©mu
+        setting_theme: Motiv strÃ¡nky
+        setting_unfollow_modal: Zobrazovat pÅ™ed zruÅ¡enÃm sledovÃ¡nÃ potvrzovacÃ okno
+        severity: PÅ™Ãsnost
+        type: Typ importu
+        username: UÅ¾ivatelskÃ© jmÃ©no
+        username_or_email: UÅ¾ivatelskÃ© jmÃ©no nebo e-mail
+        whole_word: CelÃ© slovo
+      interactions:
+        must_be_follower: Blokovat oznÃ¡menÃ od lidÃ, kteÅ™Ã vÃ¡s nesledujÃ
+        must_be_following: Blokovat oznÃ¡menÃ od lidÃ, kterÃ© nesledujete
+        must_be_following_dm: Blokovat pÅ™ÃmÃ© zprÃ¡vy od lidÃ, kterÃ© nesledujete
+      notification_emails:
+        digest: PosÃlat e-maily s pÅ™ehledem
+        favourite: PosÃlat e-maily, kdyÅ¾ si nÄ›kdo oblÃbÃ vÃ¡Å¡ pÅ™ÃspÄ›vek
+        follow: PosÃlat e-maily, kdyÅ¾ vÃ¡s nÄ›kdo zaÄne sledovat
+        follow_request: PosÃlat e-maily, kdyÅ¾ vÃ¡s nÄ›kdo poÅ¾Ã¡dÃ¡ o sledovÃ¡nÃ
+        mention: PosÃlat e-maily, kdyÅ¾ vÃ¡s nÄ›kdo zmÃnÃ
+        reblog: PosÃlat e-maily, kdyÅ¾ nÄ›kdo boostne vÃ¡Å¡ pÅ™ÃspÄ›vek
+        report: PosÃlat e-maily, je-li odeslÃ¡no novÃ© nahlÃ¡Å¡enÃ
+    'no': Ne
+    required:
+      mark: "*"
+      text: poÅ¾adovÃ¡no
+    'yes': Ano
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d3f9cb340d8246294e3709c320f724f8c8ed42fa
--- /dev/null
+++ b/config/locales/simple_form.cy.yml
@@ -0,0 +1,104 @@
+---
+cy:
+  simple_form:
+    hints:
+      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
+        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
+        digest: Ond yn cael eu hanfon ar Ã´l cyfnod hir o anweithgarwch ac ond os ydych wedi derbyn unrhyw negeseuon personol yn eich absenoldeb
+        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
+        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
+        locale: Iaith y rhyngwyneb, e-byst a hysbysiadau push
+        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_default_language: Mae modd adnabod iaith eich tÅµtiau yn awtomatig, ond nid yw bob tro'n gywir
+        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_noindex: Mae hyn yn effeithio ar eich proffil cyhoeddus a'ch tudalennau statws
+        setting_theme: Mae hyn yn effeithio ar sut olwg sydd ar Matododon pan yr ydych wedi mewngofnodi o unrhyw ddyfais.
+        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
+      imports:
+        data: Allforiwyd dogfen CSV o achos Mastodon arall
+      sessions:
+        otp: 'Mewnbynnwch y cod dau gam a gynhyrchwyd gan eich ap ffÃ´n neu defnyddiwch un o''ch codau adfer:'
+      user:
+        chosen_languages: Wedi eu dewis, dim ond tÅµtiau yn yr ieithoedd hyn bydd yn cael eu harddangos mewn ffrydiau cyhoeddus
+    labels:
+      account:
+        fields:
+          name: Label
+          value: Cynnwys
+      defaults:
+        autofollow: Gwahodd i ddilyn eich cyfrif
+        avatar: Afatar
+        bot: Cyfrif bot yw hwn
+        chosen_languages: Hidlo ieithoedd
+        confirm_new_password: Cadarnhau cyfrinair newydd
+        confirm_password: Cadarnhau cyfrinair
+        context: Hidlo cyd-destunau
+        current_password: Cyfrinair presennol
+        data: Data
+        display_name: Enw arddangos
+        email: Cyfeiriad e-bost
+        expires_in: Yn dod i ben ar Ã´l
+        fields: Metadata proffil
+        header: Pennyn
+        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
+        new_password: Cyfrinair newydd
+        note: Bywgraffiad
+        otp_attempt: CÃ´d dau gam
+        password: Cyfrinair
+        phrase: Allweddair neu ymadrodd
+        setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig
+        setting_boost_modal: Dangos deialog cadarnhad cyn bÅµstio
+        setting_default_language: Cyhoeddi iaith
+        setting_default_privacy: Cyfrinachedd 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_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_reduce_motion: Lleihau mudiant mewn animeiddiadau
+        setting_system_font_ui: Defnyddio ffont rhagosodedig y system
+        setting_theme: Thema'r wefan
+        setting_unfollow_modal: Dangos deialog cadarnhau cyn dad-ddilyn rhywun
+        severity: Difrifoldeb
+        type: Modd mewnforio
+        username: Enw defnyddiwr
+        username_or_email: Enw defnyddiwr neu e-bost
+        whole_word: Gair cyfan
+      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
+      notification_emails:
+        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
+        reblog: Anfon e-bost pan mae rhywun yn bÅµstio eich statws
+        report: Anfon e-bost pan y cyflwynir adroddiad newydd
+    'no': Na
+    required:
+      mark: "*"
+      text: gofynnol
+    'yes': Ie
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 07862e8a82d74c20dd3e2b888a72b946bc0c65e9..f73dbac9634292170d27f50180f9c5f0eb219fe5 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -2,71 +2,84 @@
 da:
   simple_form:
     hints:
+      admin_account_action:
+        type_html: VÃ¦lg hvad du vil gÃ¸re med <strong>%{acct}</strong>
       defaults:
         autofollow: Folk der har oprettet sig gennem invitationen vil automatisk fÃ¸lge dig
-        avatar: PNG, GIF eller JPG. HÃ¸jest 2MB. Vil blive skaleret ned til 400x400px
+        avatar: PNG, GIF eller JPG. HÃ¸jest %{size}. Vil blive skaleret ned til %{dimensions}px
         bot: Denne konto udfÃ¸rer hovedsageligt automatiserede handlinger og bliver muligvis ikke overvÃ¥get
         context: En eller flere sammenhÃ¦nge hvor filteret skal vÃ¦re gÃ¦ldende
         digest: Sendes kun efter en lang periode med inaktivitet og kun hvis du har modtaget nogle personlige beskeder mens du er vÃ¦k
-        display_name:
-          one: <span class="name-counter">1</span> tegn tilbage
-          other: <span class="name-counter">%{count}</span>tegn tilbage
+        email: Du vil fÃ¥ tilsendt en bekrÃ¦ftelsed mail
         fields: Du kan have op til 4 ting vist som en tabel pÃ¥ din profil
-        header: PNG, GIF eller JPG. HÃ¸jest 2MB. Vil blive skaleret ned til 700x335px
-        irreversible: Filtrerede toots vil forsvinde fulstÃ¦ndigt, selv hvis filteret senere skulle blive fjernet
+        header: PNG, GIF eller JPG. HÃ¸jest %{size}. Vil blive skaleret ned til %{dimensions}px
+        inbox_url: Kopiere linket fra forsiden af den relay som du Ã¸nsker at bruge
+        irreversible: Filtrerede trut vil forsvinde fulstÃ¦ndigt, selv hvis filteret senere skulle blive fjernet
         locale: Sproget pÃ¥ interfacet, emails og push beskeder
         locked: KrÃ¦ver, at du godkender fÃ¸lgere manuelt
-        note:
-          one: <span class="note-counter">1</span> tegn tilbage
-          other: <span class="note-counter">%{count}</span> tegn tilbage
-        phrase: Vil blive parret uanset om der er store eller smÃ¥ bogstaver i teksten eller om der er en advarsel om en toot
+        password: Brug mindst 8 tegn
+        phrase: Vil blive parret uanset om der er store eller smÃ¥ bogstaver i teksten eller om der er en advarsel om et trut
         scopes: Hvilke APIs applikationen vil fÃ¥ adgang til. Hvis du vÃ¦lger et hÃ¸jtlevel omfang, behÃ¸ver du ikke vÃ¦lge enkeltstÃ¥ende.
-        setting_default_language: Sproget for dine toots kan blive fundet automatisk, men det er ikke altid prÃ¦cist
+        setting_default_language: Sproget for dine trut kan blive fundet automatisk, men det er ikke altid prÃ¦cist
+        setting_display_media_default: Skjul medier markeret som fÃ¸lsomt
+        setting_display_media_hide_all: Skjul altid alle medier
         setting_hide_network: Hvem du fÃ¸lger og hvem der fÃ¸lger dig vil ikke blive vist pÃ¥ din profil
         setting_noindex: PÃ¥virker din offentlige profil og status sider
-        setting_theme: PÃ¥virker hvordan Mastodon ser ud nÃ¥t du er logget ind via en hvilken som helst enhed.
+        setting_theme: PÃ¥virker hvordan Mastodon ser ud nÃ¥r du er logget ind via en hvilken som helst enhed.
+        username: Dit brugernavn vil vÃ¦re unikt pÃ¥ %{domain}
+        whole_word: NÃ¥r nÃ¸gle ordet eller udtrykket kun er alfanumerisk, vil det kun blive brugt hvis det passer hele ordet
       imports:
         data: CSV fil eksporteret fra en anden Mastodon instans
       sessions:
-        otp: 'Indtast to-faktor koden der generes af appen pÃ¥ din fon eller brug en af din genoprettelses koder:'
+        otp: 'Indtast to-faktor koden der generes af appen af appen pÃ¥ din telefon eller brug en af din genoprettelses koder:'
       user:
-        chosen_languages: NÃ¥r markeret, vil kun toots i de valgte sprog blive vist pÃ¥ offentlige tidslinjer
+        chosen_languages: NÃ¥r markeret, vil kun trut i de valgte sprog blive vist pÃ¥ offentlige tidslinjer
     labels:
       account:
         fields:
           name: Etiket
           value: Indhold
+      admin_account_action:
+        type: Handling
+        types:
+          disable: Deaktiver
+          none: GÃ¸r intet
       defaults:
         autofollow: Inviter til at fÃ¸lge din konto
         avatar: Profilbillede
-        bot: Dette er en bot konto
+        bot: Dette er en robot konto
         chosen_languages: Filtrer sprog
-        confirm_new_password: BekrÃ¦ft dit nye kodeord
-        confirm_password: BekrÃ¦ft kodeord
+        confirm_new_password: BekrÃ¦ft din nye adgangskode
+        confirm_password: BekrÃ¦ft adgangskode
         context: Filtrer sammenhÃ¦nge
-        current_password: NuvÃ¦rende kodeord
+        current_password: NuvÃ¦rende adgangskode
         data: Data
         display_name: Visningsnavn
         email: E-mail adresse
         expires_in: UdlÃ¸ber efter
         fields: Profil metadata
         header: Overskrift
+        inbox_url: Link til relay indbakken
         irreversible: Ignorer istedet for at skjule
         locale: Sprog pÃ¥ interface
         locked: LÃ¥s konto
         max_uses: HÃ¸jeste antal benyttelser
-        new_password: Nyt kodeord
+        new_password: Ny adgangskode
         note: Biografi
         otp_attempt: To-faktor kode
-        password: Kodeord
+        password: Adgangskode
         phrase: NÃ¸gleord eller sÃ¦tning
         setting_auto_play_gif: Afspil automatisk animerede GIFs
         setting_boost_modal: Vis bekrÃ¦ftelses dialog fÃ¸r du fremhÃ¦ver
         setting_default_language: Sprog for opslag
         setting_default_privacy: Privatliv
-        setting_default_sensitive: Marker altid multimedia som vÃ¦rende fÃ¸lsomt
-        setting_delete_modal: Vis bekrÃ¦ftelses dialog fÃ¸r du sletter et toot
-        setting_display_sensitive_media: Vis altid multimedier markeret som vÃ¦rende fÃ¸lsomt
+        setting_default_sensitive: Marker altid medier som vÃ¦rende fÃ¸lsomt
+        setting_delete_modal: Vis bekrÃ¦ftelses dialog fÃ¸r du sletter et trut
+        setting_display_media: Visning af medier
+        setting_display_media_default: Standard
+        setting_display_media_hide_all: Skjul alle
+        setting_display_media_show_all: Vis alle
+        setting_expand_spoilers: Udvid altid trut der er markeret med indholdsadvarsler
         setting_hide_network: Skjul dit netvÃ¦rk
         setting_noindex: Frameld dig sÃ¸gemaskiners indeksering
         setting_reduce_motion: Reducer animationers bevÃ¦gelse
@@ -77,6 +90,7 @@ da:
         type: Importtype
         username: Brugernavn
         username_or_email: Brugernavn eller Email
+        whole_word: Helt ord
       interactions:
         must_be_follower: Bloker notifikationer fra folk der ikke fÃ¸lger dig
         must_be_following: Bloker notifikationer fra folk du ikke fÃ¸lger
@@ -88,6 +102,7 @@ da:
         follow_request: Send email nÃ¥r nogen anmoder om at fÃ¸lge dig
         mention: Send e-mail nÃ¥r nogen nÃ¦vner dig
         reblog: Send email nÃ¥r nogen fremhÃ¦ver din status
+        report: Send email nÃ¥r en ny anmeldelse bliver indsendt
     'no': Nej
     required:
       mark: "*"
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index fb8d9e7c7583f1e5e2f4f0d75dea28db7b67c25a..3958e315f665ee661f8d6f88c2bcf5959792be89 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -2,29 +2,40 @@
 de:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Du kannst Toot-Syntax benutzen, wie zum Beispiel URLs, Hashtags und ErwÃ¤hnungen
+      admin_account_action:
+        send_email_notification: Der Benutzer erhÃ¤lt eine ErklÃ¤rung, was mit seinem Account geschehen ist
+        text_html: Optional. Du kannst Toot-Syntax benutzen. Du kannst <a href="%{path}">Warnungsvorlagen</a> benutzen um Zeit zu sparen
+        type_html: WÃ¤hle aus, was du mit <strong>%{acct}</strong> machen mÃ¶chtest
+        warning_preset_id: Optional. Du kannst immer noch eigenen Text an das Ende der Vorlage hinzufÃ¼gen
       defaults:
-        autofollow: Leute die sich Ã¼ber deine Einladung registrieren werden dir automatisch folgen
-        avatar: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 400Ã—400 px herunterskaliert
+        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 Aspekte, wo der Filter greifen soll
         digest: Wenn du lange Zeit inaktiv bist, wird dir eine Zusammenfassung von ErwÃ¤hnungen in deiner Abwesenheit zugeschickt
-        display_name:
-          one: <span class="name-counter">1</span> Zeichen verbleibt
-          other: <span class="name-counter">%{count}</span> Zeichen verbleiben
-        fields: Du kannst bis zu 4 Elemente als Tabelle dargestellt auf deinem Profil anzeigen lassen
-        header: PNG, GIF oder JPG. Maximal 2 MB. Wird auf 700Ã—335 px herunterskaliert
+        discoverable_html: Das <a href="%{path}" target="_blank">Verzeichnis</a> lÃ¤sst dich basierend auf Interessen und AktivitÃ¤ten neue Benutzerkonten finden. Dies benÃ¶tigt mindestens %{min_followers} Follower
+        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
+        inbox_url: Kopiere die URL von der Startseite des gewÃ¼nschten Relays
         irreversible: Gefilterte BeitrÃ¤ge werden unwiderruflich gefiltert, selbst wenn der Filter spÃ¤ter entfernt wurde
         locale: Die Sprache der OberflÃ¤che, E-Mails und Push-Benachrichtigungen
         locked: Wer dir folgen mÃ¶chte, muss um deine Erlaubnis bitten
-        note:
-          one: <span class="note-counter">1</span> Zeichen verbleibt
-          other: <span class="note-counter">%{count}</span> Zeichen verbleiben
+        password: Verwende mindestens 8 Zeichen
         phrase: Wird unabhÃ¤ngig vom umgebenen Text oder Inhaltswarnung eines Beitrags verglichen
         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_language: Die Sprache der BeitrÃ¤ge kann automatisch erkannt werden, aber dies ist nicht immer genau
-        setting_hide_network: Wem du folgst und wer dir folgt wird in deinem Profil nicht angezeigt
+        setting_display_media_default: Verstecke Medien, die als sensibel markiert sind
+        setting_display_media_hide_all: Alle Medien immer verstecken
+        setting_display_media_show_all: Medien, die als sensibel markiert sind, 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_theme: Wirkt sich darauf aus, wie Mastodon aussieht, egal auf welchem GerÃ¤t du eingeloggt bist.
+        username: Dein Benutzer:innen-Name wird auf %{domain} nur einmal vorkommen
+        whole_word: Wenn das Schlagwort oder die Phrase nur Buchstaben und Zahlen enthÃ¤lt, wird es nur angewendet, wenn es dem ganzen Wort entspricht
       imports:
         data: CSV-Datei, die aus einer anderen Mastodon-Instanz exportiert wurde
       sessions:
@@ -36,22 +47,36 @@ de:
         fields:
           name: Bezeichnung
           value: Inhalt
+      account_warning_preset:
+        text: Vorlagentext
+      admin_account_action:
+        send_email_notification: Benachrichtige den Nutzer per E-Mail
+        text: Eigene Warnung
+        type: Aktion
+        types:
+          disable: Deaktivieren
+          none: Nichts tun
+          silence: Stummschalten
+          suspend: Deaktivieren und unwiderruflich Benutzerdaten lÃ¶schen
+        warning_preset_id: Benutze eine Warnungsvorlage
       defaults:
-        autofollow: Einladen, um deinen Account zu folgen
+        autofollow: Einladen, um deinem Account zu folgen
         avatar: Profilbild
-        bot: Dies ist ein bot Benutzer
+        bot: Dieser Benutzer ist ein Bot
         chosen_languages: Sprachen filtern
         confirm_new_password: Neues Passwort bestÃ¤tigen
         confirm_password: Passwort bestÃ¤tigen
         context: Aspekte filtern
         current_password: Derzeitiges Passwort
         data: Daten
+        discoverable: Dieses Benutzerkonto im Verzeichnis auflisten
         display_name: Anzeigename
         email: E-Mail-Adresse
-        expires_in: GÃ¼ltig bis
+        expires_in: LÃ¤uft ab
         fields: Profil-Metadaten
         header: Kopfbild
-        irreversible: Fallen lassen anstatt es zu verstecken
+        inbox_url: Inbox-URL des Relays
+        irreversible: Verwerfen statt verstecken
         locale: Sprache der BenutzeroberflÃ¤che
         locked: Gesperrtes Profil
         max_uses: Maximale Verwendungen
@@ -60,27 +85,33 @@ de:
         otp_attempt: Zwei-Faktor-Authentisierungs-Code
         password: Passwort
         phrase: Schlagwort oder Phrase
+        setting_aggregate_reblogs: Gruppiere erneut geteilte BeitrÃ¤ge in Zeitleisten
         setting_auto_play_gif: Animierte GIFs automatisch abspielen
         setting_boost_modal: BestÃ¤tigungsdialog anzeigen, bevor ein Beitrag geteilt wird
         setting_default_language: Beitragssprache
         setting_default_privacy: Beitragssichtbarkeit
-        setting_default_sensitive: Medien immer als heikel markieren
+        setting_default_sensitive: Medien immer als sensibel markieren
         setting_delete_modal: BestÃ¤tigungsdialog anzeigen, bevor ein Beitrag gelÃ¶scht wird
-        setting_display_sensitive_media: Medien, die als heikel markiert sind, immer anzeigen
+        setting_display_media: Medien-Anzeige
+        setting_display_media_default: Standard
+        setting_display_media_hide_all: Alle verstecken
+        setting_display_media_show_all: Alle anzeigen
+        setting_expand_spoilers: BeitrÃ¤ge mit Inhaltswarnungen immer ausklappen
         setting_hide_network: Blende dein Netzwerk aus
         setting_noindex: Suchmaschinen-Indexierung verhindern
         setting_reduce_motion: Bewegung in Animationen verringern
         setting_system_font_ui: Standardschriftart des Systems verwenden
         setting_theme: Theme der Website
-        setting_unfollow_modal: BestÃ¤tigungsdialog anzeigen, bevor jemand entfolgt wird
+        setting_unfollow_modal: BestÃ¤tigungsdialog anzeigen, bevor jemandem entfolgt wird
         severity: Schweregrad
         type: Importtyp
         username: Profilname
-        username_or_email: Profilname oder Email
+        username_or_email: Profilname oder E-Mail
+        whole_word: Ganzes Wort
       interactions:
         must_be_follower: Benachrichtigungen von Nicht-Folgenden blockieren
         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_following_dm: Private Nachrichten von Profilen, denen ich nicht folge, blockieren
       notification_emails:
         digest: Schicke Ãœbersichts-E-Mails
         favourite: E-Mail senden, wenn jemand meinen Beitrag favorisiert
@@ -88,6 +119,7 @@ de:
         follow_request: E-Mail senden, wenn mir jemand folgen mÃ¶chte
         mention: E-Mail senden, wenn mich jemand erwÃ¤hnt
         reblog: E-Mail senden, wenn jemand meinen Beitrag teilt
+        report: E-Mail senden, wenn ein neuer Bericht vorliegt
     'no': Nein
     required:
       mark: "*"
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 00fba5d27d1aa4cd6277be2a7810a5ebe04be203..fecddd11f5a4a26f00822607fdf0864b1bbbaa70 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -2,29 +2,40 @@
 el:
   simple_form:
     hints:
+      account_warning_preset:
+        text: ÎœÏ€Î¿ÏÎµÎ¹Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ…Î½Ï„Î±ÎºÏ„Î¹ÎºÏŒ ÎµÎ½ÏŒÏ‚ Ï„Î¿Ï…Ï„ ÏŒÏ€Ï‰Ï‚ Î´Î¹ÎµÏ…Î¸ÏÎ½ÏƒÎµÎ¹Ï‚ URL, Ï„Î±Î¼Ï€ÎÎ»ÎµÏ‚ ÎºÎ±Î¹ Î±Î½Î±Ï†Î¿ÏÎÏ‚
+      admin_account_action:
+        send_email_notification: ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ Î¸Î± Î»Î¬Î²ÎµÎ¹ Î¼Î¹Î± ÎµÎ¾Î®Î³Î·ÏƒÎ· Ï„Î¿Ï… Ï„Î¹ ÏƒÏ…Î½ÎÎ²Î· Î¼Îµ Ï„Î¿Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ Ï„Î¿Ï…
+        text_html: Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ ÏƒÏ…Î½Ï„Î±ÎºÏ„Î¹ÎºÏŒ ÎµÎ½ÏŒÏ‚ Ï„Î¿Ï…Ï„. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± <a href="%{path}">Î¿ÏÎ¯ÏƒÎµÎ¹Ï‚ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½ÎµÏ‚ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚</a> Î³Î¹Î± Î½Î± Î³Î»Ï…Ï„ÏŽÏƒÎµÎ¹Ï‚ Ï‡ÏÏŒÎ½Î¿
+        type_html: Î”Î¹Î¬Î»ÎµÎ¾Îµ Ï„Î¹ Î¸Î± ÎºÎ±Î½ÎµÎ¯Ï‚ Î¼Îµ Ï„Î¿Î½  <strong>%{acct}</strong>
+        warning_preset_id: Î ÏÎ¿Î±Î¹ÏÎµÏ„Î¹ÎºÏŒ. ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± Ï€ÏÎ¿ÏƒÎ¸ÎÏƒÎµÎ¹Ï‚ ÎµÏ€Î¹Ï€Î»ÎÎ¿Î½ ÎºÎµÎ¯Î¼ÎµÎ½Î¿ Î¼ÎµÏ„Î¬ Ï„Î¿ Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿
       defaults:
         autofollow: ÎŒÏƒÎ¿Î¹ ÎµÎ³Î³ÏÎ±Ï†Î¿ÏÎ½ Î¼ÎÏƒÏ‰ Ï„Î·Ï‚ Ï€ÏÏŒÏƒÎºÎ»Î·ÏƒÎ·Ï‚ Î¸Î± ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î±
-        avatar: PNG, GIF Î® JPG. ÎˆÏ‰Ï‚ 2MB. Î˜Î± Î¼ÎµÎ¹Ï‰Î¸ÎµÎ¯ ÏƒÎµ Î´Î¹Î¬ÏƒÏ„Î±ÏƒÎ· 400x400px
+        avatar: PNG, GIF Î® JPG. ÎˆÏ‰Ï‚ %{size}. Î˜Î± Ï€ÎµÏÎ¹Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯ ÏƒÎµ Î´Î¹Î¬ÏƒÏ„Î±ÏƒÎ· %{dimensions}px
         bot: ÎŸ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒÏ‚ Î±Ï…Ï„ÏŒÏ‚ ÎµÎºÏ„ÎµÎ»ÎµÎ¯ ÎºÏ…ÏÎ¯Ï‰Ï‚ Î±Ï…Ï„Î¿Î¼Î±Ï„Î¿Ï€Î¿Î¹Î·Î¼ÎÎ½ÎµÏ‚ ÎµÎ½ÎÏÎ³ÎµÎ¹ÎµÏ‚ ÎºÎ±Î¹ Î¯ÏƒÏ‰Ï‚ Î½Î± Î¼Î·Î½ Ï€Î±ÏÎ±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï„Î±Î¹
         context: ÎˆÎ½Î± Î® Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎ± Ï€Î»Î±Î¯ÏƒÎ¹Î± ÏƒÏ„Î± Î¿Ï€Î¿Î¯Î± Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÏ†Î±ÏÎ¼ÏŒÎ¶ÎµÏ„Î±Î¹ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï†Î¯Î»Ï„ÏÎ¿
         digest: Î‘Ï€Î¿ÏƒÏ„ÎÎ»Î»ÎµÏ„Î±Î¹ Î¼ÏŒÎ½Î¿ Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ Î¼Î±ÎºÏÎ¬ Ï€ÎµÏÎ¯Î¿Î´Î¿ Î±Î´ÏÎ¬Î½ÎµÎ¹Î±Ï‚ ÎºÎ±Î¹ Î¼ÏŒÎ½Î¿ Î±Î½ ÎÏ‡ÎµÎ¹Ï‚ Î»Î¬Î²ÎµÎ¹ Ï€ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¬ Î¼Î·Î½ÏÎ¼Î±Ï„Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Ï€Î¿Ï…ÏƒÎ¯Î± ÏƒÎ¿Ï…
-        display_name:
-          one: Î±Ï€Î¿Î¼ÎÎ½ÎµÎ¹ <span class="name-counter">1</span> Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ±Ï‚
-          other: Î±Ï€Î¿Î¼ÎÎ½Î¿Ï…Î½ <span class="name-counter">%{count}</span> Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚
+        discoverable_html: "ÎŸ <a href=\"%{path}\" target=\"_blank\">ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚</a> \nÏƒÎ¿Ï… ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÎ¹ Î½Î± Î²ÏÎµÎ¹Ï‚ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿ÏÏ‚ Î²Î¬ÏƒÎµÎ¹ ÎµÎ½Î´Î¹Î±Ï†ÎµÏÏŒÎ½Ï„Ï‰Î½ ÎºÎ±Î¹ Î´ÏÎ±ÏƒÏ„Î·ÏÎ¹ÏŒÏ„Î·Ï„Î±Ï‚. Î‘Ï€Î±Î¹Ï„ÎµÎ¯ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ %{min_followers} Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿Ï…Ï‚"
+        email: Î˜Î± ÏƒÎ¿Ï… ÏƒÏ„Î±Î»ÎµÎ¯ email ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚
         fields: ÎœÏ€Î¿ÏÎµÎ¯Ï‚ Î½Î± ÎÏ‡ÎµÎ¹Ï‚ ÎÏ‰Ï‚ 4 ÏƒÎ·Î¼ÎµÎ¹ÏŽÏƒÎµÎ¹Ï‚ ÏƒÎµ Î¼Î¿ÏÏ†Î® Ï€Î¯Î½Î±ÎºÎ± ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï…
-        header: PNG, GIF Î® JPG. ÎˆÏ‰Ï‚ 2MB. Î˜Î± Î¼ÎµÎ¹Ï‰Î¸ÎµÎ¯ ÏƒÎµ Î´Î¹Î¬ÏƒÏ„Î±ÏƒÎ· 700x335px
+        header: PNG, GIF Î® JPG. ÎˆÏ‰Ï‚ %{size}. Î˜Î± Ï€ÎµÏÎ¹Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯ ÏƒÎµ Î´Î¹Î¬ÏƒÏ„Î±ÏƒÎ· %{dimensions}px
+        inbox_url: Î‘Î½Ï„ÎÎ³ÏÎ±ÏˆÎµ Ï„Î¿ URL Ï„Î·Ï‚ Î±ÏÏ‡Î¹ÎºÎ®Ï‚ ÏƒÎµÎ»Î¯Î´Î±Ï‚ Ï„Î¿Ï… Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î® (relay) Ï€Î¿Ï… Î¸ÎÎ»ÎµÎ¹Ï‚ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚
         irreversible: Î¤Î± Ï†Î¹Î»Ï„ÏÎ±ÏÎ¹ÏƒÎ¼ÎÎ½Î± Ï„Î¿Ï…Ï„ Î¸Î± ÎµÎ¾Î±Ï†Î±Î½Î¹ÏƒÏ„Î¿ÏÎ½ Î±Î¼ÎµÏ„Î¬ÎºÎ»Î·Ï„Î±, Î±ÎºÏŒÎ¼Î± ÎºÎ±Î¹ Î±Î½ Ï„Î¿ Ï†Î¯Î»Ï„ÏÎ¿ Î±ÏÎ³ÏŒÏ„ÎµÏÎ± Î±Ï†Î±Î¹ÏÎµÎ¸ÎµÎ¯
         locale: Î— Î³Î»ÏŽÏƒÏƒÎ± Ï„Î¿Ï… Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½Ï„Î¿Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚, Ï„Ï‰Î½ email ÎºÎ±Î¹ Ï„Ï‰Î½ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ‰Î½ ÏŽÎ¸Î·ÏƒÎ·Ï‚
         locked: Î‘Ï€Î±Î¹Ï„ÎµÎ¯ Î½Î± ÎµÎ³ÎºÏÎ¯Î½ÎµÎ¹Ï‚ Ï‡ÎµÎ¹ÏÎ¿ÎºÎ¯Î½Î·Ï„Î± Ï„Î¿Ï…Ï‚ Î±ÎºÏŒÎ»Î¿Ï…Î¸Î¿ÏÏ‚ ÏƒÎ¿Ï…
-        note:
-          one: Î±Ï€Î¿Î¼ÎÎ½ÎµÎ¹ <span class="note-counter">1</span> Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎ±Ï‚
-          other: Î±Ï€Î¿Î¼ÎÎ½Î¿Ï…Î½ <span class="note-counter">%{count}</span> Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚
+        password: Î§ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¯Î·ÏƒÎµ Ï„Î¿Ï…Î»Î¬Ï‡Î¹ÏƒÏ„Î¿Î½ 8 Ï‡Î±ÏÎ±ÎºÏ„Î®ÏÎµÏ‚
         phrase: Î˜Î± Ï„Î±Î¹ÏÎ¹Î¬Î¶ÎµÎ¹ Î±Î½ÎµÎ¾Î±ÏÏ„Î®Ï„Ï‰Ï‚ Ï€ÎµÎ¶ÏŽÎ½/ÎºÎµÏ†Î±Î»Î±Î¯Ï‰Î½ Î® Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚ Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï… Ï„Î¿Ï… Ï„Î¿Ï…Ï„
         scopes: Î Î¿Î¹Î± API Î¸Î± ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹ ÏƒÏ„Î·Î½ ÎµÏ†Î±ÏÎ¼Î¿Î³Î® Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚. Î‘Î½ ÎµÏ€Î¹Î»ÎÎ¾ÎµÎ¹Ï‚ ÎºÎ¬Ï€Î¿Î¹Î¿ Ï…ÏˆÎ·Î»ÏŒ ÎµÏÏÎ¿Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚, Î´Îµ Ï‡ÏÎµÎ¹Î¬Î¶ÎµÏ„Î±Î¹ Î½Î± ÎµÏ€Î¹Î»ÎÎ¾ÎµÎ¹Ï‚ ÎºÎ±Î¹ ÎµÎ¾ÎµÎ¹Î´Î¹ÎºÎµÏ…Î¼ÎÎ½Î±.
+        setting_aggregate_reblogs: Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· Ï„Ï‰Î½ Î½ÎÏ‰Î½ Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÏ‰Î½Î³Î¹Î± Ï„Î± Ï„Î¿Ï…Ï„ Ï€Î¿Ï… ÎÏ‡Î¿Ï…Î½ Ï€ÏÎ¿Ï‰Î¸Î·Î¸ÎµÎ¯ Ï€ÏÏŒÏƒÏ†Î±Ï„Î± (ÎµÏ€Î·ÏÎµÎ¬Î¶ÎµÎ¹ Î¼ÏŒÎ½Î¿ Ï„Î¹Ï‚ Î½ÎÎµÏ‚ Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÎ¹Ï‚)
         setting_default_language: Î— Î³Î»ÏŽÏƒÏƒÎ± Ï„Ï‰Î½ Ï„Î¿Ï…Ï„ ÏƒÎ¿Ï… Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Î±Î½Î¹Ï‡Î½ÎµÏ…Ï„ÎµÎ¯ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± Î±Î»Î»Î¬ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Ï€Î¬Î½Ï„Î± Î±ÎºÏÎ¹Î²ÎÏ‚
-        setting_hide_network: Î¤Î¿ Ï€Î¿Î¹Î¿Ï…Ï‚ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ ÎºÎ±Î¹ Ï„Î¿ Ï€Î¿Î¹Î¿Î¹ ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½ Î´Îµ Î¸Î± Ï†Î±Î¯Î½ÎµÏ„Î±Î¹ ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï…
+        setting_display_media_default: Î‘Ï€ÏŒÎºÏÏ…ÏˆÎ· ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
+        setting_display_media_hide_all: ÎœÏŒÎ½Î¹Î¼Î· Î±Ï€ÏŒÎºÏÏ…ÏˆÎ· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
+        setting_display_media_show_all: ÎœÏŒÎ½Î¹Î¼Î· ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½
+        setting_hide_network: Î”Îµ Î¸Î± ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÏ„Î±Î¹ ÏƒÏ„Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÏƒÎ¿Ï… Ï€Î¿Î¹Î¿Ï…Ï‚ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚ ÎºÎ±Î¹ Ï€Î¿Î¹Î¿Î¹ ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î¿ÏÎ½
         setting_noindex: Î•Ï€Î·ÏÎµÎ¬Î¶ÎµÎ¹ Ï„Î¿ Î´Î·Î¼ÏŒÏƒÎ¹Î¿ Ï€ÏÎ¿Ï†Î¯Î» ÎºÎ±Î¹ Ï„Î¹Ï‚ Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÎ¹Ï‚ ÏƒÎ¿Ï…
         setting_theme: Î•Ï€Î·ÏÎµÎ¬Î¶ÎµÎ¹ Ï„Î·Î½ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· Ï„Î¿Ï… Mastodon ÏŒÏ„Î±Î½ ÏƒÏ…Î½Î´ÎÎµÏ„Î±Î¹ Î±Ï€ÏŒ Î¿Ï€Î¿Î¹Î±Î´Î®Ï€Î¿Ï„Îµ ÏƒÏ…ÏƒÎºÎµÏ…Î®.
+        username: Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎ¿Ï… Î¸Î± ÎµÎ¯Î½Î±Î¹ Î¼Î¿Î½Î±Î´Î¹ÎºÏŒ ÏƒÏ„Î¿ %{domain}
+        whole_word: ÎŒÏ„Î±Î½ Î· Î»ÎÎ¾Î· Î® Î· Ï†ÏÎ¬ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¯ ÎµÎ¯Î½Î±Î¹ Î¼ÏŒÎ½Î¿ Î±Î»Ï†Î±ÏÎ¹Î¸Î¼Î·Ï„Î¹ÎºÎ®, Î¸Î± ÎµÏ†Î±ÏÎ¼Î¿ÏƒÏ„ÎµÎ¯ Î¼ÏŒÎ½Î¿ Î±Î½ Ï„Î±Î¹ÏÎ¹Î¬Î¶ÎµÎ¹ Î¼Îµ Î¿Î»ÏŒÎºÎ»Î·ÏÎ· Ï„Î· Î»ÎÎ¾Î·
       imports:
         data: Î‘ÏÏ‡ÎµÎ¯Î¿ CSV Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ ÎµÎ¾Î±Ï‡Î¸ÎµÎ¯ Î±Ï€ÏŒ Î´Î¹Î±Ï†Î¿ÏÎµÏ„Î¹ÎºÏŒ ÎºÏŒÎ¼Î²Î¿ Mastodon
       sessions:
@@ -36,6 +47,18 @@ el:
         fields:
           name: Î¤Î±Î¼Ï€ÎÎ»Î±
           value: Î ÎµÏÎ¹ÎµÏ‡ÏŒÎ¼ÎµÎ½Î¿
+      account_warning_preset:
+        text: Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿ ÎºÎµÎ¯Î¼ÎµÎ½Î¿
+      admin_account_action:
+        send_email_notification: Î•Î½Î·Î¼ÎÏÏ‰ÏƒÎ· Ï‡ÏÎ®ÏƒÏ„Î· Î¼ÎÏƒÏ‰ email
+        text: Î ÏÎ¿ÏƒÎ±ÏÎ¼Î¿ÏƒÎ¼ÎÎ½Î· Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+        type: Î•Î½ÎÏÎ³ÎµÎ¹Î±
+        types:
+          disable: Î‘Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·
+          none: ÎšÎ±Î¼Î¯Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±
+          silence: Î‘Ï€Î¿ÏƒÎ¹ÏŽÏ€Î·ÏƒÎ·
+          suspend: Î‘Î½Î±ÏƒÏ„Î¿Î»Î® ÎºÎ±Î¹ Î±Î¼ÎµÏ„Î¬ÎºÎ»Î·Ï„Î· Î´Î¹Î±Î³ÏÎ±Ï†Î® ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Ï‰Î½ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
+        warning_preset_id: Î§ÏÎ®ÏƒÎ· Ï€ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î·Ï‚ Ï€ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚
       defaults:
         autofollow: Î ÏÎ¿ÏƒÎºÎ¬Î»ÎµÏƒÎµ Î³Î¹Î± Î½Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎ¿Ï…Î½ Ï„Î¿ Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼ÏŒ ÏƒÎ¿Ï…
         avatar: Î‘Î²Î±Ï„Î¬Ï
@@ -46,11 +69,13 @@ el:
         context: Î Î»Î±Î¯ÏƒÎ¹Î± Ï†Î¹Î»Ï„ÏÎ±ÏÎ¯ÏƒÎ¼Î±Ï„Î¿Ï‚
         current_password: Î¤ÏÎÏ‡Î¿Î½ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ
         data: Î”ÎµÎ´Î¿Î¼ÎÎ½Î±
+        discoverable: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÏ„Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿
         display_name: ÎŒÎ½Î¿Î¼Î± ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ·Ï‚
         email: Î”Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email
         expires_in: Î›Î®Î¾Î· Î¼ÎµÏ„Î¬ Î±Ï€ÏŒ
         fields: ÎœÎµÏ„ÎµÎ´ÎµÎ´Î¿Î¼ÎÎ½Î± Ï€ÏÎ¿Ï†Î¯Î»
         header: Î•Ï€Î¹ÎºÎµÏ†Î±Î»Î¯Î´Î±
+        inbox_url: Î¤Î¿ URL Ï„Î¿Ï… inbox Ï„Î¿Ï… Î±Î½Ï„Î±Ï€Î¿ÎºÏÎ¹Ï„Î® (relay)
         irreversible: Î‘Ï€ÏŒÏÏÎ¹ÏˆÎ· Î±Î½Ï„Î¯ Î³Î¹Î± ÎºÏÏÏˆÎ¹Î¼Î¿
         locale: Î“Î»ÏŽÏƒÏƒÎ± Ï€ÎµÏÎ¹Î²Î¬Î»Î»Î¿Î½Ï„Î¿Ï‚
         locked: ÎšÎ»ÎµÎ¯Î´Ï‰Î¼Î± Î»Î¿Î³Î±ÏÎ¹Î±ÏƒÎ¼Î¿Ï
@@ -60,13 +85,18 @@ el:
         otp_attempt: ÎšÏ‰Î´Î¹ÎºÏŒÏ‚ Î´Ï…Î¿ Ï€Î±ÏÎ±Î³ÏŒÎ½Ï„Ï‰Î½
         password: Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ
         phrase: Î›ÎÎ¾Î· Î® Ï†ÏÎ¬ÏƒÎ· ÎºÎ»ÎµÎ¹Î´Î¯
+        setting_aggregate_reblogs: ÎŸÎ¼Î±Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï€ÏÎ¿Ï‰Î¸Î®ÏƒÎµÏ‰Î½ ÏƒÏ„Î¹Ï‚ ÏÎ¿ÎÏ‚
         setting_auto_play_gif: Î‘Ï…Ï„ÏŒÎ¼Î±Ï„Î· Î±Î½Î±Ï€Î±ÏÎ±Î³Ï‰Î³Î® Ï„Ï‰Î½ GIF
         setting_boost_modal: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÎµÏÏŽÏ„Î·ÏƒÎ·Ï‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚ Ï€ÏÎ¹Î½ Ï„Î·Î½ Ï€ÏÎ¿ÏŽÎ¸Î·ÏƒÎ·
         setting_default_language: Î“Î»ÏŽÏƒÏƒÎ± Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÏ‰Î½
         setting_default_privacy: Î™Î´Î¹Ï‰Ï„Î¹ÎºÏŒÏ„Î·Ï„Î± Î´Î·Î¼Î¿ÏƒÎ¹ÎµÏÏƒÎµÏ‰Î½
         setting_default_sensitive: Î£Î·Î¼ÎµÎ¯Ï‰Î½Îµ Ï€Î¬Î½Ï„Î± Ï„Î± Ï€Î¿Î»Ï…Î¼ÎÏƒÎ± Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Î¿Ï… Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Î¿Ï…
         setting_delete_modal: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· ÎµÏÏŽÏ„Î·ÏƒÎ·Ï‚ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¯Ï‰ÏƒÎ·Ï‚ Ï€ÏÎ¹Î½ Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÎ¹Ï‚ ÎÎ½Î± Ï„Î¿Ï…Ï„
-        setting_display_sensitive_media: Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î¬Î½Ï„Î± Ï„Ï‰Î½ Ï€Î¿Î»Ï…Î¼ÎÏƒÏ‰Î½ ÏƒÎ·Î¼ÎµÎ¹Ï‰Î¼ÎÎ½Ï‰Î½ Ï‰Ï‚ ÎµÏ…Î±Î¯ÏƒÎ¸Î·Ï„Ï‰Î½
+        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: ÎœÎµÎ¯Ï‰ÏƒÎ· ÎºÎ¯Î½Î·ÏƒÎ·Ï‚ ÎºÎ¹Î½Î¿Ï…Î¼ÎÎ½Ï‰Î½ ÏƒÏ„Î¿Î¹Ï‡ÎµÎ¯Ï‰Î½
@@ -77,6 +107,7 @@ el:
         type: Î¤ÏÏ€Î¿Ï‚ ÎµÎ¹ÏƒÎ±Î³Ï‰Î³Î®Ï‚
         username: ÎŒÎ½Î¿Î¼Î± Ï‡ÏÎ·ÏƒÏ„Î·
         username_or_email: ÎŒÎ½Î¿Î¼Î± Î® Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· email Ï‡ÏÎ®ÏƒÏ„Î·
+        whole_word: ÎŸÎ»ÏŒÎºÎ»Î·ÏÎ· Î»ÎÎ¾Î·
       interactions:
         must_be_follower: ÎœÏ€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¹Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Î±Ï€ÏŒ ÏŒÏƒÎ¿Ï…Ï‚ Î´ÎµÎ½ Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚
         must_be_following: ÎœÏ€Î»ÏŒÎºÎ±ÏÎµ Ï„Î¹Ï‚ ÎµÎ¹Î´Î¿Ï€Î¿Î¹Î®ÏƒÎµÎ¹Ï‚ Ï€Î¿Ï… Ï€ÏÎ¿ÎÏÏ‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Î¬Ï„Î¿Î¼Î± Ï€Î¿Ï… Î´ÎµÎ½ Ï„Î± Î±ÎºÎ¿Î»Î¿Ï…Î¸ÎµÎ¯Ï‚
@@ -88,6 +119,7 @@ el:
         follow_request: Î£Ï„ÎÎ»Î½Îµ email ÏŒÏ„Î±Î½ ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ Î¶Î·Ï„Î¬ÎµÎ¹ Î½Î± ÏƒÎµ Î±ÎºÎ¿Î»Î¿Ï…Î¸Î®ÏƒÎµÎ¹
         mention: Î£Ï„ÎÎ»Î½Îµ email ÏŒÏ„Î±Î½ ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ ÏƒÎµ Î±Î½Î±Ï†ÎÏÎµÎ¹
         reblog: Î£Ï„ÎÎ»Î½Îµ email ÏŒÏ„Î±Î½ ÎºÎ¬Ï€Î¿Î¹Î¿Ï‚ Ï€ÏÎ¿Ï‰Î¸ÎµÎ¯ Ï„Î· Î´Î·Î¼Î¿ÏƒÎ¯ÎµÏ…ÏƒÎ· ÏƒÎ¿Ï…
+        report: Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® email ÏŒÏ„Î±Î½ Ï…Ï€Î¿Î²Î¬Î»Î»ÎµÏ„Î±Î¹ Î½ÎÎ± ÎºÎ±Ï„Î±Î³Î³ÎµÎ»Î¯Î±
     'no': ÎŒÏ‡Î¹
     required:
       mark: "*"
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 49d94bcde9e1d0cafd416021169043ac8d3e6fbf..4363c59e429c8ab4706deca90ac38c8818a5cbb7 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -2,29 +2,40 @@
 en:
   simple_form:
     hints:
+      account_warning_preset:
+        text: You can use toot syntax, such as URLs, hashtags and mentions
+      admin_account_action:
+        send_email_notification: The user will receive an explanation of what happened with their account
+        text_html: Optional. You can use toot syntax. You can <a href="%{path}">add warning presets</a> to save time
+        type_html: Choose what to do with <strong>%{acct}</strong>
+        warning_preset_id: Optional. You can still add custom text to end of the preset
       defaults:
         autofollow: People who sign up through the invite will automatically follow you
-        avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
+        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         bot: This account mainly performs automated actions and might not be monitored
         context: One or multiple contexts where the filter should apply
         digest: Only sent after a long period of inactivity and only if you have received any personal messages in your absence
-        display_name:
-          one: <span class="name-counter">1</span> character left
-          other: <span class="name-counter">%{count}</span> characters left
+        discoverable_html: The <a href="%{path}" target="_blank">directory</a> lets people find accounts based on interests and activity. Requires at least %{min_followers} followers
+        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 2MB. Will be downscaled to 700x335px
+        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        inbox_url: Copy the URL from the frontpage of the relay you want to use
         irreversible: Filtered toots will disappear irreversibly, even if filter is later removed
         locale: The language of the user interface, e-mails and push notifications
         locked: Requires you to manually approve followers
-        note:
-          one: <span class="note-counter">1</span> character left
-          other: <span class="note-counter">%{count}</span> characters left
+        password: Use at least 8 characters
         phrase: Will be matched regardless of casing in text or content warning of a toot
         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 toots that have been recently boosted (only affects newly-received boosts)
         setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
+        setting_display_media_default: Hide media marked as sensitive
+        setting_display_media_hide_all: Always hide all media
+        setting_display_media_show_all: Always show media marked as sensitive
         setting_hide_network: Who you follow and who follows you will not be shown on your profile
         setting_noindex: Affects your public profile and status pages
         setting_theme: Affects how Mastodon looks when you're logged in from any device.
+        username: Your username will be unique on %{domain}
+        whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
       imports:
         data: CSV file exported from another Mastodon instance
       sessions:
@@ -36,6 +47,18 @@ en:
         fields:
           name: Label
           value: Content
+      account_warning_preset:
+        text: Preset text
+      admin_account_action:
+        send_email_notification: Notify the user per e-mail
+        text: Custom warning
+        type: Action
+        types:
+          disable: Disable
+          none: Do nothing
+          silence: Silence
+          suspend: Suspend and irreversibly delete account data
+        warning_preset_id: Use a warning preset
       defaults:
         autofollow: Invite to follow your account
         avatar: Avatar
@@ -46,11 +69,13 @@ en:
         context: Filter contexts
         current_password: Current password
         data: Data
+        discoverable: List this account on the directory
         display_name: Display name
         email: E-mail address
         expires_in: Expire after
         fields: Profile metadata
         header: Header
+        inbox_url: URL of the relay inbox
         irreversible: Drop instead of hide
         locale: Interface language
         locked: Lock account
@@ -60,13 +85,18 @@ en:
         otp_attempt: Two-factor code
         password: Password
         phrase: Keyword or phrase
+        setting_aggregate_reblogs: Group boosts in timelines
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
         setting_default_language: Posting language
         setting_default_privacy: Post privacy
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
-        setting_display_sensitive_media: Always show media marked as sensitive
+        setting_display_media: Media display
+        setting_display_media_default: Default
+        setting_display_media_hide_all: Hide all
+        setting_display_media_show_all: Show all
+        setting_expand_spoilers: Always expand toots marked with content warnings
         setting_hide_network: Hide your network
         setting_noindex: Opt-out of search engine indexing
         setting_reduce_motion: Reduce motion in animations
@@ -77,6 +107,7 @@ en:
         type: Import type
         username: Username
         username_or_email: Username or Email
+        whole_word: Whole word
       interactions:
         must_be_follower: Block notifications from non-followers
         must_be_following: Block notifications from people you don't follow
@@ -88,6 +119,7 @@ en:
         follow_request: Send e-mail when someone requests to follow you
         mention: Send e-mail when someone mentions you
         reblog: Send e-mail when someone boosts your status
+        report: Send e-mail when a new report is submitted
     'no': 'No'
     required:
       mark: "*"
diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d9e1a256f6c9a5842d1647e5207699a27c1afc83
--- /dev/null
+++ b/config/locales/simple_form.en_GB.yml
@@ -0,0 +1,2 @@
+---
+{}
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index a46fcc42e6391bce8369349ee236b8de1bc66564..b78d2dd81399afe956c2d88ca6e76b91ba75c4aa 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -4,26 +4,28 @@ eo:
     hints:
       defaults:
         autofollow: Homoj, kiuj registriÄos per la invito aÅtomate sekvos vin
-        avatar: Formato PNG, GIF aÅ JPG. Äœis 2MB. Estos malgrandigita al 400x400px
+        avatar: Formato PNG, GIF aÅ JPG. Äœis %{size}. Estos malgrandigita al %{dimensions}px
         bot: Tiu konto Ä‰efe faras aÅtomatajn agojn, kaj povas esti ne kontrolata
         context: Unu ol pluraj kuntekstoj kie la filtrilo devus agi
         digest: Sendita nur post longa tempo de neaktiveco, kaj nur se vi ricevis personan mesaÄon en via foresto
-        display_name:
-          one: <span class="name-counter">1</span> signo restas
-          other: <span class="name-counter">%{count}</span> signoj restas
+        email: Vi ricevos konfirman retmesaÄon
         fields: Vi povas havi Äis 4 tabelajn elementojn en via profilo
-        header: Formato PNG, GIF aÅ JPG. Äœis 2MB. Estos malgrandigita al 700x335px
+        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
         locked: Vi devos aprobi Ä‰iun peton de sekvado mane
-        note:
-          one: <span class="note-counter">1</span> signo restas
-          other: <span class="note-counter">%{count}</span> signoj restas
+        password: Uzu almenaÅ 8 signojn
         phrase: Estos provita senzorge pri la uskleco de teksto aÅ averto pri enhavo de mesaÄo
         setting_default_language: La lingvo de viaj mesaÄoj povas esti aÅtomate detektitaj, sed tio ne Ä‰iam Äustas
+        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_theme: Influas kiel Mastodon aspektas post ensaluto de ajna aparato.
+        username: Via uzantnomo estos unika Ä‰e %{domain}
+        whole_word: Kiam la vorto aÅ frazo estas nur litera aÅ cifera, Äi estos uzata nur se Äi kongruas kun la tuta vorto
       imports:
         data: CSV-dosiero el alia nodo de Mastodon
       sessions:
@@ -50,6 +52,7 @@ eo:
         expires_in: EksvalidiÄas post
         fields: Profilaj metadatumoj
         header: Fonbildo
+        inbox_url: URL de la ripetila enirkesto
         irreversible: ForÄµeti anstataÅ kaÅi
         locale: Interfaca lingvo
         locked: Åœlosi konton
@@ -65,7 +68,11 @@ eo:
         setting_default_privacy: MesaÄa videbleco
         setting_default_sensitive: Äˆiam marki aÅdovidaÄµojn tiklaj
         setting_delete_modal: Montri fenestron por konfirmi antaÅ ol forigi mesaÄon
-        setting_display_sensitive_media: Äˆiam montri aÅdovidaÄµojn markitajn tiklaj
+        setting_display_media: AÅdovidaÄµa montrado
+        setting_display_media_default: Dekomenca
+        setting_display_media_hide_all: KaÅi Ä‰iujn
+        setting_display_media_show_all: Montri Ä‰iujn
+        setting_expand_spoilers: Äˆiam grandigi mesaÄojn markitajn per avertoj pri enhavo
         setting_hide_network: KaÅi viajn sekvantojn kaj sekvatojn
         setting_noindex: EllistiÄi de retserÄ‰ila indeksado
         setting_reduce_motion: Malrapidigi animaciojn
@@ -76,6 +83,7 @@ eo:
         type: Importa tipo
         username: Uzantnomo
         username_or_email: Uzantnomo aÅ Retadreso
+        whole_word: Tuta vorto
       interactions:
         must_be_follower: Bloki sciigojn de nesekvantoj
         must_be_following: Bloki sciigojn de homoj, kiujn vi ne sekvas
@@ -87,6 +95,7 @@ eo:
         follow_request: Sendi retmesaÄon kiam iu petas sekvi vin
         mention: Sendi retmesaÄon kiam iu mencias vin
         reblog: Sendi retmesaÄon kiam iu diskonigas vian mesaÄon
+        report: Sendi retmesaÄon kiam nova signalo estas sendita
     'no': Ne
     required:
       mark: "*"
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 000a33edc62467fb0e263bd35ca09bd9601e7dbc..c0d72dc2782acb3c870f4c918f3c4be93f0e2efd 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -3,33 +3,52 @@ es:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF o JPG. MÃ¡ximo 2MB. SerÃ¡ escalado a 400x400px
+        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
+        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
         digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia
-        display_name:
-          one: <span class="name-counter">1</span> caracter restante
-          other: <span class="name-counter">%{count}</span> caracteres restantes
-        header: PNG, GIF o JPG. MÃ¡ximo 2MB. SerÃ¡ escalado a 700x335px
+        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
+        inbox_url: Copia la URL de la pÃ¡gina principal del relÃ©s que quieres utilizar
+        irreversible: Los toots filtrados desaparecerÃ¡n irreversiblemente, incluso si este filtro es eliminado mÃ¡s adelante
+        locale: El idioma de la interfaz de usuario, correos y notificaciones push
         locked: Requiere que manualmente apruebes seguidores y las publicaciones serÃ¡n mostradas solamente a tus seguidores
-        note:
-          one: <span class="name-counter">1</span> carÃ¡cter restante
-          other: <span class="name-counter">%{count}</span> caracteres restantes
+        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_default_language: El idioma de tus toots podrÃ¡ detectarse automÃ¡ticamente, pero no siempre es preciso
+        setting_hide_network: A quiÃ©n sigues y quiÃ©n te sigue no serÃ¡ mostrado en tu perfil
         setting_noindex: Afecta a tu perfil pÃºblico y pÃ¡ginas de estado
         setting_theme: Afecta al aspecto de Mastodon cuando te identificas desde cualquier dispositivo.
+        whole_word: Cuando la palabra clave o frase es solo alfanumÃ©rica, solo serÃ¡ aplicado si concuerda con toda la palabra
       imports:
         data: Archivo CSV exportado desde otra instancia de Mastodon
       sessions:
-        otp: Introduce el cÃ³digo de autenticaciÃ³n de dos factores de tu telÃ©fono o usa uno de tus cÃ³digos de recuperaciÃ³n.
+        otp: 'Introduce el cÃ³digo de autenticaciÃ³n de dos factores geberado por tu aplicaciÃ³n de telÃ©fono o usa uno de tus cÃ³digos de recuperaciÃ³n:'
+      user:
+        chosen_languages: Cuando se marca, solo se mostrarÃ¡n los toots en los idiomas seleccionados en los timelines pÃºblicos
     labels:
+      account:
+        fields:
+          name: Etiqueta
+          value: Contenido
       defaults:
+        autofollow: Invitar a seguir tu cuenta
         avatar: Avatar
+        bot: Esta es una cuenta bot
+        chosen_languages: Filtrar idiomas
         confirm_new_password: Confirmar nueva contraseÃ±a
         confirm_password: Confirmar contraseÃ±a
+        context: Filtrar contextos
         current_password: ContraseÃ±a actual
         data: InformaciÃ³n
         display_name: Nombre para mostrar
         email: DirecciÃ³n de correo electrÃ³nico
         expires_in: Expirar tras
+        fields: Metadatos de perfil
         header: Img. cabecera
+        inbox_url: URL de la entrada de relÃ©s
+        irreversible: Dejar en lugar de ocultar
         locale: Idioma
         locked: Hacer privada esta cuenta
         max_uses: MÃ¡x. nÃºmero de usos
@@ -37,12 +56,14 @@ es:
         note: BiografÃa
         otp_attempt: CÃ³digo de dos factores
         password: ContraseÃ±a
+        phrase: Palabra clave o frase
         setting_auto_play_gif: Reproducir automÃ¡ticamente los GIFs animados
         setting_boost_modal: Mostrar ventana de confirmaciÃ³n antes de un Retoot
+        setting_default_language: Idioma de publicaciÃ³n
         setting_default_privacy: Privacidad de publicaciones
         setting_default_sensitive: Marcar siempre imÃ¡genes como sensibles
         setting_delete_modal: Mostrar diÃ¡logo de confirmaciÃ³n antes de borrar un toot
-        setting_display_sensitive_media: Mostrar siempre material marcado como sensible
+        setting_hide_network: Ocultar tu red
         setting_noindex: Excluirse del indexado de motores de bÃºsqueda
         setting_reduce_motion: Reducir el movimiento de las animaciones
         setting_system_font_ui: Utilizar la tipografÃa por defecto del sistema
@@ -52,6 +73,7 @@ es:
         type: Importar tipo
         username: Nombre de usuario
         username_or_email: Usuario o Email
+        whole_word: Toda la palabra
       interactions:
         must_be_follower: Bloquear notificaciones de personas que no te siguen
         must_be_following: Bloquear notificaciones de personas que no sigues
@@ -63,6 +85,7 @@ es:
         follow_request: Enviar correo electrÃ³nico cuando alguien solicita seguirte
         mention: Enviar correo electrÃ³nico cuando alguien te mencione
         reblog: Enviar correo electrÃ³nico cuando alguien comparta su publicaciÃ³n
+        report: Enviar un correo cuando se envÃa un nuevo informe
     'no': 'No'
     required:
       mark: "*"
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index 2d60030ec19ed0e50ef435812fc31a0aacde9d85..0ffc22b53d158dad6ae7012bcc79a294ecaf0ff6 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -2,25 +2,40 @@
 eu:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Toot sintaxia erabili dezakezu, URLak, traolak eta aipamenak
+      admin_account_action:
+        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
+        warning_preset_id: Aukerakoa. Zure testua gehitu dezakezu aurre-ezarpenaren ostean
       defaults:
-        autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko zaituzte
-        avatar: PNG, GIF edo JPG. Gehienez 2MB. 400x400px neurrira eskalatuko da
+        autofollow: Gonbidapena erabiliz izena ematen dutenek automatikoki jarraituko dizute
+        avatar: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px neurrira eskalatuko da
         bot: Kontu honek nagusiki automatizatutako ekintzak burutzen ditu eta agian ez du inork monitorizatzen
+        context: Iragazkia aplikatzeko testuinguru bat edo batzuk
         digest: Soilik jarduerarik gabeko epe luze bat eta gero, eta soilik ez zeudela mezu pertsonalen bat jaso baduzu
-        display_name:
-          one: Karaktere <span class="name-counter">1</span> geratzen da
-          other: <span class="name-counter">%{count}</span> karaktere geratzen dira
+        discoverable_html: <a href="%{path}" target="_blank">Direktorioa</a>k Jendea interesen eta jardueraren arabera aurkitzea ahalbidetzen du. Gutxienez %{min_followers} jarraitzaile behar dira bertan agertzeko
+        email: Baieztapen e-mail bat bidaliko zaizu
         fields: 4 elementu bistaratu ditzakezu taula batean zure profilean
-        header: PNG, GIF edo JPG. Gehienez 2MB. 700x335px eskalara txikituko da
+        header: PNG, GIF edo JPG. Gehienez %{size}. %{dimensions}px eskalara txikituko da
+        inbox_url: Kopiatu erabili nahi duzun errelearen hasiera orriaren URLa
+        irreversible: Iragazitako Toot-ak betirako galduko dira, geroago iragazkia kentzen baduzu ere
         locale: Erabiltzaile-interfazea, e-mail mezuen eta jakinarazpenen hizkuntza
         locked: Jarraitzaileak eskuz onartu behar dituzu
-        note:
-          one: Karaktere<span class="note-counter">1</span> geratzen da
-          other: <span class="note-counter"> %{count}</span> karaktere geratzen dira
-        setting_default_language: Zure toot-en hizkuntza automatikoki antzeman daiteke, baina ez da beti zehatza
+        password: Erabili 8 karaktere gutxienez
+        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 buktzada berriak berriki bultzada jaso duten tootentzat (berriki jasotako bultzadei eragiten die besterik ez)
+        setting_default_language: Zure Toot-en hizkuntza automatikoki antzeman daiteke, baina ez da beti zehatza
+        setting_display_media_default: Ezkutatu hunkigarri gisa markatutako multimedia
+        setting_display_media_hide_all: Ezkutatu multimedia guztia beti
+        setting_display_media_show_all: Erakutsi beti hunkigarri gisa markatutako multimedia
         setting_hide_network: Nor jarraitzen duzun eta nork jarraitzen zaituen ez da bistaratuko zure profilean
-        setting_noindex: Zure profil publiko eta toot orrietan eragina du
+        setting_noindex: Zure profil publiko eta Toot-en orrietan eragina du
         setting_theme: Edozein gailutik konektatzean Mastodon-en itxuran eragiten du.
+        username: Zure erabiltzaile-izena bakana izango da %{domain} domeinuan
+        whole_word: Hitz eta esaldi gakoa alfanumerikoa denean, hitz osoarekin bat datorrenean besterik ez da aplikatuko
       imports:
         data: Beste Mastodon instantzia batetik esportatutako CSV fitxategia
       sessions:
@@ -32,6 +47,17 @@ eu:
         fields:
           name: Etiketa
           value: Edukia
+      account_warning_preset:
+        text: Aurrez ezarritako testua
+      admin_account_action:
+        send_email_notification: Jakinarazi erabiltzaileari e-mail bidez
+        text: Abisu pertsonalizatua
+        type: Ekintza
+        types:
+          disable: Desaktibatu
+          none: Ez egin ezer
+          silence: Isiltarazi
+        warning_preset_id: Erabili aurre-ezarritako abisu bat
       defaults:
         autofollow: Gonbidatu zure kontua jarraitzera
         avatar: Abatarra
@@ -39,13 +65,17 @@ eu:
         chosen_languages: Iragazi hizkuntzak
         confirm_new_password: Berretsi pasahitz berria
         confirm_password: Berretsi pasahitza
+        context: Iragazkiaren testuinguruak
         current_password: Oraingo pasahitza
         data: Datuak
+        discoverable: Zerrendatu kontu hau direktorioan
         display_name: Pantaila-izena
         email: E-mail helbidea
         expires_in: Iraungitzea
         fields: Profilaren metadatuak
         header: Goiburua
+        inbox_url: Errelearen sarrera ontziaren URLa
+        irreversible: Baztertu ezkutatu ordez
         locale: Interfazearen hizkuntza
         locked: Giltzapetu kontua
         max_uses: Gehieneko erabiltzaile kopurua
@@ -53,13 +83,19 @@ eu:
         note: Biografia
         otp_attempt: Bi faktoreetako kodea
         password: Pasahitza
+        phrase: Hitz edo esaldi gakoa
+        setting_aggregate_reblogs: Taldekatu bultzadak denbora-lerroetan
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
         setting_default_language: Argitalpenen hizkuntza
         setting_default_privacy: Mezuen pribatutasuna
         setting_default_sensitive: Beti markatu edukiak hunkigarri gisa
         setting_delete_modal: Erakutsi baieztapen elkarrizketa-koadroa toot bat ezabatu aurretik
-        setting_display_sensitive_media: Beti erakutsi hunkigarri gisa markatutako edukia
+        setting_display_media: Multimedia bistaratzea
+        setting_display_media_default: Lehenetsia
+        setting_display_media_hide_all: Ezkutatu guztia
+        setting_display_media_show_all: Erakutsi guztia
+        setting_expand_spoilers: Hedatu beti edukia abisua (CW) duten  tootak
         setting_hide_network: Ezkutatu zure sarea
         setting_noindex: Atera bilaketa motorraren indexaziotik
         setting_reduce_motion: Murriztu animazioen mugimenduak
@@ -70,6 +106,7 @@ eu:
         type: Inportazio mota
         username: Erabiltzaile-izena
         username_or_email: Erabiltzaile-izena edo e-mail helbidea
+        whole_word: Hitz osoa
       interactions:
         must_be_follower: Blokeatu jarraitzaile ez direnen jakinarazpenak
         must_be_following: Blokeatu zuk jarraitzen ez dituzunen jakinarazpenak
@@ -81,6 +118,7 @@ eu:
         follow_request: Bidali e-mail bat norbaitek zu jarraitzea eskatzen duenean
         mention: Bidali e-mail bat norbaitek zu aipatzean
         reblog: Bidali e-mail bat norbaitek zure mezuari bultzada ematen badio
+        report: Bidali e-maila txosten berri bat aurkezten denean
     'no': Ez
     required:
       mark: "*"
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 2a2cc6731a05f0538f5875fd192101ad11cb7864..2eeacade62761337197bf331869e75c96b668c6a 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -4,26 +4,29 @@ fa:
     hints:
       defaults:
         autofollow: Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ø§Ø² Ø±Ø§Ù‡ Ø¯Ø¹ÙˆØªâ€ŒÙ†Ø§Ù…Ù‡ Ø¹Ø¶Ùˆ Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± Ù¾ÛŒÚ¯ÛŒØ± Ø´Ù…Ø§ Ø®ÙˆØ§Ù‡Ù†Ø¯ Ø´Ø¯
-        avatar: ÛŒÚ©ÛŒ Ø§Ø² Ù‚Ø§Ù„Ø¨â€ŒÙ‡Ø§ÛŒ PNG ÛŒØ§  GIF ÛŒØ§ JPG. Ø¨ÛŒØ´ØªØ±ÛŒÙ† Ø§Ù†Ø¯Ø§Ø²Ù‡ Û² Ù…Ú¯Ø§Ø¨Ø§ÛŒØª. ØªØµÙˆÛŒØ± Ø¨Ù‡ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Û´Û°Û°Ã—Û´Û°Û° Ù¾ÛŒÚ©Ø³Ù„ ØªØ¨Ø¯ÛŒÙ„ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
+        avatar: ÛŒÚ©ÛŒ Ø§Ø² Ù‚Ø§Ù„Ø¨â€ŒÙ‡Ø§ÛŒ PNG ÛŒØ§  GIF ÛŒØ§ JPG. Ø¨ÛŒØ´ØªØ±ÛŒÙ† Ø§Ù†Ø¯Ø§Ø²Ù‡ %{size}. ØªØµÙˆÛŒØ± Ø¨Ù‡ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” %{dimensions} Ù¾ÛŒÚ©Ø³Ù„ ØªØ¨Ø¯ÛŒÙ„ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
         bot: Ø§ÛŒÙ† ØØ³Ø§Ø¨ Ø¨ÛŒØ´ØªØ± Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± ÙØ¹Ø§Ù„ÛŒØª Ù…ÛŒâ€ŒÚ©Ù†Ø¯ Ùˆ Ù†Ø¸Ø§Ø±Øª Ù¾ÛŒÙˆØ³ØªÙ‡â€ŒØ§ÛŒ Ø±ÙˆÛŒ Ø¢Ù† ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯
         context: ÛŒÚ© ÛŒØ§ Ú†Ù†Ø¯ Ø²Ù…ÛŒÙ†Ù‡ Ú©Ù‡ ÙÛŒÙ„ØªØ± Ø¨Ø§ÛŒØ¯ Ø¯Ø± Ø¢Ù†â€ŒÙ‡Ø§ Ø§Ø¹Ù…Ø§Ù„ Ø´ÙˆØ¯
         digest: ØªÙ†Ù‡Ø§ ÙˆÙ‚ØªÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ Ú©Ù‡ Ù…Ø¯ØªÛŒ Ø·ÙˆÙ„Ø§Ù†ÛŒ ÙØ¹Ø§Ù„ÛŒØªÛŒ Ù†Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´ÛŒØ¯ Ùˆ Ø¯Ø± Ø§ÛŒÙ† Ù…Ø¯Øª Ø¨Ø±Ø§ÛŒ Ø´Ù…Ø§ Ù¾ÛŒØºØ§Ù… Ø®ØµÙˆØµÛŒâ€ŒØ§ÛŒ Ù†ÙˆØ´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§Ø´Ø¯
-        display_name:
-          one: <span class="name-counter">1</span> ØØ±Ù Ø¨Ø§Ù‚ÛŒ Ù…Ø§Ù†Ø¯Ù‡
-          other: <span class="name-counter">%{count}</span> ØØ±Ù Ø¨Ø§Ù‚ÛŒ Ù…Ø§Ù†Ø¯Ù‡
+        email: Ø¨Ù‡ Ø´Ù…Ø§ Ø§ÛŒÙ…ÛŒÙ„ ØªØ£ÛŒÛŒØ¯ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
         fields: Ø´Ù…Ø§ Ù…ÛŒâ€ŒØªÙˆØ§Ù†ÛŒØ¯ ØªØ§ Ú†Ù‡Ø§Ø± Ù…ÙˆØ±Ø¯ Ø±Ø§ Ø¯Ø± ÛŒÚ© Ø¬Ø¯ÙˆÙ„ Ø¯Ø± Ù†Ù…Ø§ÛŒÙ‡Ù” Ø®ÙˆØ¯ Ù†Ù…Ø§ÛŒØ´ Ø¯Ù‡ÛŒØ¯
-        header: ÛŒÚ©ÛŒ Ø§Ø² Ù‚Ø§Ù„Ø¨â€ŒÙ‡Ø§ÛŒ PNG ÛŒØ§  GIF ÛŒØ§ JPG. Ø¨ÛŒØ´ØªØ±ÛŒÙ† Ø§Ù†Ø¯Ø§Ø²Ù‡ Û² Ù…Ú¯Ø§Ø¨Ø§ÛŒØª. ØªØµÙˆÛŒØ± Ø¨Ù‡ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” Û³Û³ÛµÃ—Û·Û°Û° Ù¾ÛŒÚ©Ø³Ù„ ØªØ¨Ø¯ÛŒÙ„ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
+        header: ÛŒÚ©ÛŒ Ø§Ø² Ù‚Ø§Ù„Ø¨â€ŒÙ‡Ø§ÛŒ PNG ÛŒØ§  GIF ÛŒØ§ JPG. Ø¨ÛŒØ´ØªØ±ÛŒÙ† Ø§Ù†Ø¯Ø§Ø²Ù‡ %{size}. ØªØµÙˆÛŒØ± Ø¨Ù‡ Ø§Ù†Ø¯Ø§Ø²Ù‡Ù” %{dimensions} Ù¾ÛŒÚ©Ø³Ù„ ØªØ¨Ø¯ÛŒÙ„ Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
+        inbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙØÙ‡Ù” Ø§ØµÙ„ÛŒ Ø±Ù„Ù‡â€ŒØ§ÛŒ Ø±Ø§ Ú©Ù‡ Ù…ÛŒâ€ŒØ®ÙˆØ§Ù‡ÛŒØ¯ Ø¨Ù‡ Ú©Ø§Ø± Ø¨Ø¨Ø±ÛŒØ¯ Ú©Ù¾ÛŒ Ú©Ù†ÛŒØ¯
         irreversible: Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ÛŒ ÙÛŒÙ„ØªØ±Ø´Ø¯Ù‡ Ø¨Ù‡ Ø·ÙˆØ± Ø¨Ø±Ú¯Ø´Øªâ€ŒÙ†Ø§Ù¾Ø°ÛŒØ±ÛŒ Ù†Ø§Ù¾Ø¯ÛŒØ¯ Ù…ÛŒâ€ŒØ´ÙˆÙ†Ø¯ØŒ ØØªÛŒ Ø§Ú¯Ø± ÙÛŒÙ„ØªØ± Ø±Ø§ Ø¨Ø¹Ø¯Ø§Ù‹ Ø¨Ø±Ø¯Ø§Ø±ÛŒØ¯
         locale: Ø²Ø¨Ø§Ù† Ù…ØÛŒØ· Ú©Ø§Ø±Ø¨Ø±ÛŒØŒ Ø§ÛŒÙ…ÛŒÙ„â€ŒÙ‡Ø§ØŒ Ùˆ Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§
         locked: Ø¨Ø§ÛŒØ¯ Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù† ØªØ§Ø²Ù‡ Ø±Ø§ Ø®ÙˆØ¯ØªØ§Ù† ØªØ£ÛŒÛŒØ¯ Ú©Ù†ÛŒØ¯
-        note:
-          one: <span class="note-counter">1</span> ØØ±Ù Ø¨Ø§Ù‚ÛŒ Ù…Ø§Ù†Ø¯Ù‡
-          other: <span class="note-counter">%{count}</span> ØØ±Ù Ø¨Ø§Ù‚ÛŒ Ù…Ø§Ù†Ø¯Ù‡
+        password: Ø¯Ø³Øªâ€ŒÚ©Ù… Ø¨Ø§ÛŒØ¯ Û¸ Ù†ÙˆÛŒØ³Ù‡ Ø¯Ø§Ø´ØªÙ‡ Ø¨Ø§Ø´Ø¯
         phrase: Ù…Ø³ØªÙ‚Ù„ Ø§Ø² Ú©ÙˆÚ†Ú©ÛŒ Ùˆ Ø¨Ø²Ø±Ú¯ÛŒ ØØ±ÙˆÙØŒ Ø¨Ø§ Ù…ØªÙ† Ø§ØµÙ„ÛŒ ÛŒØ§ Ù‡Ø´Ø¯Ø§Ø± Ù…ØØªÙˆØ§ÛŒ Ø¨ÙˆÙ‚â€ŒÙ‡Ø§ Ù…Ù‚Ø§ÛŒØ³Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯
-        setting_default_language: Ø²Ø¨Ø§Ù† Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± ØªØ´Ø®ÛŒØµ Ø¯Ø§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ØŒ ÙˆÙ„ÛŒ Ø§ÛŒÙ† ØªØ´Ø®ØµÛŒ Ù‡Ù…ÛŒØ´Ù‡ Ø¯Ù‚ÛŒÙ‚ Ù†ÛŒØ³Øª
+        scopes: ÙˆØ§Ø³Ø·â€ŒÙ‡Ø§ÛŒ Ø¨Ø±Ù†Ø§Ù…Ù‡â€ŒÙ†ÙˆÛŒØ³ÛŒ Ú©Ù‡ Ø§ÛŒÙ† Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø¨Ù‡ Ø¢Ù† Ø¯Ø³ØªØ±Ø³ÛŒ Ø¯Ø§Ø±Ø¯. Ø§Ú¯Ø± Ø¨Ø§Ù„Ø§ØªØ±ÛŒÙ† Ø³Ø·Ø Ø¯Ø³ØªØ±Ø³ÛŒ Ø±Ø§ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯ØŒ Ø¯ÛŒÚ¯Ø± Ù†ÛŒØ§Ø²ÛŒ Ø¨Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ø³Ø·Øâ€ŒÙ‡Ø§ÛŒ Ù¾Ø§ÛŒÛŒÙ†ÛŒ Ù†Ø¯Ø§Ø±ÛŒØ¯.
+        setting_default_language: Ø²Ø¨Ø§Ù† Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ Ø¨Ù‡ Ø·ÙˆØ± Ø®ÙˆØ¯Ú©Ø§Ø± ØªØ´Ø®ÛŒØµ Ø¯Ø§Ø¯Ù‡ Ù…ÛŒâ€ŒØ´ÙˆØ¯ØŒ ÙˆÙ„ÛŒ Ø§ÛŒÙ† ØªØ´Ø®ÛŒØµ Ù‡Ù…ÛŒØ´Ù‡ Ø¯Ù‚ÛŒÙ‚ Ù†ÛŒØ³Øª
+        setting_display_media_default: ØªØµÙˆÛŒØ±Ù‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øª Ø²Ø¯Ù‡ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯ Ù¾Ù†Ù‡Ø§Ù† Ú©Ù†
+        setting_display_media_hide_all: Ù‡Ù…ÛŒØ´Ù‡ Ù‡Ù…Ù‡Ù” Ø¹Ú©Ø³â€ŒÙ‡Ø§ Ùˆ ÙˆÛŒØ¯ÛŒÙˆÙ‡Ø§ Ø±Ø§ Ù¾Ù†Ù‡Ø§Ù† Ú©Ù†
+        setting_display_media_show_all: Ù‡Ù…ÛŒØ´Ù‡ ØªØµÙˆÛŒØ±Ù‡Ø§ÛŒÛŒ Ø±Ø§ Ú©Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øª Ø²Ø¯Ù‡ Ø´Ø¯Ù‡â€ŒØ§Ù†Ø¯ Ø±Ø§ Ù†Ø´Ø§Ù† Ø¨Ø¯Ù‡
         setting_hide_network: ÙÙ‡Ø±Ø³Øª Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù† Ø´Ù…Ø§ Ùˆ ÙÙ‡Ø±Ø³Øª Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ø´Ù…Ø§ Ù¾ÛŒ Ù…ÛŒâ€ŒÚ¯ÛŒØ±ÛŒØ¯ Ø±ÙˆÛŒ Ù†Ù…Ø§ÛŒÙ‡Ù” Ø´Ù…Ø§ Ø¯ÛŒØ¯Ù‡ Ù†Ø®ÙˆØ§Ù‡Ø¯ Ø´Ø¯
         setting_noindex: Ø±ÙˆÛŒ Ù†Ù…Ø§ÛŒÙ‡Ù” Ø¹Ù…ÙˆÙ…ÛŒ Ùˆ ØµÙØÙ‡Ù” Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§ÛŒ Ø´Ù…Ø§ ØªØ£Ø«ÛŒØ± Ù…ÛŒâ€ŒÚ¯Ø°Ø§Ø±Ø¯
         setting_theme: Ø¸Ø§Ù‡Ø± Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø±Ø§ ÙˆÙ‚ØªÛŒ Ú©Ù‡ Ø§Ø² Ù‡Ø± Ø¯Ø³ØªÚ¯Ø§Ù‡ÛŒ Ø¨Ù‡ Ø¢Ù† ÙˆØ§Ø±Ø¯ Ù…ÛŒâ€ŒØ´ÙˆÛŒØ¯ ØªØ¹ÛŒÛŒÙ† Ù…ÛŒâ€ŒÚ©Ù†Ø¯.
+        username: Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ Ø´Ù…Ø§ Ø±ÙˆÛŒ %{domain} ÛŒÚ©ØªØ§ Ø®ÙˆØ§Ù‡Ø¯ Ø¨ÙˆØ¯
+        whole_word: Ø§Ú¯Ø± Ú©Ù„ÛŒØ¯ÙˆØ§Ú˜Ù‡ ÙÙ‚Ø· Ø¯Ø§Ø±Ø§ÛŒ ØØ±ÙˆÙ Ùˆ Ø§Ø¹Ø¯Ø§Ø¯ Ø¨Ø§Ø´Ø¯ØŒ ØªÙ†Ù‡Ø§ ÙˆÙ‚ØªÛŒ Ù¾ÛŒØ¯Ø§ Ù…ÛŒâ€ŒØ´ÙˆØ¯ Ú©Ù‡ Ø¨Ø§ Ú©Ù„ ÛŒÚ© ÙˆØ§Ú˜Ù‡ Ø¯Ø± Ù…ØªÙ† Ù…Ù†Ø·Ø¨Ù‚ Ø¨Ø§Ø´Ø¯ØŒ Ù†Ù‡ Ø¨Ø§ Ø¨Ø®Ø´ÛŒ Ø§Ø² ÛŒÚ© ÙˆØ§Ú˜Ù‡
       imports:
         data: Ù¾Ø±ÙˆÙ†Ø¯Ù‡Ù” CSV Ú©Ù‡ Ø§Ø² Ø³Ø±ÙˆØ± Ù…Ø§Ø³ØªØ¯ÙˆÙ† Ø¯ÛŒÚ¯Ø±ÛŒ Ø¨Ø±ÙˆÙ†â€ŒØ³Ù¾Ø§Ø±ÛŒ Ø´Ø¯Ù‡
       sessions:
@@ -50,6 +53,7 @@ fa:
         expires_in: ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§
         fields: Ø§Ø·Ù„Ø§Ø¹Ø§Øª ØªÚ©Ù…ÛŒÙ„ÛŒ Ù†Ù…Ø§ÛŒÙ‡
         header: ØªØµÙˆÛŒØ± Ø²Ù…ÛŒÙ†Ù‡
+        inbox_url: Ù†Ø´Ø§Ù†ÛŒ ØµÙ†Ø¯ÙˆÙ‚ ÙˆØ±ÙˆØ¯ÛŒ Ø±Ù„Ù‡
         irreversible: Ø¨Ù‡ Ø¬Ø§ÛŒ Ù¾Ù†Ù‡Ø§Ù†â€ŒØ³Ø§Ø²ÛŒØŒ ØØ°Ù Ú©Ù†
         locale: Ø²Ø¨Ø§Ù† Ù…ØÛŒØ· Ú©Ø§Ø±Ø¨Ø±ÛŒ
         locked: Ø®ØµÙˆØµÛŒâ€ŒÚ©Ø±Ø¯Ù† ØØ³Ø§Ø¨
@@ -65,7 +69,11 @@ fa:
         setting_default_privacy: ØØ±ÛŒÙ… Ø®ØµÙˆØµÛŒ Ù†ÙˆØ´ØªÙ‡â€ŒÙ‡Ø§
         setting_default_sensitive: Ù‡Ù…ÛŒØ´Ù‡ ØªØµØ§ÙˆÛŒØ± Ø±Ø§ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø¹Ù„Ø§Ù…Øª Ø¨Ø²Ù†
         setting_delete_modal: Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒØºØ§Ù… ØªØ£ÛŒÛŒØ¯ Ù¾ÛŒØ´ Ø§Ø² Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† ÛŒÚ© Ù†ÙˆØ´ØªÙ‡
-        setting_display_sensitive_media: Ù‡Ù…ÛŒØ´Ù‡ ØªØµÙˆÛŒØ±Ù‡Ø§ÛŒ Ø¹Ù„Ø§Ù…Øªâ€ŒØ²Ø¯Ù‡â€ŒØ´Ø¯Ù‡ Ø¨Ù‡ Ø¹Ù†ÙˆØ§Ù† ØØ³Ø§Ø³ Ø±Ø§ Ù†Ù…Ø§ÛŒØ´ Ø¨Ø¯Ù‡
+        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: Ú©Ø§Ø³ØªÙ† Ø§Ø² ØØ±Ú©Øª Ø¯Ø± Ù¾ÙˆÛŒØ§Ù†Ù…Ø§ÛŒÛŒâ€ŒÙ‡Ø§
@@ -74,8 +82,9 @@ fa:
         setting_unfollow_modal: Ù†Ù…Ø§ÛŒØ´ Ù¾ÛŒØºØ§Ù… ØªØ£ÛŒÛŒØ¯ Ù¾ÛŒØ´ Ø§Ø² Ù„ØºÙˆ Ù¾ÛŒÚ¯ÛŒØ±ÛŒ Ø¯ÛŒÚ¯Ø±Ø§Ù†
         severity: Ø´Ø¯Øª
         type: Ù†ÙˆØ¹ Ø¯Ø±ÙˆÙ†â€ŒØ±ÛŒØ²ÛŒ
-        username: Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ (ØªÙ†Ù‡Ø§ ØØ±ÙˆÙ Ø§Ù†Ú¯Ù„ÛŒØ³ÛŒ)
+        username: Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ (Ù„Ø§ØªÛŒÙ†)
         username_or_email: Ù†Ø§Ù… Ú©Ø§Ø±Ø¨Ø±ÛŒ ÛŒØ§ Ø§ÛŒÙ…ÛŒÙ„
+        whole_word: ØªØ·Ø§Ø¨Ù‚ ÙˆØ§Ú˜Ù‡Ù” Ú©Ø§Ù…Ù„
       interactions:
         must_be_follower: Ù…Ø³Ø¯ÙˆØ¯Ú©Ø±Ø¯Ù† Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ù‡Ù…Ù‡ Ø¨Ù‡ Ø¬Ø² Ù¾ÛŒÚ¯ÛŒØ±Ø§Ù†
         must_be_following: Ù…Ø³Ø¯ÙˆØ¯Ú©Ø±Ø¯Ù† Ø§Ø¹Ù„Ø§Ù†â€ŒÙ‡Ø§ÛŒ Ú©Ø³Ø§Ù†ÛŒ Ú©Ù‡ Ø´Ù…Ø§ Ù¾ÛŒ Ù†Ù…ÛŒâ€ŒÚ¯ÛŒØ±ÛŒØ¯
@@ -87,6 +96,7 @@ fa:
         follow_request: ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ù¾ÛŒÚ¯ÛŒØ±ÛŒ Ú©Ø±Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨ÙØ±Ø³Øª
         mention: ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ø§Ø² Ø´Ù…Ø§ Ù†Ø§Ù… Ø¨Ø±Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨ÙØ±Ø³Øª
         reblog: ÙˆÙ‚ØªÛŒ Ú©Ø³ÛŒ Ù†ÙˆØ´ØªÙ‡Ù” Ø´Ù…Ø§ Ø±Ø§ Ø¨Ø§Ø²Ø¨ÙˆÙ‚ÛŒØ¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨ÙØ±Ø³Øª
+        report: ÙˆÙ‚ØªÛŒ Ú¯Ø²Ø§Ø±Ø´ ØªØ§Ø²Ù‡â€ŒØ§ÛŒ ÙØ±Ø³ØªØ§Ø¯Ù‡ Ø´Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨ÙØ±Ø³Øª
     'no': Ø®ÛŒØ±
     required:
       mark: "*"
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 190790ca55814468586d1153f6a5e072182aef50..b0f958f2f17323b5b531546bb67f36d7458467a3 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -3,17 +3,11 @@ fi:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF tai JPG. EnintÃ¤Ã¤n 2 Mt. Skaalataan kokoon 400 x 400 px
+        avatar: PNG, GIF tai JPG. EnintÃ¤Ã¤n %{size}. Skaalataan kokoon %{dimensions} px
         digest: LÃ¤hetetÃ¤Ã¤n vain pitkÃ¤n poissaolon jÃ¤lkeen ja vain, jos olet saanut suoria viestejÃ¤ poissaolosi aikana
-        display_name:
-          one: <span class="name-counter">1</span> merkki jÃ¤ljellÃ¤
-          other: <span class="name-counter">%{count}</span> merkkiÃ¤ jÃ¤ljellÃ¤
         fields: Sinulla voi olla korkeintaan 4 asiaa profiilissasi taulukossa
-        header: PNG, GIF tai JPG. EnintÃ¤Ã¤n 2 Mt. Skaalataan kokoon 700 x 335 px
+        header: PNG, GIF tai JPG. EnintÃ¤Ã¤n %{size}. Skaalataan kokoon %{dimensions} px
         locked: Sinun tÃ¤ytyy hyvÃ¤ksyÃ¤ seuraajat manuaalisesti
-        note:
-          one: <span class="note-counter">1</span> merkki jÃ¤ljellÃ¤
-          other: <span class="note-counter">%{count}</span> merkkiÃ¤ jÃ¤ljellÃ¤
         setting_noindex: Vaikuttaa julkiseen profiiliisi ja tilasivuihisi
         setting_theme: Vaikuttaa Mastodonin ulkoasuun millÃ¤ tahansa laitteella kirjauduttaessa.
       imports:
@@ -47,7 +41,6 @@ fi:
         setting_default_privacy: Julkaisun nÃ¤kyvyys
         setting_default_sensitive: Merkitse media aina arkaluontoiseksi
         setting_delete_modal: Kysy vahvistusta ennen tuuttauksen poistamista
-        setting_display_sensitive_media: NÃ¤ytÃ¤ aina arkaluontoiseksi merkitty media
         setting_noindex: JÃ¤ttÃ¤ydy pois hakukoneindeksoinnista
         setting_reduce_motion: VÃ¤hennÃ¤ animaatioiden liikettÃ¤
         setting_system_font_ui: KÃ¤ytÃ¤ jÃ¤rjestelmÃ¤n oletusfonttia
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index e510bd155f605244a9fb994bce89341789356072..730a6952258e8d50635ecdcc853f5785e6d11122 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -2,33 +2,44 @@
 fr:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Vous pouvez utiliser la syntaxe des pouets, comme les URLs, les hashtags et les mentions
+      admin_account_action:
+        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 pouets. Vous pouvez <a href="%{path}">ajouter des prÃ©sÃ©lections d'attention</a> pour Ã©conomiser du temps
+        type_html: Choisir que faire avec <strong>%{acct}</strong>
+        warning_preset_id: Optionnel. Vous pouvez toujours ajouter un texte personnalisÃ© Ã  la fin de la prÃ©sÃ©lection
       defaults:
-        autofollow: Les personnes qui s'inscrivent grÃ¢ce Ã  l'invitation vous suivront automatiquement
-        avatar: Au format PNG, GIF ou JPG. 2â€¯Mo maximum. Sera rÃ©duit Ã  400x400px
+        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Ã©
-        context: Un ou plusieurs contextes oÃ¹ le filtre devrait s'appliquer
+        context: Un ou plusieurs contextes oÃ¹ le filtre devrait sâ€™appliquer
         digest: Uniquement envoyÃ© aprÃ¨s une longue pÃ©riode dâ€™inactivitÃ© et uniquement si vous avez reÃ§u des messages personnels pendant votre absence
-        display_name:
-          one: <span class="name-counter">1</span> caractÃ¨re restant
-          other: <span class="name-counter">%{count}</span> caractÃ¨res restants
-        fields: Vous pouvez avoir jusqu'Ã  4 Ã©lÃ©ments affichÃ©s en tant que tableau sur votre profil
-        header: Au format PNG, GIF ou JPG. 2â€¯Mo maximum. Sera rÃ©duit Ã  700x335px
+        discoverable_html: L'<a href="%{path}" target="_blank">annuaire</a> permet aux gens de trouver des comptes en se basant sur les intÃ©rÃªts et les activitÃ©s. NÃ©cessite au moins %{min_followers} abonnÃ©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 pouets filtrÃ©s disparaÃ®tront irrÃ©mÃ©diablement, mÃªme si le filtre est supprimÃ© plus tard
-        locale: La langue de l'interface-utilisateur, des courriels, et des notifications
+        locale: La langue de lâ€™interface, des courriels et des notifications
         locked: Vous devrez approuver chaque abonnÃ©â‹…e et vos statuts ne sâ€™afficheront quâ€™Ã  vos abonnÃ©â‹…es
-        note:
-          one: <span class="note-counter">1</span> caractÃ¨re restant
-          other: <span class="note-counter">%{count}</span> caractÃ¨res restants
-        phrase: Sera trouvÃ© sans que la case ou l'avertissement de contenu du pouet soit pris en compte
-        scopes: Ã€ quelles APIs l'application sera autorisÃ©e Ã  accÃ©der. Si vous sÃ©lectionnez un pÃ©rimÃ¨tre de haut-niveau, vous n'avez pas besoin de sÃ©lectionner les individuels.
-        setting_default_language: La langue de vos pouets peut Ãªtre dÃ©tectÃ©e automatiquement, mais Ã§a n'est pas toujours pertinent
+        password: Utilisez au moins 8 caractÃ¨res
+        phrase: Sera trouvÃ© sans que la case ou lâ€™avertissement de contenu du pouet soit pris en compte
+        scopes: Ã€ quelles APIs lâ€™application sera autorisÃ©e Ã  accÃ©der. Si vous sÃ©lectionnez un pÃ©rimÃ¨tre de haut-niveau, vous nâ€™avez pas besoin de sÃ©lectionner les individuels.
+        setting_aggregate_reblogs: Ne pas afficher de nouveaux repartagÃ©s pour les pouets qui ont Ã©tÃ© rÃ©cemment repartagÃ©s (n'affecte que les repartagÃ©s nouvellement reÃ§us)
+        setting_default_language: La langue de vos pouets peut Ãªtre dÃ©tectÃ©e automatiquement, mais Ã§a nâ€™est pas toujours pertinent
+        setting_display_media_default: Masquer les supports marquÃ©s comme sensibles
+        setting_display_media_hide_all: Toujours masquer tous les mÃ©dias
+        setting_display_media_show_all: Toujours afficher les mÃ©dias marquÃ©s comme sensibles
         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_theme: Affecte lâ€™apparence de Mastodon quand vous Ãªtes connectÃ©Â·e depuis nâ€™importe quel appareil.
+        username: Votre nom dâ€™utilisateur sera unique sur %{domain}
+        whole_word: Lorsque le mot-clef ou la phrase-clef est uniquement alphanumÃ©rique, Ã§a sera uniquement appliquÃ© sâ€™il correspond au mot entier
       imports:
         data: Un fichier CSV gÃ©nÃ©rÃ© par une autre instance de Mastodon
       sessions:
-        otp: 'Entrez le code dâ€™authentification Ã  deux facteurs gÃ©nÃ©rÃ© par votre tÃ©lÃ©phone ou utilisez un de vos codes de rÃ©cupÃ©ration :'
+        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â€¯:'
       user:
         chosen_languages: Lorsque cochÃ©, seuls les pouets dans les langues sÃ©lectionnÃ©es seront affichÃ©s sur les fils publics
     labels:
@@ -36,6 +47,18 @@ fr:
         fields:
           name: Ã‰tiquette
           value: Contenu
+      account_warning_preset:
+        text: Texte de prÃ©sÃ©lection
+      admin_account_action:
+        send_email_notification: Notifier l'utilisateur par courriel
+        text: Attention personnalisÃ©e
+        type: Action
+        types:
+          disable: DÃ©sactiver
+          none: Ne rien faire
+          silence: Silence
+          suspend: Suspendre et effacer les donnÃ©es du compte de maniÃ¨re irrÃ©versible
+        warning_preset_id: Utiliser un modÃ¨le d'avertissement
       defaults:
         autofollow: Invitation Ã  suivre votre compte
         avatar: Image de profil
@@ -46,27 +69,34 @@ fr:
         context: Contextes du filtre
         current_password: Mot de passe actuel
         data: DonnÃ©es
+        discoverable: Inscrire ce compte dans l'annuaire
         display_name: Nom public
         email: Adresse courriel
         expires_in: Expire aprÃ¨s
         fields: MÃ©tadonnÃ©es du profil
         header: Image dâ€™en-tÃªte
+        inbox_url: URL de la boÃ®te de relais
         irreversible: Supprimer plutÃ´t que de cacher
-        locale: Langue de l'interface
+        locale: Langue de lâ€™interface
         locked: Verrouiller le compte
-        max_uses: Nombre maximum d'utilisations
+        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_aggregate_reblogs: RepartagÃ©s en groupe dans la ligne de temps
         setting_auto_play_gif: Lire automatiquement les GIFs animÃ©s
         setting_boost_modal: Afficher une fenÃªtre de confirmation avant de partager
         setting_default_language: Langue de publication
         setting_default_privacy: ConfidentialitÃ© des statuts
         setting_default_sensitive: Toujours marquer les mÃ©dias comme sensibles
         setting_delete_modal: Afficher une fenÃªtre de confirmation avant de supprimer un pouet
-        setting_display_sensitive_media: Toujours afficher les mÃ©dias marquÃ©s comme sensibles
+        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Ã©velopper les pouets 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
@@ -76,7 +106,8 @@ fr:
         severity: SÃ©vÃ©ritÃ©
         type: Type dâ€™import
         username: Identifiant
-        username_or_email: Nom d'utilisateur ou courriel
+        username_or_email: Nom dâ€™utilisateurÂ·ice ou courriel
+        whole_word: Mot entier
       interactions:
         must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas
         must_be_following: Masquer les notifications des personnes que vous ne suivez pas
@@ -88,6 +119,7 @@ fr:
         follow_request: Envoyer un courriel lorsque quelquâ€™un demande Ã  me suivre
         mention: Envoyer un courriel lorsque quelquâ€™un me mentionne
         reblog: Envoyer un courriel lorsque quelquâ€™un partage mes statuts
+        report: Envoyer un courriel lorsquâ€™un nouveau rapport est soumis
     'no': Non
     required:
       mark: "*"
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index 25694395deaddee77b1bf86155001efa86bc83c4..d5e0ef574aae9617a5e92f9a905836b047fb457c 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -2,29 +2,40 @@
 gl:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Vostede pode utilizar dar formato ao toot, como URLs, etiquetas e menciÃ³ns
+      admin_account_action:
+        send_email_notification: A usuaria recibirÃ¡ unha explicaciÃ³n sobre o que lle aconteceu a sÃºa conta
+        text_html: Optativo. Pode utilizar formato no toot. Pode <a href="%{path}">engadir avisos preestablecidos</a> para aforrar tempo
+        type_html: Escolla que facer con <strong>%{acct}</strong>
+        warning_preset_id: Optativo. PoderÃ¡ engadir texto personalizado ao final do preestablecido
       defaults:
         autofollow: As persoas que se conectaron a travÃ©s de un convite seguirana automÃ¡ticamente a vostede
-        avatar: PNG, GIF ou JPG.  MÃ¡ximo 2MB. SerÃ¡ reducida a 400x400px
+        avatar: PNG, GIF ou JPG.  MÃ¡ximo %{size}. SerÃ¡ reducida a %{dimensions}px
         bot: Esta conta realiza principalmente acciÃ³ns automatizadas e poderÃa non estar monitorizada
         context: Un ou varios contextos onde se deberÃa aplicar o filtro
-        digest: Enviar sÃ³ tras un longo perÃodo de inactividade e sÃ³ si recibeu algunha mensaxe personal na sÃºa ausencia
-        display_name:
-          one: <span class="name-counter">1</span> caracter restante
-          other: <span class="name-counter">%{count}</span> caracteres restantes
+        digest: Enviar sÃ³ tras un longo perÃodo de inactividade e sÃ³ si recibeu algunha mensaxe persoal na sÃºa ausencia
+        discoverable_html: O <a href="%{path}" target="_blank">directorio</a> permite atopar contas en funciÃ³n de intereses e actividade. Require ter ao menos %{min_followers} seguidoras
+        email: EnviarÃ¡selle un correo-e de confirmaciÃ³n
         fields: Pode ter ate 4 elementos no seu perfil mostrados como unha tÃ¡boa
-        header: PNG, GIF ou JPG. MÃ¡ximo 2MB. SerÃ¡ reducida a 700x335px
+        header: PNG, GIF ou JPG. MÃ¡ximo %{size}. SerÃ¡ reducida a %{dimensions}px
+        inbox_url: Copiar o URL desde a pÃ¡xina de inicio do repetidor que quere utilizar
         irreversible: Os toots filtrados desaparecerÃ¡n de xeito irreversible, incluso si despois se elimina o filtro
         locale: O idioma da interface de usuaria, correos e notificaciÃ³ns
         locked: Require que vostede acepte as seguidoras de xeito manual
-        note:
-          one: <span class="note-counter">1</span> caracter restante
-          other: <span class="note-counter">%{count}</span> caracteres restantes
+        password: Utilice 8 caracteres ao menos
         phrase: ConcordarÃ¡ independentemente das maiÃºsculas ou avisos de contido no toot
         scopes: A que APIs terÃ¡ acceso a aplicaciÃ³n. Si selecciona un Ã¡mbito de alto nivel, non precisa seleccionar elementos individuais.
+        setting_aggregate_reblogs: Non mostrar novas promociÃ³ns de toots que foron promocionados recentemente (sÃ³ afecta a promociÃ³ns recÃ©n recibidas)
         setting_default_language: PÃ³dese detectar automÃ¡ticamente o idioma dos seus toots, mais non sempre Ã© preciso
+        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 seu perfil quen a segue e quen a estÃ¡ a seguir
         setting_noindex: Afecta ao seu perfil pÃºblico e pÃ¡xinas de estado
         setting_theme: Afecta ao aspecto de Mastodon en calquer dispositivo cando estÃ¡ conectada.
+        username: O seu 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
       imports:
         data: Ficheiro CSV exportado desde outra instancia Mastodon
       sessions:
@@ -36,6 +47,18 @@ gl:
         fields:
           name: Etiqueta
           value: Contido
+      account_warning_preset:
+        text: Texto preestablecido
+      admin_account_action:
+        send_email_notification: Notificar a usuaria por correo-e
+        text: Aviso personalizado
+        type: AcciÃ³n
+        types:
+          disable: Desactivar
+          none: Non facer nada
+          silence: Acalar
+          suspend: Suspender e eliminar irreversiblemente datos da conta
+        warning_preset_id: Utilizar un aviso preestablecido
       defaults:
         autofollow: Convide a seguir a sÃºa conta
         avatar: Avatar
@@ -46,11 +69,13 @@ gl:
         context: Contextos do filtro
         current_password: Contrasinal actual
         data: Datos
+        discoverable: IncluÃr esta conta no directorio
         display_name: Nome mostrado
         email: enderezo correo electrÃ³nico
         expires_in: Caducidade despois de
         fields: Metadatos do perfil
         header: Cabeceira
+        inbox_url: URL da caixa de entrada do repetidor
         irreversible: Soltar en lugar de agochar
         locale: Idioma da interface
         locked: Protexer conta
@@ -60,13 +85,18 @@ gl:
         otp_attempt: CÃ³digo de Doble-Factor
         password: Contrasinal
         phrase: Palabra chave ou frase
+        setting_aggregate_reblogs: Agrupar promociÃ³ns nas liÃ±as temporais
         setting_auto_play_gif: ReproduciÃ³n automÃ¡tica de GIFs animados
         setting_boost_modal: Pedir confirmaciÃ³n antes de promocionar
         setting_default_language: Idioma de publicaciÃ³n
         setting_default_privacy: Intimidade da publicaciÃ³n
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmaciÃ³n antes de eliminar unha mensaxe
-        setting_display_sensitive_media: Mostrar sempre os medios marcados como sensibles
+        setting_display_media: Mostrar medios
+        setting_display_media_default: Por omisiÃ³n
+        setting_display_media_hide_all: Ocultar todo
+        setting_display_media_show_all: Mostrar todo
+        setting_expand_spoilers: Despregar sempre as mensaxes marcadas con avisos de contido
         setting_hide_network: Agochar a sÃºa rede
         setting_noindex: Pedir non aparecer nas buscas dos motores de busca
         setting_reduce_motion: Reducir o movemento nas animaciÃ³ns
@@ -77,6 +107,7 @@ gl:
         type: Tipo de importaciÃ³n
         username: Nome de usuaria
         username_or_email: Nome de usuaria ou Correo-e
+        whole_word: Palabra completa
       interactions:
         must_be_follower: Bloquear as notificaciÃ³ns de non-seguidoras
         must_be_following: Bloquea as notificaciÃ³ns de personas que non segue
@@ -88,6 +119,7 @@ gl:
         follow_request: Enviar un correo cando alguÃ©n solicita seguila
         mention: Enviar un correo cando alguÃ©n a menciona
         reblog: Enviar un correo cando alguÃ©n promociona a sÃºa mensaxe
+        report: Enviar un correo cando se envÃe un novo informe
     'no': Non
     required:
       mark: "*"
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 96cdccd2b4b1ddaf8f2aeba93e81925a72e3cbe8..c86498c66aa99f893b2aff57786b12d50d086739 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -3,16 +3,10 @@ he:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF ××• JPG. ×ž×§×¡×™×ž×•× 2MB. ×’×•×“×œ ×”×ª×ž×•× ×” ×™×•×§×˜×Ÿ ×œ-400x400px
+        avatar: PNG, GIF ××• JPG. ×ž×§×¡×™×ž×•× %{size}. ×’×•×“×œ ×”×ª×ž×•× ×” ×™×•×§×˜×Ÿ ×œ-%{dimensions}px
         digest: × ×©×œ×— ×œ××—×¨ ×ª×§×•×¤×” ××¨×•×›×” ×©×œ ××™-×¤×¢×™×œ×•×ª ×¢× ×¡×™×›×•× ××™×–×›×•×¨×™× ×©×§×™×‘×œ×ª ×‘×”×¢×“×¨×š
-        display_name:
-          one: × ×•×ª×¨×” ××•×ª<span class="name-counter">××—×ª</span>
-          other: × ×•×ª×¨×•<span class="name-counter">%{count}</span> ××•×ª×™×•×ª
-        header: PNG, GIF ××• JPG. ×ž×§×¡×™×ž×•× 2MB. ×’×•×“×œ ×”×ª×ž×•× ×” ×™×•×§×˜×Ÿ 700x335px
+        header: PNG, GIF ××• JPG. ×ž×§×¡×™×ž×•× %{size}. ×’×•×“×œ ×”×ª×ž×•× ×” ×™×•×§×˜×Ÿ %{dimensions}px
         locked: ×ž×—×™×™×‘ ××™×©×•×¨ ×¢×•×§×‘×™× ×‘××•×¤×Ÿ ×™×“× ×™. ×¤×¨×˜×™×•×ª ×”×”×•×“×¢×•×ª ×ª×”×™×” ×¢×•×§×‘×™×-×‘×œ×‘×“ ××œ× ×× ×™×¦×•×™×Ÿ ××—×¨×ª
-        note:
-          one: × ×•×ª×¨×” ××•×ª<span class="note-counter">××—×ª</span>
-          other: × ×•×ª×¨×• <span class="note-counter">%{count}</span> ××•×ª×™×•×ª
         setting_noindex: ×ž×©×¤×™×¢ ×¢×œ ×”×¤×¨×•×¤×™×œ ×”×¦×™×‘×•×¨×™ ×©×œ×š ×•×¢×ž×•×“×™ ×”×”×•×“×¢×•×ª
         setting_theme: ×ž×©×¤×™×¢ ×¢×œ ×”×ž×¨××” ×©×œ ×ž×¡×˜×•×“×•×Ÿ ×‘×¢×ª ×”×—×™×‘×•×¨ ×”×ž×–×•×”×” ×ž×›×œ ×ž×›×©×™×¨ ×©×”×•×.
       imports:
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index 6cff526ef91407489fdc13bb718e7f01f471f541..4b1d2b1e0a224163939faf39a443a5ed1a087917 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -3,11 +3,9 @@ hr:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF ili JPG. NajviÅ¡e 2MB. Bit Ä‡e smanjen na 400x400px
-        display_name: NajviÅ¡e 30 znakova
-        header: PNG, GIF ili JPG. NajviÅ¡e 2MB. Bit Ä‡e smanjen na 700x335px
+        avatar: PNG, GIF ili JPG. NajviÅ¡e %{size}. Bit Ä‡e smanjen na %{dimensions}px
+        header: PNG, GIF ili JPG. NajviÅ¡e %{size}. Bit Ä‡e smanjen na %{dimensions}px
         locked: traÅ¾i te da ruÄno odobriÅ¡ sljedbenike i postavlja privatnost postova na dostupnu samo sljedbenicima
-        note: NajviÅ¡e 65535 znakova
       imports:
         data: CSV fajl izvezen iz druge Mastodon instance
     labels:
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 2b36dc85b2faec2ffd6eaec0b807a28b2956b3ac..f36fabda1b91472014a988613abb751e991b281d 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -3,16 +3,10 @@ hu:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF vagy JPG. Maximum 2MB. Ãt lesz mÃ©retezve 400x400 pixelre
+        avatar: PNG, GIF vagy JPG. Maximum %{size}. Ãt lesz mÃ©retezve %{dimensions} pixelre
         digest: Csak hosszÃº tÃ¡vollÃ©t esetÃ©n kÃ¼ldve Ã©s csak ha szemÃ©lyes Ã¼zenetet kaptÃ¡l tÃ¡vollÃ©tedben
-        display_name:
-          one: <span class="name-counter">1</span>karakter maradt
-          other: <span class="name-counter">%{count}</span>karakter maradt
-        header: PNG, GIF vagy JPG. Maximum 2MB. Ãt lesz mÃ©retezve 700x335 pixelre
+        header: PNG, GIF vagy JPG. Maximum %{size}. Ãt lesz mÃ©retezve %{dimensions} pixelre
         locked: EgyenkÃ©nt engedÃ©lyezned kell a kÃ¶vetÅ‘idet
-        note:
-          one: <span class="note-counter">1</span>karakter maradt
-          other: <span class="note-counter">%{count}</span>karakter maradt
         setting_noindex: A publikus profilodra Ã©s stÃ¡tusz oldalra vonatkozik
         setting_theme: A bÃ¡rmely eszkÃ¶zrÅ‘l bejelentkezett felÃ¼let kinÃ©zetÃ©re vonatkozik.
       imports:
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 76ea67cccbaf9b70d45e4607af339a1f2ffedf2f..c6da2beff3c3a9fe5a41dc05703cbeb46f1b72ce 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -3,11 +3,9 @@ id:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 400x400px
-        display_name: Maksimal 30 karakter
-        header: PNG, GIF atau JPG. Maksimal 2MB. Ukuran dikecilkan menjadi 700x335px
+        avatar: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
+        header: PNG, GIF atau JPG. Maksimal %{size}. Ukuran dikecilkan menjadi %{dimensions}px
         locked: Anda harus menerima permintaan pengikut secara manual dan setting privasi postingan akan diubah khusus untuk pengikut
-        note: Maksimum 65535 karakter
       imports:
         data: File CSV yang diexpor dari server Mastodon lain
       sessions:
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 94b12532c4b7ee44c778af56ead3798ee6fb2fda..c9fd9899e87332f4579cf799118052d6a6343489 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -3,11 +3,9 @@ io:
   simple_form:
     hints:
       defaults:
-        avatar: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 400x400px
-        display_name: 30 signi maxime
-        header: En la formato PNG, GIF o JPG. Til 2Mo. Esos mikrigita a 700x335px
+        avatar: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
+        header: En la formato PNG, GIF o JPG. Til %{size}. Esos mikrigita a %{dimensions}px
         locked: Tu devos aprobar omna demandi di sequado, e tua mesaji esos senchanje nur por tua sequanti.
-        note: 65535 signi maxime
       imports:
         data: Dosiero CSV de altra instaluro di Mastodon
       sessions:
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 185bba2055171633f8de23995aad976dea525f3a..dd43898d2536bc3faf717fe10407127c7904d5da 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -2,29 +2,40 @@
 it:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Puoi usare la sintassi dei toot, come URL, hashtag e menzioni
+      admin_account_action:
+        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
+        type_html: Decidi cosa fare con <strong>%{acct}</strong>
+        warning_preset_id: Opzionale. Puoi aggiungere un testo personalizzato alla fine di quello preimpostato
       defaults:
         autofollow: Le persone che si iscrivono attraverso l'invito ti seguiranno automaticamente
-        avatar: PNG, GIF o JPG. Al massimo 2MB. Verranno scalate a 400x400px
+        avatar: PNG, GIF o JPG. Al massimo %{size}. Verranno scalate a %{dimensions}px
         bot: Questo account esegue principalmente operazioni automatiche e potrebbe non essere tenuto sotto controllo da una persona
         context: Uno o piÃ¹ contesti nei quali il filtro dovrebbe essere applicato
         digest: Inviata solo dopo un lungo periodo di inattivitÃ  e solo se hai ricevuto qualche messaggio personale in tua assenza
-        display_name:
-          one: <span class="name-counter">1</span> carattere rimanente
-          other: <span class="name-counter">%{count}</span> caratteri rimanenti
+        discoverable_html: La <a href="%{path}" target="_blank">directory</a> permette alle persone di trovare account in base a determinati interessi o attivitÃ . Richiede almeno %{min_followers} seguaci
+        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 2MB. Verranno scalate a 700x335px
+        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
         locale: La lingua dell'interfaccia utente, di email e notifiche push
         locked: Richiede che approvi i follower manualmente
-        note:
-          one: <span class="note-counter">1</span> carattere rimanente
-          other: <span class="note-counter">%{count}</span> caratteri rimanenti
+        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_default_language: La lingua dei tuoi toot puÃ² essere individuata automaticamente, ma il risultato non Ã¨ sempre accurato
+        setting_display_media_default: Nascondi media segnati come sensibili
+        setting_display_media_hide_all: Nascondi sempre tutti i media
+        setting_display_media_show_all: Nascondi sempre i media segnati come sensibili
         setting_hide_network: Chi segui e chi segue te non saranno mostrati sul tuo profilo
         setting_noindex: Ha effetto sul tuo profilo pubblico e sulle pagine degli status
         setting_theme: Ha effetto sul modo in cui Mastodon verrÃ  visualizzato quando sarai collegato da qualsiasi dispositivo.
+        username: Il tuo nome utente sarÃ  unico su %{domain}
+        whole_word: Quando la parola chiave o la frase Ã¨ solo alfanumerica, si applica solo se corrisponde alla parola intera
       imports:
         data: File CSV esportato da un'altra istanza di Mastodon
       sessions:
@@ -36,6 +47,18 @@ it:
         fields:
           name: Etichetta
           value: Contenuto
+      account_warning_preset:
+        text: Testo preimpostato
+      admin_account_action:
+        send_email_notification: Informa l'utente via email
+        text: Avviso personalizzato
+        type: Azione
+        types:
+          disable: Disabilita
+          none: Non fare nulla
+          silence: Silenzia
+          suspend: Sospendi e cancella i dati dell'account in modo irreversibile
+        warning_preset_id: Usa un avviso preimpostato
       defaults:
         autofollow: Invita a seguire il tuo account
         avatar: Avatar
@@ -46,39 +69,47 @@ it:
         context: Contesti del filtro
         current_password: Password corrente
         data: Data
+        discoverable: Inserisci questo account nella directory
         display_name: Nome visualizzato
         email: Indirizzo email
         expires_in: Scade dopo
         fields: Metadati del profilo
-        header: Header
+        header: Intestazione
+        inbox_url: URL della inbox del ripetitore
         irreversible: Elimina invece di nascondere
         locale: Lingua dell'interfaccia
         locked: Blocca account
         max_uses: Numero massimo di utilizzi
         new_password: Nuova password
-        note: Bio
+        note: Biografia
         otp_attempt: Codice due-fattori
         password: Password
         phrase: Parola chiave o frase
+        setting_aggregate_reblogs: Raggruppa condivisioni in timeline
         setting_auto_play_gif: Play automatico GIF animate
         setting_boost_modal: Mostra dialogo di conferma prima del boost
         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_display_sensitive_media: Mostra sempre i media segnati come sensibili
+        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_hide_network: Nascondi la tua rete
-        setting_noindex: Non indicizzare dai motori di ricerca
+        setting_noindex: Non farti indicizzare dai motori di ricerca
         setting_reduce_motion: Riduci movimento nelle animazioni
-        setting_system_font_ui: Usa il carattere di default del sistema
+        setting_system_font_ui: Usa il carattere predefinito del sistema
         setting_theme: Tema sito
         setting_unfollow_modal: Mostra dialogo di conferma prima di smettere di seguire qualcuno
         severity: SeveritÃ 
         type: Tipo importazione
         username: Nome utente
         username_or_email: Nome utente o email
+        whole_word: Parola intera
       interactions:
-        must_be_follower: Blocca notifiche dai non follower
+        must_be_follower: Blocca notifiche da chi non ti segue
         must_be_following: Blocca notifiche dalle persone che non segui
         must_be_following_dm: Blocca i messaggi diretti dalle persone che non segui
       notification_emails:
@@ -88,6 +119,7 @@ it:
         follow_request: Invia email quando qualcuno richiede di seguirti
         mention: Invia email quando qualcuno ti menziona
         reblog: Invia email quando qualcuno da un boost al tuo stato
+        report: Manda una mail quando viene inviato un nuovo rapporto
     'no': 'No'
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 7f7f3af19dd3ce06725aa341ff58ece4322a6955..f9beedb7e1b1125be4ae710527881b9553d00187 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -2,25 +2,40 @@
 ja:
   simple_form:
     hints:
+      account_warning_preset:
+        text: URLã€ãƒãƒƒã‚·ãƒ¥ã‚¿ã‚°ã€ãƒ¡ãƒ³ã‚·ãƒ§ãƒ³ãªã©ã€æŠ•ç¨¿ã«ç”¨ã„ã‚‹æ§‹æ–‡ãŒä½¿ç”¨ã§ãã¾ã™
+      admin_account_action:
+        send_email_notification: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¯è‡ªåˆ†ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ä½•ãŒèµ·ã“ã£ãŸã®ã‹èª¬æ˜Žã‚’å—ã‘å–ã‚Šã¾ã™
+        text_html: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã™ã€‚æŠ•ç¨¿ã«ç”¨ã„ã‚‹æ§‹æ–‡ã‚’ä½¿ã†ã“ã¨ãŒã§ãã¾ã™ã€‚ç°¡ç•¥åŒ–ã®ãŸã‚<a href="%{path}">ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡ã‚’è¿½åŠ </a>ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™
+        type_html: "<strong>%{acct}</strong>ã•ã‚“ã«å¯¾ã—ã€ä½•ã‚’è¡Œã†ã‹é¸æŠžã—ã¦ãã ã•ã„"
+        warning_preset_id: ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ã™ã€‚ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡ã®æœ«å°¾ã«ä»»æ„ã®æ–‡å—åˆ—ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™
       defaults:
         autofollow: æ‹›å¾…ã‹ã‚‰ç™»éŒ²ã—ãŸäººãŒè‡ªå‹•çš„ã«ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™
-        avatar: 2MBã¾ã§ã®PNGã€GIFã€JPGãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚400x400pxã¾ã§ç¸®å°ã•ã‚Œã¾ã™
+        avatar: "%{size}ã¾ã§ã®PNGã€GIFã€JPGãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚%{dimensions}pxã¾ã§ç¸®å°ã•ã‚Œã¾ã™"
         bot: ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¯ä¸»ã«è‡ªå‹•ã§å‹•ä½œã—ã€äººãŒè¦‹ã¦ã„ãªã„å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™
         context: ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’é©ç”¨ã™ã‚‹å¯¾è±¡ (è¤‡æ•°é¸æŠžå¯)
         digest: é•·æœŸé–“ä½¿ç”¨ã—ã¦ã„ãªã„å ´åˆã¨ä¸åœ¨æ™‚ã«è¿”ä¿¡ã‚’å—ã‘ãŸå ´åˆã®ã¿é€ä¿¡ã•ã‚Œã¾ã™
-        display_name: ã‚ã¨<span class="name-counter">%{count}</span>æ–‡å—å…¥åŠ›ã§ãã¾ã™ã€‚
+        discoverable_html: <a href="%{path}" target="_blank">ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª</a> ã¯èˆˆå‘³ã‚„æ´»å‹•ã‚’ã‚‚ã¨ã«ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’è¦‹ã¤ã‘ã‚‹ã“ã¨ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚ æŽ²è¼‰ã«ã¯ %{min_followers} äººä»¥ä¸Šã®ãƒ•ã‚©ãƒãƒ¯ãƒ¼ãŒå¿…è¦ã§ã™
+        email: ç¢ºèªã®ãƒ¡ãƒ¼ãƒ«ãŒé€ä¿¡ã•ã‚Œã¾ã™
         fields: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã«è¡¨ã¨ã—ã¦4ã¤ã¾ã§ã®é …ç›®ã‚’è¡¨ç¤ºã™ã‚‹ã“ã¨ãŒã§ãã¾ã™
-        header: 2MBã¾ã§ã®PNGã€GIFã€JPGãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚ 700x335pxã¾ã§ç¸®å°ã•ã‚Œã¾ã™
+        header: "%{size}ã¾ã§ã®PNGã€GIFã€JPGãŒåˆ©ç”¨å¯èƒ½ã§ã™ã€‚ %{dimensions}pxã¾ã§ç¸®å°ã•ã‚Œã¾ã™"
+        inbox_url: ä½¿ç”¨ã—ãŸã„ãƒªãƒ¬ãƒ¼ã‚µãƒ¼ãƒãƒ¼ã®ãƒˆãƒƒãƒ—ãƒšãƒ¼ã‚¸ã‹ã‚‰URLã‚’ã‚³ãƒ”ãƒ¼ã—ã¾ã™
         irreversible: ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ãŒå¾Œã§å‰Šé™¤ã•ã‚Œã¦ã‚‚ã€é™¤å¤–ã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆã¯å…ƒã«æˆ»ã›ãªããªã‚Šã¾ã™
         locale: ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã€ãƒ¡ãƒ¼ãƒ«ã‚„ãƒ—ãƒƒã‚·ãƒ¥é€šçŸ¥ã®è¨€èªž
         locked: ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã‚’æ‰‹å‹•ã§æ‰¿èªã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™
-        note: ã‚ã¨<span class="note-counter">%{count}</span>æ–‡å—å…¥åŠ›ã§ãã¾ã™ã€‚
+        password: å°‘ãªãã¨ã‚‚8æ–‡å—ã¯å…¥åŠ›ã—ã¦ãã ã•ã„
         phrase: ãƒˆã‚¥ãƒ¼ãƒˆã®å¤§æ–‡å—å°æ–‡å—ã‚„é–²è¦§æ³¨æ„ã«é–¢ä¿‚ãªãä¸€è‡´
         scopes: ã‚¢ãƒ—ãƒªã® API ã«è¨±å¯ã™ã‚‹ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚’é¸æŠžã—ã¦ãã ã•ã„ã€‚æœ€ä¸Šä½ã®ã‚¹ã‚³ãƒ¼ãƒ—ã‚’é¸æŠžã™ã‚‹å ´åˆã€å€‹ã€…ã®ã‚¹ã‚³ãƒ¼ãƒ—ã‚’é¸æŠžã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚
+        setting_aggregate_reblogs: æœ€è¿‘ãƒ–ãƒ¼ã‚¹ãƒˆã•ã‚ŒãŸãƒˆã‚¥ãƒ¼ãƒˆãŒæ–°ãŸã«ãƒ–ãƒ¼ã‚¹ãƒˆã•ã‚Œã¦ã‚‚è¡¨ç¤ºã—ã¾ã›ã‚“ (è¨å®šå¾Œå—ä¿¡ã—ãŸã‚‚ã®ã«ã®ã¿å½±éŸ¿)
         setting_default_language: ãƒˆã‚¥ãƒ¼ãƒˆã®è¨€èªžã¯è‡ªå‹•çš„ã«æ¤œå‡ºã•ã‚Œã¾ã™ãŒã€å¿…ãšã—ã‚‚æ£ç¢ºã¨ã¯é™ã‚Šã¾ã›ã‚“
+        setting_display_media_default: é–²è¦§æ³¨æ„ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢ã¯éš ã™
+        setting_display_media_hide_all: å…¨ã¦ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å¸¸ã«éš ã™
+        setting_display_media_show_all: é–²è¦§æ³¨æ„ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚‚å¸¸ã«è¡¨ç¤ºã™ã‚‹
         setting_hide_network: ãƒ•ã‚©ãƒãƒ¼ã¨ãƒ•ã‚©ãƒãƒ¯ãƒ¼ã®æƒ…å ±ãŒãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ãƒšãƒ¼ã‚¸ã§è¦‹ã‚‰ã‚Œãªã„ã‚ˆã†ã«ã—ã¾ã™
         setting_noindex: å…¬é–‹ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ãŠã‚ˆã³å„æŠ•ç¨¿ãƒšãƒ¼ã‚¸ã«å½±éŸ¿ã—ã¾ã™
         setting_theme: ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„ã‚‹å…¨ã¦ã®ãƒ‡ãƒã‚¤ã‚¹ã§é©ç”¨ã•ã‚Œã‚‹ãƒ‡ã‚¶ã‚¤ãƒ³ã§ã™ã€‚
+        username: ã‚ãªãŸã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¯ %{domain} ã®ä¸ã§é‡è¤‡ã—ã¦ã„ãªã„å¿…è¦ãŒã‚ã‚Šã¾ã™
+        whole_word: ã‚ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã¾ãŸã¯ãƒ•ãƒ¬ãƒ¼ã‚ºãŒè‹±æ•°å—ã®ã¿ã®å ´åˆã€å˜èªžå…¨ä½“ã¨ä¸€è‡´ã™ã‚‹å ´åˆã®ã¿é©ç”¨ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™
       imports:
         data: ä»–ã® Mastodon ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‹ã‚‰ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã—ãŸCSVãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¦ä¸‹ã•ã„
       sessions:
@@ -32,6 +47,18 @@ ja:
         fields:
           name: ãƒ©ãƒ™ãƒ«
           value: å†…å®¹
+      account_warning_preset:
+        text: ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡
+      admin_account_action:
+        send_email_notification: ãƒ¡ãƒ¼ãƒ«ã§ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«é€šçŸ¥
+        text: ã‚«ã‚¹ã‚¿ãƒ è¦å‘Šæ–‡
+        type: ã‚¢ã‚¯ã‚·ãƒ§ãƒ³
+        types:
+          disable: ç„¡åŠ¹åŒ–
+          none: ä½•ã‚‚ã—ãªã„
+          silence: ã‚µã‚¤ãƒ¬ãƒ³ã‚¹
+          suspend: åœæ¢ã—ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒ‡ãƒ¼ã‚¿ã‚’æ’ä¹…çš„ã«å‰Šé™¤ã™ã‚‹
+        warning_preset_id: ãƒ—ãƒªã‚»ãƒƒãƒˆè¦å‘Šæ–‡ã‚’ä½¿ç”¨
       defaults:
         autofollow: æ‹›å¾…ã‹ã‚‰å‚åŠ å¾Œã€ã‚ãªãŸã‚’ãƒ•ã‚©ãƒãƒ¼
         avatar: ã‚¢ã‚¤ã‚³ãƒ³
@@ -39,14 +66,16 @@ ja:
         chosen_languages: è¡¨ç¤ºã™ã‚‹è¨€èªž
         confirm_new_password: æ–°ã—ã„ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ï¼ˆç¢ºèªç”¨ï¼‰
         confirm_password: ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ï¼ˆç¢ºèªç”¨ï¼‰
-        context: ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼å¯¾è±¡
+        context: é™¤å¤–å¯¾è±¡
         current_password: ç¾åœ¨ã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰
         data: ãƒ‡ãƒ¼ã‚¿
+        discoverable: ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æŽ²è¼‰ã™ã‚‹
         display_name: è¡¨ç¤ºå
         email: ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹
         expires_in: æœ‰åŠ¹æœŸé™
         fields: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«è£œè¶³æƒ…å ±
         header: ãƒ˜ãƒƒãƒ€ãƒ¼
+        inbox_url: ãƒªãƒ¬ãƒ¼ã‚µãƒ¼ãƒãƒ¼ã® inbox URL
         irreversible: éš ã™ã®ã§ã¯ãªãé™¤å¤–ã™ã‚‹
         locale: è¨€èªž
         locked: æ‰¿èªåˆ¶ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã«ã™ã‚‹
@@ -55,14 +84,19 @@ ja:
         note: ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«
         otp_attempt: äºŒæ®µéšŽèªè¨¼ã‚³ãƒ¼ãƒ‰
         password: ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰
-        phrase: å˜èªžã¾ãŸã¯èªžå¥
+        phrase: ã‚ãƒ¼ãƒ¯ãƒ¼ãƒ‰ã¾ãŸã¯ãƒ•ãƒ¬ãƒ¼ã‚º
+        setting_aggregate_reblogs: ãƒ–ãƒ¼ã‚¹ãƒˆã‚’ã¾ã¨ã‚ã‚‹
         setting_auto_play_gif: ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³GIFã‚’è‡ªå‹•å†ç”Ÿã™ã‚‹
         setting_boost_modal: ãƒ–ãƒ¼ã‚¹ãƒˆã™ã‚‹å‰ã«ç¢ºèªãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’è¡¨ç¤ºã™ã‚‹
         setting_default_language: æŠ•ç¨¿ã™ã‚‹è¨€èªž
         setting_default_privacy: æŠ•ç¨¿ã®å…¬é–‹ç¯„å›²
         setting_default_sensitive: ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å¸¸ã«é–²è¦§æ³¨æ„ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹
         setting_delete_modal: ãƒˆã‚¥ãƒ¼ãƒˆã‚’å‰Šé™¤ã™ã‚‹å‰ã«ç¢ºèªãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’è¡¨ç¤ºã™ã‚‹
-        setting_display_sensitive_media: é–²è¦§æ³¨æ„ã¨ã—ã¦ãƒžãƒ¼ã‚¯ã•ã‚ŒãŸãƒ¡ãƒ‡ã‚£ã‚¢ã‚‚å¸¸ã«è¡¨ç¤ºã™ã‚‹
+        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: ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã®å‹•ãã‚’æ¸›ã‚‰ã™
@@ -73,6 +107,7 @@ ja:
         type: ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹é …ç›®
         username: ãƒ¦ãƒ¼ã‚¶ãƒ¼å
         username_or_email: ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¾ãŸã¯ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹
+        whole_word: å˜èªžå…¨ä½“ã«ãƒžãƒƒãƒ
       interactions:
         must_be_follower: ãƒ•ã‚©ãƒãƒ¯ãƒ¼ä»¥å¤–ã‹ã‚‰ã®é€šçŸ¥ã‚’ãƒ–ãƒãƒƒã‚¯
         must_be_following: ãƒ•ã‚©ãƒãƒ¼ã—ã¦ã„ãªã„ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‹ã‚‰ã®é€šçŸ¥ã‚’ãƒ–ãƒãƒƒã‚¯
@@ -84,6 +119,7 @@ ja:
         follow_request: ãƒ•ã‚©ãƒãƒ¼ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’å—ã‘ãŸæ™‚ã«ãƒ¡ãƒ¼ãƒ«ã§é€šçŸ¥ã™ã‚‹
         mention: è¿”ä¿¡ãŒæ¥ãŸæ™‚ã«ãƒ¡ãƒ¼ãƒ«ã§é€šçŸ¥ã™ã‚‹
         reblog: ãƒˆã‚¥ãƒ¼ãƒˆãŒãƒ–ãƒ¼ã‚¹ãƒˆã•ã‚ŒãŸæ™‚ã«ãƒ¡ãƒ¼ãƒ«ã§é€šçŸ¥ã™ã‚‹
+        report: é€šå ±ã‚’å—ã‘ãŸæ™‚ã«ãƒ¡ãƒ¼ãƒ«ã§é€šçŸ¥ã™ã‚‹
     'no': ã„ã„ãˆ
     required:
       mark: "*"
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6bccb3134629d352ab84c7dba25a6d9308aa5468
--- /dev/null
+++ b/config/locales/simple_form.ka.yml
@@ -0,0 +1,92 @@
+---
+ka:
+  simple_form:
+    hints:
+      defaults:
+        autofollow: áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ˜ áƒ áƒáƒ›áƒšáƒ”áƒ‘áƒ˜áƒª áƒ“áƒáƒ áƒ”áƒ’áƒ˜áƒ¡áƒ¢áƒ áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ˜áƒáƒœ áƒ›áƒáƒ¬áƒ•áƒ”áƒ•áƒ˜áƒ—, áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒáƒ“ áƒ’áƒáƒ›áƒáƒ’áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒáƒœ
+        avatar: áƒžáƒœáƒ’, áƒ’áƒ˜áƒ¤ áƒáƒœ áƒ¯áƒžáƒ’. áƒ›áƒáƒ¥áƒ¡. %{size}. áƒ–áƒáƒ›áƒ áƒ“áƒáƒžáƒáƒ¢áƒáƒ áƒáƒ•áƒ“áƒ”áƒ‘áƒ %{dimensions}áƒžáƒ˜áƒ¥áƒ¡.-áƒ–áƒ”
+        bot: áƒ”áƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜ áƒ£áƒ›áƒ—áƒáƒ•áƒ áƒ”áƒ¡áƒáƒ“ áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ¡ áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ  áƒ›áƒáƒ¥áƒ›áƒ”áƒ“áƒ”áƒ‘áƒ”áƒ‘áƒ¡ áƒ“áƒ áƒ¨áƒ”áƒ¡áƒáƒ«áƒšáƒáƒ áƒáƒ  áƒ˜áƒ§áƒáƒ¡ áƒ›áƒáƒœáƒ˜áƒ¢áƒáƒ áƒ˜áƒœáƒ’áƒ˜áƒ¡ áƒ¥áƒ•áƒ”áƒ¨
+        context: áƒ”áƒ áƒ— áƒáƒœ áƒ›áƒ áƒáƒ•áƒáƒšáƒ˜ áƒ™áƒáƒœáƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜ áƒ¡áƒáƒ“áƒáƒª áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜ áƒ£áƒœáƒ“áƒ áƒ¨áƒ”áƒ¡áƒ áƒ£áƒšáƒ“áƒ”áƒ¡
+        digest: áƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒ”áƒ‘áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒ®áƒáƒœáƒ’áƒ áƒ«áƒšáƒ˜áƒ•áƒ˜ áƒ£áƒáƒ¥áƒ¢áƒ˜áƒ•áƒáƒ‘áƒ˜áƒ¡ áƒžáƒ”áƒ áƒ˜áƒáƒ“áƒ˜áƒ¡ áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’ áƒ“áƒ áƒáƒ áƒ§áƒáƒ¤áƒœáƒ˜áƒ¡áƒáƒ¡ áƒ—áƒ£ áƒ›áƒ˜áƒ˜áƒ¦áƒ”áƒ— áƒ”áƒ áƒ—áƒ˜ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ áƒ›áƒáƒ˜áƒœáƒª
+        fields: áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ–áƒ” áƒ¢áƒáƒ‘áƒ£áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ˜áƒ— áƒ¨áƒ”áƒ¡áƒáƒ«áƒšáƒáƒ áƒ¡áƒáƒ©áƒ•áƒ”áƒœáƒ”áƒ‘áƒšáƒáƒ“ áƒ’áƒáƒ’áƒáƒ©áƒœáƒ“áƒ”áƒ— áƒ›áƒáƒ¥áƒ¡. 4 áƒžáƒ£áƒœáƒ¥áƒ¢áƒ˜
+        header: áƒžáƒœáƒ’, áƒ’áƒ˜áƒ¤ áƒáƒœ áƒ¯áƒžáƒ’. áƒ›áƒáƒ¥áƒ¡. %{size}. áƒ–áƒáƒ›áƒ áƒ“áƒáƒžáƒáƒ¢áƒáƒ áƒáƒ•áƒ“áƒ”áƒ‘áƒ %{dimensions}áƒžáƒ˜áƒ¥áƒ¡.-áƒ–áƒ”
+        inbox_url: áƒ£áƒ áƒš áƒ“áƒáƒáƒ™áƒáƒ˜áƒ áƒ”áƒ— áƒ’áƒáƒ›áƒáƒ§áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡áƒ—áƒ•áƒ˜áƒ¡ áƒ¡áƒáƒ¡áƒ£áƒ áƒ•áƒ”áƒšáƒ˜ áƒ áƒ˜áƒšáƒ”áƒ˜áƒ¡ áƒ¬áƒ˜áƒœáƒ áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜áƒ“áƒáƒœ
+        irreversible: áƒ’áƒáƒ¤áƒ˜áƒšáƒ¢áƒ áƒ£áƒšáƒ˜ áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜ áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ”áƒ‘áƒ áƒáƒ¦áƒ£áƒ“áƒ’áƒ”áƒœáƒšáƒáƒ“, áƒ˜áƒ› áƒ¨áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒáƒ¨áƒ˜áƒª áƒ™áƒ˜ áƒ—áƒ£ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜ áƒ¡áƒáƒ›áƒáƒ›áƒáƒ•áƒšáƒáƒ“ áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ”áƒ‘áƒ
+        locale: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜áƒ¡, áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒ¤áƒ£áƒ¨ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜áƒ¡ áƒ”áƒœáƒ
+        locked: áƒ¡áƒáƒáƒ˜áƒ áƒáƒ”áƒ‘áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœ áƒ›áƒ˜áƒ”áƒ  áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ®áƒ”áƒšáƒ˜áƒ— áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒáƒ¡
+        phrase: áƒ“áƒáƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ áƒ›áƒáƒ®áƒ“áƒ”áƒ‘áƒ áƒ“áƒ˜áƒ“áƒ˜ áƒ“áƒ áƒžáƒáƒ¢áƒáƒ áƒ áƒáƒ¡áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒáƒœ áƒ™áƒáƒœáƒ¢áƒ”áƒœáƒ¢áƒ˜áƒ¡ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ—áƒ•áƒáƒšáƒ˜áƒ¡áƒ¬áƒ˜áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ áƒ”áƒ¨áƒ”
+        scopes: áƒ áƒáƒ›áƒ”áƒšáƒ˜ áƒáƒžáƒ˜áƒ”áƒ‘áƒ˜áƒ¡áƒáƒ“áƒ›áƒ˜ áƒ”áƒ¥áƒœáƒ”áƒ‘áƒ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒáƒ¡ áƒªáƒ•áƒ“áƒáƒ›áƒ. áƒ—áƒ£ áƒáƒ áƒ˜áƒ©áƒ”áƒ•áƒ— áƒ£áƒ›áƒ—áƒáƒ•áƒ áƒ”áƒ¡ áƒ¤áƒáƒ áƒ’áƒšáƒ”áƒ‘áƒ¡, áƒáƒ  áƒ“áƒáƒ’áƒáƒ˜áƒ áƒ“áƒ”áƒ‘áƒáƒ— áƒ˜áƒœáƒ“áƒ˜áƒ•áƒ˜áƒ“áƒ£áƒáƒšáƒ£áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒáƒ›áƒáƒ áƒ©áƒ”áƒ•áƒ.
+        setting_default_language: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜áƒ¡ áƒ”áƒœáƒ áƒ¨áƒ”áƒ˜áƒ«áƒšáƒ”áƒ‘áƒ áƒ“áƒáƒ“áƒ’áƒ˜áƒœáƒ“áƒ”áƒ¡ áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒáƒ“, áƒ›áƒáƒ’áƒ áƒáƒ› áƒ”áƒ¡ áƒáƒ áƒáƒ áƒ§áƒáƒ•áƒ”áƒšáƒ—áƒ•áƒ˜áƒ¡ áƒ–áƒ£áƒ¡áƒ¢áƒ˜
+        setting_hide_network: áƒ•áƒ˜áƒ¡ áƒ›áƒ˜áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ— áƒ“áƒ áƒ•áƒ˜áƒœ áƒ›áƒáƒ’áƒ§áƒ•áƒ”áƒ‘áƒáƒ— áƒáƒ  áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ‘áƒ áƒáƒ¥
+        setting_noindex: áƒ’áƒáƒ•áƒšáƒ”áƒœáƒáƒ¡ áƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¦áƒ˜áƒ áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡áƒ áƒ“áƒ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ˜áƒ¡ áƒ’áƒ•áƒ”áƒ áƒ“áƒ”áƒ‘áƒ–áƒ”
+        setting_theme: áƒ’áƒáƒ•áƒšáƒ”áƒœáƒáƒ¡ áƒáƒ®áƒ“áƒ”áƒœáƒ¡ áƒ—áƒ£ áƒ áƒáƒ’áƒáƒ  áƒ’áƒáƒ›áƒáƒ˜áƒ§áƒ£áƒ áƒ”áƒ‘áƒ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜, áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ¨áƒ”áƒ¡áƒ£áƒšáƒ˜ áƒ®áƒáƒ áƒ— áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒ›áƒ” áƒ›áƒáƒ¬áƒ§áƒáƒ‘áƒ˜áƒšáƒáƒ‘áƒ˜áƒ“áƒáƒœ.
+        whole_word: áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ¡áƒ˜áƒ¢áƒ§áƒ•áƒ áƒáƒœ áƒ¤áƒ áƒáƒ–áƒ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒáƒšáƒ¤áƒ-áƒœáƒ£áƒ›áƒ”áƒ áƒ˜áƒ™áƒ£áƒšáƒ˜áƒ, áƒ˜áƒ¡ áƒ“áƒáƒ¤áƒ˜áƒ¥áƒ¡áƒ˜áƒ áƒ“áƒ”áƒ‘áƒ áƒ—áƒ£ áƒ”áƒ›áƒ—áƒ®áƒ•áƒ”áƒ•áƒ áƒ¡áƒ áƒ£áƒš áƒ¡áƒ˜áƒ¢áƒ§áƒ•áƒáƒ¡
+      imports:
+        data: áƒªáƒ¡áƒ• áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ”áƒ¥áƒ¡áƒžáƒáƒ áƒ¢áƒ˜ áƒ›áƒáƒ®áƒ“áƒ áƒ›áƒáƒ¡áƒ¢áƒáƒ“áƒáƒœáƒ˜áƒ¡ áƒ¡áƒ®áƒ•áƒ áƒ˜áƒœáƒ¡áƒ¢áƒáƒœáƒªáƒ˜áƒ˜áƒ“áƒáƒœ
+      sessions:
+        otp: 'áƒ¨áƒ”áƒ˜áƒ§áƒ•áƒáƒœáƒ”áƒ— áƒ›áƒ”áƒáƒ áƒ” áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒ“áƒ˜, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ“áƒáƒáƒ’áƒ”áƒ áƒ˜áƒ áƒ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ›áƒ áƒ¢áƒ”áƒšáƒ”áƒ¤áƒáƒœáƒ›áƒ áƒáƒœ áƒ›áƒáƒ˜áƒ®áƒ›áƒáƒ áƒ”áƒ— áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜ áƒáƒ¦áƒ“áƒ’áƒ”áƒœáƒ˜áƒ¡ áƒ™áƒáƒ“áƒ”áƒ‘áƒ˜áƒ“áƒáƒœ áƒ”áƒ áƒ—-áƒ”áƒ áƒ—áƒ˜:'
+      user:
+        chosen_languages: áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ›áƒáƒ˜áƒœáƒ˜áƒ¨áƒœáƒ”áƒ‘áƒ, áƒ¦áƒ˜áƒ áƒ—áƒáƒ˜áƒ›áƒšáƒáƒ˜áƒœáƒ–áƒ” áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ‘áƒ áƒ¢áƒ£áƒ¢áƒ”áƒ‘áƒ˜ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒáƒ áƒ©áƒ”áƒ£áƒš áƒ”áƒœáƒ”áƒ‘áƒ–áƒ”
+    labels:
+      account:
+        fields:
+          name: áƒšáƒ”áƒ˜áƒ‘áƒšáƒ˜
+          value: áƒ›áƒáƒªáƒ£áƒšáƒáƒ‘áƒ
+      defaults:
+        autofollow: áƒ›áƒáƒ˜áƒ¬áƒ•áƒ˜áƒ”áƒ— áƒ áƒáƒ› áƒ’áƒáƒ›áƒáƒ°áƒ§áƒ•áƒœáƒ”áƒœ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ¡
+        avatar: áƒáƒ•áƒáƒ¢áƒáƒ áƒ˜
+        bot: áƒ”áƒ¡ áƒ‘áƒáƒ¢áƒ˜áƒ¡ áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ
+        chosen_languages: áƒ”áƒœáƒ”áƒ‘áƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜
+        confirm_new_password: áƒ“áƒáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ— áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜
+        confirm_password: áƒ“áƒáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ— áƒžáƒáƒ áƒáƒšáƒ˜
+        context: áƒ™áƒáƒœáƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜áƒ¡ áƒ¤áƒ˜áƒšáƒ¢áƒ áƒ˜
+        current_password: áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒžáƒáƒ áƒáƒšáƒ˜
+        data: áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ”áƒ‘áƒ˜
+        display_name: áƒ“áƒ˜áƒ¡áƒžáƒšáƒ”áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
+        email: áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜
+        expires_in: áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ
+        fields: áƒžáƒ áƒáƒ¤áƒ˜áƒšáƒ˜áƒ¡ áƒ›áƒ”áƒ¢áƒ-áƒ›áƒáƒœáƒáƒªáƒ”áƒ›áƒ˜
+        header: áƒ“áƒáƒ¡áƒáƒ—áƒáƒ£áƒ áƒ”áƒ‘áƒ
+        inbox_url: áƒ áƒ˜áƒšáƒ”áƒ˜ áƒ˜áƒœáƒ‘áƒáƒ¥áƒ¡áƒ˜áƒ¡ áƒ£áƒ áƒš
+        irreversible: áƒ’áƒáƒ£áƒ¥áƒ›áƒ“áƒ”áƒ¡ áƒ“áƒáƒ›áƒáƒšáƒ•áƒ˜áƒ¡ áƒ›áƒáƒ’áƒ˜áƒ•áƒ áƒáƒ“
+        locale: áƒ˜áƒœáƒ¢áƒ”áƒ áƒ¤áƒ”áƒ˜áƒ¡áƒ˜áƒ¡ áƒ”áƒœáƒ
+        locked: áƒáƒœáƒ’áƒáƒ áƒ˜áƒ¨áƒ˜áƒ¡ áƒ©áƒáƒ™áƒ”áƒ¢áƒ•áƒ
+        max_uses: áƒ›áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ¥áƒ¡. áƒáƒ“áƒ”áƒœáƒáƒ‘áƒ
+        new_password: áƒáƒ®áƒáƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜
+        note: áƒ‘áƒ˜áƒ.
+        otp_attempt: áƒ›áƒ”áƒáƒ áƒ”-áƒ¤áƒáƒ¥áƒ¢áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒ“áƒ˜
+        password: áƒžáƒáƒ áƒáƒšáƒ˜
+        phrase: áƒ¡áƒ˜áƒ¢áƒ§áƒ•áƒ áƒáƒœ áƒ¤áƒ áƒáƒ–áƒ
+        setting_auto_play_gif: áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ£áƒ áƒ˜ áƒ’áƒ˜áƒ¤áƒ”áƒ‘áƒ˜áƒ¡ áƒáƒ•áƒ¢áƒ-áƒ“áƒáƒ™áƒ•áƒ áƒ
+        setting_boost_modal: áƒ‘áƒ£áƒ¡áƒ¢áƒáƒ›áƒ” áƒ›áƒáƒ®áƒ“áƒ”áƒ¡ áƒ“áƒáƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ
+        setting_default_language: áƒžáƒáƒ¡áƒ¢áƒ˜áƒœáƒ’áƒ˜áƒ¡ áƒ”áƒœáƒ
+        setting_default_privacy: áƒžáƒáƒ¡áƒ¢áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¤áƒ˜áƒ“áƒ”áƒœáƒªáƒ˜áƒáƒšáƒ£áƒ áƒáƒ‘áƒ
+        setting_default_sensitive: áƒ§áƒáƒ•áƒ”áƒšáƒ—áƒ•áƒ˜áƒ¡ áƒ›áƒáƒ˜áƒœáƒ˜áƒ¨áƒœáƒáƒ¡ áƒ›áƒ”áƒ“áƒ˜áƒ áƒ›áƒ’áƒ áƒ«áƒœáƒáƒ‘áƒ˜áƒáƒ áƒ”áƒ“
+        setting_delete_modal: áƒ¢áƒ£áƒ¢áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒáƒ›áƒ“áƒ” áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ¡ áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ¤áƒáƒœáƒ¯áƒáƒ áƒ
+        setting_hide_network: áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¥áƒ¡áƒ”áƒšáƒ˜áƒ¡ áƒ“áƒáƒ›áƒáƒšáƒ•áƒ
+        setting_noindex: áƒ¡áƒáƒ«áƒáƒ”áƒ‘áƒ˜ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ˜áƒœáƒ“áƒ”áƒ¥áƒ¡áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ
+        setting_reduce_motion: áƒ›áƒáƒ«áƒ áƒáƒáƒ‘áƒ˜áƒ¡ áƒ¨áƒ”áƒ›áƒªáƒ˜áƒ áƒ”áƒ‘áƒ áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ”áƒ‘áƒ¨áƒ˜
+        setting_system_font_ui: áƒ›áƒáƒ®áƒ“áƒ”áƒ¡ áƒ¡áƒ˜áƒ¡áƒ¢áƒ”áƒ›áƒ˜áƒ¡ áƒ¡áƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ áƒ¤áƒáƒœáƒ¢áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ
+        setting_theme: áƒ¡áƒáƒ˜áƒ¢áƒ˜áƒ¡ áƒ—áƒ”áƒ›áƒ
+        setting_unfollow_modal: áƒ’áƒáƒ›áƒáƒ©áƒœáƒ“áƒ”áƒ¡ áƒ“áƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ¤áƒáƒœáƒ¯áƒáƒ áƒ, áƒ¡áƒáƒœáƒáƒ› áƒ¨áƒ”áƒ§áƒ•áƒ”áƒ¢áƒ— áƒ•áƒ˜áƒœáƒ›áƒ”áƒ¡ áƒ“áƒáƒ“áƒ”áƒ•áƒœáƒ”áƒ‘áƒáƒ¡
+        severity: áƒ¡áƒ˜áƒ›áƒ«áƒ˜áƒ›áƒ”
+        type: áƒ˜áƒ›áƒžáƒáƒ áƒ¢áƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒáƒ‘áƒ
+        username: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜
+        username_or_email: áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒšáƒ˜áƒ¡ áƒ¡áƒáƒ®áƒ”áƒšáƒ˜ áƒáƒœ áƒ”áƒš-áƒ¤áƒáƒ¡áƒ¢áƒ
+        whole_word: áƒ›áƒ—áƒ”áƒšáƒ˜ áƒ¡áƒ˜áƒ¢áƒ§áƒ•áƒ
+      interactions:
+        must_be_follower: áƒ“áƒáƒ˜áƒ‘áƒšáƒáƒ™áƒáƒ¡ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒáƒ áƒ áƒ›áƒ˜áƒ›áƒ“áƒ”áƒ•áƒ áƒ”áƒ‘áƒ˜áƒ¡áƒ’áƒáƒœ
+        must_be_following: áƒ“áƒáƒ˜áƒ‘áƒšáƒáƒ™áƒáƒ¡ áƒ¨áƒ”áƒ¢áƒ§áƒáƒ‘áƒ˜áƒœáƒ”áƒ‘áƒ”áƒ‘áƒ˜ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ”áƒ‘áƒ˜áƒ¡áƒ’áƒáƒœ áƒ•áƒ˜áƒ¡áƒáƒª áƒáƒ  áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—
+        must_be_following_dm: áƒ“áƒáƒ˜áƒ‘áƒšáƒáƒ™áƒáƒ¡ áƒžáƒ˜áƒ áƒáƒ“áƒ˜ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ”áƒ‘áƒ˜ áƒáƒ“áƒáƒ›áƒ˜áƒáƒœáƒ‘áƒ˜áƒ¡áƒ’áƒáƒœ áƒ•áƒ˜áƒ¡áƒáƒª áƒáƒ  áƒ›áƒ˜áƒ°áƒ§áƒ•áƒ”áƒ‘áƒ˜áƒ—
+      notification_emails:
+        digest: áƒ’áƒáƒ›áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡ áƒ“áƒáƒ˜áƒ¯áƒ”áƒ¡áƒ¢ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ”áƒ‘áƒ˜
+        favourite: áƒ’áƒáƒ›áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ•áƒ˜áƒœáƒ›áƒ” áƒ¤áƒáƒ•áƒáƒ áƒ˜áƒ¢áƒáƒ“ áƒáƒ¥áƒªáƒ”áƒ•áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ¡
+        follow: áƒ’áƒáƒ›áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ•áƒ˜áƒœáƒ›áƒ” áƒ’áƒáƒ›áƒáƒ’áƒ§áƒ•áƒ”áƒ‘áƒáƒ—
+        follow_request: áƒ’áƒáƒ›áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ•áƒ˜áƒœáƒ›áƒ” áƒ›áƒáƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ’áƒáƒ°áƒ§áƒ•áƒ”áƒ—
+        mention: áƒ’áƒáƒ›áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ•áƒ˜áƒœáƒ›áƒ” áƒ’áƒáƒ¡áƒáƒ®áƒ”áƒšáƒ”áƒ‘áƒ—
+        reblog: áƒ’áƒáƒ›áƒáƒ˜áƒ’áƒ–áƒáƒ•áƒœáƒáƒ¡ áƒ¬áƒ”áƒ áƒ˜áƒšáƒ˜ áƒ áƒáƒ“áƒ”áƒ¡áƒáƒª áƒ•áƒ˜áƒœáƒ›áƒ” áƒ’áƒáƒ–áƒ áƒ“áƒ˜áƒ¡ áƒ—áƒ¥áƒ•áƒ”áƒœáƒ¡ áƒ¡áƒ¢áƒáƒ¢áƒ£áƒ¡áƒ¡
+    'no': áƒáƒ áƒ
+    required:
+      mark: "*"
+      text: áƒáƒ£áƒªáƒ˜áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜
+    'yes': áƒ™áƒ˜
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index e0a6a74052b2ca18aa129a106952e39b9631dc82..fd0a1940ee12abd04ba12daf7336048d35fc125a 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -2,28 +2,40 @@
 ko:
   simple_form:
     hints:
+      account_warning_preset:
+        text: URL, í•´ì‹œíƒœê·¸, ë©˜ì…˜ê³¼ ê°™ì€ íˆ¿ ë¬¸ë²•ì„ ì‚¬ìš©í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
+      admin_account_action:
+        send_email_notification: ìœ ì €ëŠ” ì–´ë–¤ ì¼ì´ ì¼ì–´ë‚¬ëŠ” ì§€ì— ëŒ€í•œ ì„¤ëª…ì„ ë°›ê²Œ ë©ë‹ˆë‹¤
+        text_html: ì„ íƒì‚¬í•. íˆ¿ ë¬¸ë²•ì„ ì‚¬ìš©í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤. <a href="%{path}">ê²½ê³  í‹€ì„ ì¶”ê°€</a>í•˜ì—¬ ì‹œê°„ì„ ì ˆì•½í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
+        type_html: "<strong>%{acct}</strong>ì— ëŒ€í•´ ì·¨í•  í–‰ë™ ì„ íƒ"
+        warning_preset_id: ì„ íƒì‚¬í•. í‹€ì˜ ë§ˆì§€ë§‰ì— ìž„ì˜ì˜ í…ìŠ¤íŠ¸ë¥¼ ì¶”ê°€ í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤
       defaults:
         autofollow: ì´ ì´ˆëŒ€ë¥¼ í†µí•´ ê°€ìž…í•˜ëŠ” ì‚¬ëžŒì€ ë‹¹ì‹ ì„ ìžë™ìœ¼ë¡œ íŒ”ë¡œìš° í•˜ê²Œ ë©ë‹ˆë‹¤
-        avatar: PNG, GIF í˜¹ì€ JPG. ìµœëŒ€ 2MB. 400x400pxë¡œ ë‹¤ìš´ìŠ¤ì¼€ì¼ ë  ê²ƒìž„
+        avatar: PNG, GIF í˜¹ì€ JPG. ìµœëŒ€ %{size}. %{dimensions}pxë¡œ ë‹¤ìš´ìŠ¤ì¼€ì¼ ë  ê²ƒìž„
         bot: ì‚¬ëžŒë“¤ì—ê²Œ ê³„ì •ì´ ì‚¬ëžŒì´ ì•„ë‹˜ì„ ì•Œë¦½ë‹ˆë‹¤
         context: í•„í„°ë¥¼ ì ìš© í•  í•œ ê°œ ì´ìƒì˜ ì»¨í…ìŠ¤íŠ¸
         digest: ì˜¤ëž«ë™ì•ˆ í™œë™í•˜ì§€ ì•Šì•˜ì„ ë•Œ ë°›ì€ ë©˜ì…˜ë“¤ì— ëŒ€í•œ ìš”ì•½ ë°›ê¸°
-        display_name:
-          one: <span class="name-counter">1</span> ê¸€ìž ë‚¨ìŒ
-          other: <span class="name-counter">%{count}</span> ê¸€ìž ë‚¨ìŒ
+        discoverable_html: <a href="%{path}" target="_blank">ë””ë ‰í† ë¦¬</a> ëŠ” ì‚¬ëžŒë“¤ì˜ ê´€ì‹¬ì‚¬ì™€ í™œë™ì— ê´€ë ¨ ëœ ê³„ì •ë“¤ì„ ì°¾ì„ ìˆ˜ ìžˆê²Œ í•´ ì¤ë‹ˆë‹¤. ìµœì†Œ %{min_followers}ëª…ì˜ íŒ”ë¡œì–´ê°€ í•„ìš”í•©ë‹ˆë‹¤
+        email: ë‹¹ì‹ ì€ í™•ì¸ ë©”ì¼ì„ ë°›ê²Œ ë©ë‹ˆë‹¤
         fields: ë‹¹ì‹ ì˜ í”„ë¡œíŒŒì¼ì— ìµœëŒ€ 4ê°œê¹Œì§€ í‘œ í˜•ì‹ìœ¼ë¡œ ë‚˜íƒ€ë‚¼ ìˆ˜ ìžˆìŠµë‹ˆë‹¤
-        header: PNG, GIF í˜¹ì€ JPG. ìµœëŒ€ 2MB. 700x335pxë¡œ ë‹¤ìš´ìŠ¤ì¼€ì¼ ë¨
+        header: PNG, GIF í˜¹ì€ JPG. ìµœëŒ€ %{size}. %{dimensions}pxë¡œ ë‹¤ìš´ìŠ¤ì¼€ì¼ ë¨
+        inbox_url: ì‚¬ìš© í•  ë¦´ë ˆì´ ì„œë²„ì˜ í”„ë¡ íŠ¸íŽ˜ì´ì§€ì—ì„œ URLì„ ë³µì‚¬í•©ë‹ˆë‹¤
         irreversible: í•„í„°ë§ ëœ íˆ¿ì€ ë‚˜ì¤‘ì— í•„í„°ê°€ ì‚¬ë¼ì§€ë”ë¼ë„ ëŒì•„ì˜¤ì§€ ì•Šê²Œ ë©ë‹ˆë‹¤
         locale: ìœ ì € ì¸í„°íŽ˜ì´ìŠ¤, ì´ë©”ì¼, í‘¸ì‹œ ì•Œë¦¼ ì–¸ì–´
         locked: ìˆ˜ë™ìœ¼ë¡œ íŒ”ë¡œì›Œë¥¼ ìŠ¹ì¸í•˜ê³ , ê¸°ë³¸ íˆ¿ í”„ë¼ì´ë²„ì‹œ ì„¤ì •ì„ íŒ”ë¡œì›Œ ì „ìš©ìœ¼ë¡œ ë³€ê²½
-        note:
-          one: <span class="note-counter">1</span> ê¸€ìž ë‚¨ìŒ
-          other: <span class="note-counter">%{count}</span> ê¸€ìž ë‚¨ìŒ
+        password: ìµœì†Œ 8ê¸€ìž
         phrase: íˆ¿ ë‚´ìš©ì´ë‚˜ CW ë‚´ìš© ì•ˆì—ì„œ ëŒ€ì†Œë¬¸ìž êµ¬ë¶„ ì—†ì´ ë§¤ì¹ ë©ë‹ˆë‹¤
+        scopes: ì• í”Œë¦¬ì¼€ì´ì…˜ì— í—ˆìš©í•  APIë“¤ìž…ë‹ˆë‹¤. ìµœìƒìœ„ ìŠ¤ì½”í”„ë¥¼ ì„ íƒí•˜ë©´ ê°œë³„ì ì¸ ê²ƒì€ ì„ íƒí•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤.
+        setting_aggregate_reblogs: ë‚´ê°€ ë¶€ìŠ¤íŠ¸ í–ˆë˜ íˆ¿ì€ ìƒˆë¡œ ë¶€ìŠ¤íŠ¸ ë˜ì–´ë„ ë³´ì—¬ì£¼ì§€ ì•ŠìŠµë‹ˆë‹¤
         setting_default_language: ìž‘ì„±í•œ íˆ¿ì˜ ì–¸ì–´ëŠ” ìžë™ìœ¼ë¡œ ì¸ì‹í•  ìˆ˜ ìžˆì§€ë§Œ, ì–¸ì œë‚˜ ì •í™•í•œ ê±´ ì•„ë‹™ë‹ˆë‹¤
+        setting_display_media_default: ë¯¼ê°í•¨ìœ¼ë¡œ ì„¤ì • ëœ ë¯¸ë””ì–´ ê°€ë¦¬ê¸°
+        setting_display_media_hide_all: í•ìƒ ëª¨ë“  ë¯¸ë””ì–´ë¥¼ ê°€ë¦¬ê¸°
+        setting_display_media_show_all: ë¯¼ê°í•¨ìœ¼ë¡œ ì„¤ì • ëœ ë¯¸ë””ì–´ë¥¼ í•ìƒ ë³´ì´ê¸°
         setting_hide_network: ë‚˜ë¥¼ íŒ”ë¡œìš° í•˜ëŠ” ì‚¬ëžŒë“¤ê³¼ ë‚´ê°€ íŒ”ë¡œìš° í•˜ëŠ” ì‚¬ëžŒë“¤ì´ ë‚´ í”„ë¡œí•„ì— í‘œì‹œë˜ì§€ ì•Šê²Œ í•©ë‹ˆë‹¤
         setting_noindex: ê³µê°œ í”„ë¡œí•„ ë° ê° íˆ¿íŽ˜ì´ì§€ì— ì˜í–¥ì„ ë¯¸ì¹©ë‹ˆë‹¤
         setting_theme: ë¡œê·¸ì¸ì¤‘ì¸ ëª¨ë“  ë””ë°”ì´ìŠ¤ì— ì ìš©ë˜ëŠ” ë””ìžì¸ìž…ë‹ˆë‹¤.
+        username: ë‹¹ì‹ ì˜ ìœ ì €ë„¤ìž„ì€ %{domain} ì•ˆì—ì„œ ìœ ì¼í•´ì•¼ í•©ë‹ˆë‹¤
+        whole_word: í‚¤ì›Œë“œê°€ ì˜ë¬¸ê³¼ ìˆ«ìžë¡œë§Œ ì´ë£¨ì–´ ì§„ ê²½ìš°, ë‹¨ì–´ ì „ì²´ì— ë§¤ì¹ ë˜ì—ˆì„ ë•Œì—ë§Œ ìž‘ë™í•˜ê²Œ í•©ë‹ˆë‹¤
       imports:
         data: ë‹¤ë¥¸ ë§ˆìŠ¤í† ëˆ ì¸ìŠ¤í„´ìŠ¤ì—ì„œ ì¶”ì¶œëœ CSV íŒŒì¼
       sessions:
@@ -35,6 +47,18 @@ ko:
         fields:
           name: ë¼ë²¨
           value: ë‚´ìš©
+      account_warning_preset:
+        text: í”„ë¦¬ì…‹ í…ìŠ¤íŠ¸
+      admin_account_action:
+        send_email_notification: ì´ë©”ì¼ë¡œ ìœ ì €ì—ê²Œ ì•Œë¦¬ê¸°
+        text: ì»¤ìŠ¤í…€ ê²½ê³ 
+        type: ì¡°ì¹˜
+        types:
+          disable: ë¹„í™œì„±í™”
+          none: ì•„ë¬´ ê²ƒë„ í•˜ì§€ ì•Šê¸°
+          silence: ì¹¨ë¬µ
+          suspend: ì •ì§€í•˜ê³  ë˜ëŒë¦´ ìˆ˜ ì—†ëŠ” ë°ì´í„° ì‚ì œ
+        warning_preset_id: ê²½ê³  í‹€ ì‚¬ìš©í•˜ê¸°
       defaults:
         autofollow: ì´ˆëŒ€ë¥¼ í†µí•œ íŒ”ë¡œìš°
         avatar: ì•„ë°”íƒ€
@@ -45,11 +69,13 @@ ko:
         context: í•„í„° ì»¨í…ìŠ¤íŠ¸
         current_password: í˜„ìž¬ ë¹„ë°€ë²ˆí˜¸ ìž…ë ¥
         data: ë°ì´í„°
+        discoverable: ì´ ê³„ì •ì„ ë””ë ‰í† ë¦¬ì—ì„œ ì°¾ì„ ìˆ˜ ìžˆë„ë¡ í•©ë‹ˆë‹¤
         display_name: í‘œì‹œë˜ëŠ” ì´ë¦„
         email: ì´ë©”ì¼ ì£¼ì†Œ
         expires_in: ë§Œë£Œì‹œê°
         fields: í”„ë¡œí•„ ë©”íƒ€ë°ì´í„°
         header: í—¤ë”
+        inbox_url: ë¦´ë ˆì´ ì„œë²„ì˜ inbox URL
         irreversible: ìˆ¨ê¸°ëŠ” ëŒ€ì‹  ì‚ì œ
         locale: ì¸í„°íŽ˜ì´ìŠ¤ ì–¸ì–´
         locked: ê³„ì • ìž ê¸ˆ
@@ -59,13 +85,18 @@ ko:
         otp_attempt: 2ë‹¨ê³„ ì¸ì¦ ì½”ë“œ
         password: ë¹„ë°€ë²ˆí˜¸
         phrase: í‚¤ì›Œë“œ ë˜ëŠ” ë¬¸ìž¥
+        setting_aggregate_reblogs: íƒ€ìž„ë¼ì¸ì˜ ë¶€ìŠ¤íŠ¸ë¥¼ ê·¸ë£¹í™”
         setting_auto_play_gif: ì• ë‹ˆë©”ì´ì…˜ GIFë¥¼ ìžë™ ìž¬ìƒ
         setting_boost_modal: ë¶€ìŠ¤íŠ¸ ì „ í™•ì¸ ì°½ì„ í‘œì‹œ
         setting_default_language: ê²Œì‹œë¬¼ ì–¸ì–´
         setting_default_privacy: íˆ¿ í”„ë¼ì´ë²„ì‹œ
         setting_default_sensitive: ë¯¸ë””ì–´ë¥¼ ì–¸ì œë‚˜ ë¯¼ê°í•œ ì»¨í…ì¸ ë¡œ ì„¤ì •
         setting_delete_modal: íˆ¿ ì‚ì œ ì „ í™•ì¸ ì°½ì„ í‘œì‹œ
-        setting_display_sensitive_media: ì—´ëžŒì£¼ì˜ë¡œ ì„¤ì • ëœ ì´ë¯¸ì§€ë„ í•ìƒ ë³´ì—¬ì£¼ê¸°
+        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: ì• ë‹ˆë©”ì´ì…˜ ì¤„ì´ê¸°
@@ -76,6 +107,7 @@ ko:
         type: ë¶ˆëŸ¬ì˜¤ê¸° ì¢…ë¥˜
         username: ìœ ì € ì´ë¦„
         username_or_email: ìœ ì €ë„¤ìž„ ë˜ëŠ” ì´ë©”ì¼
+        whole_word: ë‹¨ì–´ ì „ì²´ì— ë§¤ì¹
       interactions:
         must_be_follower: ë‚˜ë¥¼ íŒ”ë¡œìš° í•˜ì§€ ì•ŠëŠ” ì‚¬ëžŒì—ê²Œì„œ ì˜¨ ì•Œë¦¼ì„ ì°¨ë‹¨
         must_be_following: ë‚´ê°€ íŒ”ë¡œìš° í•˜ì§€ ì•ŠëŠ” ì‚¬ëžŒì—ê²Œì„œ ì˜¨ ì•Œë¦¼ì„ ì°¨ë‹¨
@@ -87,6 +119,7 @@ ko:
         follow_request: ëˆ„êµ°ê°€ ë‚˜ë¥¼ íŒ”ë¡œìš° í•˜ê¸¸ ì›í•  ë•Œ ì´ë©”ì¼ ë³´ë‚´ê¸°
         mention: ëˆ„êµ°ê°€ ë‚˜ì—ê²Œ ë‹µìž¥í–ˆì„ ë•Œ ì´ë©”ì¼ ë³´ë‚´ê¸°
         reblog: ëˆ„êµ°ê°€ ë‚´ íˆ¿ì„ ë¶€ìŠ¤íŠ¸ í–ˆì„ ë•Œ ì´ë©”ì¼ ë³´ë‚´ê¸°
+        report: ìƒˆ ì‹ ê³  ë“±ë¡ì‹œ ì´ë©”ì¼ë¡œ ì•Œë¦¬ê¸°
     'no': ì•„ë‹ˆì˜¤
     required:
       mark: "*"
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index eb13ec1950d5707c6ba697e9ee22b34872ff459b..6eb784c303eacf5f998fedda54e542c1a74d1e60 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -2,33 +2,44 @@
 nl:
   simple_form:
     hints:
+      account_warning_preset:
+        text: Je kunt voor toots specifieke tekst gebruiken, zoals URL's, hashtags en vermeldingen
+      admin_account_action:
+        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}">voorinstellingen van waarschuwingen toevoegen</a>
+        type_html: Kies wat er met <strong>%{acct}</strong> moet gebeuren
+        warning_preset_id: Optioneel. Je kunt nog steeds handmatig tekst toevoegen aan het eind van de voorinstelling
       defaults:
         autofollow: Mensen die zich via de uitnodiging hebben geregistreerd, volgen jou automatisch
-        avatar: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 400x400px
+        avatar: PNG, GIF of JPG. Maximaal %{size}. Wordt teruggeschaald naar %{dimensions}px
         bot: Dit is een geautomatiseerd account en wordt mogelijk niet gemonitord
         context: Een of meerdere locaties waar de filter actief moet zijn
         digest: Wordt alleen na een lange periode van inactiviteit verzonden en alleen wanneer je tijdens jouw afwezigheid persoonlijke berichten hebt ontvangen
-        display_name:
-          one: <span class="name-counter">1</span> teken over
-          other: <span class="name-counter">%{count}</span> tekens over
+        discoverable_html: In de <a href="%{path}" target="_blank">gebruikersgids</a> kunnen mensen andere accounts vinden aan de hand van interesses en activiteit. Dit vereist tenminste %{min_followers} volgers
+        email: Je krijgt een bevestigingsmail
         fields: Je kan maximaal 4 items als een tabel op je profiel weergeven
-        header: PNG, GIF of JPG. Maximaal 2MB. Wordt teruggeschaald naar 700x335px
+        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
         locale: De taal van de gebruikersomgeving, e-mails en pushmeldingen
         locked: Vereist dat je handmatig volgers moet accepteren
-        note:
-          one: <span class="note-counter">1</span> teken over
-          other: <span class="note-counter">%{count}</span> tekens over
+        password: Gebruik tenminste 8 tekens
         phrase: Komt overeen ongeacht hoofd-/kleine letters of tekstwaarschuwingen
         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_default_language: De taal van jouw toots kan automatisch worden gedetecteerd, maar het is niet altijd accuraat
+        setting_display_media_default: Als gevoelig gemarkeerde media verbergen
+        setting_display_media_hide_all: Media altijd verbergen
+        setting_display_media_show_all: Als gevoelig gemarkeerde media altijd verbergen
         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_theme: Heeft invloed op hoe de webapp van Mastodon eruitziet (op elk apparaat waarmee je inlogt).
+        username: Jouw gebruikersnaam is uniek op %{domain}
+        whole_word: Wanneer het trefwoord of zinsdeel alfanumeriek is, wordt het alleen gefilterd wanneer het hele woord overeenkomt
       imports:
         data: CSV-bestand dat op een andere Mastodonserver werd geÃ«xporteerd
       sessions:
-        otp: Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes.
+        otp: 'Voer de tweestaps-aanmeldcode vanaf jouw mobiele telefoon in of gebruik een van jouw herstelcodes:'
       user:
         chosen_languages: Alleen toots in de aangevinkte talen worden op de openbare tijdlijnen getoond
     labels:
@@ -36,6 +47,18 @@ nl:
         fields:
           name: Label
           value: Inhoud
+      account_warning_preset:
+        text: Tekst van voorinstelling
+      admin_account_action:
+        send_email_notification: Meld dit per e-mail aan de gebruiker
+        text: Aangepaste waarschuwing
+        type: Actie
+        types:
+          disable: Uitschakelen
+          none: Niets doen
+          silence: Negeren
+          suspend: Opschorten en onomkeerbaar accountgegevens verwijderen
+        warning_preset_id: Gebruik een voorinstelling van een waarschuwing
       defaults:
         autofollow: Uitnodigen om jouw account te volgen
         avatar: Avatar
@@ -46,11 +69,13 @@ nl:
         context: Filterlocaties
         current_password: Huidig wachtwoord
         data: Gegevens
+        discoverable: Dit account in de gebruikersgids tonen
         display_name: Weergavenaam
         email: E-mailadres
         expires_in: Vervalt na
         fields: Metadata profiel
         header: Omslagfoto
+        inbox_url: Inbox-URL van de relayserver
         irreversible: Verwijderen in plaats van verbergen
         locale: Taal van de gebruikersomgeving
         locked: Maak account besloten
@@ -60,13 +85,18 @@ nl:
         otp_attempt: Tweestaps-aanmeldcode
         password: Wachtwoord
         phrase: Trefwoord of zinsdeel
+        setting_aggregate_reblogs: Boosts in tijdlijnen groeperen
         setting_auto_play_gif: Speel geanimeerde GIF's automatisch af
         setting_boost_modal: Vraag voor het boosten van een toot een bevestiging
         setting_default_language: Taal van jouw toots
         setting_default_privacy: Standaardzichtbaarheid van jouw toots
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een toot een bevestiging
-        setting_display_sensitive_media: Als gevoelig gemarkeerde media altijd tonen
+        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 tekstwaarschuwingen uitklappen
         setting_hide_network: Jouw volgers en wie je volgt verbergen
         setting_noindex: Jouw toots niet door zoekmachines laten indexeren
         setting_reduce_motion: Langzamere animaties
@@ -77,17 +107,19 @@ nl:
         type: Importtype
         username: Gebruikersnaam
         username_or_email: Gebruikersnaam of e-mailadres
+        whole_word: Heel woord
       interactions:
         must_be_follower: Meldingen van mensen die jou niet volgen blokkeren
         must_be_following: Meldingen van mensen die jij niet volgt blokkeren
         must_be_following_dm: Directe berichten van mensen die jij niet volgt blokkeren
       notification_emails:
         digest: Periodiek e-mails met een samenvatting versturen
-        favourite: Een e-mail versturen wanneer iemand jouw toot als favoriet markeert
+        favourite: Een e-mail versturen wanneer iemand jouw toot aan hun favorieten heeft toegevoegd
         follow: Een e-mail versturen wanneer iemand jou volgt
         follow_request: Een e-mail versturen wanneer iemand jou wil volgen
         mention: Een e-mail versturen wanneer iemand jou vermeld
         reblog: Een e-mail versturen wanneer iemand jouw toot heeft geboost
+        report: Verstuur een e-mail wanneer een nieuw rapportage is ingediend
     'no': Nee
     required:
       mark: "*"
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index aba8feeb610c7e995575c58028d7ca409c887bda..fc339c3f27b633b9fd6fc55c8d93052241a95ccf 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -3,16 +3,10 @@
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF eller JPG. Maksimalt 2 MB. Vil bli nedskalert til 400x400px
+        avatar: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         digest: Kun sendt etter en lang periode med inaktivitet og bare dersom du har mottatt noen personlige meldinger mens du var borte
-        display_name:
-          one: <span class="name-counter">1</span> tegn igjen
-          other: <span class="name-counter">%{count}</span> tegn igjen
-        header: PNG, GIF eller JPG. Maksimalt 2MB. Vil bli nedskalert til 700x335px
+        header: PNG, GIF eller JPG. Maksimalt %{size}. Vil bli nedskalert til %{dimensions}px
         locked: Krever at du manuelt godkjenner fÃ¸lgere
-        note:
-          one: <span class="note-counter">1</span> tegn igjen
-          other: <span class="note-counter">%{count}</span> tegn igjen
         setting_noindex: PÃ¥virker din offentlige profil og statussider
         setting_theme: PÃ¥virker hvordan Mastodon ser ut nÃ¥r du er logget inn fra uansett enhet.
       imports:
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 7d11d0d3fef8f9a03d1b1308250eb973de7e882f..6ded448e903373c173609b0293442e1408fbbade 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -2,33 +2,44 @@
 oc:
   simple_form:
     hints:
+      account_warning_preset:
+        text: PodÃ¨tz utilizar la sintaxi dels tuts, coma las URL, las etiquetas e las mencions
+      admin_account_action:
+        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>
+        warning_preset_id: Opcional. PodÃ¨tz ajustar un tÃ¨xt personalizat a a fin de Ã§Ã² predefinit
       defaults:
         autofollow: Lo monde que se marcan grÃ cia a lâ€™invitacion vos segrÃ n automaticament
-        avatar: PNG, GIF o JPG. Maximum 2 Mo. SerÃ  retalhat en 400x400px
+        avatar: PNG, GIF o JPG. Maximum %{size}. SerÃ  retalhat en %{dimensions}px
         bot: Avisar lo monde quâ€™aqueste compte es pas dâ€™una persona
         context: Un o mai de contÃ¨xtes ont lo filtre deuriÃ¡ sâ€™aplicar
         digest: Solament enviat aprÃ¨p un long moment dâ€™inactivitat e solament sâ€™avÃ¨tz recebut de messatges personals pendent vÃ²stra absÃ©ncia
-        display_name:
-          one: DemÃ²ra encara <span class="name-counter">1</span> caractÃ¨r
-          other: DemÃ²ran encara <span class="name-counter">%{count}</span> caractÃ¨rs
+        discoverable_html: Lâ€™<a href="%{path}" target="_blank">annuari</a> permet al monde de trobar de comptes segon lor interÃ¨sses e activitats. RequerÃs almens %{min_followers} seguidors
+        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 2 Mo. SerÃ  retalhada en 700x335px
+        header: PNG, GIF o JPG. Maximum %{size}. SerÃ  retalhada en %{dimensions}px
+        inbox_url: Copiatz lâ€™URL de la pagina mÃ ger del relai que volÃ¨tz utilizar
         irreversible: Los tuts filtrats desapareisserÃ n irreversiblament, encara que lo filtre siÃ¡ suprimit mai tard
         locale: La lenga de lâ€™interfÃ cia dâ€™utilizacion, los messatges e las notificacions
         locked: Demanda quâ€™acceptetz manualament lo mond que vos sÃ¨gon e botarÃ  la visibilitat de vÃ²stras publicacions coma accessiblas a vÃ²stres seguidors solament
-        note:
-          one: DemÃ²ra encara <span class="name-counter">1</span> caractÃ¨r
-          other: DemÃ²ran encara <span class="name-counter">%{count}</span> caractÃ¨rs
+        password: Utilizatz almens 8 caractÃ¨rs
         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_default_language: La lenga de vÃ²stres tuts pÃ²t Ã¨sser detectada automaticament, mas de cÃ²ps es pas corrÃ¨ctament determinada
+        setting_display_media_default: Rescondre los mÃ¨dias marcats coma sensibles
+        setting_display_media_hide_all: Totjorn rescondre los mÃ¨dias
+        setting_display_media_show_all: Totjorn mostrar los mÃ¨dias marcats coma sensibles
         setting_hide_network: VÃ²stre perfil mostrarÃ  pas los que vos sÃ¨gon e lo monde que seguÃ¨tz
         setting_noindex: AquÃ² es destinat a vÃ²stre perfil public e vÃ²stra pagina dâ€™estatuts
         setting_theme: AquÃ² cÃ mbia lo tÃ¨ma grafic de Mastodon quand sÃ¨tz connectat qual que siasque lo periferic.
+        username: VÃ²stre nom dâ€™utilizaire serÃ  unic sus %{domain}
+        whole_word: Quand lo mot-clau o frasa es solament alfranumeric, serÃ  pas quâ€™aplicat se correspond al mot complÃ¨t
       imports:
         data: FichiÃ¨r CSV exportat dâ€™una autra instÃ ncia Mastodon
       sessions:
-        otp: 'Picatz lo cÃ²di dâ€™autentificacion en dos temps (Two factor code) de vÃ²stra aplicacion mobil o utilizatz un de vÃ²stres cÃ²dis de recuperacion :'
+        otp: 'Picatz lo cÃ²di dâ€™autentificacion en dos temps (Two factor code) de vÃ²stra aplicacion mobil o utilizatz un de vÃ²stres cÃ²dis de recuperacionâ€¯:'
       user:
         chosen_languages: Quand seleccionadas, solament los tuts dins las lengas triadas serÃ n mostrats dins vÃ²stre flux dâ€™actualitat
     labels:
@@ -36,6 +47,18 @@ oc:
         fields:
           name: Nom
           value: Contengut
+      account_warning_preset:
+        text: TÃ¨xt predefinit
+      admin_account_action:
+        send_email_notification: Avisar lâ€™utilizaire per corriÃ¨l
+        text: Avertiment personalizat
+        type: Accions
+        types:
+          disable: Desactivar
+          none: Far pas res
+          silence: Metre en silence
+          suspend: Suspendre e escafar per de bon las donadas del compte
+        warning_preset_id: Utilizar un avertiment predefinit
       defaults:
         autofollow: Convidar a sÃ¨gre vÃ²stre compte
         avatar: Avatar
@@ -46,11 +69,13 @@ oc:
         context: ContÃ¨xte del filtre
         current_password: Senhal actual
         data: Donadas
+        discoverable: Far aparÃ©isser aqueste compte a lâ€™annuari
         display_name: Escais
         email: CorriÃ¨l
         expires_in: Expira aprÃ¨p
         fields: Metadonada del perfil
         header: BandiÃ¨ra
+        inbox_url: URL de la bÃ³stia de recepcion del relai
         irreversible: Suprimir allÃ²c de rescondre
         locale: Lenga de lâ€™interfÃ cia
         locked: Far venir lo compte privat
@@ -60,23 +85,29 @@ oc:
         otp_attempt: CÃ²di Two-factor
         password: Senhal
         phrase: Senhal o frasa
+        setting_aggregate_reblogs: Agropar los partatges dins lo flux dâ€™actualitat
         setting_auto_play_gif: Lectura automatica dels GIFS animats
-        setting_boost_modal: Afichar una fenÃ¨stra de confirmacion abans de partejar un estatut
+        setting_boost_modal: Mostrar una fenÃ¨stra de confirmacion abans de partejar un estatut
         setting_default_language: Lenga de publicacion
-        setting_default_privacy: Confidencialitat de las publicacions
+        setting_default_privacy: Confidencialitat dels tuts
         setting_default_sensitive: Totjorn marcar los mÃ¨dias coma sensibles
         setting_delete_modal: Mostrar una fenÃ¨stra de confirmacion abans de suprimir un estatut
-        setting_display_sensitive_media: Totjorn mostrar los mÃ¨dias coma sensibles
+        setting_display_media: Afichatge dels mÃ¨dias
+        setting_display_media_default: Defaut
+        setting_display_media_hide_all: O rescondre tot
+        setting_display_media_show_all: O mostrar tot
+        setting_expand_spoilers: Totjorn desplegar los tuts marcats amb un avertiment de contengut
         setting_hide_network: Amagar vÃ²stre malhum
         setting_noindex: Ãˆsser pas indexat pels motors de recÃ¨rca
         setting_reduce_motion: Reduire la velocitat de las animacions
-        setting_system_font_ui: Utilizar la polissa del sisÃ¨ma
+        setting_system_font_ui: Utilizar la polissa del sistÃ¨ma
         setting_theme: TÃ¨ma del site
         setting_unfollow_modal: Mostrar una confirmacion abans de quitar de sÃ¨gre qualquâ€™un
         severity: Severitat
         type: Tipe dâ€™impÃ²rt
         username: Nom dâ€™utilizaire
         username_or_email: Nom dâ€™utilizaire o corriÃ¨l
+        whole_word: Mot complÃ¨t
       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
@@ -88,6 +119,7 @@ oc:
         follow_request: Enviar un corriÃ¨l quand qualquâ€™un demanda de vos sÃ¨gre
         mention: Enviar un corriÃ¨l quand qualquâ€™un vos menciona
         reblog: Enviar un corriÃ¨l quand qualquâ€™un tÃ²rna partejar vÃ²stre estatut
+        report: Enviar un corriÃ¨l pels nÃ²us senhalaments
     'no': Non
     required:
       mark: "*"
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 55c5e1c6d7f9715766aeab83d8172dacb77df255..bbc55e8a913fa06a214f5199160a267216846dc0 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -2,32 +2,40 @@
 pl:
   simple_form:
     hints:
+      account_warning_preset:
+        text: MoÅ¼esz korzystaÄ‡ ze skÅ‚adni ktÃ³rej uÅ¼ywasz we wpisach, takiej jak adresy URL, hashtagi i wspomnienia
+      admin_account_action:
+        send_email_notification: UÅ¼ytkownik otrzyma informacjÄ™, co staÅ‚o siÄ™ z jego kontem
+        text_html: MoÅ¼esz uÅ¼ywaÄ‡ skÅ‚adni ktÃ³rej uÅ¼ywasz we wpisach. MoÅ¼esz <a href="%{path}">dodaÄ‡ szablon ostrzeÅ¼enia</a> aby zaoszczÄ™dziÄ‡ czas
+        type_html: Wybierz co chcesz zrobiÄ‡ z <strong>%{acct}</strong>
+        warning_preset_id: NieobowiÄ…zkowe. MoÅ¼esz dodaÄ‡ niestandardowy tekst do koÅ„cowki szablonu
       defaults:
         autofollow: Osoby, ktÃ³re zarejestrujÄ… siÄ™ z Twojego zaproszenia automatycznie zacznÄ… CiÄ™ Å›ledziÄ‡
-        avatar: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 400x400px
+        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
         digest: WysyÅ‚ane tylko po dÅ‚ugiej nieaktywnoÅ›ci, jeÅ¼eli w tym czasie otrzymaleÅ› jakÄ…Å› wiadomoÅ›Ä‡ bezpoÅ›redniÄ…
-        display_name:
-          few: PozostaÅ‚y <span class="name-counter">%{count}</span> znaki.
-          many: PozostaÅ‚o <span class="name-counter">%{count}</span> znakÃ³w
-          one: PozostaÅ‚ <span class="name-counter">1</span> znak
-          other: PozostaÅ‚o <span class="name-counter">%{count}</span> znakÃ³w
+        discoverable_html: <a href="%{path}" target="_blank">Katalog</a> pozwala znaleÅºÄ‡ konta na podstawie zainteresowaÅ„ i aktywnoÅ›ci. Profil musi Å›ledziÄ‡ przynajmniej %{min_followers} osÃ³b
+        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 2MB. Zostanie zmniejszony do 700x335px
+        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
-        note:
-          few: PozostaÅ‚y <span class="name-counter">%{count}</span> znaki.
-          many: PozostaÅ‚o <span class="name-counter">%{count}</span> znakÃ³w
-          one: PozostaÅ‚ <span class="name-counter">1</span> znak
-          other: PozostaÅ‚o <span class="name-counter">%{count}</span> znakÃ³w
+        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_default_language: JÄ™zyk Twoich wpisÃ³w moÅ¼e byÄ‡ wykrywany automatycznie, ale nie zawsze jest to dokÅ‚adne
+        setting_display_media_default: Ukrywaj zawartoÅ›Ä‡ oznaczonÄ… jako wraÅ¼liwa
+        setting_display_media_hide_all: Zawsze ukrywaj zawartoÅ›Ä‡ multimedialnÄ…
+        setting_display_media_show_all: Zawsze pokazuj zawartoÅ›Ä‡ multimedialnÄ… jako wraÅ¼liwÄ…
         setting_hide_network: Informacje o tym, kto CiÄ™ Å›ledzi i kogo Å›ledzisz nie bÄ™dÄ… widoczne
         setting_noindex: WpÅ‚ywa na widocznoÅ›Ä‡ strony profilu i Twoich wpisÃ³w
         setting_theme: Zmienia wyglÄ…d Mastodona po zalogowaniu z dowolnego urzÄ…dzenia.
+        username: Twoja nazwa uÅ¼ytkownika bÄ™dzie niepowtarzalna na %{domain}
+        whole_word: JeÅ›li sÅ‚owo lub fraza skÅ‚ada siÄ™ jedynie z liter lub cyfr, filtr bÄ™dzie zastosowany tylko do peÅ‚nych wystÄ…pieÅ„
       imports:
         data: Plik CSV wyeksportowany z innej instancji Mastodona
       sessions:
@@ -39,6 +47,18 @@ pl:
         fields:
           name: Nazwa
           value: ZawartoÅ›Ä‡
+      account_warning_preset:
+        text: Tekst szablonu
+      admin_account_action:
+        send_email_notification: Powiadom uÅ¼ytkownika mailem
+        text: Niestandardowe ostrzeÅ¼enie
+        type: DziaÅ‚anie
+        types:
+          disable: WyÅ‚Ä…cz
+          none: Nie rÃ³b niczego
+          silence: Wycisz
+          suspend: ZawieÅ› i nieodwracalnie usuÅ„ dane konta
+        warning_preset_id: UÅ¼yj szablonu ostrzeÅ¼enia
       defaults:
         autofollow: Zapraszaj do Å›ledzenia swojego konta
         avatar: Awatar
@@ -49,11 +69,13 @@ pl:
         context: Filtruj zawartoÅ›Ä‡
         current_password: Obecne hasÅ‚o
         data: Dane
+        discoverable: WyÅ›wietlaj ten profil w katalogu
         display_name: Widoczna nazwa
         email: Adres e-mail
         expires_in: WygaÅ›nie po
         fields: Metadane profilu
         header: NagÅ‚Ã³wek
+        inbox_url: Adres skrzynki przekaÅºnika
         irreversible: Usuwaj zamiast ukrywaÄ‡
         locale: JÄ™zyk interfejsu
         locked: Ustaw konto jako prywatne
@@ -64,13 +86,18 @@ pl:
         password: HasÅ‚o
         phrase: SÅ‚owo kluczowe lub fraza
         scopes: Do ktÃ³rych API aplikacja bÄ™dzie miaÅ‚a dostÄ™p. JeÅ¼eli wybierzesz zakres wyÅ¼szego poziomu, nie musisz zaznaczaÄ‡ bardziej szczegÃ³Å‚owych.
+        setting_aggregate_reblogs: Grupuj podbicia na osiach czasu
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_language: JÄ™zyk wpisÃ³w
         setting_default_privacy: WidocznoÅ›Ä‡ wpisÃ³w
         setting_default_sensitive: Zawsze oznaczaj zawartoÅ›Ä‡ multimedialnÄ… jako wraÅ¼liwÄ…
         setting_delete_modal: Pytaj o potwierdzenie przed usuniÄ™ciem wpisu
-        setting_display_sensitive_media: Zawsze oznaczaj zawartoÅ›Ä‡ multimedialnÄ… jako wraÅ¼liwÄ…
+        setting_display_media: WyÅ›wietlanie zawartoÅ›ci multimedialnej
+        setting_display_media_default: DomyÅ›lne
+        setting_display_media_hide_all: Ukryj wszystko
+        setting_display_media_show_all: PokaÅ¼ wszystko
+        setting_expand_spoilers: Zawsze rozwijaj wpisy oznaczone ostrzeÅ¼eniem o zawartoÅ›ci
         setting_hide_network: Ukryj swojÄ… sieÄ‡
         setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
         setting_reduce_motion: Ogranicz ruch w animacjach
@@ -81,6 +108,7 @@ pl:
         type: Importowane dane
         username: Nazwa uÅ¼ytkownika
         username_or_email: Nazwa uÅ¼ytkownika lub adres e-mail
+        whole_word: CaÅ‚e sÅ‚owo
       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
@@ -92,6 +120,7 @@ pl:
         follow_request: Powiadamiaj mnie e-mailem, gdy ktoÅ› poprosi o pozwolenie na Å›ledzenie mnie
         mention: Powiadamiaj mnie e-mailem, gdy ktoÅ› o mnie wspomni
         reblog: Powiadamiaj mnie e-mailem, gdy ktoÅ› podbije mÃ³j wpis
+        report: Powiadamiaj mnie e-mailem, gdy zostanie utworzone nowe zgÅ‚oszenie
     'no': Nie
     required:
       mark: "*"
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 9b72c7a7a72aa1466f079062bf55721ead99d4c8..664c07a463ce1200b5a08b72c0ad4320be5bb34a 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -2,29 +2,40 @@
 pt-BR:
   simple_form:
     hints:
+      account_warning_preset:
+        text: VocÃª pode usar a sintaxe de um toot, como URLs, hashtags e menÃ§Ãµes
+      admin_account_action:
+        send_email_notification: O usuÃ¡rio vai receber uma explicaÃ§Ã£o do que aconteceu com a sua conta
+        text_html: Opcional. VocÃª pode usar a sintaxe de toots. VocÃª pode <a href="%{path}">adicionar avisos prÃ©-definidos</a> para ganhar tempo.
+        type_html: Escolha o que fazer com <strong>%{acct}</strong>
+        warning_preset_id: Opcional. VocÃª ainda pode adicionar texto customizado no fim do texto prÃ©-definido
       defaults:
         autofollow: Pessoas que se cadastrarem atravÃ©s de seu convite te seguirÃ£o automaticamente
-        avatar: PNG, GIF or JPG. Arquivos de atÃ© 2MB. Eles serÃ£o diminuÃdos para 400x400px
+        avatar: PNG, GIF or JPG. Arquivos de atÃ© %{size}. Eles serÃ£o diminuÃdos 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 ser aplicado
         digest: Enviado apÃ³s um longo perÃodo de inatividade com um resumo das menÃ§Ãµes que vocÃª recebeu em sua ausÃªncia
-        display_name:
-          one: <span class="name-counter">1</span> caracter restante
-          other: <span class="name-counter">%{count}</span> caracteres restantes
+        discoverable_html: O <a href="%{path}" target="_blank">diretÃ³rio</a> permite encontrar contas baseado em seus interesses e atividades. Requer pelo menos %{min_followers} seguidores
+        email: VocÃª receberÃ¡ um email de confirmaÃ§Ã£o
         fields: VocÃª pode ter atÃ© 4 itens exibidos em forma de tabela no seu perfil
-        header: PNG, GIF or JPG. Arquivos de atÃ© 2MB. Eles serÃ£o diminuÃdos para 700x335px
+        header: PNG, GIF or JPG. Arquivos de atÃ© %{size}. Eles serÃ£o diminuÃdos para %{dimensions}px
+        inbox_url: Copie a URL da pÃ¡gina inicial do repetidor que vocÃª quer usar
         irreversible: Os toots filtrados vÃ£o desaparecer irreversivelmente, mesmo se o filtro for removido depois
         locale: O idioma das telas de usuÃ¡rio, e-mails e notificaÃ§Ãµes push
         locked: Requer aprovaÃ§Ã£o manual de seguidores
-        note:
-          one: <span class="note-counter">1</span> caracter restante
-          other: <span class="note-counter">%{count}</span> caracteres restantes
+        password: Use pelo menos 8 caracteres
         phrase: Vai coincidir, independente de maiÃºsculas ou minÃºsculas, no texto ou no aviso de conteÃºdo de um toot
         scopes: Quais APIs a aplicaÃ§Ã£o vai ter permissÃ£o de acessar. Se vocÃª selecionar um escopo de alto nÃvel, vocÃª nÃ£o precisa selecionar individualmente os outros.
+        setting_aggregate_reblogs: NÃ£o mostrar novos compartilhamentos para toots que foram compartilhados recentemente (afeta somente novos compartilhamentos recebidos)
         setting_default_language: O idioma de seus toots pode ser detectado automaticamente, mas isso nem sempre Ã© preciso
+        setting_display_media_default: Esconder mÃdia marcada como sensÃvel
+        setting_display_media_hide_all: Sempre esconder todas as mÃdias
+        setting_display_media_show_all: Sempre mostrar mÃdia marcada como sensÃvel
         setting_hide_network: Quem vocÃª segue e quem segue vocÃª nÃ£o serÃ£o exibidos no seu perfil
         setting_noindex: Afeta seu perfil pÃºblico e as pÃ¡ginas de suas postagens
         setting_theme: Afeta a aparÃªncia do Mastodon quando em sua conta em qualquer aparelho.
+        username: Seu nome de usuÃ¡rio serÃ¡ Ãºnico em %{domain}
+        whole_word: Quando a palavra ou frase Ã© inteiramente alfanumÃ©rica, ela serÃ¡ aplicada somente se corresponder a palavra inteira
       imports:
         data: Arquivo CSV exportado de outra instÃ¢ncia do Mastodon
       sessions:
@@ -36,6 +47,18 @@ pt-BR:
         fields:
           name: RÃ³tulo
           value: ConteÃºdo
+      account_warning_preset:
+        text: Texto prÃ©-definido
+      admin_account_action:
+        send_email_notification: Notificar o usuÃ¡rio por e-mail
+        text: Aviso customizado
+        type: AÃ§Ã£o
+        types:
+          disable: Desabilitar
+          none: NÃ£o fazer nada
+          silence: Silenciar
+          suspend: Suspender e excluir irreversivelmente dados da conta
+        warning_preset_id: Usar um aviso prÃ©-definido
       defaults:
         autofollow: Convite para seguir a sua conta
         avatar: Avatar
@@ -46,11 +69,13 @@ pt-BR:
         context: Contextos de filtro
         current_password: Senha atual
         data: Dados
+        discoverable: Listar essa conta no diretÃ³rio
         display_name: Nome de exibiÃ§Ã£o
         email: EndereÃ§o de e-mail
         expires_in: Expira em
         fields: Metadados do perfil
         header: CabeÃ§alho
+        inbox_url: URL da caixa de entrada do repetidor
         irreversible: Ignorar ao invÃ©s de esconder
         locale: Idioma das telas
         locked: Trancar conta
@@ -60,13 +85,18 @@ pt-BR:
         otp_attempt: CÃ³digo de autenticaÃ§Ã£o em dois passos
         password: Senha
         phrase: Palavra-chave ou frase
+        setting_aggregate_reblogs: Agrupar compartilhamentos nas timelines
         setting_auto_play_gif: Reproduzir GIFs automaticamente
         setting_boost_modal: Mostrar diÃ¡logo de confirmaÃ§Ã£o antes de compartilhar postagem
         setting_default_language: Idioma das postagens
         setting_default_privacy: Privacidade das postagens
         setting_default_sensitive: Sempre marcar mÃdia como sensÃvel
         setting_delete_modal: Mostrar diÃ¡logo de confirmaÃ§Ã£o antes de deletar uma postagem
-        setting_display_sensitive_media: Sempre exibir mÃdia marcada como sensÃvel
+        setting_display_media: ExibiÃ§Ã£o das mÃdias
+        setting_display_media_default: PadrÃ£o
+        setting_display_media_hide_all: Esconder tudo
+        setting_display_media_show_all: Mostrar tudo
+        setting_expand_spoilers: Sempre expandir toots marcados com aviso de conteÃºdo
         setting_hide_network: Esconder as suas redes
         setting_noindex: NÃ£o quero ser indexado por mecanismos de busca
         setting_reduce_motion: Reduz movimento em animaÃ§Ãµes
@@ -77,6 +107,7 @@ pt-BR:
         type: Tipo de importaÃ§Ã£o
         username: Nome de usuÃ¡rio
         username_or_email: Nome de usuÃ¡rio ou e-mail
+        whole_word: Palavra inteira
       interactions:
         must_be_follower: Bloquear notificaÃ§Ãµes de nÃ£o-seguidores
         must_be_following: Bloquear notificaÃ§Ãµes de pessoas que vocÃª nÃ£o segue
@@ -88,6 +119,7 @@ pt-BR:
         follow_request: Mandar um e-maill quando alguÃ©m solicitar ser seu seguidor
         mention: Mandar um e-mail quando alguÃ©m te mencionar
         reblog: Mandar um e-mail quando alguÃ©m compartilhar suas postagens
+        report: Mandar um e-mail quando uma nova denÃºncia Ã© submetida
     'no': NÃ£o
     required:
       mark: "*"
diff --git a/config/locales/simple_form.pt.yml b/config/locales/simple_form.pt.yml
index 5b79bd29f75277cefa516ff80d226ea577a05f51..88be3ac70fff8292db92fd1bb7c7b17c530b5d69 100644
--- a/config/locales/simple_form.pt.yml
+++ b/config/locales/simple_form.pt.yml
@@ -3,16 +3,10 @@ pt:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF or JPG. Arquivos atÃ© 2MB. VÃ£o ser reduzidos para 400x400px
+        avatar: PNG, GIF or JPG. Arquivos atÃ© %{size}. VÃ£o ser reduzidos para %{dimensions}px
         digest: Enviado apÃ³s um longo perÃodo de inatividade e apenas se foste mencionado na tua ausÃªncia
-        display_name:
-          one: <span class="name-counter">1</span> caracter restante
-          other: <span class="name-counter">%{count}</span> caracteres restantes
-        header: PNG, GIF or JPG. Arquivos atÃ© 2MB. VÃ£o ser reduzidos para 700x335px
+        header: PNG, GIF or JPG. Arquivos atÃ© %{size}. VÃ£o ser reduzidos para %{dimensions}px
         locked: Requer aprovaÃ§Ã£o manual de seguidores
-        note:
-          one: <span class="note-counter">1</span> caracter restante
-          other: <span class="note-counter">%{count}</span> caracteres restantes
         setting_noindex: Afecta o teu perfil pÃºblico e as pÃ¡ginas das tuas publicaÃ§Ãµes
         setting_theme: Afecta a aparÃªncia do Mastodon quando entras na tua conta em qualquer dispositivo.
       imports:
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
new file mode 100644
index 0000000000000000000000000000000000000000..757b8720434521413af3a21ad350c88dfd60fd24
--- /dev/null
+++ b/config/locales/simple_form.ro.yml
@@ -0,0 +1,122 @@
+---
+ro:
+  simple_form:
+    hints:
+      account_warning_preset:
+        text: PoÈ›i utiliza sintaxe precum URL, hastag sau menÈ›ionÄƒri
+      admin_account_action:
+        send_email_notification: Utilizatorul va primi o explicaÈ›ie cu privire la ceea ce sa Ã®ntÃ¢mplat cu contul lui
+        text_html: OpÈ›ional. PoÈ›i utiliza sintaxe. PoÈ›i <a href="%{path}">adÄƒuga avertismente predefinite</a> pentru a salva timp
+        type_html: Alege ce se Ã®ntÃ¢mplÄƒ cu <strong>%{acct}</strong>
+        warning_preset_id: OpÈ›ional. PoÈ›i adÄƒuga text personalizat la sfÃ¢rÈ™itul presetului
+      defaults:
+        autofollow: Persoanele care se Ã®nregistreazÄƒ datoritÄƒ invitaÈ›iei tale te vor urmÄƒri automat
+        avatar: PNG, GIF sau JPG. Cel mult %{size}. Va fi redimensionatÄƒ la %{dimensions}px
+        bot: Acest cont performeazÄƒ Ã®n cea mai mare parte acÈ›iuni automate È™i nu poate fi monitorizat
+        context: Contextele Ã®n care filtrul trebuie aplicat
+        digest: Este trimis doar dupÄƒ o lungÄƒ perioadÄƒ de inactivitate È™i numai dacÄƒ primeÈ™ti mesaje personale Ã®n perioada de absenÈ›Äƒ
+        discoverable_html: <a href="%{path}" target="_blank">Directorul</a> permite utilizatorilor sÄƒ gÄƒseascÄƒ conturi dupÄƒ interese È™i activitÄƒÈ›i. NecesitÄƒ minim %{min_followers} urmÄƒritori
+        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
+        inbox_url: CopiazÄƒ adresa URL de pe prima paginÄƒ a reului pe care vrei sÄƒ Ã®l utilizezi
+        irreversible: PostÄƒrile sortate vor dispÄƒrea ireversibil, chiar dacÄƒ filtrul este ulterior È™ters
+        locale: Limba interfaÈ›ei de utilizator, e-mailurile si notificÄƒrile push
+        locked: NecesitÄƒ aprobare manualÄƒ a urmÄƒritorilor
+        password: UtilizeazÄƒ cel puÈ›in 8 caractere
+        phrase: Vor fi potrivite indiferent de textul din casetÄƒ sau advertismentul unei postÄƒri
+        scopes: La care API-uri aplicaÈ›ia are nevoie de acces. DacÄƒ selectezi un scop principal nu mai e nevoie sÄƒ selectezi fiecare sub-scop al acestuia.
+        setting_aggregate_reblogs: Nu afiÈ™a redistribuirile noi pentru postÄƒrile care au fost deja recent redistribuite (afecteazÄƒ doar noile redistribuiri primite)
+        setting_default_language: Limba postÄƒrilor tale poate fi detectatÄƒ automat, dar nu este Ã®ntotdeauna precisÄƒ
+        setting_display_media_default: Ascunde conÈ›inutul media marcat ca sensibil (NSFW)
+        setting_display_media_hide_all: ÃŽntotdeauna ascunde tot conÈ›inutul media
+        setting_display_media_show_all: ÃŽntotdeauna afiÈ™eazÄƒ conÈ›inutul media marcat ca sensibil
+        setting_hide_network: Pe cine urmÄƒreÈ™ti È™i cine te urmÄƒreÈ™te nu vor fi afiÈ™aÈ›i pe profilul tÄƒu
+        setting_noindex: AfecteazÃ¢ profilul tÄƒu public È™i statusurile tale
+        setting_theme: AfecteazÃ¢ modul Ã®n care aratÄƒ interfaÈ›a pe toate dispozitivele pe care eÈ™ti conectat.
+        username: Numele tÄƒu de utilizator va fi unic pe %{domain}
+        whole_word: CÃ¢nd fraza sau cuvÃ¢ntul este doar alfanumeric, acesta se aplicÄƒ doar dacÄƒ existÄƒ o potrivire completÄƒ
+      imports:
+        data: FiÈ™ierul CSV exportat de la o altÄƒ instanÈ›Äƒ
+      sessions:
+        otp: 'Introdu codul pentru dubla protecÈ›ie generat de telefonul mobil sau unul din codurile de rezervÄƒ:'
+      user:
+        chosen_languages: Doar postÄƒrile Ã®n limbile selectate vor fi afiÈ™ate Ã®n fluxurile publice
+    labels:
+      account:
+        fields:
+          name: EtichetÄƒ
+          value: ConÈ›inut
+      account_warning_preset:
+        text: Text presetat
+      admin_account_action:
+        send_email_notification: NotificaÈ›i utilizatorul prin e-mail
+        text: Avertisment personalizat
+        type: AcÈ›iune
+        types:
+          disable: DezactiveazÄƒ
+          none: Nu fÄƒ nimic
+          silence: LiniÈ™te
+          suspend: SuspendÄƒ È™i È™terge ireversibil datele contului
+        warning_preset_id: UtilizeazÄƒ un avertisment predefinit
+      defaults:
+        autofollow: InvitÄƒ sÄƒ te urmÄƒreascÄƒ
+        avatar: Fotografie de profil
+        bot: Acesta este un cont automat (bot)
+        chosen_languages: Limbile filtrului
+        confirm_new_password: ConfirmÄƒ noua parolÄƒ
+        confirm_password: ConfirmÄƒ parola
+        context: Contextele filtrului
+        current_password: Parola actualÄƒ
+        data: Data
+        discoverable: ListeazÄƒ acest cont in director
+        display_name: Numele afiÈ™at
+        email: Adresa de e-mail
+        expires_in: ExpirÄƒ dupÄƒ
+        fields: ReÈ›ele externe - Unde mai poÈ›i fi gÄƒsit
+        header: Antet
+        inbox_url: Adresa URL a inbox-ului
+        irreversible: LasÄƒ Ã®nloc sÄƒ ascunzi
+        locale: LimbÄƒ
+        locked: Cont Privat
+        max_uses: NumÄƒrul maxim de utilizatori
+        new_password: Parola nouÄƒ
+        note: Descriere
+        otp_attempt: Cod dublÄƒ protecÈ›ie
+        password: ParolÄƒ
+        phrase: CuvÃ¢nt sau frazÄƒ
+        setting_auto_play_gif: RedÄƒ automat animaÈ›iile GIF
+        setting_boost_modal: AratÄƒ dialogul de confirmare Ã®nainte de a redistribui
+        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_delete_modal: AratÄƒ dialogul de confirmare Ã®nainte de a È™terge o postare
+        setting_display_media_default: Standard
+        setting_hide_network: Ascunde reÈ›eaua
+        setting_noindex: Nu permite motoarelor de cÄƒutare sÄƒ indexeze reÈ›eaua ta
+        setting_reduce_motion: Redu miÈ™carea Ã®n animaÈ›ii
+        setting_system_font_ui: UtilizeazÄƒ fontul standard as sistemului
+        setting_theme: Tema siteului
+        setting_unfollow_modal: AratÄƒ dialogul de confirmare Ã®nainte de a nu mai urmÄƒri pe cineva
+        severity: Severitate
+        type: Ce importaÈ›i
+        username: Nume de utilizator
+        username_or_email: Numele de utilizator sau adresa de E-mail
+        whole_word: CuvÃ¢nt Ã®ntreg
+      interactions:
+        must_be_follower: BlocheazÄƒ notificÄƒrile de la persoane care nu te urmÄƒresc
+        must_be_following: BlocheazÄƒ notificÄƒrile de la persoane pe care nu le urmÄƒreÈ™ti
+        must_be_following_dm: BlocheazÄƒ mesajele directe de la persoane pe care nu le urmÄƒreÈ™ti
+      notification_emails:
+        digest: Trimite rezumate
+        favourite: Trimite e-mail cÃ¢nd cineva favorizeazÄƒ unul din statusurile tale
+        follow: Trimite e-mail cÃ¢nd cineva te urmÄƒreÈ™te
+        follow_request: Trimite e-mail cÃ¢nd cineva trimite o cerere de urmÄƒrire
+        mention: Trimite e-mail cÃ¢nd cineva te menÈ›ioneazÄƒ
+        reblog: Trimite e-mail cÃ¢nd cineva redistribuie unul din statusurile tale
+        report: Trimite e-mail cÃ¢nd un raport nou este trimis
+    'no': Nu
+    required:
+      mark: "*"
+      text: obligatoriu
+    'yes': Da
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 6bb95b13faa6422fb21ef085ab438f5195719e1b..44cd7ccd6265b145ec4d2f1a472c960cdfec1190 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -3,59 +3,66 @@ ru:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾ 2MB. Ð‘ÑƒÐ´ÐµÑ‚ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¾ Ð´Ð¾ 400x400px
+        autofollow: Ð›ÑŽÐ´Ð¸, Ð¿Ñ€Ð¸ÑˆÐµÐ´ÑˆÐ¸Ðµ Ð¿Ð¾ ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸ÑŽ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð½Ð° Ð’Ð°Ñ
+        avatar: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾ %{size}. Ð‘ÑƒÐ´ÐµÑ‚ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¾ Ð´Ð¾ %{dimensions}px
         bot: ÐÑ‚Ð¾Ñ‚ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾ Ð²Ñ‹Ð¿Ð¾Ð»ÑÐµÑ‚ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ð·Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚ Ð½Ðµ Ð¿Ñ€Ð¾ÑÐ¼Ð°Ñ‚Ñ€Ð¸Ð²Ð°Ñ‚ÑŒÑÑ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼
+        context: ÐžÐ´Ð¸Ð½ Ð¸Ð»Ð¸ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚Ð¾Ð², Ðº ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ñ‹ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹
         digest: ÐžÑ‚ÑÑ‹Ð»Ð°ÐµÑ‚ÑÑ Ð»Ð¸ÑˆÑŒ Ð¿Ð¾ÑÐ»Ðµ Ð´Ð»Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ð¸, ÐµÑÐ»Ð¸ Ð’Ñ‹ Ð² ÑÑ‚Ð¾ Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ð»Ð¸ Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ
-        display_name:
-          few: ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ <span class="name-counter">%{count}</span> ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°
-          many: ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ <span class="name-counter">%{count}</span> ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²
-          one: ÐžÑÑ‚Ð°Ð»ÑÑ <span class="name-counter">1</span> ÑÐ¸Ð¼Ð²Ð¾Ð»
-          other: ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ <span class="name-counter">%{count}</span> ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²
         fields: Ð’ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ðµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ð´Ð¾ 4 Ð¿ÑƒÐ½ÐºÑ‚Ð¾Ð² ÐºÐ°Ðº Ñ‚Ð°Ð±Ð»Ð¸Ñ†Ñƒ
-        header: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾ 2MB. Ð‘ÑƒÐ´ÐµÑ‚ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¾ Ð´Ð¾ 700x335px
+        header: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾ %{size}. Ð‘ÑƒÐ´ÐµÑ‚ ÑƒÐ¼ÐµÐ½ÑŒÑˆÐµÐ½Ð¾ Ð´Ð¾ %{dimensions}px
+        inbox_url: ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ URL Ñ Ð³Ð»Ð°Ð²Ð½Ð¾Ð¹ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñ‹ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð°, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ð’Ñ‹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ
+        irreversible: ÐžÑ‚Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÑ‹ Ð±ÑƒÐ´ÑƒÑ‚ ÑƒÑ‚ÐµÑ€ÑÐ½Ñ‹ Ð½Ð°Ð²ÑÐµÐ³Ð´Ð°, Ð´Ð°Ð¶Ðµ ÐµÑÐ»Ð¸ Ð² Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ¼ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ Ð±ÑƒÐ´ÐµÑ‚ ÑƒÐ±Ñ€Ð°Ð½
+        locale: Ð¯Ð·Ñ‹Ðº Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ°, e-mail Ð¿Ð¸ÑÐµÐ¼ Ð¸ push-ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹
         locked: ÐŸÐ¾Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð¾Ñ‚ Ð’Ð°Ñ Ñ€ÑƒÑ‡Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð², Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚ÑŒ Ð¿Ð¾ÑÑ‚Ð¾Ð² Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð½Ð° "Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²"
-        note:
-          few: ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ <span class="name-counter">%{count}</span> ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°
-          many: ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ <span class="name-counter">%{count}</span> ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²
-          one: ÐžÑÑ‚Ð°Ð»ÑÑ <span class="name-counter">1</span> ÑÐ¸Ð¼Ð²Ð¾Ð»
-          other: ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ <span class="name-counter">%{count}</span> ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²
+        phrase: Ð‘ÑƒÐ´ÐµÑ‚ ÑÐ¾Ð¿Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¾ Ð½ÐµÐ·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ Ð¾Ñ‚ Ð¿Ñ€Ð¸ÑÑƒÑ‚ÑÑ‚Ð²Ð¸Ñ Ð² Ñ‚ÐµÐºÑÑ‚Ðµ Ð¸Ð»Ð¸ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ ÑÐ¾Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑÐ°
+        scopes: ÐšÐ°ÐºÐ¸Ðµ API Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÑŽ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ. Ð•ÑÐ»Ð¸ Ð’Ñ‹ Ð²Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑÐ°Ð¼Ñ‹Ð¹ Ð²ÐµÑ€Ñ…Ð½Ð¸Ð¹, Ð½Ð¸Ð¶ÐµÑÑ‚Ð¾ÑÑ‰Ð¸Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸.
+        setting_default_language: Ð¯Ð·Ñ‹Ðº Ð’Ð°ÑˆÐ¸Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð² Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ‘Ð½ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸, Ð½Ð¾ Ð½Ðµ Ð²ÑÐµÐ³Ð´Ð° Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾
         setting_hide_network: Ð¢Ðµ, Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð’Ñ‹ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹ Ð¸ ÐºÑ‚Ð¾ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð½Ð° Ð’Ð°Ñ, Ð½Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ñ‹ Ð² Ð’Ð°ÑˆÐµÐ¼ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ðµ
         setting_noindex: ÐžÑ‚Ð½Ð¾ÑÐ¸Ñ‚ÑÑ Ðº Ð’Ð°ÑˆÐµÐ¼Ñƒ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¾Ð¼Ñƒ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»ÑŽ Ð¸ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°Ð¼ ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
         setting_theme: Ð’Ð»Ð¸ÑÐµÑ‚ Ð½Ð° Ð²Ð½ÐµÑˆÐ½Ð¸Ð¹ Ð²Ð¸Ð´ Mastodon Ð¿Ñ€Ð¸ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½Ð¾Ð¼ Ð²Ñ…Ð¾Ð´Ðµ Ð² Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚.
+        whole_word: Ð•ÑÐ»Ð¸ ÑÐ»Ð¾Ð²Ð¾ Ð¸Ð»Ð¸ Ñ„Ñ€Ð°Ð·Ð° ÑÐ¾ÑÑ‚Ð¾Ð¸Ñ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¸Ð· Ð±ÑƒÐºÐ² Ð¸ Ñ†Ð¸Ñ„Ñ€, ÑÐ¾Ð¿Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾Ð¹Ð´Ñ‘Ñ‚ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¿Ð¾ Ð¿Ð¾Ð»Ð½Ð¾Ð¼Ñƒ ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸ÑŽ
       imports:
         data: Ð¤Ð°Ð¹Ð» CSV, ÑÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ ÑƒÐ·Ð»Ð° Mastodon
       sessions:
         otp: 'Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ð´ Ð´Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ð¹ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸, ÑÐ³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ð² Ð¼Ð¾Ð±Ð¸Ð»ÑŒÐ½Ð¾Ð¼ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¸, Ð¸Ð»Ð¸ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ Ð¾Ð´Ð¸Ð½ Ð¸Ð· Ð’Ð°ÑˆÐ¸Ñ… ÐºÐ¾Ð´Ð¾Ð² Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:'
+      user:
+        chosen_languages: Ð•ÑÐ»Ð¸ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð¾, Ñ‚Ð¾ Ð² Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ… Ð»ÐµÐ½Ñ‚Ð°Ñ… Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ‹ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð¿Ð¾ÑÑ‚Ñ‹ Ð½Ð° Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… ÑÐ·Ñ‹ÐºÐ°Ñ…
     labels:
       account:
         fields:
           name: ÐŸÑƒÐ½ÐºÑ‚
           value: Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ
       defaults:
+        autofollow: ÐŸÑ€Ð¸Ð³Ð»Ð°ÑÐ¸Ñ‚Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒÑÑ Ð½Ð° Ð’Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
         avatar: ÐÐ²Ð°Ñ‚Ð°Ñ€
         bot: ÐÑ‚Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð±Ð¾Ñ‚Ð°
+        chosen_languages: Ð¤Ð¸Ð»ÑŒÑ‚Ñ€ ÑÐ·Ñ‹ÐºÐ¾Ð²
         confirm_new_password: ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
         confirm_password: ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
+        context: ÐšÐ¾Ð½Ñ‚ÐµÐºÑÑ‚ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°
         current_password: Ð¢ÐµÐºÑƒÑ‰Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
         data: Ð”Ð°Ð½Ð½Ñ‹Ðµ
         display_name: ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°ÐµÐ¼Ð¾Ðµ Ð¸Ð¼Ñ
         email: ÐÐ´Ñ€ÐµÑ e-mail
-        expires_in: Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ
+        expires_in: Ð˜ÑÑ‚ÐµÐºÐ°ÐµÑ‚ Ñ‡ÐµÑ€ÐµÐ·
         fields: ÐœÐµÑ‚Ð°Ð´Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ
         header: Ð—Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº
-        locale: Ð¯Ð·Ñ‹Ðº
+        inbox_url: URL Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´ÑÑ‰Ð¸Ñ… Ð¾Ñ‚ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑÐ»ÑÑ‚Ð¾Ñ€Ð¾Ð²
+        irreversible: Ð£Ð´Ð°Ð»ÑÑ‚ÑŒ, Ð° Ð½Ðµ ÑÐºÑ€Ñ‹Ð²Ð°Ñ‚ÑŒ
+        locale: Ð¯Ð·Ñ‹Ðº Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹ÑÐ°
         locked: Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼
         max_uses: ÐœÐ°ÐºÑ. Ñ‡Ð¸ÑÐ»Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ð¹
         new_password: ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
         note: Ðž Ð’Ð°Ñ
         otp_attempt: Ð”Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ñ‹Ð¹ ÐºÐ¾Ð´
         password: ÐŸÐ°Ñ€Ð¾Ð»ÑŒ
+        phrase: Ð¡Ð»Ð¾Ð²Ð¾ Ð¸Ð»Ð¸ Ñ„Ñ€Ð°Ð·Ð°
         setting_auto_play_gif: ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð¿Ñ€Ð¾Ð¸Ð³Ñ€Ñ‹Ð²Ð°Ñ‚ÑŒ Ð°Ð½Ð¸Ð¼Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ GIF
         setting_boost_modal: ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸ÐµÐ¼
+        setting_default_language: Ð¯Ð·Ñ‹Ðº Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÐµÐ¼Ñ‹Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ¾Ð²
         setting_default_privacy: Ð’Ð¸Ð´Ð¸Ð¼Ð¾ÑÑ‚ÑŒ Ð¿Ð¾ÑÑ‚Ð¾Ð²
         setting_default_sensitive: Ð’ÑÐµÐ³Ð´Ð° Ð¾Ñ‚Ð¼ÐµÑ‡Ð°Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ ÐºÐ°Ðº Ñ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹
         setting_delete_modal: ÐŸÐ¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸ÐµÐ¼
-        setting_display_sensitive_media: Ð’ÑÐµÐ³Ð´Ð° Ð¿Ð¾ÐºÐ°Ð·Ñ‹Ð²Ð°Ñ‚ÑŒ Ð¼ÐµÐ´Ð¸Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚, Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ð½Ñ‹Ð¹ ÐºÐ°Ðº Ñ‡ÑƒÐ²ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¹
         setting_hide_network: Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ ÑÐ²Ð¾Ð¸ ÑÐ²ÑÐ·Ð¸
         setting_noindex: ÐžÑ‚ÐºÐ°Ð·Ð°Ñ‚ÑŒÑÑ Ð¾Ñ‚ Ð¸Ð½Ð´ÐµÐºÑÐ°Ñ†Ð¸Ð¸ Ð² Ð¿Ð¾Ð¸ÑÐºÐ¾Ð²Ñ‹Ñ… Ð¼Ð°ÑˆÐ¸Ð½Ð°Ñ…
         setting_reduce_motion: Ð£Ð¼ÐµÐ½ÑŒÑˆÐ¸Ñ‚ÑŒ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ðµ Ð² Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ð¸
@@ -66,6 +73,7 @@ ru:
         type: Ð¢Ð¸Ð¿ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°
         username: Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ
         username_or_email: Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ e-mail
+        whole_word: Ð¡Ð»Ð¾Ð²Ð¾ Ñ†ÐµÐ»Ð¸ÐºÐ¾Ð¼
       interactions:
         must_be_follower: Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð½Ðµ Ð¾Ñ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‡Ð¸ÐºÐ¾Ð²
         must_be_following: Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð’Ñ‹ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹
@@ -77,6 +85,7 @@ ru:
         follow_request: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÑÑ‚ÑŒ Ð¿Ð¾ e-mail, ÐºÐ¾Ð³Ð´Ð° ÐºÑ‚Ð¾-Ñ‚Ð¾ Ð·Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°ÐµÑ‚ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ðµ Ð½Ð° Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÑƒ
         mention: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÑÑ‚ÑŒ Ð¿Ð¾ e-mail, ÐºÐ¾Ð³Ð´Ð° ÐºÑ‚Ð¾-Ñ‚Ð¾ ÑƒÐ¿Ð¾Ð¼ÑÐ½ÑƒÐ» Ð’Ð°Ñ
         reblog: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÑÑ‚ÑŒ Ð¿Ð¾ e-mail, ÐºÐ¾Ð³Ð´Ð° ÐºÑ‚Ð¾-Ñ‚Ð¾ Ð¿Ñ€Ð¾Ð´Ð²Ð¸Ð½ÑƒÐ» Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ
+        report: Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÑÑ‚ÑŒ Ð¿Ð¾ e-mail Ð¿Ñ€Ð¸ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¶Ð°Ð»Ð¾Ð±Ñ‹
     'no': ÐÐµÑ‚
     required:
       mark: "*"
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 39fa3b8337682b8e26dc5562daeea058a388e965..f2d26cf026ece21e483ed7c6ff456214debe75d7 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -2,31 +2,40 @@
 sk:
   simple_form:
     hints:
+      account_warning_preset:
+        text: MÃ´Å¾eÅ¡ pouÅ¾ÃvaÅ¥ rovnakÃº syntaxiu ako v rÃ¡mci prÃspevkov, ÄiÅ¾e URL, haÅ¡tagy, a spomenutia
+      admin_account_action:
+        send_email_notification: UÅ¾ÃvateÄ¾ dostane vysvetlenie ohÄ¾adom toho, Äo sa stalo s ich ÃºÄtom
+        text_html: VoliteÄ¾nÃ©. MÃ´Å¾eÅ¡ pouÅ¾ÃvaÅ¥ rovnakÃº syntaxiu ako v prÃspevkoch. MÃ´Å¾eÅ¡ pridaÅ¥ <a href="%{path}">varovnÃ© predlohy</a> a uÅ¡etriÅ¥ tak Äas
+        type_html: Vyber si, Äo urobiÅ¥ s ÃºÄtom <strong>%{acct}</strong>
+        warning_preset_id: VoliteÄ¾nÃ©. StÃ¡le mÃ´Å¾eÅ¡ vloÅ¾iÅ¥ vlastnÃ½ text na samÃ½ koniec predlohy
       defaults:
         autofollow: Ä½udia ktorÃ sa zaregistrujÃº prostrednÃctvom pozvÃ¡nky, Å¥a budÃº inheÄ nÃ¡sledovaÅ¥
-        avatar: PNG, GIF alebo JPG. MaximÃ¡lne 2MB. Bude zmenÅ¡enÃ½ na 400x400px
+        avatar: PNG, GIF alebo JPG. MaximÃ¡lne %{size}. Bude zmenÅ¡enÃ½ na %{dimensions}px
         bot: Tento ÃºÄet vykonÃ¡va hlavne automatizovanÃ© akcie, a je pravdepodobne nespravovanÃ½
         context: Jedno, alebo viac kritÃ©riÃ, v ktorÃ½ch mÃ¡ byÅ¥ filtrovanie uplatnenÃ©
         digest: OdoslanÃ© iba v prÃpade dlhodobej neprÃtomnosti, a len ak si obdÅ•Å¾al/a nejakÃ© osobnÃ© sprÃ¡vy kÃ½m si bol/a preÄ
-        display_name:
-          few: OstÃ¡vajÃº ti <span class="name-counter">%{count}</span> znaky
-          one: OstÃ¡va ti <span class="name-counter">1</span> znak
-          other: OstÃ¡va ti <span class="name-counter">%{count}</span> znakov
-        fields: MÃ´Å¾eÅ¡ maÅ¥ 4 poloÅ¾ky na svojom profile zobrazenÃ© vo forme tabuÄ¾ky
-        header: PNG, GIF alebo JPG. MaximÃ¡lne 2MB. Bude zmenÅ¡enÃ½ na 700x335px
+        discoverable_html: TÃ¡to <a href="%{path}" target="_blank">databÃ¡za</a> umoÅ¾Åˆuje Ä¾udom nÃ¡jsÅ¥ profily podÄ¾a zÃ¡ujmu a aktÃvnosti. VyÅ¾aduje aby mali aspoÅˆ %{min_followers} sledovateÄ¾ov
+        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
+        inbox_url: SkopÃruj adresu z hlavnej strÃ¡nky mostÃka, ktorÃ½ chceÅ¡ pouÅ¾ÃvaÅ¥
         irreversible: VytriedenÃ© prÃspevky zmiznÃº nenÃ¡vratne, aj keÄ triedenie neskÃ´r zruÅ¡ÃÅ¡
-        locale: Jazyk uÅ¾ÃvateÄ¾skÃ©ho rozhrania, emailovÃ½ch a nÃ¡stenkovÃ½ch oboznÃ¡menÃ
-        locked: VyÅ¾aduje manuÃ¡lne schvalovaÅ¥ sledujÃºcich
-        note:
-          few: OstÃ¡vajÃº ti <span class="note-counter">%{count}</span> znaky
-          one: OstÃ¡va ti <span class="note-counter">1</span> znak
-          other: OstÃ¡va ti <span class="note-counter">%{count}</span> znakov
+        locale: Jazyk uÅ¾ÃvateÄ¾skÃ©ho rozhrania, emailovÃ½ch, a nÃ¡stenkovÃ½ch oboznÃ¡menÃ
+        locked: VyÅ¾aduje, aby si manuÃ¡lne schvaÄ¾oval/a nÃ¡sledovateÄ¾ov
+        password: Zadaj aspoÅˆ osem znakov
         phrase: Zhoda sa nÃ¡jde nezÃ¡visle od toho, Äi je text napÃsanÃ½, veÄ¾kÃ½mi, alebo malÃ½mi pÃsmenami, Äi uÅ¾ v tele, alebo v hlaviÄke
         scopes: KtorÃ© API budÃº povolenÃ© aplikÃ¡cii pre prÃstup. Ak vyberieÅ¡ vrcholnÃ½ stupeÅˆ, nemusÃÅ¡ uÅ¾ potom vyberaÅ¥ po jednom.
+        setting_aggregate_reblogs: Neukazuj novÃ© vyzdvihnutia pre prÃspevky, ktorÃ© uÅ¾ boli len nedÃ¡vno povÃ½Å¡enÃ© (tÃ½ka sa iba nanovo zÃskanÃ½ch vyzdvihnutÃ)
         setting_default_language: Jazyk tvojÃch prÃspevkov mÃ´Å¾e byÅ¥ zistenÃ½ automaticky, ale nieje to vÅ¾dy presnÃ©
+        setting_display_media_default: SkryÅ¥ mÃ©diÃ¡ oznaÄenÃ© ako citlivÃ©
+        setting_display_media_hide_all: VÅ¾dy ukryÅ¥ vÅ¡etky mÃ©diÃ¡
+        setting_display_media_show_all: StÃ¡le ukazuj mÃ©diÃ¡ oznaÄenÃ© ako citlivÃ©
         setting_hide_network: Koho nÃ¡sledujeÅ¡, a kto nÃ¡sleduje teba nebude zobrazenÃ© na tvojom profile
-        setting_noindex: OvplyvÅˆuje verejnÃ½ profil a statusy
-        setting_theme: Toto ovplyvÅˆuje ako Mastodon vyzerÃ¡ pri prihlÃ¡senÃ z hociakÃ©ho zariadenia.
+        setting_noindex: OvplyvÅˆuje verejnÃ½ profil a strÃ¡nky s prÃspevkami
+        setting_theme: OvplyvÅˆuje ako Mastodon vyzerÃ¡ pri prihlÃ¡senÃ z hociakÃ©ho zariadenia.
+        username: Tvoja prezÃ½vka bude unikÃ¡tna pre server %{domain}
+        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
       imports:
         data: CSV sÃºbor vyexportovanÃ½ z inej Mastodon inÅ¡tancie
       sessions:
@@ -38,6 +47,18 @@ sk:
         fields:
           name: OznaÄenie
           value: Obsah
+      account_warning_preset:
+        text: Text predlohy
+      admin_account_action:
+        send_email_notification: OznÃ¡m uÅ¾ÃvateÄ¾ovi cez email
+        text: Å pecifickÃ© varovanie
+        type: Ãškon
+        types:
+          disable: Deaktivuj
+          none: Neurob niÄ
+          silence: UtÃÅ¡enie
+          suspend: VylÃºÄ a nenÃ¡vratne vymaÅ¾ dÃ¡ta na ÃºÄte
+        warning_preset_id: PouÅ¾i varovnÃº predlohu
       defaults:
         autofollow: Pozvi k nÃ¡sledovaniu tvojho profilu
         avatar: Avatar
@@ -48,11 +69,13 @@ sk:
         context: Triedenie kontextov
         current_password: SÃºÄasnÃ© heslo
         data: DÃ¡ta
+        discoverable: ZaraÄ tento ÃºÄet do databÃ¡zy
         display_name: Meno
         email: EmailovÃ¡ adresa
         expires_in: ExpirovaÅ¥ po
         fields: MetadÃ¡ta profilu
         header: ObrÃ¡zok v hlaviÄke
+        inbox_url: URL adresa prechodnej schrÃ¡nky
         irreversible: ZahoÄ, namiesto skritia
         locale: Jazyk rozhrania
         locked: ZamknÃºÅ¥ ÃºÄet
@@ -62,13 +85,18 @@ sk:
         otp_attempt: Dvoj-faktorovÃ½ overovacÃ (2FA) kÃ³d
         password: Heslo
         phrase: KÄ¾ÃºÄovÃ© slovo, alebo frÃ¡za
-        setting_auto_play_gif: Automaticky prehrÃ¡vaÅ¥ animovanÃ© GIFy
-        setting_boost_modal: ZobrazovaÅ¥ potvrdzovacie okno pred re-toot
+        setting_aggregate_reblogs: Zoskupuj vyzdvihnutia v Äasovej osi
+        setting_auto_play_gif: Automaticky prehrÃ¡vaj animovanÃ© GIFy
+        setting_boost_modal: Zobrazuj potvrdzovacie okno pred povÃ½Å¡enÃm
         setting_default_language: PÃÅ¡eÅ¡ v jazyku
         setting_default_privacy: SÃºkromie prÃspevkov
         setting_default_sensitive: OznaÄ vÅ¡etky mediÃ¡lne sÃºbory ako chÃºlostivÃ©
         setting_delete_modal: Zobrazuj potvrdzovacie okno pred vymazanÃm toot-u
-        setting_display_sensitive_media: VÅ¾dy zobrazuj mÃ©diÃ¡ ktorÃ© sÃº oznaÄenÃ© ako chÃºlostivÃ©
+        setting_display_media: Zobrazovanie mÃ©diÃ
+        setting_display_media_default: Å tandard
+        setting_display_media_hide_all: SkryÅ¥ vÅ¡etky
+        setting_display_media_show_all: UkÃ¡Å¾ vÅ¡etky
+        setting_expand_spoilers: StÃ¡le rozbaÄ¾ prÃspevky oznaÄenÃ© varovanÃm o obsahu
         setting_hide_network: Ukri svoju sieÅ¥ kontaktov
         setting_noindex: NezaraÄuj prÃspevky do indexu pre vyhÄ¾adÃ¡vÄe
         setting_reduce_motion: RedukovaÅ¥ pohyb v animÃ¡ciÃ¡ch
@@ -79,17 +107,19 @@ sk:
         type: Typ importu
         username: PrezÃ½vka
         username_or_email: PrezÃvka, alebo email
+        whole_word: CelÃ© slovo
       interactions:
-        must_be_follower: BlokovaÅ¥ oznÃ¡menia od uÅ¾ÃvateÄ¾ov, ktorÃ Å¥a nesledujÃº
-        must_be_following: BlokovaÅ¥ oboznÃ¡menia ohÄ¾adom Ä¾udÃ ktorÃ½ch nesledujeÅ¡
-        must_be_following_dm: BlokovaÅ¥ sÃºkromnÃ© sprÃ¡vy od Ä¾udÃ ktorÃ½ch nesledujeÅ¡
+        must_be_follower: Blokuj oboznÃ¡menia ohÄ¾adom uÅ¾ÃvateÄ¾ov, ktorÃ Å¥a nesledujÃº
+        must_be_following: Blokuj oboznÃ¡menia ohÄ¾adom Ä¾udÃ ktorÃ½ch nesledujeÅ¡
+        must_be_following_dm: Blokuj sÃºkromnÃ© sprÃ¡vy od Ä¾udÃ ktorÃ½ch nesledujeÅ¡
       notification_emails:
-        digest: PosielaÅ¥ sÃºhrnnÃ© emaily
-        favourite: PoslaÅ¥ email ak niekto oznaÄÃ vÃ¡Å¡ prÃspevok ako obÄ¾ÃºbenÃ½
+        digest: Posielaj sÃºhrnnÃ© emaily
+        favourite: PoslaÅ¥ email ak si niekto obÄ¾Ãºbi tvoj prÃspevok
         follow: PoslaÅ¥ email, ak Å¥a niekto zaÄne nÃ¡sledovaÅ¥
         follow_request: ZaslaÅ¥ email ak ti niekto poÅ¡le Å¾iadosÅ¥ o sledovanie
         mention: PoslaÅ¥ email ak Å¥a niekto spomenie v svojom prÃspevku
         reblog: PoslaÅ¥ email ak niekto re-tootne tvoj prÃspevok
+        report: PoslaÅ¥ e-mail ak niekto dodÃ¡ novÃ© hlÃ¡senie
     'no': Nie
     required:
       mark: "*"
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 31d1e117016dff618e637cfd278e0716852d9dc1..890cbac418fe4c0b3951f0becca3e3a8d6ccb91f 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -3,13 +3,102 @@ sl:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF ali JPG. NajveÄ 2MB. ZmanjÅ¡ana bo na 400x400px
-        bot: Opozarja ljudi, da raÄun ne predstavlja osebe
+        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
         digest: PoÅ¡lje se le po dolgem obdobju nedejavnosti in samo, Äe ste prejeli osebna sporoÄila v vaÅ¡i odsotnosti
-        display_name:
-          one: <span class="name-counter">1</span> znak ostane
-          other: <span class="name-counter">%{count}</span> znakov ostane
+        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Ä 2MB. ZmanjÅ¡ana bo na 700x335px
+        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
+        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
+        scopes: Do katerih API-jev bo imel program dostop. ÄŒe izberete obseg najviÅ¡je ravni, vam ni treba izbrati posameznih.
+        setting_default_language: Jezik vaÅ¡ih trobov je lahko samodejno zaznan, vendar ni vedno pravilen
+        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_theme: Vpliva na to, kako izgleda Mastodon, ko ste prijavljeni s katero koli napravo.
+        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
       imports:
         data: IzvoÅ¾ena CSV datoteka iz drugega Mastodon vozliÅ¡Äa
+      sessions:
+        otp: 'Vnesite dvomestno kodo, ki je ustvarjena z aplikacijo na telefonu, ali uporabite eno od vaÅ¡ih obnovitvenih kod:'
+      user:
+        chosen_languages: Ko je oznaÄeno, bodo v javnih Äasovnicah prikazani samo trobi v izbranih jezikih
+    labels:
+      account:
+        fields:
+          name: Oznaka
+          value: Vsebina
+      defaults:
+        autofollow: Povabite, da sledi vaÅ¡emu raÄunu
+        avatar: Podoba
+        bot: To je raÄun robota
+        chosen_languages: Filtriraj jezike
+        confirm_new_password: Potrdite novo geslo
+        confirm_password: Potrdite geslo
+        context: Filtriraj vsebino
+        current_password: Trenutno geslo
+        data: Podatki
+        display_name: Prikazno ime
+        email: E-poÅ¡tni naslov
+        expires_in: PreteÄe po
+        fields: Metapodatki profila
+        header: Glava
+        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: Bio
+        otp_attempt: Dvofaktorska koda
+        password: Geslo
+        phrase: KljuÄna beseda ali fraza
+        setting_auto_play_gif: Samodejno predvajanje animiranih GIF-ov
+        setting_boost_modal: Pred sunkom pokaÅ¾i potrditveno okno
+        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_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_hide_network: Skrij svoje omreÅ¾je
+        setting_noindex: Odsotnost indeksiranja iskalnikov
+        setting_reduce_motion: ZmanjÅ¡anje premikanja v animacijah
+        setting_system_font_ui: Uporabi privzeto pisavo sistema
+        setting_theme: Tema strani
+        setting_unfollow_modal: PokaÅ¾i potrditveno okno, preden nekoga prenehamo slediti
+        severity: Strogost
+        type: Vrsta uvoza
+        username: UporabniÅ¡ko ime
+        username_or_email: UporabniÅ¡ko ime ali E-poÅ¡ta
+        whole_word: Celotna beseda
+      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
+      notification_emails:
+        digest: PoÅ¡lji izvleÄke e-poÅ¡t
+        favourite: PoÅ¡lji e-poÅ¡to, ko nekdo doda vaÅ¡e stanje 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
+        reblog: PoÅ¡lji e-poÅ¡to, ko nekdo sune vaÅ¡e stanje
+        report: PoÅ¡lji e-poÅ¡to, ko je oddano novo poroÄilo
+    'no': Ne
+    required:
+      mark: "*"
+      text: zahtevano
+    'yes': Da
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index 608630c0ce300d6b8b6f3f70044ddafb772864cd..eac64988fecac1502ce39ef06d22aaa3de95eec4 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -3,26 +3,16 @@ sr-Latn:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF ili JPG. NajviÅ¡e 2MB. BiÄ‡e smanjena na 400x400px
+        avatar: PNG, GIF ili JPG. NajviÅ¡e %{size}. BiÄ‡e smanjena na %{dimensions}px
         digest: Poslato posle duÅ¾eg perioda neaktivnosti sa pregledom svih bitnih stvari koje ste dobili dok ste bili odsutni
-        display_name:
-          few: <span class="name-counter">%{count}</span> karaktera preostala
-          many: <span class="name-counter">%{count}</span> karaktera preostalo
-          one: <span class="name-counter">1</span> karakter preostao
-          other: <span class="name-counter">%{count}</span> karaktera preostalo
-        header: PNG, GIF ili JPG. NajviÅ¡e 2MB. BiÄ‡e smanjena na 700x335px
+        header: PNG, GIF ili JPG. NajviÅ¡e %{size}. BiÄ‡e smanjena na %{dimensions}px
         locked: Zahteva da pojedinaÄno odobrite pratioce
-        note:
-          few: <span class="note-counter">%{count}</span> karaktera preostal
-          many: <span class="note-counter">%{count}</span> karaktera preostalo
-          one: <span class="note-counter">1</span> karakter preostao
-          other: <span class="note-counter">%{count}</span> karaktera preostalo
         setting_noindex: UtiÄe na VaÅ¡ javni profil i statusne strane
         setting_theme: UtiÄe kako Ä‡e Mastodont izgledati kada ste prijavljeni sa bilo kog ureÄ‘aja.
       imports:
         data: CSV fajl izvezen sa druge Mastodont instance
       sessions:
-        otp: Unesite dvofaktorski kod sa VaÅ¡eg telefona ili koristite jedan od kodova za oporavak.
+        otp: 'Unesite dvofaktorski kod sa VaÅ¡eg telefona ili koristite jedan od kodova za oporavak:'
     labels:
       defaults:
         avatar: Avatar
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index ab9ef0f492a14e95675808988709582b9cca4799..7e3c6685e09104123352211eb28620d68b8eeb88 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -2,38 +2,81 @@
 sr:
   simple_form:
     hints:
+      account_warning_preset:
+        text: ÐœÐ¾Ð¶ÐµÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÑÐ¸Ð½Ñ‚Ð°ÐºÑÑƒ Ñ‚Ñ€ÑƒÐ±Ð°, ÐºÐ°Ð¾ ÑˆÑ‚Ð¾ ÑÑƒ Ð½Ð¿Ñ€. Ð£Ð Ð›-Ð¾Ð²Ð°, Ñ‚Ð°Ñ€Ð°Ð±Ðµ Ð¸ Ð¿Ð¾Ð¼Ð¸ÑšÐ°ÑšÐ°
+      admin_account_action:
+        send_email_notification: ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ñ›Ðµ Ð´Ð¾Ð±Ð¸Ñ‚Ð¸ Ð¾Ð±Ñ˜Ð°ÑˆÑšÐµÑšÐµ Ñ‚Ð¾Ð³Ð° ÑˆÑ‚Ð° Ð¼Ñƒ ÑÐµ Ð´ÐµÑÐ¸Ð»Ð¾ ÑÐ° Ð½Ð°Ð»Ð¾Ð³Ð°
+        text_html: ÐžÐ¿Ñ†Ð¸Ð¾Ð½Ð°Ð»Ð½Ð¾. ÐœÐ¾Ð¶ÐµÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÑÐ¸Ð½Ñ‚Ð°ÐºÑÑƒ Ñ‚Ñ€ÑƒÐ±Ð°. ÐœÐ¾Ð¶ÐµÑ‚Ðµ <a href="%{path}">Ð´Ð¾Ð´Ð°Ñ‚Ð¸ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€Ð°Ð²Ð°Ñ˜ÑƒÑ›Ð° Ð¿Ñ€ÐµÐ¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ</a> Ð´Ð° ÑÐ°Ñ‡ÑƒÐ²Ð°Ñ‚Ðµ Ð²Ñ€ÐµÐ¼Ðµ
+        type_html: Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ ÑˆÑ‚Ð° Ð´Ð° Ñ€Ð°Ð´Ð¸Ñ‚Ðµ ÑÐ° <strong>%{acct}</strong>
+        warning_preset_id: ÐžÐ¿Ñ†Ð¸Ð¾Ð½Ð°Ð»Ð½Ð¾. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¸ Ð´Ð°Ñ™Ðµ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¸Ð»Ð°Ð³Ð¾Ñ’ÐµÐ½Ð¸ Ñ‚ÐµÐºÑÑ‚ Ð½Ð° ÐºÑ€Ð°Ñ˜ Ð¿Ñ€ÐµÑÐµÑ‚Ð°
       defaults:
-        avatar: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐÐ°Ñ˜Ð²Ð¸ÑˆÐµ 2MB. Ð‘Ð¸Ñ›Ðµ ÑÐ¼Ð°ÑšÐµÐ½Ð° Ð½Ð° 400x400px
+        autofollow: ÐžÑÐ¾Ð±Ðµ ÐºÐ¾Ñ˜Ðµ ÑÐµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ðµ ÐºÑ€Ð¾Ð· Ð¿Ð¾Ð·Ð¸Ð²Ð½Ð¸Ñ†Ðµ Ñ›Ðµ Ð²Ð°Ñ Ð°ÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ¸ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸
+        avatar: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐÐ°Ñ˜Ð²Ð¸ÑˆÐµ %{size}. Ð‘Ð¸Ñ›Ðµ ÑÐ¼Ð°ÑšÐµÐ½Ð° Ð½Ð° %{dimensions}px
+        bot: ÐžÐ²Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³ ÑƒÐ³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð²Ñ€ÑˆÐ¸ Ð°ÑƒÑ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ð·Ð¾Ð²Ð°Ð½Ðµ Ñ€Ð°Ð´ÑšÐµ Ð¸ Ð¼Ð¾Ð¶Ð´Ð° ÑÐµ Ð½Ðµ Ð½Ð°Ð´Ð³Ð»ÐµÐ´Ð°
+        context: ÐˆÐµÐ´Ð°Ð½ Ð¸Ð»Ð¸ Ð²Ð¸ÑˆÐµ ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚Ð° Ñƒ ÐºÐ¾Ñ˜Ð¸Ð¼Ð° Ñ‚Ñ€ÐµÐ±Ð° Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸Ð¼ÐµÐ½Ð¸ Ñ„Ð¸Ð»Ñ‚ÐµÑ€
         digest: ÐŸÐ¾ÑÐ»Ð°Ñ‚Ð¾ Ð¿Ð¾ÑÐ»Ðµ Ð´ÑƒÐ¶ÐµÐ³ Ð¿ÐµÑ€Ð¸Ð¾Ð´Ð° Ð½ÐµÐ°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ð¸ ÑÐ° Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð¾Ð¼ ÑÐ²Ð¸Ñ… Ð±Ð¸Ñ‚Ð½Ð¸Ñ… ÑÑ‚Ð²Ð°Ñ€Ð¸ ÐºÐ¾Ñ˜Ðµ ÑÑ‚Ðµ Ð´Ð¾Ð±Ð¸Ð»Ð¸ Ð´Ð¾Ðº ÑÑ‚Ðµ Ð±Ð¸Ð»Ð¸ Ð¾Ð´ÑÑƒÑ‚Ð½Ð¸
-        display_name:
-          few: <span class="name-counter">%{count}</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð»Ð°
-          many: <span class="name-counter">%{count}</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð»Ð¾
-          one: <span class="name-counter">1</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€ Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð¾
-          other: <span class="name-counter">%{count}</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð»Ð¾
-        header: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐÐ°Ñ˜Ð²Ð¸ÑˆÐµ 2MB. Ð‘Ð¸Ñ›Ðµ ÑÐ¼Ð°ÑšÐµÐ½Ð° Ð½Ð° 700x335px
+        discoverable_html: <a href="%{path}" target="_blank">Ð”Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼</a> Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð°Ð²Ð° Ñ™ÑƒÐ´Ð¸Ð¼Ð° Ð´Ð° Ð¿Ñ€Ð¾Ð½Ð°Ñ’Ñƒ Ð½Ð°Ð»Ð¾Ð³Ðµ Ð·Ð°ÑÐ½Ð¾Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ‚ÐµÑ€ÐµÑÐ¸Ð¼Ð° Ð¸ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚Ð¸.  Ð—Ð°Ñ…Ñ‚ÐµÐ²Ð° Ð±Ð°Ñ€ %{min_followers} Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð°
+        email: Ð‘Ð¸Ñ›Ðµ Ð²Ð°Ð¼ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° ÑÐ° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¾Ð¼
+        fields: ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾ 4 ÑÑ‚Ð°Ð²ÐºÐµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð°Ð½Ðµ ÐºÐ°Ð¾ Ñ‚Ð°Ð±ÐµÐ»Ð° Ð½Ð° Ð²Ð°ÑˆÐµÐ¼ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ
+        header: PNG, GIF Ð¸Ð»Ð¸ JPG. ÐÐ°Ñ˜Ð²Ð¸ÑˆÐµ %{size}. Ð‘Ð¸Ñ›Ðµ ÑÐ¼Ð°ÑšÐµÐ½Ð° Ð½Ð° %{dimensions}px
+        inbox_url: ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜Ñ‚Ðµ URL ÑÐ° Ð½Ð°ÑÐ»Ð¾Ð²Ð½Ðµ ÑÑ‚Ñ€Ð°Ð½Ðµ Ñ€ÐµÐ»ÐµÑ˜Ð° ÐºÐ¾Ñ˜Ð¸ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸
+        irreversible: Ð¤Ð¸Ð»Ñ‚Ñ€Ð¸Ñ€Ð°Ð½e Ñ‚Ñ€ÑƒÐ±Ðµ Ñ›Ðµ Ð½ÐµÑÑ‚Ð°Ñ‚Ð¸ Ð½ÐµÐ¿Ð¾Ð²Ñ€Ð°Ñ‚Ð½Ð¾, Ñ‡Ð°Ðº Ð¸ Ð°ÐºÐ¾ Ñ˜Ðµ Ñ„Ð¸Ð»Ñ‚ÐµÑ€ ÐºÐ°ÑÐ½Ð¸Ñ˜Ðµ ÑƒÐºÐ»Ð¾ÑšÐµÐ½
+        locale: ÐˆÐµÐ·Ð¸Ðº ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾Ð³ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÑ˜ÑÐ°, Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ Ð¸ Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¸Ñ… Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°
         locked: Ð—Ð°Ñ…Ñ‚ÐµÐ²Ð° Ð´Ð° Ð¿Ð¾Ñ˜ÐµÐ´Ð¸Ð½Ð°Ñ‡Ð½Ð¾ Ð¾Ð´Ð¾Ð±Ñ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ðµ
-        note:
-          few: <span class="note-counter">%{count}</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð»
-          many: <span class="note-counter">%{count}</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð»Ð¾
-          one: <span class="note-counter">1</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€ Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð¾
-          other: <span class="note-counter">%{count}</span> ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐ¾ÑÑ‚Ð°Ð»Ð¾
+        password: ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ð½Ð°Ñ˜Ð¼Ð°ÑšÐµ 8 Ð·Ð½Ð°ÐºÐ¾Ð²Ð°
+        phrase: Ð‘Ð¸Ñ›Ðµ ÑƒÐ¿Ð°Ñ€ÐµÐ½Ð° Ð±ÐµÐ· Ð¾Ð±Ð·Ð¸Ñ€Ð° Ð½Ð° Ð²ÐµÐ»Ð¸ÐºÐ¾ Ð¸Ð»Ð¸ Ð¼Ð°Ð»Ð¾ ÑÐ»Ð¾Ð²Ð¾ Ñƒ Ñ‚ÐµÐºÑÑ‚Ñƒ Ð¸Ð»Ð¸ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐ° Ð¾ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜Ñƒ Ñ‚Ñ€ÑƒÐ±Ðµ
+        scopes: ÐšÐ¾Ñ˜Ð¸Ð¼ API-Ñ˜Ð¸Ð¼Ð° Ñ›Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ð´Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿. ÐÐºÐ¾ Ð¸Ð·Ð°Ð±ÐµÑ€ÐµÑ‚Ðµ Ð¾Ð¿ÑÐµÐ³ Ð½Ð°Ñ˜Ð²Ð¸ÑˆÐµÐ³ Ð½Ð¸Ð²Ð¾Ð°, Ð½Ðµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¾Ð´Ð°Ð±Ñ€Ð°Ñ‚Ð¸ Ð¿Ð¾Ñ˜ÐµÐ´Ð¸Ð½Ð°Ñ‡Ð½Ðµ.
+        setting_aggregate_reblogs: ÐÐµ Ð¿Ð¾ÐºÐ°Ð·ÑƒÑ˜ Ð½Ð¾Ð²Ð° Ð´ÐµÑ™ÐµÑšÐ° Ð·Ð° Ñ‚Ñ€ÑƒÐ±Ðµ ÐºÐ¾Ñ˜Ðµ ÑÑƒ Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¿Ð¾Ð´ÐµÑ™ÐµÐ½Ðµ (ÑƒÑ‚Ð¸Ñ‡Ðµ ÑÐ°Ð¼Ð¾ Ð½Ð° Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ Ð¿Ñ€Ð¸Ð¼Ñ™ÐµÐ½Ð° Ð´ÐµÑ™ÐµÑšÐ°)
+        setting_default_language: ÐˆÐµÐ·Ð¸Ðº Ð²Ð°ÑˆÐ¸Ñ… Ñ‚Ñ€ÑƒÐ±Ð° Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ‚Ð¸ Ð°ÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ¸ Ð¾Ñ‚ÐºÑ€Ð¸Ð²ÐµÐ½, Ð°Ð»Ð¸ Ð½Ð¸Ñ˜Ðµ ÑƒÐ²ÐµÐº Ð¿Ñ€ÐµÑ†Ð¸Ð·Ð°Ð½
+        setting_display_media_default: Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ð¼ÐµÐ´Ð¸Ñ˜Ðµ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ ÐºÐ°Ð¾ Ð¾ÑÐµÑ‚Ñ™Ð¸Ð²Ðµ
+        setting_display_media_hide_all: Ð£Ð²ÐµÐº ÑÐ°ÐºÑ€Ð¸Ñ˜ ÑÐ²Ðµ Ð¼ÐµÐ´Ð¸Ñ˜Ðµ
+        setting_display_media_show_all: Ð£Ð²ÐµÐº Ð¿Ñ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¼ÐµÐ´Ð¸Ñ˜Ðµ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ ÐºÐ°Ð¾ Ð¾ÑÐµÑ‚Ñ™Ð¸Ð²Ðµ
+        setting_hide_network: ÐšÐ¾Ð³Ð° Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¸ ÐºÐ¾ Ð²Ð°Ñ Ð¿Ñ€Ð°Ñ‚Ð¸ Ð½ÐµÑ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾ Ð½Ð° Ð²Ð°ÑˆÐµÐ¼ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ
         setting_noindex: Ð£Ñ‚Ð¸Ñ‡Ðµ Ð½Ð° Ð’Ð°Ñˆ Ñ˜Ð°Ð²Ð½Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð» Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑÐ½Ðµ ÑÑ‚Ñ€Ð°Ð½Ðµ
         setting_theme: Ð£Ñ‚Ð¸Ñ‡Ðµ ÐºÐ°ÐºÐ¾ Ñ›Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð¸Ð·Ð³Ð»ÐµÐ´Ð°Ñ‚Ð¸ ÐºÐ°Ð´Ð° ÑÑ‚Ðµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð¸ ÑÐ° Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ð³ ÑƒÑ€ÐµÑ’Ð°Ñ˜Ð°.
+        username: Ð’Ð°Ñˆ Ð½Ð°Ð´Ð¸Ð¼Ð°Ðº Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ñ˜ÐµÐ´Ð¸Ð½ÑÑ‚Ð²ÐµÐ½ Ð½Ð° %{domain}
+        whole_word: ÐšÐ°Ð´Ð° Ñ˜Ðµ ÐºÑ™ÑƒÑ‡Ð½Ð° Ñ€ÐµÑ‡ Ð¸Ð»Ð¸ Ñ„Ñ€Ð°Ð·Ð° Ð¸ÑÐºÑ™ÑƒÑ‡Ð¸Ð²Ð¾ Ð°Ð»Ñ„Ð°Ð½ÑƒÐ¼ÐµÑ€Ð¸Ñ‡ÐºÐ°, Ð±Ð¸Ñ›Ðµ Ð¿Ñ€Ð¸Ð¼ÐµÑšÐµÐ½Ð° ÑÐ°Ð¼Ð¾ Ð°ÐºÐ¾ ÑÐµ Ð¿Ð¾Ð´ÑƒÐ´Ð°Ñ€Ð° ÑÐ° Ñ†ÐµÐ»Ð¾Ð¼ Ñ€ÐµÑ‡Ð¸
       imports:
         data: CSV Ñ„Ð°Ñ˜Ð» Ð¸Ð·Ð²ÐµÐ·ÐµÐ½ ÑÐ° Ð´Ñ€ÑƒÐ³Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ
       sessions:
-        otp: Ð£Ð½ÐµÑÐ¸Ñ‚Ðµ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ¸ ÐºÐ¾Ð´ ÑÐ° Ð’Ð°ÑˆÐµÐ³ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° Ð¸Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ñ˜ÐµÐ´Ð°Ð½ Ð¾Ð´ ÐºÐ¾Ð´Ð¾Ð²Ð° Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº.
+        otp: 'Ð£Ð½ÐµÑÐ¸Ñ‚Ðµ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ¸ ÐºÐ¾Ð´ ÑÐ° Ð’Ð°ÑˆÐµÐ³ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° Ð¸Ð»Ð¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ Ñ˜ÐµÐ´Ð°Ð½ Ð¾Ð´ ÐºÐ¾Ð´Ð¾Ð²Ð° Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº:'
+      user:
+        chosen_languages: ÐšÐ°Ð´Ð° Ð¾Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ðµ, Ñ‚Ñ€ÑƒÐ±Ðµ Ñƒ Ð¸Ð·Ð°Ð±Ñ€Ð°Ð½Ð¸Ð¼ Ñ˜ÐµÐ·Ð¸Ñ†Ð¸Ð¼Ð° Ñ›Ðµ ÑÐµ Ð¿Ñ€Ð¸ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð½Ð° Ñ˜Ð°Ð²Ð½Ð¾Ñ˜ Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ¾Ñ˜ Ð»Ð¸Ð½Ð¸Ñ˜Ð¸
     labels:
+      account:
+        fields:
+          name: Ð•Ñ‚Ð¸ÐºÐµÑ‚Ð°
+          value: Ð¡Ð°Ð´Ñ€Ð¶Ð°Ñ˜
+      account_warning_preset:
+        text: Ð¢ÐµÐºÑÑ‚ Ð¿Ñ€ÐµÑÐµÑ‚Ð°
+      admin_account_action:
+        send_email_notification: ÐžÐ±Ð°Ð²ÐµÑÑ‚Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° Ð¿Ñ€ÐµÐºÐ¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ
+        text: ÐŸÑ€Ð¸Ð»Ð°Ð³Ð¾Ñ’ÐµÐ½Ð¾ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ
+        type: Ð Ð°Ð´ÑšÐ°
+        types:
+          disable: ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸
+          none: ÐÐµ Ñ€Ð°Ð´Ð¸ Ð½Ð¸ÑˆÑ‚Ð°
+          silence: Ð£Ñ‚Ð¸ÑˆÐ°Ñ˜
+          suspend: ÐžÐ±ÑƒÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð¸ Ð½ÐµÐ¿Ð¾Ð²Ñ€Ð°Ñ‚Ð½Ð¾ Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ¸Ñ‚Ðµ Ð¿Ð¾Ð´Ð°Ñ‚ÐºÐµ Ð¾ Ð½Ð°Ð»Ð¾Ð³Ñƒ
+        warning_preset_id: ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€Ð°Ð²Ð°Ñ˜ÑƒÑ›Ð¸ Ð¿Ñ€ÐµÑÐµÑ‚
       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: URL Ð¾Ð´ Ñ€ÐµÐ»ÐµÑ˜Ð½Ð¾Ð³ Ð¿Ñ€Ð¸Ñ˜ÐµÐ¼Ð½Ð¾Ð³ ÑÐ°Ð½Ð´ÑƒÑ‡ÐµÑ‚Ð°
+        irreversible: Ð˜ÑÐ¿ÑƒÑÑ‚Ð¸Ñ‚Ð¸ ÑƒÐ¼ÐµÑÑ‚Ð¾ ÑÐ°ÐºÑ€Ð¸Ñ‚Ð¸
         locale: ÐˆÐµÐ·Ð¸Ðº
         locked: Ð—Ð°ÐºÑ™ÑƒÑ‡Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³
         max_uses: ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð¸ Ð±Ñ€Ð¾Ñ˜ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
@@ -41,11 +84,20 @@ sr:
         note: Ð‘Ð¸Ð¾Ð³Ñ€Ð°Ñ„Ð¸Ñ˜Ð°
         otp_attempt: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ¸ ÐºÐ¾Ð´
         password: Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°
+        phrase: ÐšÑ™ÑƒÑ‡Ð½Ð° Ñ€ÐµÑ‡ Ð¸Ð»Ð¸ Ñ„Ñ€Ð°Ð·Ð°
+        setting_aggregate_reblogs: Ð“Ñ€ÑƒÐ¿Ð¸ÑˆÐ¸ Ð´ÐµÑ™ÐµÑšÐ° Ñƒ Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ¸Ð¼ Ð»Ð¸Ð½Ð¸Ñ˜Ð°Ð¼Ð°
         setting_auto_play_gif: ÐÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ¸ Ð¿ÑƒÑˆÑ‚Ð°Ñ˜ Ð°Ð½Ð¸Ð¼Ð¸Ñ€Ð°Ð½Ðµ GIF-Ð¾Ð²Ðµ
         setting_boost_modal: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð´Ð¸Ñ˜Ð°Ð»Ð¾Ð³ Ð·Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ Ð¿Ñ€Ðµ Ð´Ð°Ð²Ð°ÑšÐ° Ð¿Ð¾Ð´Ñ€ÑˆÐºÐµ
+        setting_default_language: ÐˆÐµÐ·Ð¸Ðº Ð¾Ð±Ñ˜Ð°Ð²Ñ™Ð¸Ð²Ð°ÑšÐ°
         setting_default_privacy: ÐŸÑ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚ Ð¾Ð±Ñ˜Ð°Ð²Ð°
         setting_default_sensitive: Ð£Ð²ÐµÐº Ð¾Ð·Ð½Ð°Ñ‡Ð¸ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ñƒ ÐºÐ°Ð¾ Ð¾ÑÐµÑ‚Ñ™Ð¸Ð²Ñƒ
         setting_delete_modal: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð´Ð¸Ñ˜Ð°Ð»Ð¾Ð³ Ð·Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ Ð¿Ñ€Ðµ Ð±Ñ€Ð¸ÑÐ°ÑšÐ° Ñ‚ÑƒÑ‚Ð°
+        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: ÐžÐ´Ñ˜Ð°Ð²Ð¸ ÑÐµ Ð¾Ð´ Ð¸Ð½Ð´ÐµÐºÑÐ¸Ñ€Ð°ÑšÐ° search engine-Ð°
         setting_reduce_motion: Ð¡Ð¼Ð°ÑšÐ¸ Ð¿Ð¾ÐºÑ€ÐµÑ‚Ðµ Ñƒ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ˜Ð°Ð¼Ð°
         setting_system_font_ui: ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸ ÑÐ¸ÑÑ‚ÐµÐ¼ÑÐºÐ¸ Ñ„Ð¾Ð½Ñ‚
@@ -54,6 +106,8 @@ sr:
         severity: ÐžÑˆÑ‚Ñ€Ð¸Ð½Ð°
         type: Ð¢Ð¸Ð¿ ÑƒÐ²Ð¾Ð·Ð°
         username: ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ
+        username_or_email: ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ Ð¸Ð»Ð¸ Ð•-Ð¿Ð¾ÑˆÑ‚Ð°
+        whole_word: Ð¦ÐµÐ»Ð° Ñ€ÐµÑ‡
       interactions:
         must_be_follower: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° ÐºÐ¾Ñ˜Ð¸ Ð¼Ðµ Ð½Ðµ Ð¿Ñ€Ð°Ñ‚Ðµ
         must_be_following: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ˜ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ Ñ™ÑƒÐ´Ð¸ ÐºÐ¾Ñ˜Ðµ Ð½Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¼
@@ -65,6 +119,7 @@ sr:
         follow_request: Ð¨Ð°Ñ™Ð¸ Ðµ-Ð¿Ð¾ÑˆÑ‚Ñƒ ÐºÐ°Ð´Ð° Ð½ÐµÐºÐ¾ Ð·Ð°Ñ‚Ñ€Ð°Ð¶Ð¸ Ð´Ð° Ð’Ð°Ñ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸
         mention: Ð¨Ð°Ñ™Ð¸ Ðµ-Ð¿Ð¾ÑˆÑ‚Ñƒ ÐºÐ°Ð´Ð° Ð’Ð°Ñ Ð½ÐµÐºÐ¾ Ð¿Ð¾Ð¼ÐµÐ½Ðµ
         reblog: Ð¨Ð°Ñ™Ð¸ Ðµ-Ð¿Ð¾ÑˆÑ‚Ñƒ ÐºÐ°Ð´Ð° Ð½ÐµÐºÐ¾ Ð¿Ð¾Ð´Ñ€Ð¶Ð¸ Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ
+        report: ÐŸÐ¾ÑˆÐ°Ñ™Ð¸ Ð•-Ð¿Ð¾ÑˆÑ‚Ñƒ ÐºÐ°Ð´Ð° ÑÐµ Ð¿Ð¾Ð´Ð½ÐµÑÐµ Ð½Ð¾Ð²Ð° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð°
     'no': ÐÐµ
     required:
       mark: "*"
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index e761f3d99728065c8ecee50da38c4b6a0beaca8d..8bc82c6093d84d306f012a6b3471973fd47a8715 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -4,19 +4,13 @@ sv:
     hints:
       defaults:
         autofollow: AnvÃ¤ndarkonton som skapas genom din inbjudan kommer automatiskt fÃ¶lja dig
-        avatar: HÃ¶gst 2 MB. Kommer att skalas ner till 400x400px
+        avatar: HÃ¶gst %{size}. Kommer att skalas ner till %{dimensions}px
         bot: Detta konto utfÃ¶r huvudsakligen automatiserade Ã¥tgÃ¤rder och kanske inte Ã¶vervakas
         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
-        display_name:
-          one: <span class="name-counter">1</span> tecken kvar
-          other: <span class="name-counter">%{count}</span> tecken kvar
         fields: Du kan ha upp till 4 objekt visade som en tabell pÃ¥ din profil
-        header: NG, GIF eller JPG. HÃ¶gst 2 MB. Kommer nedskalas till 700x335px
+        header: NG, GIF eller JPG. HÃ¶gst %{size}. Kommer nedskalas till %{dimensions}px
         locale: AnvÃ¤ndargrÃ¤nssnittets sprÃ¥k, e-post och push aviseringar
         locked: KrÃ¤ver att du manuellt godkÃ¤nner fÃ¶ljare
-        note:
-          one: <span class="note-counter">1</span> tecken kvar
-          other: <span class="note-counter">%{count}</span> tecken kvar
         setting_default_language: SprÃ¥ket av dina inlÃ¤gg kan upptÃ¤ckas automatiskt, men det Ã¤r inte alltid rÃ¤tt
         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
@@ -59,7 +53,6 @@ sv:
         setting_default_privacy: Postintegritet
         setting_default_sensitive: Markera alltid media som kÃ¤nsligt
         setting_delete_modal: Visa bekrÃ¤ftelsedialog innan du raderar en toot
-        setting_display_sensitive_media: Visa alltid media mÃ¤rkt som kÃ¤nsligt
         setting_hide_network: GÃ¶m ditt nÃ¤tverk
         setting_noindex: Uteslutning av sÃ¶kmotorindexering
         setting_reduce_motion: Minska rÃ¶relser i animationer
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 575b6a9f4735fd55e8001831e078ea3e7e30b00b..a8611c2f77a41a8a427e6974f105a65d04c50c17 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -3,15 +3,9 @@ th:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px
-        display_name:
-          one: <span class="name-counter">1</span> character left
-          other: <span class="name-counter">%{count}</span> characters left
-        header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
+        avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
+        header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px
         locked: Requires you to manually approve followers and defaults post privacy to followers-only
-        note:
-          one: <span class="name-counter">1</span> character left
-          other: <span class="note-counter">%{count}</span> characters left
       imports:
         data: CSV file exported from another Mastodon instance
       sessions:
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index c827aac4655982a6ded9a1bf2a7bdc234d14570d..d0b50609b0dfa7625a6f32af1b5cd66405d33280 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -3,11 +3,9 @@ tr:
   simple_form:
     hints:
       defaults:
-        avatar: En fazla 2MB olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. 400x400px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir
-        display_name: <span class="name-counter">%{count}</span> karakter kaldÄ±
-        header: En fazla 2MB olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. 700x335px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir.
+        avatar: En fazla %{size} olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. %{dimensions}px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir
+        header: En fazla %{size} olacak ÅŸekilde PNG, GIF veya JPG formatÄ±nda yÃ¼kleyiniz. %{dimensions}px bÃ¼yÃ¼klÃ¼ÄŸÃ¼ne indirgenecektir.
         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.
-        note: <span class="note-counter">%{count}</span> karakter kaldÄ±
       imports:
         data: DiÄŸer Mastodon sunucusundan dÄ±ÅŸarÄ± aktardÄ±ÄŸÄ±nÄ±z CSV dosyasÄ±
       sessions:
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 7bc3ee4b87030acfc6e725250ffe51db5030fc15..05d57509e0bb179986e95529b09090e5e08bc27c 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -3,11 +3,10 @@ uk:
   simple_form:
     hints:
       defaults:
-        avatar: PNG, GIF, Ð°Ð±Ð¾ JPG. ÐœÐ°ÐºÑÐ¸Ð¼ÑƒÐ¼ - 2ÐœÐ‘. Ð‘ÑƒÐ´Ðµ Ð·Ð¼ÐµÐ½ÑˆÐµÐ½Ð¾ Ð´Ð¾ 400x400px
-        display_name: 'Ð—Ð°Ð»Ð¸ÑˆÐ¸Ð»Ð¾ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ–Ð²: <span class="name-counter">%{count}</span>'
-        header: PNG, GIF, Ð°Ð±Ð¾ JPG. ÐœÐ°ÐºÑÐ¸Ð¼ÑƒÐ¼ - 2ÐœÐ‘. Ð‘ÑƒÐ´Ðµ Ð·Ð¼ÐµÐ½ÑˆÐµÐ½Ð¾ Ð´Ð¾ 700x335px
+        avatar: PNG, GIF, Ð°Ð±Ð¾ JPG. ÐœÐ°ÐºÑÐ¸Ð¼ÑƒÐ¼ - %{size}. Ð‘ÑƒÐ´Ðµ Ð·Ð¼ÐµÐ½ÑˆÐµÐ½Ð¾ Ð´Ð¾ %{dimensions}px
+        bot: Ð¦ÐµÐ¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð² Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¼Ñƒ Ð²Ð¸ÐºÐ¾Ð½ÑƒÑ” Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ñ– Ð´Ñ–Ñ— Ñ‚Ð° Ð¼Ð¾Ð¶Ðµ Ð½Ðµ Ð²Ñ–Ð´ÑÑ‚ÐµÐ¶ÑƒÐ²Ð°Ñ‚Ñ–ÑÑ
+        header: PNG, GIF, Ð°Ð±Ð¾ JPG. ÐœÐ°ÐºÑÐ¸Ð¼ÑƒÐ¼ - %{size}. Ð‘ÑƒÐ´Ðµ Ð·Ð¼ÐµÐ½ÑˆÐµÐ½Ð¾ Ð´Ð¾ %{dimensions}px
         locked: Ð‘ÑƒÐ´Ðµ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ‚Ð¸ Ð²Ñ–Ð´ Ð’Ð°Ñ ÑÐ°Ð¼Ð¾ÑÑ‚Ñ–Ð¹Ð½Ð¾Ð³Ð¾ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð², Ð·Ð¼Ñ–Ð½Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ–ÑÑ‚ÑŒ Ð¿Ð¾ÑÑ‚Ñ–Ð² Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼ Ð½Ð° "Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²"
-        note: 'ÐžÑÑ‚Ð°Ð»Ð¾ÑÑŒ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²: <span class="note-counter">%{count}</span>'
       imports:
         data: Ð¤Ð°Ð¹Ð» CSV, ÑÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ð¹ Ñ Ð´Ñ€ÑƒÐ³Ð¾Ð³Ð¾ ÑƒÐ·Ð»Ð° Mastodon
       sessions:
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index ce990d69267929ff00c9179a5c06852a35c196af..cfa6840a6a0d22601153debac327375662def064 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -4,15 +4,13 @@ zh-CN:
     hints:
       defaults:
         autofollow: é€šè¿‡é‚€è¯·é“¾æŽ¥æ³¨å†Œçš„ç”¨æˆ·å°†ä¼šè‡ªåŠ¨å…³æ³¨ä½ 
-        avatar: æ–‡ä»¶å¤§å°é™åˆ¶ 2MBï¼Œåªæ”¯æŒ PNGã€GIF æˆ– JPG æ ¼å¼ã€‚å›¾ç‰‡åˆ†è¾¨çŽ‡å°†ä¼šåŽ‹ç¼©è‡³ 400Ã—400px
+        avatar: æ–‡ä»¶å¤§å°é™åˆ¶ %{size}ï¼Œåªæ”¯æŒ PNGã€GIF æˆ– JPG æ ¼å¼ã€‚å›¾ç‰‡åˆ†è¾¨çŽ‡å°†ä¼šåŽ‹ç¼©è‡³ %{dimensions}px
         bot: æ¥è‡ªè¿™ä¸ªå¸æˆ·çš„ç»å¤§å¤šæ•°æ“ä½œéƒ½æ˜¯è‡ªåŠ¨è¿›è¡Œçš„ï¼Œå¹¶ä¸”å¯èƒ½æ— äººç›‘æŽ§
         digest: ä»…åœ¨ä½ é•¿æ—¶é—´æœªç™»å½•ï¼Œä¸”æ”¶åˆ°äº†ç§ä¿¡æ—¶å‘é€
-        display_name: è¿˜èƒ½è¾“å…¥ <span class="name-counter">%{count}</span> ä¸ªå—ç¬¦
         fields: è¿™å°†ä¼šåœ¨ä¸ªäººèµ„æ–™é¡µä¸Šä»¥è¡¨æ ¼çš„å½¢å¼å±•ç¤ºï¼Œæœ€å¤š 4 ä¸ªé¡¹ç›®
-        header: æ–‡ä»¶å¤§å°é™åˆ¶ 2MBï¼Œåªæ”¯æŒ PNGã€GIF æˆ– JPG æ ¼å¼ã€‚å›¾ç‰‡åˆ†è¾¨çŽ‡å°†ä¼šåŽ‹ç¼©è‡³ 700Ã—335px
+        header: æ–‡ä»¶å¤§å°é™åˆ¶ %{size}ï¼Œåªæ”¯æŒ PNGã€GIF æˆ– JPG æ ¼å¼ã€‚å›¾ç‰‡åˆ†è¾¨çŽ‡å°†ä¼šåŽ‹ç¼©è‡³ %{dimensions}px
         locale: ç”¨æˆ·ç•Œé¢ã€ç”µåé‚®ä»¶å’ŒæŽ¨é€é€šçŸ¥ä¸ä½¿ç”¨çš„è¯è¨€
         locked: ä½ éœ€è¦æ‰‹åŠ¨å®¡æ ¸æ‰€æœ‰å…³æ³¨è¯·æ±‚
-        note: è¿˜èƒ½è¾“å…¥ <span class="note-counter">%{count}</span> ä¸ªå—ç¬¦
         setting_default_language: å˜Ÿæ–‡è¯è¨€è‡ªåŠ¨æ£€æµ‹çš„ç»“æžœæœ‰å¯èƒ½ä¸å‡†ç¡®ï¼ˆæ¤è®¾ç½®ä»…å½±å“ä½ çš„å˜Ÿæ–‡ï¼‰
         setting_hide_network: ä½ å…³æ³¨çš„äººå’Œå…³æ³¨ä½ çš„äººå°†ä¸ä¼šåœ¨ä½ çš„ä¸ªäººèµ„æ–™é¡µä¸Šå±•ç¤º
         setting_noindex: æ¤è®¾ç½®ä¼šå½±å“åˆ°ä½ çš„å…¬å¼€ä¸ªäººèµ„æ–™ä»¥åŠå˜Ÿæ–‡é¡µé¢
@@ -55,7 +53,6 @@ zh-CN:
         setting_default_privacy: å˜Ÿæ–‡é»˜è®¤å¯è§èŒƒå›´
         setting_default_sensitive: æ€»æ˜¯å°†æˆ‘å‘é€çš„åª’ä½“æ–‡ä»¶æ ‡è®°ä¸ºæ•æ„Ÿå†…å®¹
         setting_delete_modal: åœ¨åˆ é™¤å˜Ÿæ–‡å‰è¯¢é—®æˆ‘
-        setting_display_sensitive_media: æ€»æ˜¯æ˜¾ç¤ºæ ‡è®°ä¸ºæ•æ„Ÿçš„åª’ä½“æ–‡ä»¶
         setting_hide_network: éšè—ä½ çš„ç¤¾äº¤ç½‘ç»œ
         setting_noindex: ç¦æ¢æœç´¢å¼•æ“Žå»ºç«‹ç´¢å¼•
         setting_reduce_motion: é™ä½Žè¿‡æ¸¡åŠ¨ç”»æ•ˆæžœ
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 0575c09f8c11e7b5f6d56028491448da4f952421..e28f935c2cd96cbf247003792550f3dd4e1b2209 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -4,19 +4,13 @@ zh-HK:
     hints:
       defaults:
         autofollow: é€šéŽé‚€è«‹ç¶²å€è¨»å†Šçš„ç”¨æˆ¶å°‡æœƒè‡ªå‹•é—œæ³¨ä½ 
-        avatar: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º 2MBï¼Œæœƒç¸®è£æˆ 400x400px
+        avatar: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼Œæœƒç¸®è£æˆ %{dimensions}px
         bot: æé†’ç”¨æˆ¶æœ¬å¸³è™Ÿæ˜¯æ©Ÿæ¢°äºº
         digest: åƒ…åœ¨ä½ é•·æ™‚é–“æœªç™»éŒ„ï¼Œä¸”æ”¶åˆ°äº†ç§ä¿¡æ™‚ç™¼é€
-        display_name:
-          one: å°šé¤˜ <span class="name-counter">1</span> å€‹å—
-          other: å°šé¤˜ <span class="name-counter">%{count}</span> å€‹å—
         fields: å€‹äººè³‡æ–™é å¯é¡¯ç¤ºå¤šè‡³ 4 å€‹é …ç›®
-        header: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º 2MBï¼Œæœƒç¸®è£æˆ 700x335px
+        header: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼Œæœƒç¸®è£æˆ %{dimensions}px
         locale: ä½¿ç”¨è€…ä»‹é¢ã€é›»éƒµå’Œé€šçŸ¥çš„èªžè¨€
         locked: ä½ å¿…é ˆäººæ‰‹æ ¸å‡†æ¯å€‹ç”¨æˆ¶å°ä½ çš„é—œæ³¨è«‹æ±‚ï¼Œè€Œä½ çš„æ–‡ç« ç§éš±æœƒè¢«é è¨ç‚ºã€Œåªæœ‰é—œæ³¨ä½ çš„äººèƒ½çœ‹ã€
-        note:
-          one: å°šé¤˜ <span class="note-counter">1</span> å€‹å—
-          other: å°šé¤˜ <span class="note-counter">%{count}</span> å€‹å—
         setting_default_language: ä½ æ–‡ç« çš„èªžè¨€æœƒè¢«è‡ªå‹•åµæ¸¬ï¼Œä½†ä¸ä¸€å®šå®Œå…¨æº–ç¢º
         setting_hide_network: ä½ é—œæ³¨çš„äººå’Œé—œæ³¨ä½ çš„äººå°‡ä¸æœƒåœ¨ä½ çš„å€‹äººè³‡æ–™é ä¸Šé¡¯ç¤º
         setting_noindex: æ¤è¨å®šæœƒå½±éŸ¿åˆ°ä½ çš„å…¬é–‹å€‹äººè³‡æ–™ä»¥åŠæ–‡ç« é é¢
@@ -59,7 +53,6 @@ zh-HK:
         setting_default_privacy: æ–‡ç« é è¨ç‚º
         setting_default_sensitive: é è¨æˆ‘çš„å…§å®¹ç‚ºæ•æ„Ÿå…§å®¹
         setting_delete_modal: åˆªæŽ¨å‰è©¢å•æˆ‘
-        setting_display_sensitive_media: é è¨æˆ‘çš„åª’é«”ç‚ºæ•æ„Ÿå…§å®¹
         setting_hide_network: éš±è—ä½ çš„ç¤¾äº¤ç¶²çµ¡
         setting_noindex: é˜»æ¢æœå°‹å¼•æ“Žæª¢ç´¢
         setting_reduce_motion: æ¸›ä½Žå‹•ç•«æ•ˆæžœ
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index 6b1dbae910068579c3e1e4a5cba48412991f286b..3747fbb983f59b0b5e65253d490996608543987f 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -4,23 +4,23 @@ zh-TW:
     hints:
       defaults:
         autofollow: é€šéŽé‚€è«‹ç¶²å€è¨»å†Šçš„ä½¿ç”¨è€…å°‡æœƒè‡ªå‹•é—œæ³¨ä½ 
-        avatar: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º 2MBï¼Œæœƒç¸®è£æˆ 400x400px
+        avatar: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼Œæœƒç¸®è£æˆ %{dimensions}px
         bot: é€™å€‹å¸³è™Ÿç”±ç¨‹å¼é€²è¡Œè‡ªå‹•å¼æ“ä½œ
+        context: æ‡‰è©²å¥—ç”¨éŽæ¿¾å™¨çš„ä¸€é …æˆ–å¤šé …å…§å®¹
         digest: åƒ…åœ¨ä½ é•·æ™‚é–“æœªç™»å…¥ï¼Œä¸¦ä¸”æ”¶åˆ°äº†ç§è¨Šæ™‚ç™¼é€
-        display_name:
-          one: å°šé¤˜ <span class="name-counter">1</span> å€‹å—
-          other: å°šé¤˜ <span class="name-counter">%{count}</span> å€‹å—
         fields: å€‹äººè³‡è¨Šé è‡³å¤šå¯é¡¯ç¤º 4 å€‹é …ç›®
-        header: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º 2MBï¼Œæœƒç¸®è£æˆ 700x335px
+        header: æ”¯æ´ PNG, GIF æˆ– JPG åœ–ç‰‡ï¼Œæª”æ¡ˆæœ€å¤§ç‚º %{size}ï¼Œæœƒç¸®è£æˆ %{dimensions}px
+        inbox_url: å¾žæ‚¨æƒ³è¦ä½¿ç”¨çš„ä¸ç¹¼é¦–é è¤‡è£½ URL
+        irreversible: å·²éŽæ¿¾çš„å˜Ÿæ–‡å°‡æœƒä¸å¯é€†çš„æ¶ˆå¤±ï¼Œå³ä¾¿éŽæ¿¾å™¨ä¹‹å¾Œä¹Ÿä¸€æ¨£
         locale: ä½¿ç”¨è€…ä»‹é¢ã€ E-mail èˆ‡é€šçŸ¥çš„èªžè¨€
         locked: ä½ å¿…é ˆæ‰‹å‹•æ ¸å‡†æ¯å€‹ä½¿ç”¨è€…å°ä½ çš„é—œæ³¨è«‹æ±‚ï¼Œè€Œä½ çš„è²¼æ–‡éš±ç§å°‡æœƒè¢«è¨å®šç‚ºã€Œåªæœ‰é—œæ³¨ä½ çš„äººèƒ½çœ‹ã€
-        note:
-          one: å°šé¤˜ <span class="note-counter">1</span> å€‹å—
-          other: å°šé¤˜ <span class="note-counter">%{count}</span> å€‹å—
+        phrase: ç„¡è«–æ˜¯å˜Ÿæ–‡çš„æœ¬æ–‡æˆ–æ˜¯å…§å®¹è¦å‘Šéƒ½æœƒè¢«éŽæ¿¾
+        scopes: æ‡‰ç”¨ç¨‹å¼å°‡æœƒè¢«å…è¨±å˜å–å“ªäº› APIã€‚è‹¥æ‚¨é¸å–äº†æœ€é«˜éšŽçš„ç¯„åœï¼Œæ‚¨å°±ä¸éœ€è¦å†é¸å–å–®ç¨çš„äº†ã€‚
         setting_default_language: ä½ å˜Ÿæ–‡çš„èªžè¨€æœƒè¢«è‡ªå‹•åµæ¸¬ï¼Œä½†ä¸ä¸€å®šå®Œå…¨æº–ç¢º
         setting_hide_network: ä½ é—œæ³¨çš„äººèˆ‡é—œæ³¨ä½ çš„äººå°‡ä¸æœƒåœ¨ä½ çš„å€‹äººè³‡æ–™é ä¸Šé¡¯ç¤º
         setting_noindex: æ¤è¨å®šæœƒå½±éŸ¿åˆ°ä½ çš„å…¬é–‹å€‹äººè³‡æ–™èˆ‡å˜Ÿæ–‡é é¢
         setting_theme: æ¤è¨å®šæœƒå½±éŸ¿åˆ°ä½ å¾žä»»æ„è¨å‚™ç™»å…¥ Mastodon æ™‚çš„é¡¯ç¤ºæ¨£å¼ã€‚
+        whole_word: å¦‚æžœé—œéµå—æˆ–è©žçµ„åƒ…æœ‰å—æ¯èˆ‡æ•¸å—ï¼Œå®ƒå°‡åªæœƒåœ¨ç¬¦åˆæ•´å€‹å–®å—çš„æ™‚å€™æ‰æœƒå¥—ç”¨
       imports:
         data: è‡ªå…¶ä»–ç«™é»žåŒ¯å‡ºçš„ CSV æª”æ¡ˆ
       sessions:
@@ -39,6 +39,7 @@ zh-TW:
         chosen_languages: èªžè¨€ç¯©é¸
         confirm_new_password: ç¢ºèªæ–°å¯†ç¢¼
         confirm_password: ç¢ºèªå¯†ç¢¼
+        context: éŽæ¿¾ç¯„åœ
         current_password: ç›®å‰å¯†ç¢¼
         data: è³‡æ–™
         display_name: é¡¯ç¤ºåç¨±
@@ -46,6 +47,8 @@ zh-TW:
         expires_in: å¤±æ•ˆæ™‚é–“
         fields: è³‡æ–™
         header: å€‹äººé é¢åœ–ç‰‡
+        inbox_url: ä¸ç¹¼æ”¶ä»¶åŒ£çš„ URL
+        irreversible: æ”¾æ£„è€Œéžéš±è—
         locale: ä»‹é¢èªžè¨€
         locked: å°‡å¸³è™Ÿè½‰ç‚ºã€Œç§å¯†ã€
         max_uses: æœ€å¤§ä½¿ç”¨æ¬¡æ•¸
@@ -53,13 +56,13 @@ zh-TW:
         note: ç°¡ä»‹
         otp_attempt: å…©éšŽæ®µèªè‰ç¢¼
         password: å¯†ç¢¼
+        phrase: é—œéµå—æˆ–ç‰‡èªž
         setting_auto_play_gif: è‡ªå‹•æ’æ”¾ GIF
         setting_boost_modal: åœ¨è½‰å˜Ÿå‰å…ˆè©¢å•æˆ‘
         setting_default_language: å˜Ÿæ–‡èªžè¨€
         setting_default_privacy: å˜Ÿæ–‡é è¨ç‚º
-        setting_default_sensitive: é è¨æˆ‘çš„åª’é«”æª”æ¡ˆç‚ºæ•æ„Ÿå…§å®¹
+        setting_default_sensitive: ç¸½æ˜¯å°‡åª’é«”æ¨™è¨˜ç‚ºæ•æ„Ÿå…§å®¹
         setting_delete_modal: åˆªé™¤å˜Ÿæ–‡å‰å…ˆè©¢å•æˆ‘
-        setting_display_sensitive_media: é è¨æˆ‘çš„åª’é«”ç‚ºæ•æ„Ÿå…§å®¹
         setting_hide_network: éš±è—ä½ çš„ç¤¾äº¤ç¶²è·¯
         setting_noindex: é˜»æ¢æœå°‹å¼•æ“Žæ”¶éŒ„
         setting_reduce_motion: æ¸›ä½Žå‹•ç•«æ•ˆæžœ
@@ -70,6 +73,7 @@ zh-TW:
         type: åŒ¯å…¥è³‡æ–™é¡žåž‹
         username: ä½¿ç”¨è€…åç¨±
         username_or_email: ä½¿ç”¨è€…åç¨±æˆ– E-mail
+        whole_word: æ•´å€‹è©ž
       interactions:
         must_be_follower: éš±è—æ²’æœ‰é—œæ³¨ä½ çš„ä½¿ç”¨è€…é€šçŸ¥
         must_be_following: éš±è—ä½ æ²’é—œæ³¨çš„ä½¿ç”¨è€…é€šçŸ¥
@@ -81,6 +85,7 @@ zh-TW:
         follow_request: ç•¶æœ‰ä½¿ç”¨è€…è¦æ±‚é—œæ³¨ä½ æ™‚ï¼Œç™¼é€ E-mail é€šçŸ¥
         mention: ç•¶æœ‰ä½¿ç”¨è€…åœ¨å˜Ÿæ–‡æåŠä½ æ™‚ï¼Œç™¼é€ E-mail é€šçŸ¥
         reblog: éƒ½æœ‰ä½¿ç”¨è€…è½‰å˜Ÿä½ çš„å˜Ÿæ–‡æ™‚ï¼Œç™¼é€ E-mail é€šçŸ¥
+        report: ç•¶éžäº¤æ–°å ±å‘Šæ™‚å‚³é€é›»åéƒµä»¶
     'no': å¦
     required:
       mark: "*"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2bc765fc5a79cda9ea74b9d7d08e54889a495bcf..209b955dcdb00b71f74be74eb80818952c5010be 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1,59 +1,82 @@
 ---
 sk:
   about:
-    about_hashtag_html: Toto sÃº verejnÃ© toot prÃspevky otagovanÃ© <strong>#%{hashtag}</strong>. Ak mÃ¡Å¡ ÃºÄet niekde vo fediverse, mÃ´Å¾eÅ¡ ich pouÅ¾ÃvaÅ¥.
-    about_mastodon_html: Mastodon je sociÃ¡lna sieÅ¥ zaloÅ¾enÃ¡ na otvorenÃ½ch webovÃ½ch protokoloch. Jej zrojovÃ½ kÃ³d je otvorenÃ½ a je decentralizovanÃ¡ podobne ako email.
+    about_hashtag_html: Toto sÃº verejnÃ© prÃspevky otagovanÃ© pod <strong>#%{hashtag}</strong>. Ak mÃ¡Å¡ ÃºÄet hocikde v rÃ¡mci fediversa, mÃ´Å¾eÅ¡ ich vyuÅ¾ÃvaÅ¥.
+    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 tejto instancii
-    administered_by: 'SprÃ¡vca je:'
-    closed_registrations: RegistrÃ¡cie sÃº momentÃ¡lne uzatvorenÃ©. AvÅ¡ak, mÃ´Å¾eÅ¡ nÃ¡jsÅ¥ nejakÃ½ inÃ½ Mastodon server kde si zaloÅ¾ ÃºÄet a zÃskaj tak prÃstup do presne tej istej siete, odtiaÄ¾.
+    administered_by: 'SprÃ¡vcom je:'
+    api: API
+    apps: AplikÃ¡cie
+    closed_registrations: RegistrÃ¡cie sÃº na tomto serveri momentÃ¡lne uzatvorenÃ©. AvÅ¡ak, mÃ´Å¾eÅ¡ nÃ¡jsÅ¥ nejakÃ½ inÃ½ Mastodon server kde si zaloÅ¾ ÃºÄet a zÃskaj tak prÃstup do presne tej istej siete odtiaÄ¾.
     contact: Kontakt
-    contact_missing: NezadanÃ©
-    contact_unavailable: NeuvedenÃ©
-    description_headline: ÄŒo je %{domain}?
-    domain_count_after: ÄalÅ¡Ãm instanciÃ¡m
-    domain_count_before: PripojenÃ½ k
+    contact_missing: NezadanÃ½
+    contact_unavailable: NeuvedenÃ½
+    documentation: DokumentÃ¡cia
     extended_description_html: |
       <h3>PravidlÃ¡</h3>
       <p>Å½iadne zatiaÄ¾ nie sÃº</p>
     features:
-      humane_approach_body: PouÄenÃ½ z chÃ½b inÃ½ch sociÃ¡lnych sietÃ, Mastodon sa snaÅ¾Ã bojovaÅ¥ s nekalÃ½m pouÅ¾ÃvanÃm siete vytvÃ¡ranÃm etickÃ½ch moÅ¾nostÃ.
+      humane_approach_body: PouÄenÃ½ z chÃ½b inÃ½ch sociÃ¡lnych sietÃ, Mastodon sa snaÅ¾Ã bojovaÅ¥ so zneuÅ¾ÃvanÃm siete voÄ¾bou etickÃ½ch nÃ¡vrhov.
       humane_approach_title: Ä½udskejÅ¡Ã prÃstup
-      not_a_product_body: Mastodon nie je komerÄnÃ¡ sieÅ¥. Å½iadne reklamy, Å¾iadne dolovanie dÃ¡t, Å¾iadne mÃºry. Å½iadna centrÃ¡lna autorita.
-      not_a_product_title: Si Älovek, nie produkt
-      real_conversation_body: S 65535 znakmi a podporou pre varovania pri obrÃ¡zkoch a videÃ¡ch sa mÃ´Å¾eÅ¡ vyjadriÅ¥ tak ako budeÅ¡ chcieÅ¥.
-      real_conversation_title: VytvorenÃ½ pre reÃ¡lnu konverzÃ¡ciu
+      not_a_product_body: Mastodon nie je komerÄnÃ¡ sieÅ¥. Å½iadne reklamy, Å¾iadne dolovanie dÃ¡t, Å¾iadne mÃºry. Nieje tu Å¾iadna centrÃ¡lna autorita.
+      not_a_product_title: Si Älovekom, nie produktom
+      real_conversation_body: K dispozÃcii s 65535 znakmi a podporou pre varovania o obsahu a mÃ©diÃ¡ch sa mÃ´Å¾eÅ¡ vyjadriÅ¥ tak ako budeÅ¡ chcieÅ¥.
+      real_conversation_title: VytvorenÃ½ pre naozajstnÃº konverzÃ¡ciu
       within_reach_body: Viacero aplikÃ¡ciÃ pre iOS, Android a inÃ© platformy, ktorÃ© ti vÄaka jednoduchÃ©mu API ekosystÃ©mu dovoÄ¾ujÃº byÅ¥ online so svojimi priateÄ¾mi kdekoÄ¾vek.
       within_reach_title: StÃ¡le v dosahu
     generic_description: "%{domain} je jeden server v sieti"
     hosted_on: Mastodon hostovanÃ½ na %{domain}
     learn_more: Zisti viac
     other_instances: Zoznam ÄalÅ¡Ãch inÅ¡tanciÃ
+    privacy_policy: Ustanovenia o sÃºkromÃ
     source_code: ZdrojovÃ½ kÃ³d
-    status_count_after: prÃspevkov
+    status_count_after:
+      few: prÃspevkov
+      one: prÃspevok
+      other: prÃspevkov
     status_count_before: KtorÃ napÃsali
-    user_count_after: uÅ¾ÃvateÄ¾ov
+    terms: Podmienky uÅ¾Ãvania
+    user_count_after:
+      few: uÅ¾Ãvatelia
+      one: uÅ¾ÃvateÄ¾
+      other: uÅ¾Ãvatelia
     user_count_before: Domov pre
     what_is_mastodon: ÄŒo je Mastodon?
   accounts:
-    follow: SledovaÅ¥
-    followers: SledujÃºci
-    following: Sleduje
+    choices_html: "%{name}vÃ© voÄ¾by:"
+    follow: Sleduj
+    followers:
+      few: Sledovatelia
+      one: SledujÃºci
+      other: Sledovatelia
+    following: SledovanÃ
+    joined: Pridal/a sa v %{date}
+    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
     nothing_here: NiÄ tu nie je!
     people_followed_by: Ä½udia, ktorÃ½ch %{name} sleduje
     people_who_follow: Ä½udia sledujÃºci %{name}
-    posts: PrÃspevky
+    pin_errors:
+      following: MusÃÅ¡ uÅ¾ nÃ¡sledovaÅ¥ toho Äloveka, ktorÃ©ho si prajeÅ¡ zviditeÄ¾niÅ¥
+    posts:
+      few: PrÃspevkov
+      one: PrÃspevok
+      other: PrÃspevkov
+    posts_tab_heading: PrÃspevky
     posts_with_replies: PrÃspevky s odpoveÄami
-    remote_follow: Sleduj vzdialenÃ©ho
     reserved_username: Prihlasovacie meno je rezervovanÃ©
     roles:
       admin: AdministrÃ¡tor
       bot: Automat
       moderator: ModerÃ¡tor
-    unfollow: PrestaÅ¥ sledovaÅ¥
+    unfollow: PrestaÅˆ sledovaÅ¥
   admin:
+    account_actions:
+      action: Vykonaj
+      title: Vykonaj moderovacÃ Ãºkon voÄi %{acct}
     account_moderation_notes:
       create: Zanechaj poznÃ¡mku
       created_msg: PoznÃ¡mka moderÃ¡tora bola ÃºspeÅ¡ne vytvorenÃ¡!
@@ -66,99 +89,106 @@ sk:
       change_email:
         changed_msg: Email k tomuto ÃºÄtu bol ÃºspeÅ¡ne zmenenÃ½!
         current_email: SÃºÄastnÃ½ email
-        label: ZmeniÅ¥ email
+        label: ZmeÅˆ email
         new_email: NovÃ½ email
-        submit: ZmeniÅ¥ email
+        submit: ZmeÅˆ email
         title: ZmeÅˆ email pre %{username}
       confirm: PotvrdiÅ¥
       confirmed: PotvrdenÃ½
       confirming: PotvrdzujÃºci
+      deleted: ZmazanÃ©
       demote: DegradovaÅ¥
       disable: ZablokovaÅ¥
       disable_two_factor_authentication: ZakÃ¡zaÅ¥ 2FA
       disabled: BlokovanÃ½
       display_name: ZobraziÅ¥ meno
       domain: DomÃ©na
-      edit: UpraviÅ¥
+      edit: Uprav
       email: Email
-      email_status: Stav Email
+      email_status: Stav emailu
       enable: PovoliÅ¥
       enabled: PovolenÃ½
       feed_url: URL Äasovej osi
       followers: SledujÃºci
       followers_url: URL sledujÃºcich
-      follows: SledovanÃ
+      follows: Sledovania
+      header: HlaviÄka
       inbox_url: URL prijatÃ½ch sprÃ¡v
+      invited_by: PozvanÃ½/Ã¡ uÅ¾ÃvateÄ¾om
       ip: IP
+      joined: Pridal/a sa
       location:
         all: VÅ¡etko
-        local: LokÃ¡lne
+        local: Miestne
         remote: FederovanÃ©
         title: LokÃ¡cia
       login_status: Status prihlÃ¡senia
       media_attachments: PrÃlohy
       memorialize: ZmeniÅ¥ na "NavÅ¾dy budeme spomÃnaÅ¥"
       moderation:
+        active: AktÃvny/a
         all: VÅ¡etko
         silenced: UmlÄanÃ©
-        suspended: SuspendovanÃ©
+        suspended: VylÃºÄenÃ½/Ã¡
         title: ModerÃ¡cia
       moderation_notes: ModerÃ¡torskÃ© poznÃ¡mky
       most_recent_activity: PoslednÃ¡ aktivita
       most_recent_ip: PoslednÃ¡ IP
+      no_limits_imposed: NiesÃº stanovenÃ© Å¾iadnÃ© obmedzenia
       not_subscribed: NezaregistrovanÃ©
-      order:
-        alphabetic: Abecedne
-        most_recent: PodÄ¾a Äasu
-        title: ZoradiÅ¥
       outbox_url: URL poslanÃ½ch
-      perform_full_suspension: SuspendovaÅ¥
+      perform_full_suspension: ZablokovaÅ¥
       profile_url: URL profilu
       promote: PovÃ½Å¡iÅ¥
       protocol: Protokol
       public: VerejnÃ¡ os
       push_subscription_expires: PuSH odoberanie expiruje
-      redownload: ObnoviÅ¥ avatar
+      redownload: Obnov profil
       remove_avatar: OdstrÃ¡niÅ¥ avatÃ¡r
+      remove_header: OdstrÃ¡Åˆ hlaviÄku
       resend_confirmation:
-        already_confirmed: Tento pouÅ¾ÃvateÄ¾ uÅ¾ bol potvrdenÃ½
-        send: Znova odoslaÅ¥ potvrdzovacÃ e-mail
-        success: PotvrdenÃ½ e-mail bol ÃºspeÅ¡ne odoslanÃ½!
-      reset: Reset
-      reset_password: ObnoviÅ¥ heslo
+        already_confirmed: Tento uÅ¾ÃvateÄ¾ uÅ¾ je potvrdenÃ½
+        send: Znovu odoslaÅ¥ potvrdzovacÃ email
+        success: PotvrdzujÃºci email bol ÃºspeÅ¡ne odoslanÃ½!
+      reset: Resetuj
+      reset_password: Obnov heslo
       resubscribe: Znovu odoberaÅ¥
       role: OprÃ¡vnenia
       roles:
         admin: AdministrÃ¡tor
         moderator: ModerÃ¡tor
         staff: ÄŒlen
-        user: PouÅ¾ÃvateÄ¾
+        user: UÅ¾ÃvateÄ¾
       salmon_url: Salmon adresa
       search: HÄ¾adaÅ¥
       shared_inbox_url: URL zdieÄ¾anej schrÃ¡nky
       show:
-        created_reports: ReportovanÃ© tÃ½mto pouÅ¾ÃvateÄ¾om
-        report: report
-        targeted_reports: NahlÃ¡senia pre tento ÃºÄet
+        created_reports: VytvorenÃ© hlÃ¡senia
+        targeted_reports: NahlÃ¡senia od ostatnÃ½ch
       silence: StÃÅ¡iÅ¥
+      silenced: UtÃÅ¡enÃ
       statuses: PrÃspevky
       subscribe: OdoberaÅ¥
+      suspended: ZablokovanÃ
       title: ÃšÄty
       unconfirmed_email: NepotvrdenÃ½ email
       undo_silenced: ZruÅ¡iÅ¥ stÃÅ¡enie
       undo_suspension: ZruÅ¡iÅ¥ suspendÃ¡ciu
-      unsubscribe: PrestaÅ¥ odoberaÅ¥
-      username: PouÅ¾ÃvateÄ¾ske meno
+      unsubscribe: PrestaÅˆ odoberaÅ¥
+      username: PrezÃ½vka
+      warn: VarovaÅ¥
       web: Web
     action_logs:
       actions:
         assigned_to_self_report: "%{name}pridelil/a hlÃ¡senie uÅ¾ÃvateÄ¾a %{target}sebe"
         change_email_user: "%{name} zmenil/a emailovÃº adresu uÅ¾ÃvateÄ¾a %{target}"
         confirm_user: "%{name} potvrdil e-mailovÃº adresu pouÅ¾ÃvateÄ¾a %{target}"
+        create_account_warning: "%{name} poslal/a varovanie uÅ¾ÃvateÄ¾ovi %{target}"
         create_custom_emoji: "%{name} nahral novÃ½ emoji %{target}"
         create_domain_block: "%{name} zablokoval domÃ©nu %{target}"
         create_email_domain_block: "%{name} pridal e-mailovÃº domÃ©nu %{target} na zoznam zakÃ¡zanÃ½ch"
         demote_user: "%{name} degradoval pouÅ¾ÃvateÄ¾a %{target}"
+        destroy_custom_emoji: "%{name} zniÄil/a %{target} emoji"
         destroy_domain_block: "%{name} povolil domÃ©nu %{target}"
         destroy_email_domain_block: "%{name} pridal e-mailovÃº domÃ©nu %{target} na zoznam povolenÃ½ch"
         destroy_status: "%{name} zmazal status %{target}"
@@ -180,6 +210,7 @@ sk:
         unsuspend_account: "%{name} zruÅ¡il/a blokovanie ÃºÄtu pouÅ¾ÃvateÄ¾a %{target}"
         update_custom_emoji: "%{name} aktualizoval/a emoji %{target}"
         update_status: "%{name} aktualizoval/a status pre %{target}"
+      deleted_status: "(zmazanÃ½ prÃspevok)"
       title: KontrÃ³lny zÃ¡znam
     custom_emojis:
       by_domain: DomÃ©na
@@ -206,8 +237,30 @@ sk:
       update_failed_msg: Nebolo moÅ¾nÃ© aktualizovaÅ¥ toto emoji
       updated_msg: Emoji bolo ÃºspeÅ¡ne aktualizovanÃ©!
       upload: NahraÅ¥
+    dashboard:
+      backlog: odloÅ¾enÃ© aktivity
+      config: Nastavenia
+      feature_deletions: Vymazanie ÃºÄtov
+      feature_invites: PozvÃ¡nky
+      feature_profile_directory: KatalÃ³g profilov
+      feature_registrations: RegistrÃ¡cie
+      feature_relay: FederovacÃ mostÃk
+      features: VymoÅ¾enosti
+      hidden_service: FederÃ¡cia so skritÃ½mi sluÅ¾bami
+      open_reports: otvorenÃ© hlÃ¡senia
+      recent_users: NedÃ¡vny uÅ¾Ãvatelia
+      search: CelofrÃ¡zovÃ© vyhÄ¾adÃ¡vanie
+      single_user_mode: JednouÅ¾ivateÄ¾skÃ© rozhranie
+      software: SoftvÃ©r
+      space: VyuÅ¾itie miesta
+      title: Spravovacie rozhranie
+      total_users: uÅ¾ÃvateÄ¾ov celkovo
+      trends: Trendy
+      week_interactions: Tohto tÃ½Å¾dÅˆovÃ© interakcie
+      week_users_active: aktÃvni tento tÃ½Å¾deÅˆ
+      week_users_new: uÅ¾ÃvateÄ¾ov poÄas tohto tÃ½Å¾dÅˆa
     domain_blocks:
-      add_new: PridaÅ¥ novÃ½
+      add_new: Pridaj novÃ© domÃ©novÃ© blokovanie
       created_msg: DomÃ©na je v procese blokovania
       destroyed_msg: Blokovanie domÃ©ny bolo zruÅ¡enÃ©
       domain: DomÃ©na
@@ -222,46 +275,76 @@ sk:
         title: NovÃ© blokovanie domÃ©ny
       reject_media: OdmietaÅ¥ sÃºbory s obrÃ¡zkami alebo videami
       reject_media_hint: ZmaÅ¾e lokÃ¡lne uloÅ¾enÃ© sÃºbory mÃ©diÃ a odmietne ich sÅ¥ahovanie v budÃºcnosti. IrelevantnÃ© pre suspendÃ¡ciu
-      severities:
-        noop: Å½iadne
-        silence: StÃÅ¡iÅ¥
-        suspend: SuspendovaÅ¥
-      severity: ZÃ¡vaÅ¾nosÅ¥
+      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: odmietanÃ© hlÃ¡senia
+      severity:
+        silence: utÃÅ¡enÃ©
+        suspend: vylÃºÄenÃ½
       show:
         affected_accounts:
           few: "%{count} ÃºÄty v databÃ¡ze ovplyvnenÃ½ch"
-          one: Jeden ÃºÄet v databÃ¡ze ovplyvnenÃ½
-          other: "%{count} ÃºÄtov v databÃ¡ze ovplyvnenÃ½ch"
+          one: Jeden ÃºÄet v databÃ¡ze bol ovplyvnenÃ½
+          other: "%{count} ÃºÄtov v databÃ¡ze bolo ovplyvnenÃ½ch"
         retroactive:
-          silence: ZruÅ¡iÅ¥ stÃÅ¡enie vÅ¡etkÃ½ch existujÃºcich ÃºÄtov z tejto domÃ©ny
-          suspend: ZruÅ¡iÅ¥ suspendÃ¡ciu vÅ¡etkÃ½ch existujÃºcich ÃºÄtov z tejto domÃ©ny
-        title: ZruÅ¡iÅ¥ blokovanie domÃ©ny pre %{domain}
+          silence: ZruÅ¡ stÃÅ¡enie vÅ¡etkÃ½ch existujÃºcich ÃºÄtov z tejto domÃ©ny
+          suspend: ZruÅ¡ suspendÃ¡ciu vÅ¡etkÃ½ch existujÃºcich ÃºÄtov z tejto domÃ©ny
+        title: ZruÅ¡ blokovanie domÃ©ny %{domain}
         undo: VrÃ¡tiÅ¥ spÃ¤Å¥
-      title: Blokovanie domÃ©n
-      undo: SpÃ¤Å¥
+      undo: Odvolaj blokovanie domÃ©ny
     email_domain_blocks:
-      add_new: PridaÅ¥ novÃ½
+      add_new: Pridaj novÃ½
       created_msg: EmailovÃ¡ domÃ©na bola ÃºspeÅ¡ne pridanÃ¡ do zoznamu zakÃ¡zanÃ½ch
       delete: ZmazaÅ¥
       destroyed_msg: EmailovÃ¡ domÃ©na bola ÃºspeÅ¡ne vymazanÃ¡ zo zoznamu zakÃ¡zanÃ½ch
       domain: DomÃ©na
       new:
-        create: PridaÅ¥ domÃ©nu
+        create: Pridaj domÃ©nu
         title: NovÃ½ email na zablokovanie
       title: BlokovanÃ© emailovÃ© adresy
+    followers:
+      back_to_account: SpÃ¤Å¥ na ÃºÄet
+      title: NÃ¡sledovatielia uÅ¾ÃvateÄ¾a %{acct}
     instances:
-      account_count: ZnÃ¡me ÃºÄty
-      domain_name: DomÃ©na
-      reset: ResetovaÅ¥
-      search: HÄ¾adaÅ¥
-      title: ZnÃ¡me instancie
+      delivery_available: Je v dosahu doruÄovania
+      known_accounts:
+        few: "%{count} znÃ¡me ÃºÄty"
+        one: "%{count} znÃ¡my ÃºÄet"
+        other: "%{count} znÃ¡me ÃºÄty"
+      moderation:
+        all: VÅ¡etky
+        limited: ObmedzenÃ©
+        title: ModerÃ¡cia
+      title: FederÃ¡cia
+      total_blocked_by_us: Nami blokovanÃ©
+      total_followed_by_them: Nimi sledovanÃ©
+      total_followed_by_us: Nami sledovanÃ©
+      total_reported: NahlÃ¡senia o nich
+      total_storage: MediÃ¡lne prÃlohy
     invites:
+      deactivate_all: PozastaviÅ¥ vÅ¡etky
       filter:
         all: VÅ¡etky
         available: DostupnÃ©
-        expired: ExpirovanÃ©
+        expired: VyprÅ¡alo
         title: FiltrovaÅ¥
       title: PozvÃ¡nky
+    relays:
+      add_new: Pridaj novÃº priechodnÃº oporu
+      delete: VymaÅ¾
+      description_html: "<strong>FederovacÃ mostÃk</strong> je prechodnÃ½ server ktorÃ½ obmieÅˆa veÄ¾kÃ© mnoÅ¾stvÃ¡ verejnÃ½ch prÃspevkov medzi tÃ½mi servermi ktorÃ© na od neho odoberajÃº, aj doÅˆho prispievajÃº. <strong>MÃ´Å¾e to pomÃ´cÅ¥ malÃ½m a strednÃ½m instanciÃ¡m objavovaÅ¥ federovanÃ½ obsah</strong>, Äo inak vyÅ¾aduje aby miestni uÅ¾Ãvatelia ruÄne nÃ¡sledovali inÃ½ch Ä¾udÃ zo vzdialenÃ½ch instanciÃ."
+      disable: Pozastav
+      disabled: ZastavenÃ©
+      enable: PovoÄ¾
+      enable_hint: Ak povolÃÅ¡, tvoj server bude odoberaÅ¥ vÅ¡etky verejnÃ© prÃspevky z tohto mostu, a zaÄne posielaÅ¥ verejnÃ© prÃspevky tvojho servera na tento most.
+      enabled: PovolenÃ©
+      inbox_url: URL mostu
+      pending: ÄŒakÃ¡m na povolenie od prechodnÃ©ho mostu
+      save_and_enable: UloÅ¾iÅ¥ a povoliÅ¥
+      setup: Nastav prepojenie s mostom
+      status: Stav
+      title: Mosty
     report_notes:
       created_msg: PoznÃ¡mka o nahlÃ¡senÃ ÃºspeÅ¡ne vytvorenÃ¡!
       destroyed_msg: PoznÃ¡mka o nahlÃ¡senÃ ÃºspeÅ¡ne vymazanÃ¡!
@@ -276,7 +359,6 @@ sk:
       comment:
         none: Å½iadne
       created_at: NahlÃ¡senÃ©
-      id: IdentifikÃ¡cia
       mark_as_resolved: OznaÄiÅ¥ ako vyrieÅ¡enÃ©
       mark_as_unresolved: OznaÄ ako nevyrieÅ¡enÃ©
       notes:
@@ -286,21 +368,16 @@ sk:
         delete: VymaÅ¾
         placeholder: OpÃÅ¡ akÃ© opatrenia boli urobenÃ©, alebo akÃ©koÄ¾vek inÃ© sÃºvisiace aktualizÃ¡cieâ€¦
       reopen: Znovu otvor report
-      report: NahlÃ¡siÅ¥
-      report_contents: Obsah
+      report: 'NahlÃ¡siÅ¥ #%{id}'
       reported_account: NahlÃ¡senÃ½ ÃºÄet
       reported_by: NahlÃ¡senÃ© uÅ¾ÃvateÄ¾om
       resolved: VyrieÅ¡enÃ©
       resolved_msg: HlÃ¡senie ÃºspeÅ¡ne vyrieÅ¡enÃ©!
-      silence_account: ZamÄºÄaÅ¥ ÃºÄet
       status: Stav
-      suspend_account: PozastaviÅ¥ ÃºÄet
-      target: CieÄ¾
       title: Reporty
       unassign: OdobraÅ¥
       unresolved: NevyrieÅ¡enÃ©
       updated_at: AktualizovanÃ©
-      view: ZobraziÅ¥
     settings:
       activity_api_enabled:
         desc_html: SÄÃtanie lokÃ¡lne publikovanÃ½ch prÃspevkov, aktÃvnych uÅ¾ÃvateÄ¾ov, a novÃ½ch registrÃ¡cii, v tÃ½Å¾dennÃ½ch intervaloch
@@ -311,15 +388,24 @@ sk:
       contact_information:
         email: PracovnÃ½ e-mail
         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
       hero:
         desc_html: Zobrazuje sa na hlavnej strÃ¡nke. DoporuÄuje sa rozliÅ¡enie aspoÅˆ 600x100px PokiaÄ¾ tu nieje niÄ dodanÃ©, bude nastavenÃ½ zÃ¡kladnÃ½ orÃ¡zok tohoto 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Ã© tÃ¡to instancia uÅ¾ vo fediverse natrafila
         title: ZverejniÅ¥ zoznam objavenÃ½ch instanciÃ
       preview_sensitive_media:
         desc_html: NÃ¡hÄ¾ad adresy z inÃ½ch instanciÃ, bude zobrazenÃ½ aj vtedy, keÄ sÃº danÃ© mÃ©diÃ¡ oznaÄenÃ© ako senzitÃvne
         title: Ukazuj aj chÃºlostivÃ© mÃ©diÃ¡ v nÃ¡hÄ¾adoch OpenGraph
+      profile_directory:
+        desc_html: PovoliÅ¥ uÅ¾ÃvateÄ¾om aby boli 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
@@ -334,17 +420,20 @@ sk:
           desc_html: PovoliÅ¥ kaÅ¾dÃ©mu aby si mohli vytvoriÅ¥ ÃºÄet
           title: VerejnÃ¡ registrÃ¡cia
       show_known_fediverse_at_about_page:
-        desc_html: PokiaÄ¾ je zapnutÃ©, bude v ukÃ¡Å¾ke osi moÅ¾nÃ© nahliadnÃºÅ¥ toot statusy z celÃ©ho znÃ¡meho fediversa. V opaÄnom prÃpade tam budÃº ukÃ¡zanÃ© iba statusy z lokÃ¡lnej osi.
-        title: UkÃ¡zaÅ¥ celÃ© znÃ¡me fediversum ako ukÃ¡Å¾ku osi
+        desc_html: PokiaÄ¾ 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: ZobraziÅ¥ moderÃ¡torsku znaÄku na uÅ¾ÃvateÄ¾ovej strÃ¡nke
-        title: ZobraziÅ¥ znaÄku moderÃ¡tora
+        desc_html: Zobraz moderÃ¡torsky odznak na uÅ¾ÃvateÄ¾ovom profile
+        title: Zobraz znaÄku moderÃ¡tora
       site_description:
-        desc_html: OboznamujÃºci paragraf na hlavnej strÃ¡nke a pri meta tagoch. MÃ´Å¾ete pouÅ¾iÅ¥ HTML kÃ³d, presnejÅ¡ie  <code>&lt; a&gt;</code> a <code>&lt; em&gt; </code>.
+        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>, ale tieÅ¾ <code>&lt;&gt;</code>.
         title: Popis instancie
       site_description_extended:
         desc_html: Toto je vhodnÃ© miesto pre vaÅ¡e pravidlÃ¡, oboznÃ¡menia a inÃ© veci, ktorÃ½mi je vaÅ¡a instancia Å¡pecifickÃ¡. Je moÅ¾nÃ© tu pouÅ¾ÃvaÅ¥ HTML kÃ³d
         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 instancie.
+        title: KrÃ¡tky popis instancie
       site_terms:
         desc_html: MÃ´Å¾ete si napÃsaÅ¥ vaÅ¡e vlastnÃ© pravidla o sÃºkromÃ, prevÃ¡dzke, alebo aj inÃ© legality. MÃ´Å¾ete tu pouÅ¾ÃvaÅ¥ HTML kÃ³d
         title: VlastnÃ© pravidlÃ¡ prevÃ¡dzky
@@ -360,13 +449,14 @@ sk:
       back_to_account: SpÃ¤Å¥ na ÃºÄet
       batch:
         delete: VymazaÅ¥
-        nsfw_off: Obsah nieje chÃºlostivÃ½
-        nsfw_on: OznaÄ obeah aka chÃºlostivÃ½
+        nsfw_off: OznaÄ ako nechÃºlostivÃ©
+        nsfw_on: OznaÄ ako chÃºlostivÃ©
       failed_to_execute: Nepodarilo sa vykonaÅ¥
       media:
         title: MÃ©diÃ¡
       no_media: Å½iadnÃ© mÃ©diÃ¡
-      title: Statusy na ÃºÄte
+      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
     subscriptions:
       callback_url: ZdrojovÃ¡ adresa URL
@@ -375,12 +465,26 @@ sk:
       last_delivery: PoslednÃ© doruÄenie
       title: WebSub
       topic: TÃ©ma
-    title: AdministrÃ¡cia
+    tags:
+      accounts: ÃšÄty
+      hidden: SkrytÃ©
+      hide: Ukri od databÃ¡zy
+      name: HaÅ¡tag
+      title: HaÅ¡tagy
+      unhide: UkÃ¡Å¾ v databÃ¡zi
+      visible: ViditeÄ¾nÃ©
+    title: Spravovanie
+    warning_presets:
+      add_new: Pridaj novÃ©
+      delete: VymaÅ¾
+      edit: Uprav
+      edit_preset: Uprav varovnÃº predlohu
+      title: Spravuj varovnÃ© predlohy
   admin_mailer:
     new_report:
-      body: "%{reporter} nahlÃ¡sil %{target}"
-      body_remote: Niekto z %{domain} nahlÃ¡sil %{target}
-      subject: NovÃ½ report pre %{instance} (#%{id})
+      body: "%{reporter} nahlÃ¡sil/a %{target}"
+      body_remote: Niekto z %{domain} nahlÃ¡sil/a %{target}
+      subject: NovÃ© hlÃ¡senie pre %{instance} (#%{id})
   application_mailer:
     notification_preferences: ZmeniÅ¥ e-mailovÃ© voÄ¾by
     salutation: "%{name},"
@@ -397,7 +501,7 @@ sk:
     warning: Na tieto Ãºdaje dÃ¡vajte ohromnÃ½ pozor. Nikdy ich s nikÃ½m nezÄieÄ¾ajte!
     your_token: VÃ¡Å¡ prÃstupovÃ½ token
   auth:
-    agreement_html: V rÃ¡mci registrÃ¡cie sÃºhlasÃÅ¡, Å¾e sa budeÅ¡ riadiÅ¥ <a href="%{rules_path}"> pravidlami tejto instancie</a>, a taktieÅ¾ <a href="%{terms_path}"> naÅ¡Ãmi servisnÃ½mi podmienkami </a>.
+    agreement_html: V rÃ¡mci registrÃ¡cie sÃºhlasÃÅ¡, Å¾e sa budeÅ¡ riadiÅ¥ <a href="%{rules_path}"> pravidlami tejto instancie</a>, a taktieÅ¾ <a href="%{terms_path}"> naÅ¡Ãmi prevoznÃ½mi podmienkami</a>.
     change_password: Heslo
     confirm_email: PotvrdiÅ¥ email
     delete_account: VymazaÅ¥ ÃºÄet
@@ -423,11 +527,11 @@ sk:
   authorize_follow:
     already_following: Tento ÃºÄet uÅ¾ nÃ¡sledujeÅ¡
     error: NaneÅ¡tastie nastala chyba pri hÄ¾adanÃ vzdialenÃ©ho ÃºÄtu
-    follow: NÃ¡sledovaÅ¥
-    follow_request: 'Poslali ste poÅ¾iadavku nÃ¡sledovaÅ¥ uÅ¾ÃvateÄ¾a:'
-    following: 'Podarilo sa! Teraz uÅ¾ nÃ¡sledujete uÅ¾ÃvateÄ¾a:'
+    follow: NÃ¡sleduj
+    follow_request: 'Poslal/a si Å¾iadosÅ¥ nÃ¡sledovaÅ¥ uÅ¾ÃvateÄ¾a:'
+    following: 'Podarilo sa! Teraz uÅ¾ nÃ¡sledujeÅ¡ uÅ¾ÃvateÄ¾a:'
     post_follow:
-      close: Alebo mÃ´Å¾ete iba zatvoriÅ¥ toto okno.
+      close: Alebo mÃ´Å¾eÅ¡ iba zatvoriÅ¥ toto okno.
       return: UkÃ¡Å¾ uÅ¾ÃvateÄ¾ov profil
       web: Prejdi do siete
     title: NÃ¡sleduj %{acct}
@@ -449,12 +553,23 @@ sk:
     bad_password_msg: DobrÃ½ pokus, hakeri! NesprÃ¡vne heslo
     confirm_password: NapÃÅ¡te svoje terajÅ¡ie heslo pre overenie vaÅ¡ej identity
     description_html: TÃ½mto <strong> natrvalo, nenavrÃ¡titeÄ¾ne </strong> vymaÅ¾eÅ¡ obsah tvojho ÃºÄtu, a deaktivujeÅ¡ ho. Tvoja prezÃ½vka ale ostane rezervovanÃ¡ ako prevencia pred budÃºcimi impersonÃ¡ciami.
-    proceed: VymazaÅ¥ ÃºÄet
-    success_msg: VÃ¡Å¡ ÃºÄet bol ÃºspeÅ¡ne vymazanÃ½
-    warning_html: Iba vymazanie obsahu z tejto konkrÃ©tnej instancie je garantovanÃ©. Obsah ktorÃ½ bol zdieÄ¾anÃ½ Å¡iroko-Äaleko pravdepodobne zanechÃ¡ nejakÃ© stopy. Servery ktorÃ© sÃº offline a tie ktorÃ© ignorujÃº tvoje zmeny teda nezaktualizujÃº svoje databÃ¡zy.
-    warning_title: O dostupnosti distribuovanÃ©ho obsahu
+    proceed: VymaÅ¾ ÃºÄet
+    success_msg: Tvoj ÃºÄet bol ÃºspeÅ¡ne vymazanÃ½
+    warning_html: Iba vymazanie obsahu z tejto konkrÃ©tnej instancie je zaruÄenÃ©. Obsah, ktorÃ½ bol zdieÄ¾anÃ½ Å¡iroko-Äaleko pravdepodobne zanechÃ¡ nejakÃ© stopy. Servery ktorÃ© sÃº offline a tie ktorÃ© ignorujÃº tvoje zmeny teda nezaktualizujÃº svoje databÃ¡zy.
+    warning_title: DostupnosÅ¥ rozÅ¡ÃrovanÃ©ho obsahu
+  directories:
+    directory: KatalÃ³g profilov
+    enabled: MomentÃ¡lne si uvedenÃ½/Ã¡ na zozname profilov.
+    enabled_but_waiting: Vyjadril/a si zÃ¡ujem o uvedenie na zozname profilov, lenÅ¾e eÅ¡te nemÃ¡Å¡ minimÃ¡lny vyÅ¾adovanÃ½ poÄet nÃ¡sledovateÄ¾ov (%{min_followers}), aby si tam bol/a uveden/Ã¡.
+    explanation: PÃ¡traj po uÅ¾ÃvateÄ¾och podÄ¾a ich zÃ¡ujmov
+    explore_mastodon: PrebÃ¡daj %{title}
+    how_to_enable: MomentÃ¡lne niesi zaradenÃ½/Ã¡ do verejnej profilovej databÃ¡zy. PrihlÃ¡siÅ¥ sa mÃ´Å¾eÅ¡ niÅ¾Å¡ie. PouÅ¾i haÅ¡tagy vo svojom biografickom popise na profile, ak chceÅ¡ byÅ¥ uvedenÃ½/Ã¡ aj pod konkrÃ©tnÃ½mi haÅ¡tagmi!
+    people:
+      few: "%{count} Ä¾udia"
+      one: "%{count} Älovek"
+      other: "%{count} Ä¾udia"
   errors:
-    '403': NemÃ¡te dostatoÄnÃ© povolenie na zobrazenie tejto strÃ¡nky.
+    '403': NemÃ¡Å¡ povolenie na zobrazenie tejto strÃ¡nky.
     '404': StrÃ¡nka ktorÃº si hÄ¾adal/a sa tu nenachÃ¡dza.
     '410': StrÃ¡nka ktorÃº si tu hÄ¾adal/a uÅ¾ viac neexistuje.
     '422':
@@ -464,7 +579,7 @@ sk:
     '500':
       content: OspravedlÅˆujeme sa. NieÄo sa pokazilo na naÅ¡om konci.
       title: TÃ¡to strÃ¡nka nieje v poriadku
-    noscript_html: Aby bolo moÅ¾nÃ© pouÅ¾ÃvaÅ¥ Mastodon web aplikÃ¡ciu, prosÃm povoÄ¾te JavaScript. Alebo skÃºste jednu z <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md"> aplikÃ¡cii </a> dostupnÃ½ch pre vaÅ¡u platformu.
+    noscript_html: Aby bolo moÅ¾nÃ© pouÅ¾ÃvaÅ¥ Mastodon web aplikÃ¡ciu, prosÃm povoÄ¾te JavaScript. Alebo skÃºste jednu z <a href="%{apps_path}"> aplikÃ¡cii </a> dostupnÃ½ch pre vaÅ¡u platformu.
   exports:
     archive_takeout:
       date: DÃ¡tum
@@ -475,7 +590,9 @@ sk:
       size: VeÄ¾kosÅ¥
     blocks: Blokujete
     csv: CSV
+    domain_blocks: BlokovanÃ© domÃ©ny
     follows: NÃ¡sledujete
+    lists: Zoznamy
     mutes: StÃÅ¡il/a si
     storage: ÃšloÅ¾isko mÃ©diÃ
   filters:
@@ -507,17 +624,21 @@ sk:
     true_privacy_html: ProsÃm ber na vedomie, <strong> Å¾e ozajstnÃ© sÃºkromie sa dÃ¡ dosiahnÃºÅ¥ iba za pomoci end-to-end enkrypcie</strong>.
     unlocked_warning_html: Hocikto Å¥a mÃ´Å¾e nÃ¡sledovaÅ¥ aby mohol/a ihneÄ vidieÅ¥ tvoje sÃºkromnÃ© prÃspevky. %{lock_link} aby si mohla skontrolovaÅ¥ a odmietaÅ¥ sledovateÄ¾ov.
     unlocked_warning_title: Tvoj ÃºÄet nieje zamknutÃ½
+  footer:
+    developers: VÃ½vojÃ¡ri
+    more: Viacâ€¦
+    resources: Podklady
   generic:
     changes_saved_msg: Zmeny boli ÃºspeÅ¡ne uloÅ¾enÃ©!
-    powered_by: pohÃ¡ÅˆanÃ© vÄaka %{link}
-    save_changes: UloÅ¾iÅ¥ zmeny
+    copy: KopÃrovaÅ¥
+    save_changes: UloÅ¾ zmeny
     validation_errors:
       few: NieÄo eÅ¡te stÃ¡le nieje v poriadku! ProsÃm skontroluj vÅ¡etky %{count} chyby
-      one: NieÄo nieje Ãºplne v poriadku! ProsÃm skontroluj chybu
-      other: NieÄo eÅ¡te stÃ¡le nieje v poriadku! ProsÃm skontroluj vÅ¡etkÃ½ch %{count} chÃ½b
+      one: NieÄo nieje Ãºplne v poriadku! ProsÃm skontroluj danÃº chybu
+      other: NieÄo eÅ¡te stÃ¡le nieje v poriadku! ProsÃm skontroluj vÅ¡etky %{count} niÅ¾Å¡ie uvedenÃ© pochybenia
   imports:
-    preface: MÃ´Å¾eÅ¡ importovaÅ¥ dÃ¡ta ktorÃ© si exportoval/a z inÃ©ho Mastodon serveru, ako sÃº naprÃklad zoznamy Ä¾udÃ ktorÃ½ch sledujeÅ¡, alebo blokujeÅ¡.
-    success: Tvoje dÃ¡ta boli nahratÃ© ÃºspeÅ¡ne, a budÃº teraz spracovanÃ© v danom Äase
+    preface: MÃ´Å¾eÅ¡ nahraÅ¥ dÃ¡ta ktorÃ© si exportoval/a z inÃ©ho Mastodon serveru, ako sÃº naprÃklad zoznamy Ä¾udÃ ktorÃ½ch sledujeÅ¡, alebo blokujeÅ¡.
+    success: Tvoje dÃ¡ta boli nahratÃ© ÃºspeÅ¡ne, a teraz budÃº spracovanÃ© v danom Äase
     types:
       blocking: Zoznam blokovanÃ½ch
       following: Zoznam sledovanÃ½ch
@@ -547,8 +668,6 @@ sk:
       expires_at: VyprÅ¡Ã
       uses: PouÅ¾Ãva
     title: Pozvi Ä¾udÃ
-  landing_strip_html: "<strong>%{name}</strong> je uÅ¾ÃvateÄ¾ na serveri %{link_to_root_path}. Ty ich mÃ´Å¾eÅ¡ nÃ¡sledovaÅ¥ a mÃ´Å¾eÅ¡ s nimi interaktovaÅ¥ pokiaÄ¾ mÃ¡Å¡ ÃºÄet kdekoÄ¾vek v rÃ¡mci fediversa."
-  landing_strip_signup_html: PokiaÄ¾ eÅ¡te nemÃ¡Å¡, mÃ´Å¾eÅ¡ <a href="%{sign_up_path}">si tu vytvoriÅ¥ ÃºÄet</a>.
   lists:
     errors:
       limit: Dosiahli ste maximÃ¡lny moÅ¾nÃ½ poÄet zoznamov
@@ -626,50 +745,77 @@ sk:
     no_account_html: NemÃ¡Å¡ eÅ¡te ÃºÄ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:'
   remote_unfollow:
     error: Chyba
     title: NÃ¡zov
     unfollowed: UÅ¾ nesledujeÅ¡
+  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
+    too_soon: DÃ¡tum musÃ byÅ¥ stanovenÃ½ do budÃºcnosti
   sessions:
     activity: NajnovÅ¡ia aktivita
     browser: PrehliadaÄ
     browsers:
       alipay: Alipay
+      blackberry: RIM Blackberry
       chrome: Google Chrome
       edge: Microsoft Edge
       electron: Electron
       firefox: Mozilla Firefox
       generic: NeznÃ¡my prehliadaÄ
       ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia Ovi Browser
+      opera: Opera
       otter: PrehliadaÄ Otter
+      phantom_js: PhantomJS
       qq: QQ PrehliadaÄ
       safari: Apple Safari
+      uc_browser: UCBrowser
       weibo: Sina/Tencent Weibo
     current_session: AktuÃ¡lna sezÃ³na
     description: "%{browser} na %{platform}"
     explanation: Tieto sÃº prehliadaÄe ktorÃ© sÃº teraz prihlÃ¡senÃ© na tvoj Mastodon ÃºÄet.
     ip: IP adresa
     platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
       chrome_os: Google ChromeOS
+      firefox_os: Firefox OS
       ios: Apple iOS
       linux: GNU/Linux
       mac: MacOSX
       other: neznÃ¡ma platforma
       windows: Microsoft Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
     revoke: Zamietni
     revoke_success: SezÃ³na ÃºspeÅ¡ne zamietnutÃ¡
-    title: SezÃ³na
+    title: SezÃ³ny
   settings:
-    authorized_apps: AutorizovanÃ© aplikÃ¡cie
+    authorized_apps: PovolenÃ© aplikÃ¡cie
     back: SpÃ¤Å¥ na Mastodon
     delete: Vymazanie ÃºÄtu
     development: VÃ½voj
     edit_profile: Uprav profil
     export: ExportovaÅ¥ dÃ¡ta
-    followers: PovolenÃ sledovatelia
+    followers: PovolenÃ nÃ¡sledovatelia
     import: ImportovaÅ¥
     migrate: PresunÃºÅ¥ ÃºÄet
-    notifications: OznÃ¡menia
+    notifications: OboznÃ¡menia
     preferences: VoÄ¾by
     settings: Nastavenia
     two_factor_authentication: Dvoj-faktorovÃ© overenie
@@ -688,17 +834,20 @@ sk:
     boosted_from_html: PovÃ½Å¡enÃ© od %{acct_link}
     content_warning: 'Varovanie o obsahu: %{warning}'
     disallowed_hashtags:
-      one: 'obsahuje nepovolenÃ½ haÅ¡tag: %{tags}'
-      other: 'obsahuje nepovolenÃ© haÅ¡tagy: %{tags}'
-    language_detection: Zisti jazyk automaticky
-    open_in_web: Otvor v okne prehliadaÄa
-    over_character_limit: limit poÄtu %{max} znakov bol presiahnutÃ½
+      few: 'obsahoval nepovolenÃ© hashtagy: %{tags}'
+      one: 'obsahoval nepovolenÃ½ hashtag: %{tags}'
+      other: 'obsahoval nepovolenÃ© hashtagy: %{tags}'
+    language_detection: Zisti automaticky
+    open_in_web: Otvor v okne na webe
+    over_character_limit: limit %{max} znakov bol presiahnutÃ½
     pin_errors:
-      limit: UÅ¾ ste si pripli ten najvyÅ¡Å¡Ã moÅ¾nÃ½ poÄet prÃspevkov
-      ownership: NemoÅ¾no pripnÃºÅ¥ prÃspevok od niekoho inÃ©ho
+      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Ãspevky nemÃ´Å¾u byÅ¥ pripnutÃ©
       reblog: Pozdvihnutie sa nedÃ¡ pripnÃºÅ¥
     show_more: UkÃ¡Å¾ viac
+    sign_in_to_participate: PrihlÃ¡s sa pre zapojenie do diskusie
+    title: '%{name}: â€ž%{quote}"'
     visibilities:
       private: Iba pre sledovateÄ¾ov
       private_long: UkÃ¡Å¾ iba nÃ¡sledovateÄ¾om
@@ -707,12 +856,30 @@ sk:
       unlisted: NezaradenÃ©
       unlisted_long: VÅ¡etci mÃ´Å¾u vidieÅ¥, ale nieje zaradenÃ© do verejnej osi
   stream_entries:
-    click_to_show: Klikni pre zobrazenie
     pinned: PripnutÃ½ toot
     reblogged: vyzdvihnutÃ½
     sensitive_content: SenzitÃvny obsah
   terms:
-    title: Podmienky uÅ¾Ãvania, a pravidlÃ¡ o sÃºkromÃ pre %{instance}
+    body_html: |
+      <h2>Podmienky sÃºkromia</h2>
+
+      <h3 id="collect">AkÃ© informÃ¡cie zbierame?</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 nÃ¡sledovateÄ¾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 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">
+    title: Podmienky uÅ¾Ãvania, a pravidlÃ¡ sÃºkromia pre %{instance}
   themes:
     contrast: VysokÃ½ kontrast
     default: Mastodon
@@ -720,6 +887,7 @@ sk:
   time:
     formats:
       default: "%b %d, %R, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
     code_hint: Pre potvrdenie teraz zadaj kÃ³d vygenerovanÃ½ pomocou tvojej overovacej aplikÃ¡cie
     description_html: Ak povolÃÅ¡ <strong> dvoj-faktorovÃ© overovanie</strong>, na prihlÃ¡senie potom budeÅ¡ potrebovaÅ¥ svoj telefÃ³n, ktorÃ½ vygeneruje prÃstupovÃ© kÃ³dy, Äo musÃÅ¡ zadaÅ¥.
@@ -741,6 +909,22 @@ 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
+    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 je ÃºÄ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.
+      review_server_policies: PrehodnoÅ¥ pravidlÃ¡ servera
+      subject:
+        disable: Tvoj ÃºÄet %{acct} bol zamrazenÃ½
+        none: Varovanie pre %{acct}
+        silence: Tvoj ÃºÄet %{acct} bol obmedzenÃ½
+        suspend: Tvoj ÃºÄet %{acct} bol vylÃºÄenÃ½
+      title:
+        disable: ÃšÄet bol zamrazenÃ½
+        none: Varovanie
+        silence: ÃšÄet bol obmedzenÃ½
+        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 hlaviÄky, 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.
@@ -752,16 +936,19 @@ sk:
       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_bridge_html: Ak prichÃ¡dzaÅ¡ z Twitteru, mÃ´Å¾eÅ¡ svojÃch priateÄ¾ov nÃ¡jsÅ¥ na Mastodone pomocou tzv. <a href="%{bridge_url}">mostÃkovej aplikÃ¡cie</a>. Ale tÃ¡ funguje iba ak ju aj oni niekedy pouÅ¾ili!
       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: LokÃ¡lna os je celkovÃ½ pohÄ¾ad na aktivitu uÅ¾ÃvateÄ¾ov %{instance}. Toto sÃº tvoji najbliÅ¾Å¡Ã susedia!
+      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Ã
     invalid_email: EmailovÃ¡ adresa je neplatnÃ¡
     invalid_otp_token: NeplatnÃ½ kÃ³d pre dvojfaktorovÃº autentikÃ¡ciu
     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:'
+  verification:
+    explanation_html: 'MÃ´Å¾eÅ¡ sa <strong>overiÅ¥ ako majiteÄ¾ odkazov v metadÃ¡tach tvojho profilu</strong>. Na to musÃ ale 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 6f581f838f560c3ae3fb856680d39c61a7684e70..594c58acc1e73106d034de9d320bb9e98a27eca7 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -5,44 +5,71 @@ sl:
     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
     administered_by: 'Upravlja:'
+    api: API
+    apps: Mobilne aplikacije
     closed_registrations: Registracije so trenutno zaprte na tem vozliÅ¡Äu. Vendar! Tukaj lahko najdete druga vozliÅ¡Äa, na katerih se prijavite in dostopate do istega omreÅ¾ja od tam.
     contact: Kontakt
     contact_missing: Ni nastavljeno
     contact_unavailable: Ni na voljo
-    description_headline: Kaj je %{domain}?
-    domain_count_after: ostala vozliÅ¡Äa
-    domain_count_before: Povezan z
+    documentation: Dokumentacija
     extended_description_html: |
       <h3>Dober prostor za pravila</h3>
       <p>RazÅ¡irjen opis Å¡e ni bil nastavljen.</p>
     features:
+      humane_approach_body: Na podlagi uÄenja od neuspehov drugih omreÅ¾ij, Å¾eli Mastodon oblikovati etiÄne naÄrte za boj proti zlorabi socialnih medijev.
       humane_approach_title: Bolj human pristop
+      not_a_product_body: Mastodon ni komercialno omreÅ¾je. Brez oglaÅ¡evanja, brez podatkovnega rudarjenja, brez obzidanih vrtov. Ni osrednjega organa.
       not_a_product_title: Ti si oseba, ne izdelek
+      real_conversation_body: S 500 znaki, ki so vam na voljo, in podporo za zrnate vsebine ter opozorila pred mediji, se lahko izrazite tako, kot Å¾elite.
       real_conversation_title: Zgrajen za pravi pogovor
+      within_reach_body: ZahvaljujoÄ razvijalcem prijaznemu API ekosistemu, obstaja veÄ aplikacija za iOS, Arduino in druge platforme, ki vam omogoÄajo, da sledite svojim prijateljem kjerkoli.
       within_reach_title: Vedno na dosegu roke
     generic_description: "%{domain} je en streÅ¾nik v omreÅ¾ju"
     hosted_on: Mastodon gostuje na %{domain}
     learn_more: Spoznaj veÄ
     other_instances: Seznam vozliÅ¡Ä
+    privacy_policy: Politika zasebnosti
     source_code: Izvorna koda
-    status_count_after: statusi
+    status_count_after:
+      few: stanja
+      one: stanje
+      other: stanja
+      two: stanja
     status_count_before: Kdo je avtor
-    user_count_after: uporabniki
+    terms: Pogoji storitve
+    user_count_after:
+      few: uporabniki
+      one: uporabnik
+      other: uporabniki
+      two: uporabniki
     user_count_before: Dom za
     what_is_mastodon: Kaj je Mastodon?
   accounts:
+    choices_html: "%{name} izbire:"
     follow: Sledi
-    followers: Sledilci
+    followers:
+      few: Sledilci
+      one: Sledilec
+      other: Sledilci
+      two: Sledilci
     following: Sledim
+    joined: Se je pridruÅ¾il na %{date}
+    link_verified_on: LastniÅ¡tvo te povezave je bilo preverjeno na %{date}
     media: Medij
     moved_html: "%{name} se je prestavil na %{new_profile_link}:"
     network_hidden: Te informacije niso na voljo
     nothing_here: NiÄ ni tukaj!
     people_followed_by: Ljudje, ki jim sledi %{name}
     people_who_follow: Ljudje, ki sledijo %{name}
-    posts: Tuti
+    pin_errors:
+      following: Verjetno Å¾e sledite osebi, ki jo Å¾elite potrditi
+    posts:
+      few: Trob
+      one: Trob
+      other: Trob
+      two: Trob
+    posts_tab_heading: Trobi
     posts_with_replies: Tuti in odgovori
-    remote_follow: Oddaljeno sledenje
     reserved_username: UporabniÅ¡ko ime je zasedeno
     roles:
       admin: Skrbnik
@@ -54,6 +81,7 @@ sl:
       create: Pusti sporoÄilo
       created_msg: UspeÅ¡no ustvarjena opomba moderiranja!
       delete: IzbriÅ¡i
+      destroyed_msg: Moderirana opomba je uspeÅ¡no uniÄena!
     accounts:
       are_you_sure: Ali si prepriÄan?
       avatar: Avatar
@@ -68,9 +96,11 @@ sl:
       confirm: Potrdi
       confirmed: Potrjeno
       confirming: Potrjujem
+      demote: PoniÅ¾aj
       disable: OnemogoÄi
       disable_two_factor_authentication: OnemogoÄi 2FA
       disabled: OnemogoÄeno
+      display_name: Prikazno ime
       domain: Domena
       edit: Uredi
       email: E-poÅ¡ta
@@ -99,8 +129,10 @@ sl:
       moderation_notes: Opombe moderiranja
       most_recent_activity: Zadnja aktivnost
       most_recent_ip: Zadnji IP
-      order:
-        alphabetic: Po abecedi
-        most_recent: NajnovejÅ¡e
-        title: Red
       promote: Spodbujanje
+  statuses:
+    pin_errors:
+      ownership: Trob nekoga drugega ne more biti pripet
+      private: Nejavnega troba ni mogoÄe pripeti
+  stream_entries:
+    pinned: Pripet trob
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index b371edcafdd006de1a1b548f0167160c41b6f356..6d71b326ed5d33baf7608008c8ad5ea0db4da60a 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -8,9 +8,6 @@ sr-Latn:
     contact: Kontakt
     contact_missing: Nije postavljeno
     contact_unavailable: N/A
-    description_headline: Å ta je %{domain}?
-    domain_count_after: ostale instance
-    domain_count_before: Povezan na
     extended_description_html: |
       <h3>Dobro mesto za pravila</h3>
       <p>ProÅ¡ireni opis koji joÅ¡ nije postavljen.</p>
@@ -44,7 +41,6 @@ sr-Latn:
     people_who_follow: Ljudi koji prate %{name}
     posts: Tutovi
     posts_with_replies: Tutovi i odgovori
-    remote_follow: Udaljena praÄ‡enja
     reserved_username: KorisniÄko ime je rezervisano
     roles:
       admin: Administrator
@@ -96,10 +92,6 @@ sr-Latn:
       most_recent_activity: Najskorija aktivnost
       most_recent_ip: Najskorija IP adresa
       not_subscribed: Nije pretplaÄ‡en
-      order:
-        alphabetic: Abecedni
-        most_recent: Najskoriji
-        title: Redosled
       outbox_url: Odlazno sanduÄe
       perform_full_suspension: IzvrÅ¡i kompletno iskljuÄenje
       profile_url: Adresa profila
@@ -126,7 +118,6 @@ sr-Latn:
       shared_inbox_url: Adresa deljenog sanduÄeta
       show:
         created_reports: Prijave koje je napravio ovaj nalog
-        report: prijava
         targeted_reports: Prijave napravljene o ovom nalogu
       silence: UÄ‡utkaj
       statuses: Statusi
@@ -203,12 +194,7 @@ sr-Latn:
           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.
-      severities:
-        noop: NiÅ¡ta
-        silence: UÄ‡utkavanje
-        suspend: Suspenzija
-      severity: OÅ¡trina
+      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
@@ -220,7 +206,6 @@ sr-Latn:
           suspend: Ugasi suspenzije za sve postojeÄ‡e naloge sa ovog domena
         title: PoniÅ¡ti blokadu domena za domen %{domain}
         undo: PoniÅ¡ti
-      title: Blokade domena
       undo: PoniÅ¡ti
     email_domain_blocks:
       add_new: Dodaj novuAdd new
@@ -233,10 +218,6 @@ sr-Latn:
         title: Nova stavka u crnoj listi e-poÅ¡ti
       title: Crna lista adresa e-poÅ¡te
     instances:
-      account_count: Poznati nalozi
-      domain_name: Domen
-      reset: Resetuj
-      search: Pretraga
       title: Poznate instance
     invites:
       filter:
@@ -250,20 +231,14 @@ sr-Latn:
       are_you_sure: Da li ste sigurni?
       comment:
         none: NiÅ¡ta
-      id: ID
       mark_as_resolved: OznaÄi kao reÅ¡en
       report: 'Prijava #%{id}'
-      report_contents: SadrÅ¾aj
       reported_account: Prijavljeni nalog
       reported_by: Prijavio
       resolved: ReÅ¡eni
-      silence_account: UÄ‡utkaj nalog
       status: Status
-      suspend_account: Suspenduj nalog
-      target: Cilj
       title: Prijave
       unresolved: NereÅ¡eni
-      view: Pogledaj
     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.
@@ -399,7 +374,7 @@ sr-Latn:
     '500':
       content: Izvinjavamo se, neÅ¡to je poÅ¡lo po zlu sa ove strane.
       title: Strana nije ispravna
-    noscript_html: Da biste koristili Mastodont veb aplikaciju, omoguÄ‡ite JavaScript. U suprotnom, probajte neku od <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">originalnih aplikacija</a> za Mastodont za VaÅ¡u platformu.
+    noscript_html: Da biste koristili Mastodont veb aplikaciju, omoguÄ‡ite JavaScript. U suprotnom, probajte neku od <a href="%{apps_path}">originalnih aplikacija</a> za Mastodont za VaÅ¡u platformu.
   exports:
     blocks: Blokirali ste
     csv: CSV
@@ -422,7 +397,6 @@ sr-Latn:
     unlocked_warning_title: VaÅ¡ nalog nije zakljuÄan
   generic:
     changes_saved_msg: Izmene uspeÅ¡no saÄuvane!
-    powered_by: omoguÄ‡io %{link}
     save_changes: Snimi izmene
     validation_errors:
       few: NeÅ¡to nije baÅ¡ kako treba! Pregledajte %{count} greÅ¡ke ispod
@@ -460,8 +434,6 @@ sr-Latn:
       expires_at: IstiÄe
       uses: KoriÅ¡Ä‡enja
     title: Pozovi ljude
-  landing_strip_html: "<strong>%{name}</strong> je korisnik na %{link_to_root_path}. MoÅ¾ete ga zapratiti ili komunicirati sa njim ako imte nalog bilo gde u fediversu."
-  landing_strip_signup_html: Ako nemate, moÅ¾ete se <a href="%{sign_up_path}">registrovati ovde</a>.
   lists:
     errors:
       limit: Dostigli ste limit broja listi
@@ -478,7 +450,7 @@ sr-Latn:
     title: Moderacija
   notification_mailer:
     digest:
-      body: 'Evo kratak pregled Å¡ta ste propustili na instanci %{instance} od poslednje posete od %{since}:'
+      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!
@@ -602,7 +574,6 @@ sr-Latn:
       unlisted: Neizlistano
       unlisted_long: Svako moÅ¾e da vidi, ali nije izlistano na javnim lajnama
   stream_entries:
-    click_to_show: Klikni da vidiÅ¡
     pinned: PrikaÄeni tut
     reblogged: podrÅ¾ano
     sensitive_content: Osetljiv sadrÅ¾aj
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index a704bcb9af30865e75637be89bbbd3f0d309d7df..6131ed01f26035cc3068a500a40d377a7933e608 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -2,16 +2,16 @@
 sr:
   about:
     about_hashtag_html: ÐžÐ²Ð¾ ÑÑƒ Ñ˜Ð°Ð²Ð½Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸ Ñ‚Ð°Ð³Ð¾Ð²Ð°Ð½Ð¸ ÑÐ° <strong>#%{hashtag}</strong>. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ€Ð°Ñ‚Ð¸ Ð½Ð° ÑšÐ¸Ñ… Ð°ÐºÐ¾ Ð¸Ð¼Ð°Ñ‚Ðµ Ð½Ð°Ð»Ð¾Ð³ Ð±Ð¸Ð»Ð¾ Ð³Ð´Ðµ Ñƒ Ñ„ÐµÐ´Ð¸Ð²ÐµÑ€ÑÑƒ.
-    about_mastodon_html: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ñ˜Ðµ Ð´Ñ€ÑƒÑˆÑ‚Ð²ÐµÐ½Ð° Ð¼Ñ€ÐµÐ¶Ð° Ð±Ð°Ð·Ð¸Ñ€Ð°Ð½Ð° Ð½Ð° Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ð¼ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¸Ð¼Ð° Ð¸ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð¼ ÑÐ¾Ñ„Ñ‚Ð²ÐµÑ€Ñƒ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð´Ð°. Ð”ÐµÑ†ÐµÐ½Ñ‚Ñ€Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð° Ñ˜Ðµ ÐºÐ°Ð¾ ÑˆÑ‚Ð¾ Ñ˜Ðµ Ð´ÐµÑ†ÐµÐ½Ñ‚Ñ€Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°.
+    about_mastodon_html: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ñ˜Ðµ Ð´Ñ€ÑƒÑˆÑ‚Ð²ÐµÐ½Ð° Ð¼Ñ€ÐµÐ¶Ð° Ð±Ð°Ð·Ð¸Ñ€Ð°Ð½Ð° Ð½Ð° Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ð¼ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð¸Ð¼Ð° Ð¸ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð¼ ÑÐ¾Ñ„Ñ‚Ð²ÐµÑ€Ñƒ Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð´Ð°. Ð”ÐµÑ†ÐµÐ½Ñ‚Ñ€Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð° Ñ˜Ðµ ÐºÐ°Ð¾ ÑˆÑ‚Ð¾ Ñ˜Ðµ Ð´ÐµÑ†ÐµÐ½Ñ‚Ñ€Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°.
     about_this: Ðž Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸
     administered_by: 'ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð¸Ñ€Ð°Ð½Ð¾ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ:'
-    closed_registrations: Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ðµ ÑÑƒ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð·Ð°Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ˜ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸. Ð˜Ð¿Ð°Ðº! ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ñ›Ð¸ Ð´Ñ€ÑƒÐ³Ñƒ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ñƒ Ð½Ð° ÐºÐ¾Ñ˜Ð¾Ñ˜ Ñ›ÐµÑ‚Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð¾Ð³ Ð¸ Ð¾Ð´Ð°Ñ‚Ð»Ðµ Ð´Ð¾Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð¸ÑÑ‚Ð¾Ñ˜ Ð¾Ð²Ð¾Ñ˜ Ð¼Ñ€ÐµÐ¶Ð¸.
+    api: API
+    apps: ÐœÐ¾Ð±Ð¸Ð»Ð½Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ
+    closed_registrations: Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ðµ ÑÑƒ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð·Ð°Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ˜ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸. ÐœÐµÑ’ÑƒÑ‚Ð¸Ð¼! ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð½Ð°Ñ›Ð¸ Ð´Ñ€ÑƒÐ³Ñƒ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ñƒ Ð½Ð° ÐºÐ¾Ñ˜Ð¾Ñ˜ Ñ›ÐµÑ‚Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð¾Ð³ Ð¸ Ð¾Ð´Ð°Ñ‚Ð»Ðµ Ð´Ð¾Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð° Ð¸ÑÑ‚Ð¾Ñ˜ Ð¾Ð²Ð¾Ñ˜ Ð¼Ñ€ÐµÐ¶Ð¸.
     contact: ÐšÐ¾Ð½Ñ‚Ð°ÐºÑ‚
     contact_missing: ÐÐ¸Ñ˜Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™ÐµÐ½Ð¾
     contact_unavailable: N/A
-    description_headline: Ð¨Ñ‚Ð° Ñ˜Ðµ %{domain}?
-    domain_count_after: Ð¾ÑÑ‚Ð°Ð»Ðµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ
-    domain_count_before: ÐŸÐ¾Ð²ÐµÐ·Ð°Ð½ Ð½Ð°
+    documentation: Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸Ñ˜Ð°
     extended_description_html: |
       <h3>Ð”Ð¾Ð±Ñ€Ð¾ Ð¼ÐµÑÑ‚Ð¾ Ð·Ð° Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð°</h3>
       <p>ÐŸÑ€Ð¾ÑˆÐ¸Ñ€ÐµÐ½Ð¸ Ð¾Ð¿Ð¸Ñ ÐºÐ¾Ñ˜Ð¸ Ñ˜Ð¾Ñˆ Ð½Ð¸Ñ˜Ðµ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™ÐµÐ½.</p>
@@ -28,41 +28,79 @@ sr:
     hosted_on: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ñ…Ð¾ÑÑ‚Ð¾Ð²Ð°Ð½ Ð½Ð° %{domain}
     learn_more: Ð¡Ð°Ð·Ð½Ð°Ñ˜Ñ‚Ðµ Ð²Ð¸ÑˆÐµ
     other_instances: Ð›Ð¸ÑÑ‚Ð° Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸
+    privacy_policy: ÐŸÐ¾Ð»Ð¸ÑÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸
     source_code: Ð˜Ð·Ð²Ð¾Ñ€Ð½Ð¸ ÐºÐ¾Ð´
-    status_count_after: ÑÑ‚Ð°Ñ‚ÑƒÑÐ°
+    status_count_after:
+      few: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸
+      many: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸
+      one: ÑÑ‚Ð°Ñ‚ÑƒÑ
+      other: ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸
     status_count_before: ÐšÐ¾Ñ˜Ð¸ ÑÑƒ Ð½Ð°Ð¿Ð¸ÑÐ°Ð»Ð¸
-    user_count_after: ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°
+    terms: Ð£ÑÐ»Ð¾Ð²Ð¸ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
+    user_count_after:
+      few: ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸
+      many: ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸
+      one: ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº
+      other: ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸
     user_count_before: Ð”Ð¾Ð¼ Ð·Ð°
-    what_is_mastodon: Ð¨Ñ‚Ð° Ñ˜Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚?
+    what_is_mastodon: Ð¨Ñ‚Ð° Ñ˜Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½?
   accounts:
-    follow: Follow
-    followers: Followers
-    following: Following
-    media: ÐœÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð°
-    moved_html: "%{name} Ñ˜Ðµ Ð¿Ð¾Ð¼ÐµÑ€ÐµÐ½ Ð½Ð° %{new_profile_link}:"
+    choices_html: "%{name}'s Ð¸Ð·Ð±Ð¾Ñ€Ð¸:"
+    follow: Ð—Ð°Ð¿Ñ€Ð°Ñ‚Ð¸
+    followers:
+      few: ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸
+      many: ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸
+      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}
-    posts: Ð¢ÑƒÑ‚Ð¾Ð²Ð¸
-    posts_with_replies: Ð¢ÑƒÑ‚Ð¾Ð²Ð¸ Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ð¸
-    remote_follow: Ð£Ð´Ð°Ñ™ÐµÐ½Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐ°
+    pin_errors:
+      following: ÐœÐ¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð¾Ð²Ñƒ Ð¾ÑÐ¾Ð±Ñƒ Ð°ÐºÐ¾ Ñ…Ð¾Ñ›ÐµÑ‚Ðµ Ð´Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ
+    posts:
+      few: Ð¢Ñ€ÑƒÐ±Ðµ
+      many: Ð¢Ñ€ÑƒÐ±Ðµ
+      one: Ð¢Ñ€ÑƒÐ±Ð°
+      other: Ð¢Ñ€ÑƒÐ±Ðµ
+    posts_tab_heading: Ð¢Ñ€ÑƒÐ±Ðµ
+    posts_with_replies: Ð¢Ñ€ÑƒÐ±Ðµ Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ð¸
     reserved_username: ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ Ñ˜Ðµ Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸ÑÐ°Ð½Ð¾
     roles:
       admin: ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€
+      bot: Ð‘Ð¾Ñ‚
       moderator: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€
     unfollow: ÐžÑ‚Ð¿Ñ€Ð°Ñ‚Ð¸
   admin:
+    account_actions:
+      action: Ð˜Ð·Ð²Ñ€ÑˆÐ¸Ñ‚Ðµ Ñ€Ð°Ð´ÑšÑƒ
+      title: Ð˜Ð·Ð²Ñ€ÑˆÐ¸Ñ‚Ðµ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐµ Ñ€Ð°Ð´ÑšÐµ Ð½Ð° %{acct}
     account_moderation_notes:
-      create: ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸
+      create: ÐžÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð±ÐµÐ»ÐµÑˆÐºÑƒ
       created_msg: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐ° Ð±ÐµÐ»ÐµÑˆÐºÐ° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð°!
       delete: ÐžÐ±Ñ€Ð¸ÑˆÐ¸
       destroyed_msg: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐ° Ð±ÐµÐ»ÐµÑˆÐºÐ° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½Ð°!
     accounts:
       are_you_sure: Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸?
+      avatar: ÐÐ²Ð°Ñ‚Ð°Ñ€
       by_domain: Ð”Ð¾Ð¼ÐµÐ½
+      change_email:
+        changed_msg: Ð•-Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð»Ð¾Ð³Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¿Ñ€Ð¾Ð¼ÐµÑšÐµÐ½Ð°!
+        current_email: Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°
+        label: ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ Ðµ-Ð¿Ð¾ÑˆÑ‚Ñƒ
+        new_email: ÐÐ¾Ð²Ð° e-Ð¿Ð¾ÑˆÑ‚Ð°
+        submit: ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ e-Ð¿Ð¾ÑˆÑ‚Ñƒ
+        title: ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ e-Ð¿Ð¾ÑˆÑ‚Ñƒ Ð·Ð° %{username}
       confirm: ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸
       confirmed: ÐŸÐ¾Ñ‚Ð²Ñ€Ñ’ÐµÐ½Ð¾
       confirming: ÐŸÐ¾Ñ‚Ð²Ñ€Ð´ÑƒÐ²Ð°ÑšÐµ
+      deleted: Ð˜Ð·Ð±Ñ€Ð¸ÑÐ°Ð½Ð¾
       demote: Ð Ð°Ð¶Ð°Ð»ÑƒÑ˜
       disable: Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸
       disable_two_factor_authentication: Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸ 2FA
@@ -71,15 +109,18 @@ sr:
       domain: Ð”Ð¾Ð¼ÐµÐ½
       edit: Ð˜Ð·Ð¼ÐµÐ½Ð¸
       email: Ð•-Ð¿Ð¾ÑˆÑ‚Ð°
-      email_status: Ð•-Ð¿Ð¾ÑˆÑ‚Ð° ÑÑ‚Ð°Ñ‚ÑƒÑ
-      enable: Ð£ÐºÑ™ÑƒÑ‡Ð¸
+      email_status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ
+      enable: ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸
       enabled: Ð£ÐºÑ™ÑƒÑ‡ÐµÐ½Ð¾
       feed_url: ÐÐ´Ñ€ÐµÑÐ° Ð´Ð¾Ð²Ð¾Ð´Ð°
       followers: ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸
       followers_url: ÐÐ´Ñ€ÐµÑÐ° Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð°
       follows: ÐŸÑ€Ð°Ñ›ÐµÐ½Ð¸
+      header: Ð—Ð°Ð³Ð»Ð°Ð²Ñ™Ðµ
       inbox_url: ÐÐ´Ñ€ÐµÑÐ° ÑÐ°Ð½Ð´ÑƒÑ‡ÐµÑ‚Ð°
+      invited_by: ÐŸÐ¾Ð·Ð²Ð°Ð½ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ
       ip: IP
+      joined: ÐŸÑ€Ð¸Ð´Ñ€ÑƒÐ¶Ð¸Ð¾ ÑÐµ
       location:
         all: Ð¡Ð²Ðµ
         local: Ð›Ð¾ÐºÐ°Ð»Ð½Ðµ
@@ -89,6 +130,7 @@ sr:
       media_attachments: ÐœÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð°Ð»Ð½Ð¸ Ð¿Ñ€Ð¸Ð»Ð¾Ð·Ð¸
       memorialize: ÐŸÑ€ÐµÐ±Ð°Ñ†Ð¸ Ñƒ in memoriam
       moderation:
+        active: ÐÐºÑ‚Ð¸Ð²Ð°Ð½
         all: Ð¡Ð²Ð¸
         silenced: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð½Ð¸
         suspended: Ð¡ÑƒÑÐ¿ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¸
@@ -96,19 +138,18 @@ sr:
       moderation_notes: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐµ Ð±ÐµÐ»ÐµÑˆÐºÐµ
       most_recent_activity: ÐÐ°Ñ˜ÑÐºÐ¾Ñ€Ð¸Ñ˜Ð° Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚
       most_recent_ip: ÐÐ°Ñ˜ÑÐºÐ¾Ñ€Ð¸Ñ˜Ð° IP Ð°Ð´Ñ€ÐµÑÐ°
+      no_limits_imposed: ÐÐµÐ¼Ð° Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÑšÐ°
       not_subscribed: ÐÐ¸Ñ˜Ðµ Ð¿Ñ€ÐµÑ‚Ð¿Ð»Ð°Ñ›ÐµÐ½
-      order:
-        alphabetic: ÐÐ±ÐµÑ†ÐµÐ´Ð½Ð¸
-        most_recent: ÐÐ°Ñ˜ÑÐºÐ¾Ñ€Ð¸Ñ˜Ð¸
-        title: Ð ÐµÐ´Ð¾ÑÐ»ÐµÐ´
       outbox_url: ÐžÐ´Ð»Ð°Ð·Ð½Ð¾ ÑÐ°Ð½Ð´ÑƒÑ‡Ðµ
-      perform_full_suspension: Ð˜Ð·Ð²Ñ€ÑˆÐ¸ ÐºÐ¾Ð¼Ð¿Ð»ÐµÑ‚Ð½Ð¾ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÑšÐµ
+      perform_full_suspension: Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸
       profile_url: ÐÐ´Ñ€ÐµÑÐ° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð°
       promote: Ð£Ð½Ð°Ð¿Ñ€ÐµÐ´Ð¸
       protocol: ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»
       public: ÐˆÐ°Ð²Ð½Ð¾
-      push_subscription_expires: PuSH subscription expires
-      redownload: ÐžÑÐ²ÐµÐ¶Ð¸ Ð°Ð²Ð°Ñ‚Ð°Ñ€
+      push_subscription_expires: PuSH Ð¿Ñ€ÐµÑ‚Ð¿Ð»Ð°Ñ‚Ð° Ð¸ÑÑ‚Ð¸Ñ‡Ðµ
+      redownload: ÐžÑÐ²ÐµÐ¶Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»
+      remove_avatar: Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð°Ð²Ð°Ñ‚Ð°Ñ€
+      remove_header: ÐžÐ´ÑÑ‚Ñ€Ð°Ð½Ð¸ Ð·Ð°Ð³Ð»Ð°Ð²Ñ™Ðµ
       resend_confirmation:
         already_confirmed: ÐžÐ²Ð¾Ñ˜ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ðµ Ð²ÐµÑœÐµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´ÐµÐ½
         send: ÐŸÑ€ÐµÐ¿Ñ€Ð°Ñ‚Ð¸ Ð³Ð¾ Ðµ-Ð¼Ð°Ñ˜Ð»Ð¾Ñ‚ Ð·Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð°
@@ -126,25 +167,32 @@ sr:
       search: ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð³Ð°
       shared_inbox_url: ÐÐ´Ñ€ÐµÑÐ° Ð´ÐµÑ™ÐµÐ½Ð¾Ð³ ÑÐ°Ð½Ð´ÑƒÑ‡ÐµÑ‚Ð°
       show:
-        created_reports: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ðµ ÐºÐ¾Ñ˜Ðµ Ñ˜Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð¾ Ð¾Ð²Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³
-        report: Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð°
-        targeted_reports: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ðµ Ð¾ Ð¾Ð²Ð¾Ð¼ Ð½Ð°Ð»Ð¾Ð³Ñƒ
+        created_reports: ÐÐ°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð¸ Ð¸Ð·Ð²ÐµÑˆÑ‚Ð°Ñ˜Ð¸
+        targeted_reports: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ðµ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ Ð´Ñ€ÑƒÐ³Ð¸Ñ…
       silence: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ñ˜
+      silenced: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð½
       statuses: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÐ¸
       subscribe: ÐŸÑ€ÐµÑ‚Ð¿Ð»Ð°Ñ‚Ð¸ ÑÐµ
+      suspended: Ð¡ÑƒÑÐ¿ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð¸
       title: ÐÐ°Ð»Ð¾Ð·Ð¸
+      unconfirmed_email: ÐÐµÐ¿Ð¾Ñ‚Ð²Ñ€Ñ’ÐµÐ½Ð° Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°
       undo_silenced: Ð£ÐºÐ¸Ð½Ð¸ Ñ›ÑƒÑ‚Ð°ÑšÐµ
       undo_suspension: Ð£ÐºÐ¸Ð½Ð¸ ÑÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ñƒ
       unsubscribe: Ð£ÐºÐ¸Ð½Ð¸ Ð¿Ñ€ÐµÑ‚Ð¿Ð»Ð°Ñ‚Ñƒ
       username: ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾ Ð¸Ð¼Ðµ
+      warn: Ð£Ð¿Ð¾Ð·Ð¾Ñ€Ð¸
       web: Ð’ÐµÐ±
     action_logs:
       actions:
+        assigned_to_self_report: "%{name} Ñ˜Ðµ Ð´Ð¾Ð´ÐµÐ»Ð¸Ð¾/Ð»Ð° Ð¸Ð·Ð²ÐµÑˆÑ‚Ð°Ñ˜ %{target} ÑÐµÐ±Ð¸"
+        change_email_user: "%{name} Ñ˜Ðµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ð¾/Ð»Ð° Ð°Ð´Ñ€ÐµÑÑƒ Ð•-Ð¿Ð¾ÑˆÑ‚Ðµ ÐºÐ¾Ð¸ÑÐ½Ð¸ÐºÐ°/Ñ†Ðµ %{target}"
         confirm_user: "%{name} Ñ˜Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ð¾ Ð°Ð´Ñ€ÐµÑÑƒ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° %{target}"
-        create_custom_emoji: "%{name} Ñ˜Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ð¾ Ð½Ð¾Ð²Ð¸ ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ %{target}"
+        create_account_warning: "%{name} Ñ˜Ðµ Ð¿Ð¾ÑÐ»Ð°Ð¾ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñƒ %{target}"
+        create_custom_emoji: "%{name} Ñ˜Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ð¾ Ð½Ð¾Ð²Ð¸ ÐµÐ¼Ð¾ÑŸÐ¸ %{target}"
         create_domain_block: "%{name} Ñ˜Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¾ Ð´Ð¾Ð¼ÐµÐ½ %{target}"
         create_email_domain_block: "%{name} Ñ˜Ðµ ÑÑ‚Ð°Ð²Ð¸Ð¾ Ð½Ð° Ñ†Ñ€Ð½Ñƒ Ð»Ð¸ÑÑ‚Ñƒ Ð´Ð¾Ð¼ÐµÐ½ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ %{target}"
         demote_user: "%{name} Ñ˜Ðµ Ñ€Ð°Ð¶Ð°Ð»Ð¾Ð²Ð°Ð¾ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° %{target}"
+        destroy_custom_emoji: "%{name} Ñ˜Ðµ ÑƒÐ½Ð¸ÑˆÑ‚Ð¸Ð¾ ÐµÐ¼Ð¾ÑŸÐ¸ %{target}"
         destroy_domain_block: "%{name} Ñ˜Ðµ Ð¾Ð´Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð¾ Ð´Ð¾Ð¼ÐµÐ½ %{target}"
         destroy_email_domain_block: "%{name} Ñ˜Ðµ ÑÑ‚Ð°Ð²Ð¸Ð¾ Ð½Ð° Ð±ÐµÐ»Ñƒ Ð»Ð¸ÑÑ‚Ñƒ Ð´Ð¾Ð¼ÐµÐ½ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ %{target}"
         destroy_status: "%{name} Ñ˜Ðµ ÑƒÐºÐ»Ð¾Ð½Ð¸Ð¾ ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° %{target}"
@@ -155,42 +203,68 @@ sr:
         enable_user: "%{name} Ñ˜Ðµ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ð¾ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñ™Ð¸Ð²Ð°ÑšÐµ Ð·Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° %{target}"
         memorialize_account: "%{name} Ñ˜Ðµ Ð¿Ñ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ð¾ ÑÑ‚Ñ€Ð°Ð½Ñƒ Ð½Ð°Ð»Ð¾Ð³Ð° %{target} ÐºÐ°Ð¾ in memoriam ÑÑ‚Ñ€Ð°Ð½Ñƒ"
         promote_user: "%{name} Ñ˜Ðµ ÑƒÐ½Ð°Ð¿Ñ€ÐµÐ´Ð¸Ð¾ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° %{target}"
+        remove_avatar_user: "%{name} Ñ˜Ðµ ÑƒÐºÐ»Ð¾Ð½Ð¸Ð¾/Ð»Ð° %{target}'s Ð°Ð²Ð°Ñ‚Ð°Ñ€"
+        reopen_report: "%{name} Ñ˜Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¾Ñ‚Ð²Ð¾Ñ€Ð¸Ð¾/Ð»Ð° Ð¸Ð·Ð²ÐµÑˆÑ‚Ð°Ñ˜ %{target}"
         reset_password_user: "%{name} Ñ˜Ðµ Ñ€ÐµÑÐµÑ‚Ð¾Ð²Ð°Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÑƒ %{target}"
         resolve_report: "%{name} Ñ˜Ðµ Ð¾Ð´Ð±Ð°Ñ†Ð¸Ð¾ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñƒ %{target}"
         silence_account: "%{name} Ñ˜Ðµ ÑƒÑ›ÑƒÑ‚ÐºÐ°Ð¾ Ð½Ð°Ð»Ð¾Ð³ %{target}"
         suspend_account: "%{name} Ñ˜Ðµ ÑÑƒÑÐ¿ÐµÐ½Ð´Ð¾Ð²Ð°Ð¾ Ð½Ð°Ð»Ð¾Ð³ %{target}"
+        unassigned_report: "%{name} Ð½ÐµÐ´Ð¾Ð´ÐµÑ™ÐµÐ½ Ð¸Ð·Ð²ÐµÑˆÑ‚Ð°Ñ˜ %{target}"
         unsilence_account: "%{name} Ñ˜Ðµ ÑƒÐºÐ¸Ð½ÑƒÐ¾ Ñ›ÑƒÑ‚Ð°ÑšÐµ Ð½Ð°Ð»Ð¾Ð³Ñƒ %{target}"
         unsuspend_account: "%{name} Ñ˜Ðµ ÑƒÐºÐ¸Ð½ÑƒÐ¾ ÑÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ñƒ Ð½Ð°Ð»Ð¾Ð³Ñƒ %{target}"
         update_custom_emoji: "%{name} Ñ˜Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð¾ ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ %{target}"
         update_status: "%{name} Ñ˜Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð¾ ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° %{target}"
+      deleted_status: "(Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½ ÑÑ‚Ð°Ñ‚ÑƒÑ)"
       title: Ð—Ð°Ð¿Ð¸ÑÐ½Ð¸Ðº
     custom_emojis:
       by_domain: Ð”Ð¾Ð¼ÐµÐ½
-      copied_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð° ÐºÐ¾Ð¿Ð¸Ñ˜Ð° ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½Ð°
+      copied_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð° ÐºÐ¾Ð¿Ð¸Ñ˜Ð° ÐµÐ¼Ð¾ÑŸÐ¸Ñ˜Ð°
       copy: ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜
-      copy_failed_msg: ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð¼ Ð»Ð¾ÐºÐ°Ð»Ð½Ñƒ ÐºÐ¾Ð¿Ð¸Ñ˜Ñƒ Ñ‚Ð¾Ð³ ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½Ð°
-      created_msg: Ð•Ð¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½!
+      copy_failed_msg: ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð¼ Ð»Ð¾ÐºÐ°Ð»Ð½Ñƒ ÐºÐ¾Ð¿Ð¸Ñ˜Ñƒ Ñ‚Ð¾Ð³ ÐµÐ¼Ð¾Ñ‚Ð¸ÑŸÐ¸Ñ˜Ð°
+      created_msg: Ð•Ð¼Ð¾ÑŸÐ¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½!
       delete: ÐžÐ±Ñ€Ð¸ÑˆÐ¸
-      destroyed_msg: Ð•Ð¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½!
+      destroyed_msg: Ð•Ð¼Ð¾ÑŸÐ¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½!
       disable: ÐžÐ½ÐµÐ¼Ð¾Ð³ÑƒÑ›Ð¸
-      disabled_msg: Ð•Ð¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð½ÐµÐ¼Ð¾Ð³ÑƒÑ›ÐµÐ½
-      emoji: Ð•Ð¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½
+      disabled_msg: Ð•Ð¼Ð¾ÑŸÐ¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð½ÐµÐ¼Ð¾Ð³ÑƒÑ›ÐµÐ½
+      emoji: Ð•Ð¼Ð¾ÑŸÐ¸
       enable: ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸
-      enabled_msg: Ð•Ð¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½
+      enabled_msg: Ð•Ð¼Ð¾ÑŸÐ¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½
       image_hint: PNG Ð´Ð¾ 50KB
       listed: Ð˜Ð·Ð»Ð¸ÑÑ‚Ð°Ð½
       new:
-        title: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½
+        title: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ ÐµÐ¼Ð¾ÑŸÐ¸
       overwrite: ÐŸÑ€ÐµÐ¿Ð¸ÑˆÐ¸
       shortcode: ÐŸÑ€ÐµÑ‡Ð¸Ñ†Ð°
       shortcode_hint: ÐÐ°Ñ˜Ð¼Ð°ÑšÐµ 2 ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð°, Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¸ ÑÑƒ ÑÐ°Ð¼Ð¾ ÑÐ»Ð¾Ð²Ð°, Ð±Ñ€Ð¾Ñ˜ÐµÐ²Ð¸ Ð¸ Ð´Ð¾ÑšÐµ Ñ†Ñ€Ñ‚Ðµ
-      title: ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½Ð¸
+      title: ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ ÐµÐ¼Ð¾Ñ‚Ð¸ÑŸÐ¸Ñ˜Ð¸
       unlisted: ÐÐµÐ¸Ð·Ð»Ð¸ÑÑ‚Ð°Ð½
-      update_failed_msg: ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ð¼ Ð¾Ð²Ð°Ñ˜ ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½
-      updated_msg: ÐµÐ¼Ð¾Ñ‚Ð¸ÐºÐ¾Ð½ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ð½!
+      update_failed_msg: ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ð¼ Ð¾Ð²Ð°Ñ˜ ÐµÐ¼Ð¾ÑŸÐ¸
+      updated_msg: Ð•Ð¼Ð¾ÑŸÐ¸ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ð½!
       upload: ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸
+    dashboard:
+      backlog: ÐŸÐ¾Ð·Ð°Ð´Ð¸Ð½ÑÐºÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ¸
+      config: ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ˜Ð°
+      feature_deletions: Ð‘Ñ€Ð¸ÑÐ°ÑšÐµ Ð½Ð°Ð»Ð¾Ð³Ð°
+      feature_invites: ÐŸÐ¾Ð·Ð¸Ð²Ð½Ð¸Ñ†Ðµ
+      feature_profile_directory: Ð¤Ð°ÑÑ†Ð¸ÐºÐ»Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð°
+      feature_registrations: Ð ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ð°
+      feature_relay: Ð¤ÐµÐ´ÐµÑ€Ð°Ñ‚Ð¸Ð²Ð½Ð¸ Ñ€ÐµÐ»ÐµÑ˜
+      features: ÐšÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð¸ÑÑ‚Ð¸ÐºÐµ
+      hidden_service: Ð¤ÐµÐ´ÐµÑ€Ð°Ñ†Ð¸Ñ˜Ð° ÑÐ° ÑÐºÑ€Ð¸Ð²ÐµÐ½Ð¸Ð¼ ÑƒÑÐ»ÑƒÐ³Ð°Ð¼Ð°
+      open_reports: Ð¾Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ðµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ðµ
+      recent_users: ÐÐµÐ´Ð°Ð²Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸
+      search: ÐŸÐ¾Ñ‚Ð¿ÑƒÐ½Ð° Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð³Ð° Ñ‚ÐµÐºÑÑ‚Ð°
+      single_user_mode: ÐŸÐ¾Ñ˜ÐµÐ´Ð¸Ð½Ð°Ñ‡Ð½Ð¸ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº
+      software: Ð¡Ð¾Ñ„Ñ‚Ð²ÐµÑ€
+      space: ÐšÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐµ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€Ð°
+      title: ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð° Ñ‚Ð°Ð±Ð»Ð°
+      total_users: ÑƒÐºÑƒÐ¿Ð°Ð½ Ð±Ñ€Ð¾Ñ˜ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ°
+      trends: Ð¢Ñ€ÐµÐ½Ð´Ð¾Ð²Ð¸
+      week_interactions: Ð¸Ð½Ñ‚ÐµÑ€Ð°ÐºÑ†Ð¸Ñ˜Ðµ Ð¾Ð²Ðµ Ð½ÐµÐ´ÐµÑ™Ðµ
+      week_users_active: Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ Ð¾Ð²Ðµ Ð½ÐµÐ´ÐµÑ™Ðµ
+      week_users_new: ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° Ð¾Ð²Ðµ Ð½ÐµÐ´ÐµÑ™Ðµ
     domain_blocks:
-      add_new: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸
+      add_new: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸ Ð±Ð»Ð¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð°
       created_msg: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°ÑšÐµ Ð´Ð¾Ð¼ÐµÐ½Ð° ÑÐµ Ð¾Ð±Ñ€Ð°Ñ’ÑƒÑ˜Ðµ
       destroyed_msg: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°ÑšÐµ Ð´Ð¾Ð¼ÐµÐ½Ð° Ñ˜Ðµ Ð¾Ð¿Ð¾Ð·Ð²Ð°Ð½Ð¾
       domain: Ð”Ð¾Ð¼ÐµÐ½
@@ -198,80 +272,145 @@ sr:
         create: ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸ Ð±Ð»Ð¾ÐºÐ°Ð´Ñƒ
         hint: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°ÑšÐµ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð½ÐµÑ›Ðµ ÑÐ¿Ñ€ÐµÑ‡Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð°Ð²Ñ™ÐµÑšÐµ Ð½Ð°Ð»Ð¾Ð³Ð° Ñƒ Ð±Ð°Ð·Ð¸, Ð°Ð»Ð¸ Ñ›Ðµ Ñ€ÐµÑ‚Ñ€Ð¾Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ Ð¸ Ð°ÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ¸ Ð¿Ñ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚Ð¸ Ð¾Ð´Ñ€ÐµÑ’ÐµÐ½Ðµ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€ÑÐºÐµ Ð¼ÐµÑ‚Ð¾Ð´Ðµ Ð½Ð°Ð´ Ñ‚Ð¸Ð¼ Ð½Ð°Ð»Ð¾Ð·Ð¸Ð¼Ð°.
         severity:
-          desc_html: "<strong>Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐµ</strong> Ñ›Ðµ ÑÐ²Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ð¾Ð²Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð° ÑƒÑ‡Ð¸Ð½Ð¸Ñ‚Ð¸ Ð½ÐµÐ²Ð¸Ð´Ð¸Ñ™Ð¸Ð²Ð¸Ð¼ Ð·Ð° ÑÐ²Ðµ, Ð¾ÑÐ¸Ð¼ Ð·Ð° Ð¾Ð½Ðµ ÐºÐ¾Ñ˜Ð¸ Ð½Ð°Ð»Ð¾Ð³ Ð²ÐµÑ› Ð¿Ñ€Ð°Ñ‚Ðµ. <strong>Ð¡ÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ð°</strong> Ñ›Ðµ ÑƒÐºÐ»Ð¾Ð½Ð¸Ñ‚Ð¸ ÑÐ°Ð² ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³Ð°, ÑÐ²Ñƒ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ñƒ, Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ‚ÐºÐµ. ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ <strong>ÐÐ¸ÑˆÑ‚Ð°</strong> Ð°ÐºÐ¾ ÑÐ°Ð¼Ð¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ð´Ð±Ð°Ñ†Ð¸Ñ‚Ðµ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð°Ð»Ð½Ðµ Ñ„Ð°Ñ˜Ð»Ð¾Ð²Ðµ."
+          desc_html: "<strong>Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐµ</strong> Ñ›Ðµ ÑÐ²Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ Ð¾Ð²Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð° ÑƒÑ‡Ð¸Ð½Ð¸Ñ‚Ð¸ Ð½ÐµÐ²Ð¸Ð´Ñ™Ð¸Ð²Ð¸Ð¼ Ð·Ð° ÑÐ²Ðµ, Ð¾ÑÐ¸Ð¼ Ð·Ð° Ð¾Ð½Ðµ ÐºÐ¾Ñ˜Ð¸ Ð²ÐµÑ› Ð¿Ñ€Ð°Ñ‚Ðµ Ð½Ð°Ð»Ð¾Ð³. <strong>Ð¡ÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ð°</strong> Ñ›Ðµ ÑƒÐºÐ»Ð¾Ð½Ð¸Ñ‚Ð¸ ÑÐ°Ð² ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³Ð°, ÑÐ²Ñƒ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ñƒ, Ð¸ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ‚ÐºÐµ. ÐšÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ðµ <strong>ÐÐ¸ÑˆÑ‚Ð°</strong> ÑÐ°Ð¼Ð¾ Ð°ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ð´Ð±Ð°Ñ†Ð¸Ñ‚Ðµ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð°Ð»Ð½Ðµ Ñ„Ð°Ñ˜Ð»Ð¾Ð²Ðµ."
           noop: ÐÐ¸ÑˆÑ‚Ð°
           silence: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐµ
           suspend: Ð¡ÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ð°
         title: ÐÐ¾Ð²Ð¾ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°ÑšÐµ Ð´Ð¾Ð¼ÐµÐ½Ð°
       reject_media: ÐžÐ´Ð±Ð°Ñ†Ð¸ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ñƒ
-      reject_media_hint: Ð£ÐºÐ»Ð°ÑšÐ° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ ÑƒÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚ÐµÐ½Ðµ Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜ÑÐºÐµ Ñ„Ð°Ñ˜Ð»Ð¾Ð²Ðµ Ð¸ Ð¾Ð´Ð±Ð¸Ñ˜Ð° Ð´Ð° Ð¸Ñ… ÑÐºÐ¸Ð´Ð° Ð½Ð° Ð´Ð°Ñ™Ðµ. ÐÐµÐ±Ð¸Ñ‚Ð½Ð¾ Ñ˜Ðµ Ð·Ð° ÑÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ñƒ.
-      severities:
-        noop: ÐÐ¸ÑˆÑ‚Ð°
-        silence: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð²Ð°ÑšÐµ
-        suspend: Ð¡ÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ð°
-      severity: ÐžÑˆÑ‚Ñ€Ð¸Ð½Ð°
+      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} Ð½Ð°Ð»Ð¾Ð³Ð° Ñƒ Ð±Ð°Ð·Ð¸
+          one: ÐˆÐµÐ´Ð°Ð½ Ð½Ð°Ð»Ð¾Ð³ Ñƒ Ð±Ð°Ð·Ð¸ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ° Ñ˜Ðµ Ð¿Ð¾Ð´ ÑƒÑ‚Ð¸Ñ†Ð°Ñ˜ÐµÐ¼
+          other: Ð£Ñ‚Ð¸Ñ‡Ðµ Ð½Ð° %{count} Ð½Ð°Ð»Ð¾Ð³Ð° Ñƒ Ð±Ð°Ð·Ð¸ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°
         retroactive:
           silence: Ð£Ð³Ð°ÑÐ¸ ÑƒÑ›ÑƒÑ‚ÐºÐ¸Ð²Ð°ÑšÐµ Ð·Ð° ÑÐ²Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ñ˜ÐµÑ›Ðµ Ð½Ð°Ð»Ð¾Ð³Ðµ ÑÐ° Ð¾Ð²Ð¾Ð³ Ð´Ð¾Ð¼ÐµÐ½Ð°
-          suspend: Ð£Ð³Ð°ÑÐ¸ ÑÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ðµ Ð·Ð° ÑÐ²Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ñ˜ÐµÑ›Ðµ Ð½Ð°Ð»Ð¾Ð³Ðµ ÑÐ° Ð¾Ð²Ð¾Ð³ Ð´Ð¾Ð¼ÐµÐ½Ð°
-        title: ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸ Ð±Ð»Ð¾ÐºÐ°Ð´Ñƒ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð·Ð° Ð´Ð¾Ð¼ÐµÐ½ %{domain}
+          suspend: Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑÑƒÑÐ¿ÐµÐ½Ð·Ð¸Ñ˜Ðµ Ð·Ð° ÑÐ²Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ñ˜ÐµÑ›Ðµ Ð½Ð°Ð»Ð¾Ð³Ðµ ÑÐ° Ð¾Ð²Ð¾Ð³ Ð´Ð¾Ð¼ÐµÐ½Ð°
+        title: ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸ Ð±Ð»Ð¾ÐºÐ°Ð´Ñƒ Ð´Ð¾Ð¼ÐµÐ½Ð° Ð·Ð° %{domain}
         undo: ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸
-      title: Ð‘Ð»Ð¾ÐºÐ°Ð´Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð°
-      undo: ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸
+      undo: ÐŸÐ¾Ð½Ð¸ÑˆÑ‚Ð¸ Ð±Ð»Ð¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð°
     email_domain_blocks:
-      add_new: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²ÑƒAdd new
-      created_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð´Ð¾Ð´Ð°Ð¾ Ð´Ð¾Ð¼ÐµÐ½ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ Ð½Ð° Ñ†Ñ€Ð½Ñƒ Ð»Ð¸ÑÑ‚Ñƒ
-      delete: Ð£ÐºÐ»Ð¾Ð½Ð¸
-      destroyed_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐºÐ»Ð¾ÑšÐµÐ½ Ð´Ð¾Ð¼ÐµÐ½ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ ÑÐ° Ñ†Ñ€Ð½Ðµ Ð»Ð¸ÑÑ‚Ðµ
+      add_new: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸
+      created_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ Ð´Ð¾Ð´Ð°Ð¾ Ð´Ð¾Ð¼ÐµÐ½ Ð•-Ð¿Ð¾ÑˆÑ‚Ðµ Ð½Ð° Ñ†Ñ€Ð½Ñƒ Ð»Ð¸ÑÑ‚Ñƒ
+      delete: ÐžÐ±Ñ€Ð¸ÑˆÐ¸
+      destroyed_msg: Ð£ÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐºÐ»Ð¾ÑšÐµÐ½ Ð´Ð¾Ð¼ÐµÐ½ Ð•-Ð¿Ð¾ÑˆÑ‚Ðµ ÑÐ° Ñ†Ñ€Ð½Ðµ Ð»Ð¸ÑÑ‚Ðµ
       domain: Ð”Ð¾Ð¼ÐµÐ½
       new:
         create: Ð”Ð¾Ð´Ð°Ñ˜ Ð´Ð¾Ð¼ÐµÐ½
-        title: ÐÐ¾Ð²Ð° ÑÑ‚Ð°Ð²ÐºÐ° Ñƒ Ñ†Ñ€Ð½Ð¾Ñ˜ Ð»Ð¸ÑÑ‚Ð¸ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð¸
-      title: Ð¦Ñ€Ð½Ð° Ð»Ð¸ÑÑ‚Ð° Ð°Ð´Ñ€ÐµÑÐ° Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ
+        title: ÐÐ¾Ð²Ð° ÑÑ‚Ð°Ð²ÐºÐ° Ðµ-Ð¿Ð¾ÑˆÑ‚e Ñƒ Ñ†Ñ€Ð½Ð¾Ñ˜ Ð»Ð¸ÑÑ‚Ð¸
+      title: Ð¦Ñ€Ð½Ð° Ð»Ð¸ÑÑ‚Ð° E-Ð¿Ð¾ÑˆÑ‚Ðµ
+    followers:
+      back_to_account: ÐÐ°Ð·Ð°Ð´ Ð½Ð° Ð½Ð°Ð»Ð¾Ð³
+      title: "%{acct} ÐŸÑ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸"
     instances:
-      account_count: ÐŸÐ¾Ð·Ð½Ð°Ñ‚Ð¸ Ð½Ð°Ð»Ð¾Ð·Ð¸
-      domain_name: Ð”Ð¾Ð¼ÐµÐ½
-      reset: Ð ÐµÑÐµÑ‚ÑƒÑ˜
-      search: ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð³Ð°
-      title: ÐŸÐ¾Ð·Ð½Ð°Ñ‚Ðµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ
+      delivery_available: Ð”Ð¾ÑÑ‚Ð°Ð²Ð° Ñ˜Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°
+      known_accounts:
+        few: "%{count} Ð·Ð½Ð°Ð½Ð¸Ñ… Ð½Ð°Ð»Ð¾Ð³Ð°"
+        many: "%{count} Ð·Ð½Ð°Ð½Ð¸Ñ… Ð½Ð°Ð»Ð¾Ð³Ð°"
+        one: "%{count} Ð·Ð½Ð°Ð½ Ð½Ð°Ð»Ð¾Ð³"
+        other: "%{count} Ð·Ð½Ð°Ð½Ð¸Ñ… Ð½Ð°Ð»Ð¾Ð³Ð°"
+      moderation:
+        all: Ð¡Ð²Ðµ
+        limited: ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¾
+        title: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ†Ð¸Ñ˜Ð°
+      title: Ð¤ÐµÐ´ÐµÑ€Ð°Ñ†Ð¸Ñ˜Ð°
+      total_blocked_by_us: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð½Ð¾ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ Ð½Ð°Ñ
+      total_followed_by_them: ÐŸÑ€Ð°Ñ›ÐµÐ½Ð¸ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ ÑšÐ¸Ñ…
+      total_followed_by_us: ÐŸÑ€Ð°Ñ›ÐµÐ½Ð¸ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ Ð½Ð°Ñ
+      total_reported: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ðµ Ð²ÐµÐ·Ð°Ð½Ðµ Ð·Ð° ÑšÐ¸Ñ…
     invites:
+      deactivate_all: Ð”ÐµÐ°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ˜ ÑÐ²Ðµ
       filter:
         all: Ð¡Ð²Ðµ
-        available: ÐÐºÑ‚Ð¸Ð²Ð½Ðµ
-        expired: Ð˜ÑÑ‚ÐµÐºÐ»Ðµ
+        available: Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸
+        expired: Ð˜ÑÑ‚ÐµÐºÐ»Ð¸
         title: Ð¤Ð¸Ð»Ñ‚ÐµÑ€
       title: ÐŸÐ¾Ð·Ð¸Ð²Ð½Ð¸Ñ†Ðµ
+    relays:
+      add_new: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸ Ñ€ÐµÐ»ÐµÑ˜
+      delete: ÐžÐ±Ñ€Ð¸ÑˆÐ¸
+      description_html: "<strong>Ð¤ÐµÐ´ÐµÑ€Ð°Ð»Ð½Ð¸ Ñ€ÐµÐ»ÐµÑ˜</strong> Ñ˜Ðµ Ð¿Ð¾ÑÑ€ÐµÐ´Ð½Ð¸Ñ‡ÐºÐ¸ ÑÐµÑ€Ð²ÐµÑ€ ÐºÐ¾Ñ˜Ð¸ Ñ€Ð°Ð·Ð¼ÐµÑšÑƒÑ˜Ðµ Ð²ÐµÐ»Ð¸ÐºÐµ ÐºÐ¾Ð»Ð¸Ñ‡Ð¸Ð½Ðµ Ñ˜Ð°Ð²Ð½Ð¸Ñ… Ñ‚Ñ€ÑƒÐ±Ð° Ð¸Ð·Ð¼ÐµÑ’Ñƒ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð½Ð° ÐºÐ¾Ñ˜Ð¸ Ñ˜Ðµ Ð¿Ñ€ÐµÑ‚Ð¿Ð»Ð°Ñ›ÐµÐ½ Ð¸ Ð½Ð° ÐºÐ¾Ñ˜Ð¸ Ð¾Ð±Ñ˜Ð°Ð²Ñ™ÑƒÑ˜Ðµ.<strong>ÐœÐ¾Ð¶Ðµ Ð¿Ð¾Ð¼Ð¾Ñ›Ð¸ Ð¼Ð°Ð»Ð¸Ð¼ Ð¸ ÑÑ€ÐµÐ´ÑšÐ¸Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¸Ð¼Ð° Ð´Ð° Ð¾Ñ‚ÐºÑ€Ð¸Ñ˜Ñƒ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð¸Ð· Ñ„ÐµÐ´Ð¸Ð²ÐµÑ€ÑÐ°</strong>, ÐºÐ¾Ñ˜Ð¸ Ð¸Ð½Ð°Ñ‡Ðµ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð° Ð¾Ð´ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ° Ð´Ð° Ñ€ÑƒÑ‡Ð½Ð¾ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð¾ÑÑ‚Ð°Ð»Ðµ Ñ™ÑƒÐ´Ðµ Ð½Ð° ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¸Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¸Ð¼Ð°."
+      disable: Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸
+      disabled: Ð˜ÑÐºÑ™ÑƒÑ‡ÐµÐ½
+      enable: Ð£ÐºÑ™ÑƒÑ‡Ð¸
+      enable_hint: ÐšÐ°Ð´Ð° ÑÐµ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸, Ð’Ð°Ñˆ ÑÐµÑ€Ð²ÐµÑ€ Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€ÐµÑ‚Ð¿Ð»Ð°Ñ›ÐµÐ½ Ð½Ð° ÑÐ²Ðµ Ñ˜Ð°Ð²Ð½Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ ÑÐ° Ð¾Ð²Ð¾Ð³ Ñ€ÐµÐ»ÐµÑ˜Ð°, Ð¸ Ð¿Ð¾Ñ‡ÐµÑ›Ðµ Ð´Ð° ÑˆÐ°Ñ™Ðµ ÑÐ²Ð¾Ñ˜Ðµ Ñ˜Ð°Ð²Ð½Ðµ Ñ‚Ñ€ÑƒÐ±Ñƒ Ð½Ð° ÑšÐµÐ³Ð°.
+      enabled: Ð£ÐºÑ™ÑƒÑ‡ÐµÐ½
+      inbox_url: URL Ð ÐµÐ»ÐµÑ˜Ð°
+      pending: Ð§ÐµÐºÐ° ÑÐµ Ð¾Ð´Ð¾Ð±Ñ€ÐµÑšÐµ Ñ€ÐµÐ»ÐµÑ˜Ð°
+      save_and_enable: Ð¡Ð°Ñ‡ÑƒÐ²Ð°Ñ˜ Ð¸ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸
+      setup: ÐŸÐ¾Ð´ÐµÑÐ¸ Ð²ÐµÐ·Ñƒ Ñ€ÐµÐ»ÐµÑ˜Ð°
+      status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ
+      title: Ð ÐµÐ»ÐµÑ˜Ð¸
+    report_notes:
+      created_msg: Ð‘ÐµÐ»ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð°!
+      destroyed_msg: Ð‘ÐµÐ»ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¸Ð·Ð±Ñ€Ð¸ÑÐ°Ð½Ð°!
     reports:
+      account:
+        note: Ð±ÐµÐ»ÐµÑˆÐºÐ°
+        report: Ð¸Ð·Ð²ÐµÑˆÑ‚Ð°Ñ˜
       action_taken_by: ÐÐºÑ†Ð¸Ñ˜Ñƒ Ð¸Ð·Ð²ÐµÐ¾
       are_you_sure: Ð”Ð° Ð»Ð¸ ÑÑ‚Ðµ ÑÐ¸Ð³ÑƒÑ€Ð½Ð¸?
+      assign_to_self: Ð”Ð¾Ð´ÐµÐ»Ð¸ Ð¼ÐµÐ½Ð¸
+      assigned: Ð”Ð¾Ð´ÐµÑ™ÐµÐ½Ð¸ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€
       comment:
         none: ÐÐ¸ÑˆÑ‚Ð°
-      id: ID
-      mark_as_resolved: ÐžÐ·Ð½Ð°Ñ‡Ð¸ ÐºÐ°Ð¾ Ñ€ÐµÑˆÐµÐ½
+      created_at: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð°
+      mark_as_resolved: ÐžÐ·Ð½Ð°Ñ‡Ð¸ ÐºÐ°Ð¾ Ñ€ÐµÑˆÐµÐ½Ñƒ
+      mark_as_unresolved: ÐžÐ·Ð½Ð°Ñ‡Ð¸ ÐºÐ°Ð¾ Ð½ÐµÑ€ÐµÑˆÐµÐ½Ñƒ
+      notes:
+        create: Ð”Ð¾Ð´Ð°Ñ˜ Ð±ÐµÐ»ÐµÑˆÐºÑƒ
+        create_and_resolve: Ð ÐµÑˆÐ¸ ÑÐ° Ð±ÐµÐ»ÐµÑˆÐºÐ¾Ð¼
+        create_and_unresolve: ÐžÑ‚Ð²Ð¾Ñ€Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ ÑÐ° Ð±ÐµÐ»ÐµÑˆÐºÐ¾Ð¼
+        delete: ÐžÐ±Ñ€Ð¸ÑˆÐ¸
+        placeholder: ÐžÐ¿Ð¸ÑˆÐ¸Ñ‚Ðµ ÐºÐ°ÐºÐ²Ðµ ÑÑƒ Ñ€Ð°Ð´ÑšÐµ Ð¿Ñ€ÐµÐ´ÑƒÐ·ÐµÑ‚Ðµ, Ð¸Ð»Ð¸ Ð±Ð¸Ð»Ð¾ ÐºÐ°ÐºÐ²Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ðµ Ð½Ð¾Ð²Ð¾ÑÑ‚Ð¸...
+      reopen: ÐžÑ‚Ð²Ð¾Ñ€Ð¸ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñƒ Ð¿Ð¾Ð½Ð¾Ð²Ð¾
       report: 'ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð° #%{id}'
-      report_contents: Ð¡Ð°Ð´Ñ€Ð¶Ð°Ñ˜
       reported_account: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð¸ Ð½Ð°Ð»Ð¾Ð³
       reported_by: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸Ð¾
-      resolved: Ð ÐµÑˆÐµÐ½Ð¸
-      silence_account: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ñ˜ Ð½Ð°Ð»Ð¾Ð³
+      resolved: Ð ÐµÑˆÐµÐ½Ð°
+      resolved_msg: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð°!
       status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ
-      suspend_account: Ð¡ÑƒÑÐ¿ÐµÐ½Ð´ÑƒÑ˜ Ð½Ð°Ð»Ð¾Ð³
-      target: Ð¦Ð¸Ñ™
       title: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ðµ
-      unresolved: ÐÐµÑ€ÐµÑˆÐµÐ½Ð¸
-      view: ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜
+      unassign: Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð´Ð¾Ð´ÐµÐ»Ñƒ
+      unresolved: ÐÐµÑ€ÐµÑˆÐµÐ½Ðµ
+      updated_at: ÐÐ¶ÑƒÑ€Ð¸Ñ€Ð°Ð½Ð°
     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 Ñ‚Ð°Ð³Ð¾Ð²Ðµ
@@ -285,6 +424,9 @@ sr:
         open:
           desc_html: Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸ ÑÐ²Ð°ÐºÐ¾Ð¼Ðµ Ð´Ð° ÐºÑ€ÐµÐ¸Ñ€Ð° Ð½Ð°Ð»Ð¾Ð³
           title: ÐžÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð° Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ð°
+      show_known_fediverse_at_about_page:
+        desc_html: ÐšÐ°Ð´Ð° ÑÐµ ÑƒÐ¿Ð°Ð»Ð¸, Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ›Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ Ð¸Ð· ÑÐ²Ð¸Ñ… Ð·Ð½Ð°Ð½Ð¸Ñ… Ñ„ÐµÐ´Ð¸Ð²ÐµÑ€ÑÐ° Ð½Ð° Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´. Ð£ ÑÑƒÐ¿Ñ€Ð¾Ñ‚Ð½Ð¾Ð¼ Ñ›Ðµ ÑÐ°Ð¼Ð¾ Ð¿Ð¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ.
+        title: ÐŸÐ¾ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ð·Ð½Ð°Ñ‚Ðµ Ð·Ð´Ñ€ÑƒÐ¶ÐµÐ½Ðµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ Ñƒ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð½Ð¸ÐºÑƒ Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐµ Ð»Ð¸Ð½Ð¸Ñ˜Ðµ
       show_staff_badge:
         desc_html: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð±ÐµÑŸ Ð¾ÑÐ¾Ð±Ñ™Ð° Ð½Ð° ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ‡ÐºÐ¾Ñ˜ ÑÑ‚Ñ€Ð°Ð½Ð¸
         title: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ð±ÐµÑŸ Ð¾ÑÐ¾Ð±Ñ™Ð°
@@ -294,6 +436,9 @@ sr:
       site_description_extended:
         desc_html: Ð”Ð¾Ð±Ñ€Ð¾ Ð¼ÐµÑÑ‚Ð¾ Ð·Ð° Ð²Ð°Ñˆ ÐºÐ¾Ð´ Ð¿Ð¾Ð½Ð°ÑˆÐ°ÑšÐ°, Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð°, ÑÐ¼ÐµÑ€Ð½Ð¸Ñ†Ðµ Ð¸ Ð´Ñ€ÑƒÐ³Ðµ ÑÑ‚Ð²Ð°Ñ€Ð¸ Ð¿Ð¾ ÐºÐ¾Ñ˜Ð¸Ð¼Ð° ÑÐµ Ð’Ð°ÑˆÐ° Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð° Ñ€Ð°Ð·Ð»Ð¸ÐºÑƒÑ˜Ðµ. ÐœÐ¾Ð¶ÐµÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ HTML Ñ‚Ð°Ð³Ð¾Ð²Ðµ
         title: ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ðµ Ð´Ð¾Ð´Ð°Ñ‚Ð½Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ
+      site_short_description:
+        desc_html: ÐŸÑ€Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾ Ñƒ Ð¸Ð·Ð±Ð¾Ñ€Ð½Ð¸ÐºÑƒ ÑÐ° ÑÑ‚Ñ€Ð°Ð½Ðµ Ð¸ Ñƒ Ð¼ÐµÑ‚Ð° Ð¾Ð·Ð½Ð°ÐºÐ°Ð¼Ð°. ÐžÐ¿Ð¸ÑˆÐ¸ ÑˆÑ‚Ð° Ñ˜Ðµ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ð¸ ÑˆÑ‚Ð° Ñ‡Ð¸Ð½Ð¸ Ð¾Ð²Ð°Ñ˜ ÑÐµÑ€Ð²ÐµÑ€ Ð¿Ð¾ÑÐµÐ±Ð½Ð¸Ð¼ Ñƒ Ñ˜ÐµÐ´Ð½Ð¾Ð¼ Ð¿Ð°ÑÑƒÑÑƒ. ÐÐºÐ¾ Ð¾ÑÑ‚Ð°Ð½Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð¾, Ð²Ñ€Ð°Ñ‚Ð¸Ñ›Ðµ ÑÐµ Ð¿Ñ€Ð²Ð¾Ð±Ð¸Ñ‚Ð½Ð¸ Ð¾Ð¿Ð¸Ñ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ.
+        title: ÐšÑ€Ð°Ñ‚Ð°Ðº Ð¾Ð¿Ð¸Ñ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ
       site_terms:
         desc_html: ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð¿Ð¸ÑÐ°Ñ‚Ð¸ Ð’Ð°ÑˆÑƒ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÑƒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸, ÑƒÑÐ»Ð¾Ð²Ðµ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¸ Ð¾ÑÑ‚Ð°Ð»Ðµ Ð»ÐµÐ³Ð°Ð»Ð½Ðµ ÑÑ‚Ð²Ð°Ñ€Ð¸. ÐœÐ¾Ð¶ÐµÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ HTML Ñ‚Ð°Ð³Ð¾Ð²Ðµ
         title: ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ñ™Ð½Ð¸ ÑƒÑÐ»Ð¾Ð²Ð¸ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
@@ -315,6 +460,7 @@ sr:
       media:
         title: ÐœÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð°
       no_media: Ð‘ÐµÐ· Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ðµ
+      no_status_selected: ÐÐ¸Ñ˜ÐµÐ´Ð°Ð½ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½Ð¸Ñ˜Ðµ Ð¿Ñ€Ð¾Ð¼ÐµÑšÐµÐ½ Ñ˜ÐµÑ€ Ð½Ð¸Ñ˜ÐµÐ´Ð°Ð½ Ð½Ð¸Ñ˜Ðµ Ð¸Ð·Ð°Ð±Ñ€Ð°Ð½
       title: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÐ¸ Ð½Ð°Ð»Ð¾Ð³Ð°
       with_media: Ð¡Ð° Ð¼ÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð¾Ð¼
     subscriptions:
@@ -324,15 +470,33 @@ sr:
       last_delivery: ÐŸÐ¾ÑÐ»ÐµÐ´ÑšÐ° Ð´Ð¾ÑÑ‚Ð°Ð²Ð°
       title: WebSub
       topic: Topic
+    tags:
+      accounts: ÐÐ°Ð»Ð¾Ð·Ð¸
+      hidden: Ð¡ÐºÑ€Ð¸Ð²ÐµÐ½Ð¾
+      hide: Ð¡Ð°ÐºÑ€Ð¸Ñ˜ Ð¾Ð´ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ
+      name: Ð¢Ð°Ñ€Ð°Ð±Ð°
+      title: Ð¢Ð°Ñ€Ð°Ð±Ð°
+      unhide: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ñƒ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð¸
+      visible: Ð’Ð¸Ð´Ñ™Ð¸Ð²Ð¾
     title: ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ð°
+    warning_presets:
+      add_new: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸
+      delete: Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸
+      edit: Ð£Ñ€ÐµÐ´Ð¸
+      edit_preset: Ð£Ñ€ÐµÐ´Ð¸ Ð¿Ñ€ÐµÑÐµÑ‚ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐ°
+      title: Ð£Ð¿Ñ€Ð°Ð²Ñ™Ð°Ñ˜ Ð¿Ñ€ÐµÑÐµÑ‚Ð¸Ð¼Ð° ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐ°
   admin_mailer:
     new_report:
       body: "%{reporter} Ñ˜Ðµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ð¾ %{target}"
+      body_remote: ÐÐµÐºÐ° ÑÐ° Ð´Ð¾Ð¼ÐµÐ½Ð° %{domain} Ñ˜Ðµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ð¾ %{target}
       subject: ÐÐ¾Ð²Ð° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð° Ð·Ð° %{instance} (#%{id})
   application_mailer:
+    notification_preferences: ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸ Ð¿Ñ€ÐµÑ„ÐµÑ€ÐµÐ½Ñ†Ðµ Ð•-Ð¿Ð¾ÑˆÑ‚Ðµ
     salutation: "%{name},"
     settings: 'ÐŸÑ€Ð¾Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ: %{link}'
     view: 'ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜:'
+    view_profile: ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»
+    view_status: ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜ ÑÑ‚Ð°Ñ‚ÑƒÑ
   applications:
     created: ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð½Ð°Ð¿Ñ€Ð°Ð²Ñ™ÐµÐ½Ð°
     destroyed: ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½Ð°
@@ -343,6 +507,8 @@ sr:
     your_token: Ð’Ð°Ñˆ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿Ð½Ð¸ Ñ‚Ð¾ÐºÐµÐ½
   auth:
     agreement_html: ÐŸÑ€Ð¸ÑÑ‚ÑƒÐ¿Ð°ÑšÐµÐ¼ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸ ÑÐµ ÑÐ»Ð°Ð¶ÐµÑ‚Ðµ ÑÐ° <a href="%{rules_path}">Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸Ð¼Ð° Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ</a> Ð¸ <a href="%{terms_path}">ÑƒÑÐ»Ð¾Ð²Ð¸Ð¼Ð° ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°</a>.
+    change_password: Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°
+    confirm_email: ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ Ð°Ð´Ñ€ÐµÑÑƒ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ
     delete_account: ÐžÐ±Ñ€Ð¸ÑˆÐ¸ Ð½Ð°Ð»Ð¾Ð³
     delete_account_html: ÐÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ð±Ñ€Ð¸ÑˆÐµÑ‚Ðµ Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href="%{path}">Ð½Ð°ÑÑ‚Ð°Ð²Ð¸Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ</a>. Ð‘Ð¸Ñ›ÐµÑ‚Ðµ ÑƒÐ¿Ð¸Ñ‚Ð°Ð½Ð¸ Ð´Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ.
     didnt_get_confirmation: ÐÐ¸ÑÑ‚Ðµ Ð´Ð¾Ð±Ð¸Ð»Ð¸ Ð¿Ð¾Ñ€ÑƒÐºÑƒ ÑÐ° ÑƒÐ¿ÑƒÑ‚ÑÑ‚Ð²Ð¸Ð¼Ð° Ð·Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ Ð½Ð°Ð»Ð¾Ð³Ð°?
@@ -352,12 +518,19 @@ sr:
     logout: ÐžÐ´Ñ˜Ð°Ð²Ð°
     migrate_account: ÐŸÐ¾Ð¼ÐµÑ€Ð¸ Ñƒ Ð´Ñ€ÑƒÐ³Ð¸ Ð½Ð°Ð»Ð¾Ð³
     migrate_account_html: ÐÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ñ€ÐµÑƒÑÐ¼ÐµÑ€Ð¸Ñ‚Ðµ Ð¾Ð²Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³ Ð½Ð° Ð½ÐµÐºÐ¸ Ð´Ñ€ÑƒÐ³Ð¸, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ‚Ð¾ <a href="%{path}">Ð¿Ð¾Ð´ÐµÑÐ¸Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ</a>.
+    or: Ð¸Ð»Ð¸
+    or_log_in_with: Ð˜Ð»Ð¸ ÑÐµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ðµ ÑÐ°
+    providers:
+      cas: CAS-Ð¾Ð¼
+      saml: SAML-Ð¾Ð¼
     register: Ð ÐµÐ³Ð¸ÑÑ‚Ñ€ÑƒÑ˜ ÑÐµ
+    register_elsewhere: Ð ÐµÐ³Ð¸ÑÑ‚Ñ€ÑƒÑ˜Ñ‚Ðµ ÑÐµ Ð½Ð° Ð´Ñ€ÑƒÐ³Ð¾Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ñƒ
     resend_confirmation: ÐŸÐ¾ÑˆÐ°Ñ™Ð¸ Ð¿Ð¾Ñ€ÑƒÐºÑƒ ÑÐ° ÑƒÐ¿ÑƒÑ‚ÑÑ‚Ð²Ð¸Ð¼Ð° Ð¾ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸ Ð½Ð°Ð»Ð¾Ð³Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð¾
     reset_password: Ð ÐµÑÐµÑ‚ÑƒÑ˜ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ
     security: Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÑ‚
     set_new_password: ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñƒ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ
   authorize_follow:
+    already_following: Ð’ÐµÑ› Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¾Ð²Ð°Ñ˜ Ð½Ð°Ð»Ð¾Ð³
     error: ÐÐ°Ð¶Ð°Ð»Ð¾ÑÑ‚, Ð´ÐµÑÐ¸Ð»Ð° ÑÐµ Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ‚Ñ€Ð°Ð¶ÐµÑšÑƒ ÑƒÐ´Ð°Ñ™ÐµÐ½Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð°
     follow: Ð—Ð°Ð¿Ñ€Ð°Ñ‚Ð¸
     follow_request: 'ÐŸÐ¾ÑÐ»Ð°Ð»Ð¸ ÑÑ‚Ðµ Ð·Ð°Ñ…Ñ‚ÐµÐ² Ð·Ð° Ð¿Ñ€Ð°Ñ›ÐµÑšÐµÐ½ Ð·Ð°:'
@@ -389,24 +562,59 @@ sr:
     success_msg: Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ Ñ˜Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½
     warning_html: Ð“Ð°Ñ€Ð°Ð½Ñ‚Ð¾Ð²Ð°Ð½Ð¾ Ñ˜Ðµ ÑÐ°Ð¼Ð¾ Ð±Ñ€Ð¸ÑÐ°ÑšÐµ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜Ð° ÑÐ° Ð¾Ð²Ðµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ. Ð¡Ð°Ð´Ñ€Ð¶Ð°Ñ˜ ÐºÐ¾Ñ˜Ð¸ Ñ˜Ðµ Ð´ÐµÑ™ÐµÐ½ Ð´Ð°Ñ™Ðµ Ñ›Ðµ Ð²ÐµÑ€Ð¾Ð²Ð°Ñ‚Ð½Ð¾ Ð´Ð° Ð¾ÑÑ‚Ð°Ð²Ð¸ Ð½ÐµÐºÐµ Ñ‚Ñ€Ð°Ð³Ð¾Ð²Ðµ. ÐÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸ Ð¸ ÑƒÐ³Ð°ÑˆÐµÐ½Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ð¸, ÐºÐ°Ð¾ Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ð¸ ÐºÐ¾Ñ˜Ð¸ ÑÑƒ Ð¾Ð´Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð¸ Ð¾Ð´ Ð¿Ñ€Ð¸Ð¼Ð°ÑšÐ° ÑÑ‚Ð°Ñ‚ÑƒÑÐ° Ð¾Ð´ Ð’Ð°Ñ, Ð½ÐµÑ›Ðµ Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ‚Ð¸ ÑÐ²Ð¾Ñ˜Ðµ Ð±Ð°Ð·Ðµ.
     warning_title: Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾ÑÑ‚ Ñ€Ð°ÑÐµÑ˜Ð°Ð½Ð¾Ð³ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜Ð°
+  directories:
+    directory: ÐŸÑ€Ð¾Ñ„Ð¸Ð» Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ
+    enabled: Ð’Ð¸ ÑÑ‚Ðµ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð²Ð¸Ð´Ñ™Ð¸Ð²Ð¸ Ñƒ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð¸.
+    explanation: ÐžÑ‚ÐºÑ€Ð¸Ñ˜Ñ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐµ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñƒ ÑšÐ¸Ñ…Ð¾Ð²Ð¸Ñ… Ð¸Ð½Ñ‚ÐµÑ€ÐµÑÐ°
+    explore_mastodon: Ð˜ÑÑ‚Ñ€Ð°Ð¶Ð¸ %{title}
+    people:
+      few: "%{count} Ñ™ÑƒÐ´Ðµ"
+      many: "%{count} Ñ™ÑƒÐ´Ðµ"
+      one: "%{count} Ð¾ÑÐ¾Ð±Ñƒ"
+      other: "%{count} Ñ™ÑƒÐ´Ðµ"
   errors:
     '403': ÐÐµÐ¼Ð°Ñ‚Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð° Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ‚Ðµ Ð¾Ð²Ñƒ ÑÑ‚Ñ€Ð°Ð½Ñƒ.
     '404': Ð¡Ñ‚Ñ€Ð°Ð½Ð° ÐºÐ¾Ñ˜Ñƒ ÑÑ‚Ðµ Ñ‚Ñ€Ð°Ð¶Ð¸Ð»Ð¸ Ð½Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸.
     '410': Ð¡Ñ‚Ñ€Ð°Ð½Ð° ÐºÐ¾Ñ˜Ñƒ ÑÑ‚Ðµ Ñ‚Ñ€Ð°Ð¶Ð¸Ð»Ð¸ Ð²Ð¸ÑˆÐµ Ð½Ðµ Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸.
     '422':
-      content: Security verification failed. Are you blocking cookies?
-      title: Security verification failed
+      content: Ð‘ÐµÐ·Ð±ÐµÐ´Ð¾Ð½Ð¾ÑÐ½Ð° Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð° Ð½Ð¸Ñ˜Ðµ ÑƒÑÐ¿ÐµÐ»Ð°. Ð”Ð° Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð°Ñ‚Ðµ ÐºÐ¾Ð»Ð°Ñ‡Ð¸Ñ›Ðµ?
+      title: Ð‘ÐµÐ·Ð±ÐµÐ´Ð¾Ð½Ð¾ÑÐ½Ð° Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð° Ð½Ð¸Ñ˜Ðµ ÑƒÑÐ¿ÐµÐ»Ð°
     '429': Ð£ÑÐ¿Ð¾Ñ€ÐµÐ´
     '500':
       content: Ð˜Ð·Ð²Ð¸ÑšÐ°Ð²Ð°Ð¼Ð¾ ÑÐµ, Ð½ÐµÑˆÑ‚Ð¾ Ñ˜Ðµ Ð¿Ð¾ÑˆÐ»Ð¾ Ð¿Ð¾ Ð·Ð»Ñƒ ÑÐ° Ð¾Ð²Ðµ ÑÑ‚Ñ€Ð°Ð½Ðµ.
       title: Ð¡Ñ‚Ñ€Ð°Ð½Ð° Ð½Ð¸Ñ˜Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð°
-    noscript_html: Ð”Ð° Ð±Ð¸ÑÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ð»Ð¸ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð²ÐµÐ± Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ñƒ, Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ñ‚Ðµ JavaScript. Ð£ ÑÑƒÐ¿Ñ€Ð¾Ñ‚Ð½Ð¾Ð¼, Ð¿Ñ€Ð¾Ð±Ð°Ñ˜Ñ‚Ðµ Ð½ÐµÐºÑƒ Ð¾Ð´ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð¸Ñ… Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°</a> Ð·Ð° ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð·Ð° Ð’Ð°ÑˆÑƒ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ñƒ.
+    noscript_html: Ð”Ð° Ð±Ð¸ÑÑ‚Ðµ ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ð»Ð¸ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð²ÐµÐ± Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ñƒ, Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ñ‚Ðµ JavaScript. Ð£ ÑÑƒÐ¿Ñ€Ð¾Ñ‚Ð½Ð¾Ð¼, Ð¿Ñ€Ð¾Ð±Ð°Ñ˜Ñ‚Ðµ Ð½ÐµÐºÑƒ Ð¾Ð´ <a href="%{apps_path}">Ð¾Ñ€Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð¸Ñ… Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°</a> Ð·Ð° ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð·Ð° Ð’Ð°ÑˆÑƒ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ñƒ.
   exports:
+    archive_takeout:
+      date: Ð”Ð°Ñ‚ÑƒÐ¼
+      download: ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸Ñ‚Ðµ Ð’Ð°ÑˆÑƒ Ð°Ñ€Ñ…Ð¸Ð²Ñƒ
+      hint_html: ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ñ‚Ñ€Ð°Ð¶Ð¸Ñ‚Ð¸ Ð°Ñ€Ñ…Ð¸Ð²Ñƒ Ð²Ð°ÑˆÐ¸Ñ… <strong>Ñ‚Ñ€ÑƒÐ±Ð° Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ñ™ÐµÐ½Ð¸Ñ… Ð¼ÐµÐ´Ð¸Ñ˜Ð°</strong>. Ð˜Ð·Ð²ÐµÐ·ÐµÐ½Ð¸ Ð¿Ð¾Ð´Ð°Ñ†Ð¸ Ñ›Ðµ Ð±Ð¸Ñ‚Ð¸ Ñƒ ÐÐºÑ‚Ð¸Ð²Ð¸Ñ‚Ð¸ÐŸÐ°Ð± Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñƒ, ÐºÐ¾Ñ˜Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ ÑÐ° Ð±Ð¸Ð»Ð¾ ÐºÐ¾Ñ˜Ð¸Ð¼ ÑƒÑÐ°Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ð¼ ÑÐ¾Ñ„Ñ‚Ð²ÐµÑ€Ð¾Ð¼. ÐÑ€Ñ…Ð¸Ð²Ñƒ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ñ‚Ñ€Ð°Ð¶Ð¸Ñ‚Ð¸ ÑÐ²Ð°ÐºÐ¸Ñ… 7 Ð´Ð°Ð½Ð°.
+      in_progress: Ð¡Ð°ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐµ Ð²Ð°ÑˆÐµ Ð°Ñ€Ñ…Ð¸Ð²Ðµ...
+      request: Ð—Ð°Ñ‚Ñ€Ð°Ð¶Ð¸Ñ‚Ðµ Ð’Ð°ÑˆÑƒ Ð°Ñ€Ñ…Ð¸Ð²Ñƒ
+      size: Ð’ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð°
     blocks: Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð°Ð»Ð¸ ÑÑ‚Ðµ
     csv: CSV
+    domain_blocks: Ð‘Ð»Ð¾ÐºÐ¾Ð²Ð¸ Ð´Ð¾Ð¼ÐµÐ½Ð°
     follows: ÐŸÑ€Ð°Ñ‚Ð¸Ñ‚Ðµ
+    lists: Ð›Ð¸ÑÑ‚Ðµ
     mutes: Ð£Ñ›ÑƒÑ‚ÐºÐ°Ð»Ð¸ ÑÑ‚Ðµ
     storage: ÐœÑƒÐ»Ñ‚Ð¸Ð¼ÐµÐ´Ð¸Ñ˜Ð°Ð»Ð½Ð¾ ÑÐºÐ»Ð°Ð´Ð¸ÑˆÑ‚Ðµ
+  filters:
+    contexts:
+      home: Ð’Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð° Ð¿Ð¾Ñ‡ÐµÑ‚Ð½Ðµ
+      notifications: ÐžÐ±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°
+      public: ÐˆÐ°Ð²Ð½Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ° Ð»Ð¸Ð½Ð¸Ñ˜Ð°
+      thread: Ð Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ð¸
+    edit:
+      title: Ð˜Ð·Ð¼ÐµÐ½Ð¸ Ñ„Ð¸Ð»Ñ‚ÐµÑ€
+    errors:
+      invalid_context: ÐÐ¸Ñ˜ÐµÐ´Ð°Ð½ Ð¸Ð»Ð¸ Ð½ÐµÐ²Ð°Ð¶ÐµÑ›Ð¸ ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚ Ð¸ÑÐ¿Ð¾Ñ€ÑƒÑ‡ÐµÐ½
+      invalid_irreversible: ÐÐµÐ¿Ð¾Ð²Ñ€Ð°Ñ‚Ð½Ð¾ Ñ„Ð¸Ð»Ñ‚Ñ€Ð¸Ñ€Ð°ÑšÐµ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¾Ð½Ð¸ÑˆÐµ ÑÐ°Ð¼Ð¾ ÑÐ° Ð¿Ð¾Ñ‡ÐµÑ‚Ð½Ð¾Ð¼ Ð¸Ð»Ð¸ ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚Ð¾Ð¼ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°
+    index:
+      delete: Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸
+      title: Ð¤Ð¸Ð»Ñ‚ÐµÑ€Ð¸
+    new:
+      title: Ð”Ð¾Ð´Ð°Ñ˜ Ð½Ð¾Ð²Ð¸ Ñ„Ð¸Ð»Ñ‚ÐµÑ€
   followers:
     domain: Ð”Ð¾Ð¼ÐµÐ½
     explanation_html: ÐÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾ÑÐ¸Ð³ÑƒÑ€Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚ Ð’Ð°ÑˆÐ¸Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÐ°, Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð±Ð¸Ñ‚Ð¸ ÑÐ²ÐµÑÐ½Ð¸ ÐºÐ¾ Ð’Ð°Ñ Ð¿Ñ€Ð°Ñ‚Ð¸. <strong>Ð’Ð°ÑˆÐ¸ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸ ÑÐµ ÑˆÐ°Ñ™Ñƒ Ð½Ð° ÑÐ²Ðµ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ Ð½Ð° ÐºÐ¾Ñ˜Ð¸Ð¼Ð° Ð¸Ð¼Ð°Ñ‚Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ðµ</strong>. ÐœÐ¾Ð¶Ð´Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¸Ñ… Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ‚Ðµ Ð¸ Ð´Ð° ÑƒÐºÐ»Ð¾Ð½Ð¸Ñ‚Ðµ Ð¾Ð½Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ðµ Ð½Ð° Ð¾Ð½Ð¸Ð¼ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð°Ð¼Ð° Ð·Ð° ÐºÐ¾Ñ˜Ðµ Ð½ÐµÐ¼Ð°Ñ‚Ðµ Ð¿Ð¾Ð²ÐµÑ€ÐµÑšÐ° Ð´Ð° Ñ›Ðµ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð°Ñ‚Ð¸ Ð’Ð°ÑˆÑƒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚.
@@ -421,9 +629,13 @@ sr:
     true_privacy_html: Ð—Ð°Ð¿Ð°Ð¼Ñ‚Ð¸Ñ‚Ðµ Ð´Ð° ÑÐµ <strong>Ð¿Ñ€Ð°Ð²Ð° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾ÑÑ‚Ð¸Ñ›Ð¸ ÑÐ°Ð¼Ð¾ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐµÐ¼ ÑÐ° ÐºÑ€Ð°Ñ˜Ð° Ð½Ð° ÐºÑ€Ð°Ñ˜</strong>.
     unlocked_warning_html: Ð¡Ð²Ð°ÐºÐ¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð’Ð°Ñ Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸ Ð´Ð° Ð¾Ð´Ð¼Ð°Ñ… Ð²Ð¸Ð´Ð¸ Ð’Ð°ÑˆÐµ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ðµ ÑÑ‚Ð°Ñ‚ÑƒÑÐµ. %{lock_link} Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´Ð°Ð»Ð¸ Ð¸ Ð¾Ð´Ð±Ð°Ñ†Ð¸Ð»Ð¸ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ðµ.
     unlocked_warning_title: Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ Ð½Ð¸Ñ˜Ðµ Ð·Ð°ÐºÑ™ÑƒÑ‡Ð°Ð½
+  footer:
+    developers: ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼ÐµÑ€Ð¸
+    more: Ð’Ð¸ÑˆÐµâ€¦
+    resources: Ð ÐµÑÑƒÑ€ÑÐ¸
   generic:
     changes_saved_msg: Ð˜Ð·Ð¼ÐµÐ½Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑÐ°Ñ‡ÑƒÐ²Ð°Ð½Ðµ!
-    powered_by: Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð¸Ð¾ %{link}
+    copy: ÐšÐ¾Ð¿Ð¸Ñ€Ð°Ñ˜
     save_changes: Ð¡Ð½Ð¸Ð¼Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ
     validation_errors:
       few: ÐÐµÑˆÑ‚Ð¾ Ð½Ð¸Ñ˜Ðµ Ð±Ð°Ñˆ ÐºÐ°ÐºÐ¾ Ñ‚Ñ€ÐµÐ±Ð°! ÐŸÑ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ %{count} Ð³Ñ€ÐµÑˆÐºÐµ Ð¸ÑÐ¿Ð¾Ð´
@@ -447,9 +659,11 @@ sr:
       '21600': 6 ÑÐ°Ñ‚Ð¸
       '3600': 1 ÑÐ°Ð´
       '43200': 12 ÑÐ°Ñ‚Ð¸
+      '604800': 1 Ð½ÐµÐ´ÐµÑ™Ð°
       '86400': 1 Ð´Ð°Ð½
     expires_in_prompt: ÐÐ¸ÐºÐ°Ð´
     generate: Ð“ÐµÐ½ÐµÑ€Ð¸ÑˆÐ¸
+    invited_by: 'ÐŸÐ¾Ð·Ð²Ð°Ð¾ Ð’Ð°Ñ Ñ˜Ðµ:'
     max_uses:
       few: "%{count} ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°"
       many: "%{count} ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°"
@@ -460,9 +674,7 @@ sr:
     table:
       expires_at: Ð˜ÑÑ‚Ð¸Ñ‡Ðµ
       uses: ÐšÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ°
-    title: ÐŸÐ¾Ð·Ð¾Ð²Ð¸ Ñ™ÑƒÐ´Ðµ
-  landing_strip_html: "<strong>%{name}</strong> Ñ˜Ðµ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº Ð½Ð° %{link_to_root_path}. ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð³Ð° Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð¸Ð»Ð¸ ÐºÐ¾Ð¼ÑƒÐ½Ð¸Ñ†Ð¸Ñ€Ð°Ñ‚Ð¸ ÑÐ° ÑšÐ¸Ð¼ Ð°ÐºÐ¾ Ð¸Ð¼Ñ‚Ðµ Ð½Ð°Ð»Ð¾Ð³ Ð±Ð¸Ð»Ð¾ Ð³Ð´Ðµ Ñƒ Ñ„ÐµÐ´Ð¸Ð²ÐµÑ€ÑÑƒ."
-  landing_strip_signup_html: ÐÐºÐ¾ Ð½ÐµÐ¼Ð°Ñ‚Ðµ, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐµ <a href="%{sign_up_path}">Ñ€ÐµÐ³Ð¸ÑÑ‚Ñ€Ð¾Ð²Ð°Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ</a>.
+    title: ÐŸÐ¾Ð·Ð¾Ð²Ð¸Ñ‚Ðµ Ñ™ÑƒÐ´Ðµ
   lists:
     errors:
       limit: Ð”Ð¾ÑÑ‚Ð¸Ð³Ð»Ð¸ ÑÑ‚Ðµ Ð»Ð¸Ð¼Ð¸Ñ‚ Ð±Ñ€Ð¾Ñ˜Ð° Ð»Ð¸ÑÑ‚Ð¸
@@ -479,7 +691,8 @@ sr:
     title: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ†Ð¸Ñ˜Ð°
   notification_mailer:
     digest:
-      body: 'Ð•Ð²Ð¾ ÐºÑ€Ð°Ñ‚Ð°Ðº Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ ÑˆÑ‚Ð° ÑÑ‚Ðµ Ð¿Ñ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð»Ð¸ Ð½Ð° Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ð¸ %{instance} Ð¾Ð´ Ð¿Ð¾ÑÐ»ÐµÐ´ÑšÐµ Ð¿Ð¾ÑÐµÑ‚Ðµ Ð¾Ð´ %{since}:'
+      action: ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ ÑÐ²Ð° Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ°
+      body: Ð•Ð²Ð¾ ÐºÑ€Ð°Ñ‚Ð°Ðº Ð¿Ñ€ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ€ÑƒÐºÐ° ÐºÐ¾Ñ˜Ðµ ÑÑ‚Ðµ Ð¿Ñ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð»Ð¸ Ð¾Ð´ Ð¿Ð¾ÑÐ»ÐµÐ´ÑšÐµ Ð¿Ð¾ÑÐµÑ‚Ðµ Ð¾Ð´ %{since}
       mention: "%{name} Ð’Ð°Ñ Ñ˜Ðµ Ð¿Ð¾Ð¼ÐµÐ½ÑƒÐ¾ Ñƒ:"
       new_followers_summary:
         few: Ð”Ð¾Ð±Ð¸Ð»Ð¸ ÑÑ‚Ðµ %{count} Ð½Ð¾Ð²Ð° Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð°! Ð¡Ñ˜Ð°Ñ˜Ð½Ð¾!
@@ -491,21 +704,29 @@ sr:
         many: "%{count} Ð½Ð¾Ð²Ð¸Ñ… Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ Ð¿Ð¾ÑÐ»ÐµÐ´ÑšÐµ Ð¿Ð¾ÑÐµÑ‚Ðµ \U0001F418"
         one: "1 Ð½Ð¾Ð²Ð¾ Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐµ Ð¾Ð´ Ð¿Ð¾ÑÐ»ÐµÐ´ÑšÐµ Ð¿Ð¾ÑÐµÑ‚Ðµ \U0001F418"
         other: "%{count} Ð½Ð¾Ð²Ð¸Ñ… Ð¾Ð±Ð°Ð²ÐµÑˆÑ‚ÐµÑšÐ° Ð¾Ð´ Ð¿Ð¾ÑÐ»ÐµÐ´ÑšÐµ Ð¿Ð¾ÑÐµÑ‚Ðµ \U0001F418"
+      title: Ð”Ð¾Ðº Ð½Ð¸ÑÑ‚Ðµ Ð±Ð¸Ð»Ð¸ Ñ‚Ñƒ...
     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} Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾(Ð»Ð°) Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ"
+      body: "%{name} Ð’Ð°Ð¼ Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾/Ð»Ð° ÑÑ‚Ð°Ñ‚ÑƒÑ:"
+      subject: "%{name} Ñ˜Ðµ Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð¾/Ð»Ð° Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ"
+      title: ÐÐ¾Ð²Ð° Ð¿Ð¾Ð´Ñ€ÑˆÐºÐ°
   number:
     human:
       decimal_units:
@@ -518,51 +739,72 @@ sr:
           trillion: T
           unit: ''
   pagination:
-    next: Ð¡Ð»ÐµÐ´ÐµÑ›Ð¸
+    newer: ÐÐ¾Ð²Ð¸Ñ˜Ðµ
+    next: Ð¡Ð»ÐµÐ´ÐµÑ›Ðµ
+    older: Ð¡Ñ‚Ð°Ñ€Ð¸Ñ˜Ðµ
     prev: ÐŸÑ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¸
     truncate: "&hellip;"
   preferences:
     languages: ÐˆÐµÐ·Ð¸Ñ†Ð¸
-    other: ÐžÑÑ‚Ð°Ð»Ð¸
+    other: ÐžÑÑ‚Ð°Ð»Ð¾
     publishing: ÐžÐ±Ñ˜Ð°Ð²Ñ™Ð¸Ð²Ð°ÑšÐµ
     web: Ð’ÐµÐ±
   remote_follow:
     acct: Ð£Ð½ÐµÑÐ¸Ñ‚Ðµ Ð’Ð°Ñˆ ÐºÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº@Ð´Ð¾Ð¼ÐµÐ½ ÑÐ° ÐºÐ¾Ð³Ð° Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ
     missing_resource: ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð½Ð°Ñ’ÐµÐ¼ Ð·Ð°Ñ…Ñ‚ÐµÐ²Ð°Ð½Ñƒ Ð°Ð´Ñ€ÐµÑÑƒ Ð¿Ñ€ÐµÑƒÑÐ¼ÐµÑ€Ð°Ð²Ð°ÑšÐ° Ð·Ð° Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³
-    proceed: ÐÐ°ÑÑ‚Ð°Ð²Ð¸Ñ‚Ðµ Ð´Ð° Ð·Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ
-    prompt: 'Ð—Ð°Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ñ›Ðµ:'
+    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: 'Ð–ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ€Ð¸Ñ‚Ðµ Ð½Ð° Ð¾Ð²Ñƒ Ñ‚Ñ€ÑƒÐ±Ñƒ:'
+  remote_unfollow:
+    error: Ð“Ñ€ÐµÑˆÐºÐ°
+    title: ÐÐ°ÑÐ»Ð¾Ð²
+    unfollowed: ÐžÑ‚Ð¿Ñ€Ð°Ñ›ÐµÐ½Ð¸
+  scheduled_statuses:
+    over_daily_limit: ÐŸÑ€ÐµÐºÐ¾Ñ€Ð°Ñ‡Ð¸Ð»Ð¸ ÑÑ‚Ðµ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ñƒ Ð¾Ð´ %{limit} Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð°Ð½Ð¸Ñ… Ñ‚Ñ€ÑƒÐ±Ð° Ð·Ð° Ñ‚Ð°Ñ˜ Ð´Ð°Ð½
+    over_total_limit: ÐŸÑ€ÐµÐºÐ¾Ñ€Ð°Ñ‡Ð¸Ð»Ð¸ ÑÑ‚Ðµ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ñƒ Ð¾Ð´ %{limit} Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð°Ð½Ð¸Ñ… Ñ‚Ñ€ÑƒÐ±Ð°
+    too_soon: ÐŸÐ»Ð°Ð½Ð¸Ñ€Ð°Ð½Ð¸ Ð´Ð°Ñ‚ÑƒÐ¼ Ð¼Ð¾Ñ€Ð° Ð±Ð¸Ñ‚Ð¸ Ñƒ Ð±ÑƒÐ´ÑƒÑ›Ð½Ð¾ÑÑ‚Ð¸
   sessions:
     activity: ÐŸÐ¾ÑÐ»ÐµÐ´ÑšÐ° Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚
     browser: Ð’ÐµÐ± Ñ‡Ð¸Ñ‚Ð°Ñ‡
     browsers:
-      alipay: Alipay
-      blackberry: Ð‘Ð»ÐµÐºÐ±ÐµÑ€Ð¸
+      alipay: ÐÐ»Ð¸Ð¿ÐµÑ˜
+      blackberry: Ð‘Ð»ÐµÐºÐ±ÐµÑ€Ð¸Ñ˜Ð°
       chrome: Ð¥Ñ€Ð¾Ð¼
-      edge: Microsoft Edge
-      firefox: Firefox
+      edge: ÐœÐ°Ñ˜ÐºÑ€Ð¾ÑÐ¾Ñ„Ñ‚ Ð•ÑŸ
+      electron: Ð•Ð»ÐµÐºÑ‚Ñ€Ð¾Ð½
+      firefox: Ð¤Ð°Ñ˜ÐµÑ€Ñ„Ð¾ÐºÑ
       generic: ÐÐµÐ¿Ð¾Ð·Ð½Ð°Ñ‚Ð¸ Ð²ÐµÐ± Ñ‡Ð¸Ñ‚Ð°Ñ‡
-      ie: Internet Explorer
-      micro_messenger: MicroMessenger
-      nokia: Nokia S40 Ovi Browser
+      ie: Ð˜Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚ Ð•ÐºÑÐ¿Ð»Ð¾Ñ€ÐµÑ€
+      micro_messenger: ÐœÐ°Ñ˜ÐºÑ€Ð¾ÐœÐµÑÐµÐ½ÑŸÐµÑ€
+      nokia: ÐÐ¾ÐºÐ¸Ñ˜Ð° Ð¡40 ÐžÐ²Ð¸ ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‡
       opera: ÐžÐ¿ÐµÑ€Ð°
-      phantom_js: PhantomJS
-      qq: QQ Browser
+      otter: ÐžÑ‚ÐµÑ€
+      phantom_js: Ð¤Ð°Ð½Ñ‚Ð¾Ð¼ÐÐµÑ˜Ð•Ñ
+      qq: ÐšÑ˜ÑƒÐšÑ˜Ñƒ ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‡
       safari: Ð¡Ð°Ñ„Ð°Ñ€Ð¸
-      uc_browser: UCBrowser
-      weibo: Weibo
+      uc_browser: Ð£Ð¦ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‡
+      weibo: Ð’ÐµÐ¸Ð±Ð¾
     current_session: Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð° ÑÐµÑÐ¸Ñ˜Ð°
     description: "%{browser} ÑÐ° %{platform}"
-    explanation: ÐžÐ²Ð¾ ÑÑƒ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð¸ Ð²ÐµÐ± Ñ‡Ð¸Ñ‚Ð°Ñ‡Ð¸ Ð½Ð° Ð’Ð°Ñˆ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚ Ð½Ð°Ð»Ð¾Ð³.
+    explanation: ÐžÐ²Ð¾ ÑÑƒ Ð²ÐµÐ± Ð¿Ñ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸Ð²Ð°Ñ‡Ð¸ ÐºÐ¾Ñ˜Ð¸ ÑÑƒ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð¸ Ð½Ð° Ð’Ð°Ñˆ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ð½Ð°Ð»Ð¾Ð³.
     ip: IP
     platforms:
-      adobe_air: Adobe Air-Ð°
+      adobe_air: ÐÐ´Ð¾Ð± Ð•Ñ€-Ð°
       android: ÐÐ½Ð´Ñ€Ð¾Ð¸Ð´Ð°
       blackberry: Ð‘Ð»ÐµÐºÐ±ÐµÑ€Ð¸Ñ˜Ð°
       chrome_os: Ð¥Ñ€Ð¾Ð¼ ÐžÐ¡-Ð°
       firefox_os: Ð¤Ð°Ñ˜ÐµÑ€Ñ„Ð¾ÐºÑ ÐžÐ¡-Ð°
-      ios: iOS
+      ios: Ð¸ÐžÐ¡-Ð°
       linux: Ð›Ð¸Ð½ÑƒÐºÑÐ°
-      mac: Mac-Ð°
+      mac: ÐœÐµÐºÐ°
       other: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ‚Ðµ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ðµ
       windows: Ð’Ð¸Ð½Ð´Ð¾ÑƒÐ·Ð°
       windows_mobile: Ð’Ð¸Ð½Ð´Ð¾ÑƒÐ· Ð¼Ð¾Ð±Ð¸Ð»Ð½Ð¾Ð³
@@ -572,7 +814,7 @@ sr:
     title: Ð¡ÐµÑÐ¸Ñ˜Ðµ
   settings:
     authorized_apps: ÐÑƒÑ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ðµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ
-    back: ÐÐ°Ð·Ð°Ð´ Ð½Ð° ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚Ð°
+    back: ÐÐ°Ð·Ð°Ð´ Ð½Ð° ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½
     delete: Ð‘Ñ€Ð¸ÑÐ°ÑšÐµ Ð½Ð°Ð»Ð¾Ð³Ð°
     development: Ð Ð°Ð·Ð²Ð¾Ñ˜
     edit_profile: Ð˜Ð·Ð¼ÐµÐ½Ð° Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ð°
@@ -586,51 +828,118 @@ sr:
     two_factor_authentication: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°
     your_apps: Ð’Ð°ÑˆÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ
   statuses:
+    attached:
+      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}'
+    disallowed_hashtags:
+      few: 'ÑÐ°Ð´Ñ€Ð¶Ð¸ Ð·Ð°Ð±Ñ€Ð°ÑšÐµÐ½Ðµ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð²Ðµ: %{tags}'
+      many: 'ÑÐ°Ð´Ñ€Ð¶Ð¸ Ð·Ð°Ð±Ñ€Ð°ÑšÐµÐ½Ðµ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð²Ðµ: %{tags}'
+      one: 'ÑÐ°Ð´Ñ€Ð¶Ð¸ Ð·Ð°Ð±Ñ€Ð°ÑšÐµÐ½Ð¸ Ñ…ÐµÑˆÑ‚ÐµÐ³: %{tags}'
+      other: 'ÑÐ°Ð´Ñ€Ð¶Ð¸ Ð·Ð°Ð±Ñ€Ð°ÑšÐµÐ½Ðµ Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð²Ðµ: %{tags}'
+    language_detection: ÐÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºo Ð¾Ñ‚ÐºÑ€Ð¸Ð²Ð°ÑšÐµ Ñ˜ÐµÐ·Ð¸ÐºÐ°
     open_in_web: ÐžÑ‚Ð²Ð¾Ñ€Ð¸ Ñƒ Ð²ÐµÐ±Ñƒ
     over_character_limit: Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÑšÐµ Ð¾Ð´ %{max} ÐºÐ°Ñ€Ð°ÐºÑ‚ÐµÑ€Ð° Ð¿Ñ€ÐµÐºÐ¾Ñ€Ð°Ñ‡ÐµÐ½Ð¾
     pin_errors:
-      limit: Ð’ÐµÑ› Ð¸Ð¼Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÐµÐ½ Ð½Ð°Ñ˜Ð²ÐµÑ›Ð¸ Ð±Ñ€Ð¾Ñ˜ Ñ‚ÑƒÑ‚Ð¾Ð²Ð°
-      ownership: Ð¢ÑƒÑ’Ð¸ Ñ‚ÑƒÑ‚Ð¾Ð²Ð¸ Ð½Ðµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ðµ
-      private: Ð¢ÑƒÑ‚Ð¾Ð²Ð¸ ÐºÐ¾Ñ˜Ð¸ Ð½Ð¸ÑÑƒ Ñ˜Ð°Ð²Ð½Ð¸ Ð½Ðµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ðµ
+      limit: Ð’ÐµÑ› Ð¸Ð¼Ð°Ñ‚Ðµ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÐµÐ½ Ð½Ð°Ñ˜Ð²ÐµÑ›Ð¸ Ð±Ñ€Ð¾Ñ˜ Ñ‚Ñ€ÑƒÐ±Ð°
+      ownership: Ð¢ÑƒÑ’Ðµ Ñ‚Ñ€ÑƒÐ±Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ðµ
+      private: Ð¢Ñ€ÑƒÐ±Ðµ ÐºÐ¾Ñ˜Ðµ Ð½Ð¸ÑÑƒ Ñ˜Ð°Ð²Ð½Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ñƒ Ð±Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ðµ
       reblog: ÐŸÐ¾Ð´Ñ€ÑˆÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡Ð¸
     show_more: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ Ñ˜Ð¾Ñˆ
+    sign_in_to_participate: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ðµ ÑÐµ Ð´Ð° ÑƒÑ‡ÐµÑÑ‚Ð²ÑƒÑ˜ÐµÑ‚Ðµ Ñƒ Ñ€Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ€Ñƒ
     title: '%{name}: "%{quote}"'
     visibilities:
       private: Ð¡Ð°Ð¼Ð¾ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸
-      private_long: Ð¡Ð°Ð¼Ð¾ Ð¿Ñ€Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸Ð¼Ð°
+      private_long: ÐŸÑ€Ð¸ÐºÐ°Ð¶Ð¸ ÑÐ°Ð¼Ð¾ Ð¿Ñ€Ð°Ñ‚Ð¸Ð¾Ñ†Ð¸Ð¼Ð°
       public: ÐˆÐ°Ð²Ð½Ð¾
       public_long: Ð¡Ð²Ð°ÐºÐ¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð²Ð¸Ð´Ð¸
       unlisted: ÐÐµÐ¸Ð·Ð»Ð¸ÑÑ‚Ð°Ð½Ð¾
-      unlisted_long: Ð¡Ð²Ð°ÐºÐ¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð²Ð¸Ð´Ð¸, Ð°Ð»Ð¸ Ð½Ð¸Ñ˜Ðµ Ð¸Ð·Ð»Ð¸ÑÑ‚Ð°Ð½Ð¾ Ð½Ð° Ñ˜Ð°Ð²Ð½Ð¸Ð¼ Ð»Ð°Ñ˜Ð½Ð°Ð¼Ð°
+      unlisted_long: Ð¡Ð²Ð°ÐºÐ¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð²Ð¸Ð´Ð¸, Ð°Ð»Ð¸ Ð½Ð¸Ñ˜Ðµ Ð¸Ð·Ð»Ð¸ÑÑ‚Ð°Ð½Ð¾ Ð½Ð° Ñ˜Ð°Ð²Ð½Ð¸Ð¼ Ð²Ñ€ÐµÐ¼ÐµÐ½ÑÐºÐ¸Ð¼ Ð»Ð¸Ð½Ð¸Ñ˜Ð°Ð¼Ð°
   stream_entries:
-    click_to_show: ÐšÐ»Ð¸ÐºÐ½Ð¸ Ð´Ð° Ð²Ð¸Ð´Ð¸Ñˆ
-    pinned: ÐŸÑ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ð¸ Ñ‚ÑƒÑ‚
+    pinned: ÐŸÑ€Ð¸ÐºÐ°Ñ‡ÐµÐ½Ð° Ñ‚Ñ€ÑƒÐ±Ð°
     reblogged: Ð¿Ð¾Ð´Ñ€Ð¶Ð°Ð½Ð¾
     sensitive_content: ÐžÑÐµÑ‚Ñ™Ð¸Ð² ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜
   terms:
     title: Ð£ÑÐ»Ð¾Ð²Ð¸ ÐºÐ¾Ñ€Ð¸ÑˆÑ›ÐµÑšÐ° Ð¸ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ð¸ Ð¸Ð½ÑÑ‚Ð°Ð½Ñ†Ðµ %{instance}
   themes:
-    default: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½Ñ‚
+    contrast: Ð’ÐµÐ»Ð¸ÐºÐ¸ ÐºÐ¾Ð½Ñ‚Ñ€Ð°ÑÑ‚
+    default: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½
+    mastodon-light: ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ (ÑÐ²ÐµÑ‚Ð»Ð¾)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
+      month: "%b %Y"
   two_factor_authentication:
-    code_hint: Ð£Ð½ÐµÑÐ¸Ñ‚Ðµ ÐºÐ¾Ð´ ÑÐ° Ð’Ð°ÑˆÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ Ð·Ð° Ð¿Ñ€Ð¾Ð²ÐµÑ€Ñƒ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð° Ð´Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ
+    code_hint: Ð”Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ð¸Ð»Ð¸, ÑƒÐ½ÐµÑÐ¸Ñ‚Ðµ ÐºÐ¾Ð´ Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð½ Ð¾Ð´ ÑÑ‚Ñ€Ð°Ð½Ðµ Ð²Ð°ÑˆÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ Ð·Ð° Ð¿Ð¾Ñ‚Ð²Ñ€Ð´Ñƒ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°
     description_html: ÐÐºÐ¾ ÑƒÐºÑ™ÑƒÑ‡Ð¸Ñ‚Ðµ <strong>Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÑƒ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ñƒ</strong>, Ð¼Ð¾Ñ€Ð°Ñ›ÐµÑ‚Ðµ Ð´Ð° Ð¸Ð¼Ð°Ñ‚Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½ ÑÐ° ÑÐ¾Ð±Ð¾Ð¼ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð¼Ð¾Ð³Ð»Ð¸ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ñ‚Ðµ. Ð¢ÐµÐ»ÐµÑ„Ð¾Ð½ Ñ›Ðµ Ð¾Ð½Ð´Ð° Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ñ‚Ð¾ÐºÐµÐ½Ðµ Ð·Ð° Ð’Ð°ÑˆÑƒ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ñƒ.
     disable: Ð˜ÑÐºÑ™ÑƒÑ‡Ð¸
-    enable: Ð£ÐºÑ™ÑƒÑ‡Ð¸
+    enable: ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸
     enabled: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ ÑƒÐºÑ™ÑƒÑ‡ÐµÐ½Ð°
     enabled_success: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ° Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ñ˜Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ ÑƒÐºÑ™ÑƒÑ‡ÐµÐ½Ð°
     generate_recovery_codes: Ð“ÐµÐ½ÐµÑ€Ð¸ÑˆÐ¸ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº
     instructions_html: "<strong>Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ñ˜Ñ‚Ðµ Ð¾Ð²Ð°Ñ˜ QR ÐºÐ¾Ð´ Ñƒ Google Authenticator Ð¸Ð»Ð¸ Ð½ÐµÐºÐ¾Ñ˜ ÑÐ»Ð¸Ñ‡Ð½Ð¾Ñ˜ TOTP Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð¸ Ð½Ð° Ð’Ð°ÑˆÐµÐ¼ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ</strong>. ÐžÐ´ ÑÐ°Ð´Ð°, Ñ‚Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ñ›Ðµ Ð’Ð°Ð¼ Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ñ‚Ð¾ÐºÐµÐ½Ðµ ÐºÐ¾Ñ˜Ðµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ ÑƒÐ½ÐµÑ‚Ð¸ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ ÑÐµ Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð¸Ð»Ð¸."
-    lost_recovery_codes: ÐšÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð’Ð°Ð¼ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð°Ð²Ð°Ñ˜Ñƒ Ð´Ð° Ð¿Ð¾Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð°Ð»Ð¾Ð³Ñƒ Ð°ÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½. ÐÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸Ñ… Ñ€ÐµÐ³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ. ÐžÐ´ Ñ‚Ð¾Ð³ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚ÐºÐ°, ÑÑ‚Ð°Ñ€Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð²Ð¸ÑˆÐµ Ð½Ðµ Ð²Ð°Ð¶Ðµ.
+    lost_recovery_codes: ÐšÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð’Ð°Ð¼ Ð¾Ð¼Ð¾Ð³ÑƒÑ›Ð°Ð²Ð°Ñ˜Ñƒ Ð´Ð° Ð¿Ð¾Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð°Ð»Ð¾Ð³Ñƒ Ð°ÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½. ÐÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸Ñ… Ñ€Ðµ-Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ñ‚Ð¸ Ð¾Ð²Ð´Ðµ. ÐžÐ´ Ñ‚Ð¾Ð³ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚ÐºÐ°, ÑÑ‚Ð°Ñ€Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð²Ð¸ÑˆÐµ Ð½Ðµ Ð²Ð°Ð¶Ðµ.
     manual_instructions: 'Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð° ÑÐºÐµÐ½Ð¸Ñ€Ð°Ñ‚Ðµ QR ÐºÐ¾Ð´ Ð¸ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð³Ð° ÑƒÐ½ÐµÑÐµÑ‚Ðµ Ñ€ÑƒÑ‡Ð½Ð¾, ÐµÐ²Ð¾ Ñ˜Ðµ Ð¾Ð³Ð¾Ñ™ÐµÐ½Ð° ÑˆÐ¸Ñ„Ñ€Ð°:'
     recovery_codes: ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ Ñ€ÐµÐ·ÐµÑ€Ð²Ñƒ ÐºÐ¾Ð´Ð¾Ð²Ð° Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº
-    recovery_codes_regenerated: ÐšÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ñ€ÐµÐ³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð½Ð¸
+    recovery_codes_regenerated: ÐšÐ¾Ð´Ð¾Ð²Ð¸ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ñ€Ðµ-Ð³ÐµÐ½ÐµÑ€Ð¸ÑÐ°Ð½Ð¸
     recovery_instructions_html: ÐÐºÐ¾ Ð¸ÐºÐ°Ð´Ð° Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¸ÑÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð´Ð°Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð´ Ð´Ð° Ð¿Ð¾Ð²Ñ€Ð°Ñ‚Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð½Ð°Ð»Ð¾Ð³Ñƒ. <strong>Ð”Ñ€Ð¶Ð¸Ñ‚Ðµ ÐºÐ¾Ð´Ð¾Ð²Ðµ Ð·Ð° Ð¾Ð¿Ð¾Ñ€Ð°Ð²Ð°Ðº Ð½Ð° ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾Ð¼</strong>. ÐÐ° Ð¿Ñ€Ð¸Ð¼ÐµÑ€, Ð¾Ð´ÑˆÑ‚Ð°Ð¼Ð¿Ð°Ñ˜Ñ‚Ðµ Ð¸Ñ… Ð¸ Ñ‡ÑƒÐ²Ð°Ñ˜Ñ‚Ðµ Ð¸Ñ… ÑÐ° Ð¾ÑÑ‚Ð°Ð»Ð¸Ð¼ Ð²Ð°Ð¶Ð½Ð¸Ð¼ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð¸Ð¼Ð°.
     setup: ÐÐ°Ð¼ÐµÑˆÑ‚Ð°ÑšÐµ
     wrong_code: Ð£Ð½ÐµÑÐµÐ½Ð¸ ÐºÐ¾Ð´ Ð½Ð¸Ñ˜Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð°Ð½! Ð”Ð° Ð»Ð¸ ÑÑƒ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð° Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ñƒ Ð¸ Ð½Ð° ÑƒÑ€ÐµÑ’Ð°Ñ˜Ñƒ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð°?
+  user_mailer:
+    backup_ready:
+      explanation: Ð¢Ñ€Ð°Ð¶Ð¸Ð»Ð¸ ÑÑ‚Ðµ Ð¿Ð¾Ñ‚Ð¿ÑƒÐ½Ñƒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñƒ ÐºÐ¾Ð¿Ð¸Ñ˜Ñƒ Ð²Ð°ÑˆÐµÐ³ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ñ€Ð°Ñ‡ÑƒÐ½Ð°. Ð¡Ð¿Ñ€ÐµÐ¼Ð½Ð° Ð·Ð° Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ!
+      subject: Ð’Ð°ÑˆÐ° Ð°Ñ€Ñ…Ð¸Ð²Ð° Ñ˜Ðµ ÑÐ¿Ñ€ÐµÐ¼Ð½Ð° Ð·Ð° Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ
+      title: Ð˜Ð·Ð²Ð¾Ð· Ð°Ñ€Ñ…Ð¸Ð²Ðµ
+    warning:
+      explanation:
+        disable: Ð”Ð¾Ðº Ñ˜Ðµ Ð²Ð°Ñˆ Ñ€Ð°Ñ‡ÑƒÐ½ Ð·Ð°Ð¼Ñ€Ð·Ð½ÑƒÑ‚, Ð¿Ð¾Ð´Ð°Ñ†Ð¸ Ð¾ Ð²Ð°ÑˆÐµÐ¼ Ñ€Ð°Ñ‡ÑƒÐ½Ñƒ Ð¾ÑÑ‚Ð°Ñ˜Ñƒ Ð½ÐµÑ‚Ð°ÐºÐ½ÑƒÑ‚Ð¸, Ð°Ð»Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ€ÑˆÐ¸Ñ‚Ð¸ Ð½Ð¸ÐºÐ°ÐºÐ²Ðµ Ñ€Ð°Ð´ÑšÐµ Ð´Ð¾Ðº ÑÐµ Ð½Ðµ Ð¾Ñ‚ÐºÑ™ÑƒÑ‡Ð°.
+        silence: Ð˜Ð°ÐºÐ¾ Ñ˜Ðµ Ð²Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½, ÑÐ°Ð¼Ð¾ Ñ™ÑƒÐ´Ð¸ ÐºÐ¾Ñ˜Ð¸ Ð²Ð°Ñ Ð²ÐµÑ› Ð¿Ñ€Ð°Ñ‚Ðµ Ñ›Ðµ Ð²Ð¸Ð´ÐµÑ‚Ð¸ Ð²Ð°ÑˆÐµ Ñ‚Ñ€ÑƒÐ±Ðµ Ð½Ð° Ð¾Ð²Ð¾Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ñƒ, Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ñ›ÐµÑ‚Ðµ Ð±Ð¸Ñ‚Ð¸ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÐ½Ð¸ Ð¸Ð· Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ‚Ð¸Ñ… Ñ˜Ð°Ð²Ð½Ð¸Ñ… Ð»Ð¸ÑÑ‚Ð°. ÐœÐµÑ’ÑƒÑ‚Ð¸Ð¼, Ð´Ñ€ÑƒÐ³Ð¸ Ð²Ð°Ñ Ð¼Ð¾Ð³Ñƒ Ð¸ Ð´Ð°Ñ™Ðµ Ñ€ÑƒÑ‡Ð½Ð¾ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸.
+        suspend: Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ Ñ˜Ðµ ÑÑƒÑÐ¿ÐµÐ½Ð´Ð¾Ð²Ð°Ð½, Ð° ÑÐ²Ðµ Ð²Ð°ÑˆÐµ Ñ‚Ñ€ÑƒÐ±Ðµ Ð¸ ÑƒÑ‡Ð¸Ñ‚Ð°Ð½Ðµ Ð¼ÐµÐ´Ð¸Ñ˜ÑÐºÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð½ÐµÐ¿Ð¾Ð²Ñ€Ð°Ñ‚Ð½Ð¾ ÑÑƒ ÑƒÐºÐ»Ð¾ÑšÐµÐ½Ð¸ ÑÐ° Ð¾Ð²Ð¾Ð³ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð¸ ÑÐµÑ€Ð²ÐµÑ€Ð° Ð½Ð° ÐºÐ¾Ñ˜Ð¸Ð¼Ð° ÑÑ‚Ðµ Ð¸Ð¼Ð°Ð»Ð¸ ÑÐ»ÐµÐ´Ð±ÐµÐ½Ð¸ÐºÐµ.
+      review_server_policies: ÐŸÑ€ÐµÐ³Ð»ÐµÐ´Ð°Ñ˜ Ð¿Ð¾Ð»Ð¸Ñ‚Ð¸ÐºÑƒ ÑÐµÑ€Ð²ÐµÑ€Ð°
+      subject:
+        disable: Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ %{acct} Ñ˜Ðµ Ð·Ð°Ð¼Ñ€Ð·Ð½ÑƒÑ‚
+        none: Ð£Ð¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ Ð·Ð° %{acct}
+        silence: Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ %{acct} Ñ˜Ðµ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½
+        suspend: Ð’Ð°Ñˆ Ð½Ð°Ð»Ð¾Ð³ %{acct} Ñ˜Ðµ ÑÑƒÑÐ¿ÐµÐ½Ð´Ð¾Ð²Ð°Ð½
+      title:
+        disable: ÐÐ°Ð»Ð¾Ð³ Ð·Ð°Ð¼Ñ€Ð·Ð½ÑƒÑ‚
+        none: Ð£Ð¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ
+        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:
-    invalid_email: ÐÐ´Ñ€ÐµÑÐ° Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ Ð½Ð¸Ñ˜Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð°
+    follow_limit_reached: ÐÐµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð°Ñ‚Ð¸Ñ‚Ð¸ Ð²Ð¸ÑˆÐµ Ð¾Ð´ %{limit} Ñ™ÑƒÐ´Ð¸
+    invalid_email: ÐÐ´Ñ€ÐµÑÐ° Ð•-Ð¿Ð¾ÑˆÑ‚Ðµ Ð½Ð¸Ñ˜Ðµ Ð¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð°
     invalid_otp_token: ÐÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð½Ð¸ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€ÑÐºÐ¸ ÐºÐ¾Ð´
-    signed_in_as: 'ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½ ÐºÐ°Ð¾:'
+    otp_lost_help_html: ÐÐºÐ¾ Ð¸Ð·Ð³ÑƒÐ±Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿ Ð·Ð° Ð¾Ð±Ð°, Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÑ‚ÑƒÐ¿Ð¸Ñ‚Ð¸ Ñƒ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚ ÑÐ° %{email}
+    seamless_external_login: ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½Ð¸ ÑÑ‚Ðµ Ð¿ÑƒÑ‚ÐµÐ¼ ÑÐ¿Ð¾Ñ™Ð°ÑˆÑšÐµ ÑƒÑÐ»ÑƒÐ³Ðµ, Ñ‚Ð°ÐºÐ¾ Ð´Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ° Ð•-Ð¿Ð¾ÑˆÑ‚Ðµ Ð½Ð¸ÑÑƒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¸.
+    signed_in_as: 'ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ñ™ÐµÐ½/Ð° ÐºÐ°Ð¾:'
+  verification:
+    explanation_html: 'ÐœÐ¾Ð¶ÐµÑ‚Ðµ <strong>Ð¸Ð·Ð²Ñ€ÑˆÐ¸Ñ‚Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ñƒ Ð´Ð° ÑÑ‚Ðµ Ð’Ð¸ Ð²Ð»Ð°ÑÐ½Ð¸Ðº Ð²ÐµÐ·Ð° Ñƒ Ð’Ð°ÑˆÐµÐ¼ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ</strong>. Ð”Ð° Ð±Ð¸ Ñ‚Ð¾ Ñ€Ð°Ð´Ð¸Ð»Ð¾, Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸ Ð²ÐµÐ± ÑÐ°Ñ˜Ñ‚ Ð¼Ð¾Ñ€Ð° Ð´Ð° ÑÐ°Ð´Ñ€Ð¶Ð¸ Ð²ÐµÐ·Ñƒ Ð½Ð°Ð·Ð°Ð´ ÐºÐ° Ð’Ð°ÑˆÐµÐ¼ ÐœÐ°ÑÑ‚Ð¾Ð´Ð¾Ð½ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñƒ. Ð’ÐµÐ·Ð° Ð½Ð°Ð·Ð°Ð´ <strong>Ð¼Ð¾Ñ€Ð°</strong> Ð´Ð° Ð¸Ð¼Ð° <code>rel="me"</code> Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚. Ð¢ÐµÐºÑÑ‚ÑƒÐµÐ»Ð½Ð¸ ÑÐ°Ð´Ñ€Ð¶Ð°Ñ˜ Ð²ÐµÐ·Ðµ Ð½Ð¸Ñ˜Ðµ Ð±Ð¸Ñ‚Ð°Ð½. Ð•Ð²Ð¾ Ð¿Ñ€Ð¸Ð¼ÐµÑ€Ð°:'
+    verification: ÐŸÑ€Ð¾Ð²ÐµÑ€Ð°
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 70735fc051181b4292b3fab2a2c4c4444b98e837..3a006ebe5a1126b3e4b0b98ac2fe2ce51003d455 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -9,9 +9,6 @@ sv:
     contact: Kontakt
     contact_missing: Inte instÃ¤lld
     contact_unavailable: N/A
-    description_headline: Vad Ã¤r %{domain}?
-    domain_count_after: andra instanser
-    domain_count_before: Uppkopplad mot
     extended_description_html: |
       <h3>En bra plats fÃ¶r regler</h3>
       <p>Den utÃ¶kade beskrivningen har inte konfigurerats Ã¤nnu.</p>
@@ -46,7 +43,6 @@ sv:
     people_who_follow: Personer som fÃ¶ljer %{name}
     posts: Toots
     posts_with_replies: Toots med svar
-    remote_follow: AvlÃ¤gsen fÃ¶ljare
     reserved_username: AnvÃ¤ndarnamnet Ã¤r reserverat
     roles:
       admin: Admin
@@ -107,10 +103,6 @@ sv:
       most_recent_activity: Senaste aktivitet
       most_recent_ip: Senaste IP
       not_subscribed: Inte prenumererat
-      order:
-        alphabetic: Alfabetiskt
-        most_recent: Senaste
-        title: Ordning
       outbox_url: Utkorg URL
       perform_full_suspension: UtfÃ¶r full avstÃ¤ngning
       profile_url: Profil URL
@@ -138,7 +130,6 @@ sv:
       shared_inbox_url: Delad inkorg URL
       show:
         created_reports: AnmÃ¤lningar som skapats av det hÃ¤r kontot
-        report: anmÃ¤la
         targeted_reports: AnmÃ¤lningar gjorda om detta konto
       silence: Tystnad
       statuses: Status
@@ -222,11 +213,6 @@ sv:
         title: Nytt domÃ¤nblock
       reject_media: Avvisa mediafiler
       reject_media_hint: Raderar lokalt lagrade mediefiler och fÃ¶rhindrar mÃ¶jligheten att ladda ner nÃ¥got i framtiden. Irrelevant fÃ¶r suspensioner
-      severities:
-        noop: Ingen
-        silence: Tysta ner
-        suspend: Suspendera
-      severity: SvÃ¥righet
       show:
         affected_accounts:
           one: Ett konto i databasen drabbades
@@ -236,7 +222,6 @@ sv:
           suspend: Ta bort suspendering frÃ¥n alla befintliga konton pÃ¥ den hÃ¤r domÃ¤nen
         title: Ã…ngra domÃ¤nblockering fÃ¶r %{domain}
         undo: Ã…ngra
-      title: DomÃ¤nblockering
       undo: Ã…ngra
     email_domain_blocks:
       add_new: LÃ¤gg till ny
@@ -249,10 +234,6 @@ sv:
         title: Ny E-postdomÃ¤nblocklistningsinmatning
       title: E-postdomÃ¤nblock
     instances:
-      account_count: KÃ¤nda konton
-      domain_name: DomÃ¤n
-      reset: Ã…terstÃ¤lla
-      search: SÃ¶k
       title: KÃ¤nda instanser
     invites:
       filter:
@@ -275,7 +256,6 @@ sv:
       comment:
         none: Ingen
       created_at: AnmÃ¤ld
-      id: ID
       mark_as_resolved: Markera som lÃ¶st
       mark_as_unresolved: Markera som olÃ¶st
       notes:
@@ -286,20 +266,15 @@ sv:
         placeholder: Beskriv vilka Ã¥tgÃ¤rder som vidtagits eller andra uppdateringar till den hÃ¤r anmÃ¤lan.
       reopen: Ã…teruppta anmÃ¤lan
       report: 'AnmÃ¤l #%{id}'
-      report_contents: InnehÃ¥ll
       reported_account: AnmÃ¤lt konto
       reported_by: AnmÃ¤ld av
       resolved: LÃ¶st
       resolved_msg: AnmÃ¤lan har lÃ¶sts framgÃ¥ngsrikt!
-      silence_account: Tysta ner konto
       status: Status
-      suspend_account: Suspendera konto
-      target: MÃ¥l
       title: AnmÃ¤lningar
       unassign: Otilldela
       unresolved: OlÃ¶sta
       updated_at: Uppdaterad
-      view: Granska
     settings:
       activity_api_enabled:
         desc_html: RÃ¤kning av lokalt postade statusar, aktiva anvÃ¤ndare och nyregistreringar per vecka
@@ -460,7 +435,7 @@ 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
-    noscript_html: FÃ¶r att anvÃ¤nda Mastodon webbapplikationen, vÃ¤nligen aktivera JavaScript. Alternativt kan du prova en av <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">inhemska appar</a> fÃ¶r Mastodon fÃ¶r din plattform.
+    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.
   exports:
     archive_takeout:
       date: Datum
@@ -488,7 +463,6 @@ sv:
     unlocked_warning_title: Ditt konto Ã¤r inte lÃ¥st
   generic:
     changes_saved_msg: Ã„ndringar sparades framgÃ¥ngsrikt!
-    powered_by: drivs av %{link}
     save_changes: Spara Ã¤ndringar
     validation_errors:
       one: NÃ¥got Ã¤r inte riktigt rÃ¤tt Ã¤nnu! Kontrollera felet nedan
@@ -524,8 +498,6 @@ sv:
       expires_at: UtgÃ¥r
       uses: AnvÃ¤ndningar
     title: Bjud in andra
-  landing_strip_html: "<strong>%{name}</strong> Ã¤r en anvÃ¤ndare pÃ¥ %{link_to_root_path}. Du kan fÃ¶lja dem eller interagera med dem om du har ett konto nÃ¥gonstans i federationen."
-  landing_strip_signup_html: Om du inte gÃ¶r det, sÃ¥ kan du <a href="%{sign_up_path}">registrera dig hÃ¤r</a>.
   lists:
     errors:
       limit: Du har nÃ¥tt det maximala antalet listor
@@ -693,7 +665,6 @@ sv:
       unlisted: Olistade
       unlisted_long: Alla kan se, men listas inte pÃ¥ offentliga tidslinjer
   stream_entries:
-    click_to_show: Klicka fÃ¶r att visa
     pinned: FÃ¤st toot
     reblogged: boostad
     sensitive_content: KÃ¤nsligt innehÃ¥ll
@@ -819,10 +790,9 @@ sv:
       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_bridge_html: Om du kommer frÃ¥n Twitter kan du hitta dina vÃ¤nner pÃ¥ Mastodon genom att anvÃ¤nda <a href="%{bridge_url}">bridge-appen</a>. Det fungerar dock bara om de ocksÃ¥ har anvÃ¤nt bridge-appen!
       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_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 till ditt hemskÃ¤rm kan du fÃ¥ push-meddelanden. Det fungerar som en inbyggd app pÃ¥ mÃ¥nga sÃ¤tt!
       tips: Tips
       title: VÃ¤lkommen ombord, %{name}!
diff --git a/config/locales/te.yml b/config/locales/te.yml
index f28b5605237d8ac889b65382f233e9331413fb2a..f0f6942abffae70284d3d13adce95116501d787f 100644
--- a/config/locales/te.yml
+++ b/config/locales/te.yml
@@ -1,5 +1,129 @@
 ---
 te:
   about:
+    about_hashtag_html: à°‡à°µà°¿ <strong>#%{hashtag}</strong>à°¤à±‹ à°Ÿà±à°—à°¾à°—à± à°šà±‡à°¯à°¬à°¡à°¿à°¨ à°ªà°¬à±à°²à°¿à°•à± à°Ÿà±‚à°Ÿà±à°²à±. à°«à±†à°¡à°¿à°µà°°à±à°¸à± à°²à±‹ à°Žà°•à±à°•à°¡ à°–à°¾à°¤à°¾à°µà±à°¨à±à°¨à°¾ à°µà±€à°Ÿà°¿à°²à±‹ à°ªà°¾à°²à±à°—à±Šà°¨à°µà°šà±à°šà±.
+    about_mastodon_html: à°®à°¾à°¸à±à°Ÿà±Šà°¡à°¾à°¨à± à°…à°¨à±‡à°¦à°¿ à°’à°• à°¸à°¾à°®à°¾à°œà°¿à°• à°®à°¾à°§à±à°¯à°®à°‚. à°‡à°¦à°¿ à°ªà±‚à°°à±à°¤à°¿à°—à°¾ à°‰à°šà°¿à°¤à°‚ à°®à°°à°¿à°¯à± à°¸à±à°µà±‡à°šà±à°›à°¾ à°¸à°¾à°«à±à°Ÿà±à°µà±‡à°°à±. à°ˆà°®à±†à°¯à°¿à°²à± à°²à°¾à°—à°¾à°¨à±‡ à°‡à°¦à°¿ à°µà°¿à°•à±‡à°‚à°¦à±à°°à±€à°•à°°à°¿à°‚à°šà°¬à°¡à°¿à°¨à°¦à°¿.
     about_this: à°—à±à°°à°¿à°‚à°šà°¿
+    administered_by: 'à°¨à°¿à°°à±à°µà°¹à°£à°²à±‹:'
+    api: API
+    apps: à°®à±Šà°¬à±ˆà°²à± à°¯à°¾à°ªà±à°¸à±
+    closed_registrations: à°ªà±à°°à°¸à±à°¤à±à°¤à°‚ à°ˆ à°‡à°¨à±à°¸à±à°Ÿà±†à°¨à±à°¸à± à°²à±‹ à°°à°¿à°œà°¿à°¸à±à°Ÿà±‡à°·à°¨à±à°²à± à°®à±‚à°¸à°¿à°µà±‡à°¯à°¬à°¡à±à°¡à°¾à°¯à°¿. à°…à°¯à°¿à°¤à±‡, à°µà±‡à°°à±‡ à°‡à°¨à±à°¸à±à°Ÿà±†à°¨à±à°¸à± à°²à±‹ à°–à°¾à°¤à°¾ à°¤à±†à°°à°šà°¿à°•à±‚à°¡à°¾ à°ˆ à°‡à°¨à±à°¸à±à°Ÿà±†à°¨à±à°¸à± à°¨à± à°…à°•à±à°•à°¡à°¿à°¨à±à°‚à°¡à±‡ à°¯à°¾à°•à±à°¸à±†à°¸à± à°šà±‡à°¯à°µà°šà±à°šà±.
     contact: à°¸à°‚à°ªà±à°°à°¦à°¿à°‚à°šà°‚à°¡à°¿
+    contact_missing: à°‡à°‚à°•à°¾ à°¸à±†à°Ÿà± à°šà±‡à°¯à°²à±‡à°¦à±
+    contact_unavailable: à°µà°°à±à°¤à°¿à°‚à°šà°¦à±
+    documentation: à°ªà°¤à±à°°à±€à°•à°°à°£
+    extended_description_html: |
+      <h3>à°¨à°¿à°¯à°®à°¾à°²à°•à± à°’à°• à°®à°‚à°šà°¿ à°ªà±à°°à°¦à±‡à°¶à°‚</h3>
+      <p>à°®à°°à°¿à°‚à°¤ à°µà°¿à°¶à°¦à±€à°•à°°à°£ à°‡à°‚à°•à°¾ à°¸à±†à°Ÿà± à°šà±‡à°¯à°¬à°¡à°²à±‡à°¦à±.</p>
+    features:
+      humane_approach_body: à°µà±‡à°°à±‡ à°¸à°¾à°®à°¾à°œà°¿à°• à°®à°¾à°§à±à°¯à°®à°¾à°² à°µà±ˆà°«à°²à±à°¯à°¾à°² à°¨à±à°‚à°¡à°¿ à°¨à±‡à°°à±à°šà±à°•à±à°¨à°¿, à°¨à±ˆà°¤à°¿à°• à°°à±‚à°ªà°•à°²à±à°ªà°¨à°²à°¤à±‹ à°¸à°¾à°®à°¾à°œà°¿à°• à°®à°¾à°§à±à°¯à°®à°¾à°² à°¦à±à°°à±à°µà°¿à°¨à°¿à°¯à±‹à°—à°‚à°ªà±ˆ  à°®à°¾à°¸à±à°Ÿà±Šà°¡à°¾à°¨à± à°ªà±‹à°°à°¾à°Ÿà°‚ à°šà±‡à°¸à±‡ à°²à°•à±à°·à±à°¯à°‚à°¤à±‹ à°ªà°¨à°¿à°šà±‡à°¸à±à°¤à±à°‚à°¦à°¿.
+      humane_approach_title: à°®à°°à°¿à°‚à°¤ à°®à°¾à°¨à°µà°¤à±à°µà°‚à°¤à±‹ à°•à±‚à°¡à°¿à°¨ à°µà°¿à°§à°¾à°¨à°‚
+      not_a_product_body: à°®à°¾à°¸à±à°Ÿà±Šà°¡à°¾à°¨à± à°µà±à°¯à°¾à°ªà°¾à°° à°¸à°‚à°¬à°‚à°§à°¿à°¤ à°®à°¾à°§à±à°¯à°®à°‚ à°•à°¾à°¦à±. à°Žà°Ÿà±à°µà°‚à°Ÿà°¿ à°ªà±à°°à°•à°Ÿà°¨à°²à±, à°¡à±‡à°Ÿà°¾ à°®à±ˆà°¨à°¿à°‚à°—à±, à°•à°‚à°šà±†à°²à± à°²à±‡à°¨à°¿à°¦à°¿. à° à°•à±‡à°‚à°¦à±à°° à°…à°§à°¿à°•à°°à°®à±‚ à°²à±‡à°¦à±.
+      not_a_product_title: à°®à±€à°°à±Šà°• à°µà±à°¯à°•à±à°¤à°¿, à°µà°¸à±à°¤à±à°µà± à°•à°¾à°¦à±
+      real_conversation_body: With 500 characters at your disposal and support for granular content and media warnings, you can express yourself the way you want to.
+      real_conversation_title: à°¨à°¿à°œà°®à±ˆà°¨ à°¸à°‚à°à°¾à°·à°£à°²à°•à±‹à°¸à°‚ à°¨à°¿à°°à±à°®à°¿à°‚à°šà°¬à°¡à°¿à°‚à°¦à°¿
+      within_reach_body: à°†à°‚à°¡à±à°°à°¾à°¯à°¿à°¡à±, iOS à°®à°°à°¿à°¯à± à°‡à°¤à°° à°ªà±à°²à°¾à°Ÿà±à°«à°¾à°‚à°²à°•à± à°µà°¿à°µà°¿à°§à°°à°•à°¾à°² à°¯à°¾à°ªà±à°¸à± à°µà±à°¨à±à°¨à°¾à°¯à°¿. à°¡à±†à°µà°²à°ªà°°à± à°¸à°¹à°¿à°¤ API à°µà±à°¯à°µà°¸à±à°¥à±‡ à°‡à°‚à°¦à±à°•à± à°®à±‚à°²à°•à°¾à°°à°£à°‚. à°‡à°µà°¿ à°®à±€ à°¸à±à°£à±‡à°¹à°¿à°¤à±à°²à°¤à±‹ à°…à°¨à±à°¨à°¿à°µà±‡à°³à°²à°¾ à°…à°‚à°¦à±à°¬à°¾à°Ÿà±à°²à±‹ à°µà±à°‚à°¡à°¡à°¾à°¨à°¿à°•à°¿ à°¸à°¹à°¾à°¯à°ªà°¡à°¤à°¾à°¯à°¿.
+      within_reach_title: à°Žà°²à±à°²à°ªà±à°ªà±à°¡à±‚ à°…à°‚à°¦à±à°¬à°¾à°Ÿà±à°²à±‹
+    generic_description: "%{domain} à°…à°¨à±‡à°¦à°¿ à°¨à±†à°Ÿà±à°µà°°à±à°•à±à°²à±‹à°¨à°¿ à°’à°• à°¸à°°à±à°µà°°à±"
+    hosted_on: à°®à°¾à°¸à±à°Ÿà±Šà°¡à°¾à°¨à± %{domain} à°²à±‹ à°¹à±‹à°¸à±à°Ÿà± à°šà±‡à°¯à°¬à°¡à°¿à°‚à°¦à°¿
+    learn_more: à°®à°°à°¿à°‚à°¤ à°¤à±†à°²à±à°¸à±à°•à±‹à°‚à°¡à°¿
+    other_instances: à°‡à°¨à±à°¸à±à°Ÿà°¾à°¨à±à°¸à± à°² à°œà°¾à°¬à°¿à°¤à°¾
+    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: à°Ÿà±‚à°Ÿà±à°²à± à°®à°°à°¿à°¯à± à°ªà±à°°à°¤à±à°¯à±à°¤à±à°¤à°°à°¾à°²à±
+    reserved_username: à°ˆ username à°°à°¿à°œà°°à±à°µà± à°šà±‡à°¯à°¬à°¡à°¿à°‚à°¦à°¿
+    roles:
+      admin: à°¨à°¿à°°à±à°µà°¾à°¹à°•à±à°²à±
+      bot: à°¬à±‹à°Ÿà±
+      moderator: à°¨à°¿à°¯à°‚à°¤à±à°°à°¿à°•à±à°¡à±
+    unfollow: à°…à°¨à±à°¸à°°à°¿à°‚à°šà°µà°¦à±à°¦à±
+  admin:
+    account_actions:
+      action: à°šà°°à±à°¯ à°¤à±€à°¸à±à°•à±‹
+      title: "%{acct}à°ªà±ˆ à°®à±‹à°¡à°°à±‡à°·à°¨à± à°šà°°à±à°¯à°¨à± à°¤à±€à°¸à±à°•à±‹"
+    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: à°•à±Šà°¤à±à°¤ à°ˆà°®à±†à°¯à°¿à°²à±
+        submit: à°ˆà°®à±†à°¯à°¿à°²à± à°¨à± à°®à°¾à°°à±à°šà±
+        title: "%{username} à°¯à±Šà°•à±à°• à°ˆà°®à±†à°¯à°¿à°²à± à°¨à± à°®à°¾à°°à±à°šà±"
+      confirm: à°§à±ƒà°µà±€à°•à°°à°¿à°‚à°šà±
+      confirmed: à°§à±ƒà°µà±€à°•à°°à°¿à°‚à°šà°¬à°¡à°¿à°‚à°¦à°¿
+      confirming: à°§à±ƒà°µà±€à°•à°°à°¿à°¸à±à°¤à±à°‚à°¦à°¿
+      demote: à°¸à±à°¥à°¾à°¨à°‚ à°¤à°—à±à°—à°¿à°‚à°šà±
+      disable: à°…à°šà±‡à°¤à°¨à°‚ à°šà±‡à°¯à°¿
+      disable_two_factor_authentication: 2FAà°¨à± à°…à°šà±‡à°¤à°¨à°‚ à°šà±‡à°¯à°¿
+      disabled: à°…à°šà±‡à°¤à°¨à°‚ à°šà±‡à°¯à°¬à°¡à°¿à°‚à°¦à°¿
+      display_name: à°ªà±‡à°°à±à°¨à± à°šà±‚à°ªà±
+      domain: à°¡à±Šà°®à±ˆà°¨à±
+      edit: à°®à°¾à°°à±à°šà±
+      email: à°ˆà°®à±†à°¯à°¿à°²à±
+      email_status: à°ˆà°®à±†à°¯à°¿à°²à± à°¸à±à°¥à°¿à°¤à°¿
+      enable: à°šà±‡à°¤à°¨à°‚
+      enabled: à°šà±‡à°¤à°¨à°‚ à°šà±‡à°¯à°¬à°¡à°¿à°‚à°¦à°¿
+      feed_url: à°«à±€à°¡à± URL
+      followers: à°…à°¨à±à°šà°°à±à°²à±
+      followers_url: à°…à°¨à±à°šà°°à±à°² URL
+      follows: à°…à°¨à±à°¸à°°à°¿à°¸à±à°¤à±à°¨à±à°¨à°¾à°°à±
+      header: Header
+      inbox_url: à°‡à°¨à± à°¬à°¾à°•à±à°¸à± URL
+      ip: IP
+      location:
+        all: à°…à°¨à±à°¨à±€
+        local: à°²à±‹à°•à°²à±
+        remote: à°°à°¿à°®à±‹à°Ÿà±
+        title: à°²à±Šà°•à±‡à°·à°¨à±
+      login_status: à°²à°¾à°—à°¿à°¨à± à°¸à±à°¥à°¿à°¤à°¿
+      media_attachments: à°®à±€à°¡à°¿à°¯à°¾ à°…à°Ÿà°¾à°šà±à°®à±†à°‚à°Ÿà±à°²à±
+      memorialize: Turn into memoriam
+      moderation:
+        active: à°¯à°¾à°•à±à°Ÿà°¿à°µà±
+        all: à°…à°¨à±à°¨à±€
+        silenced: à°¨à°¿à°¶à±à°¶à°¬à±à°§à°‚ à°šà±‡à°¯à°¬à°¡à°¿à°‚à°¦à°¿
+        suspended: à°¨à°¿à°·à±‡à°§à°¿à°‚à°šà°¬à°¡à°¿à°‚à°¦à°¿
+        title: à°®à±‹à°¡à°°à±‡à°·à°¨à±
+      moderation_notes: à°®à±‹à°¡à°°à±‡à°·à°¨à± à°¨à±‹à°Ÿà±à°¸à±
+      most_recent_activity: à°‡à°Ÿà±€à°µà°² à°¯à°¾à°•à±à°Ÿà°¿à°µà°¿à°Ÿà±€
+      most_recent_ip: à°‡à°Ÿà±€à°µà°²à°¿ IP
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 6804dbd13d3b071f4b5a4d0de0935edb4b5c261c..5be8e02c0f0d36d470ac20e766141d299b7b91ec 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -5,9 +5,6 @@ th:
     about_this: à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¸à¸´à¸™à¸‹à¸°à¹à¸•à¸™à¸‹à¹Œà¸™à¸µà¹‰
     closed_registrations: à¸à¸´à¸™à¸‹à¸°à¹à¸•à¸™à¸‹à¹Œà¸™à¸µà¹‰à¸›à¸´à¸”à¸£à¸±à¸šà¸¥à¸‡à¸—à¸°à¹€à¸šà¸µà¸¢à¸™à¹à¸¥à¹‰à¸§.
     contact: à¸•à¸´à¸”à¸•à¹ˆà¸
-    description_headline: à¹‚à¸”à¹€à¸¡à¸™à¸„à¸·à¸ %{domain} ?
-    domain_count_after: à¸à¸´à¸™à¸‹à¸°à¹à¸•à¸™à¸‹à¹Œà¸à¸·à¹ˆà¸™à¹†
-    domain_count_before: à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸à¸±à¸š
     other_instances: à¸à¸´à¸™à¸‹à¸°à¹à¸•à¸™à¸‹à¹Œà¸à¸·à¹ˆà¸™à¹†
     source_code: à¸‹à¸à¸£à¹Œà¸ªà¹‚à¸„à¹Šà¸”
     status_count_after: à¸ªà¸–à¸²à¸™à¸°
@@ -22,7 +19,6 @@ th:
     people_followed_by: à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸²à¸¡à¹‚à¸”à¸¢ %{name}
     people_who_follow: à¸„à¸™à¸—à¸µà¹ˆà¸•à¸´à¸”à¸•à¸²à¸¡ %{name}
     posts: à¹‚à¸žà¸ªà¸•à¹Œ
-    remote_follow: Remote follow
     unfollow: à¹€à¸¥à¸´à¸à¸•à¸´à¸”à¸•à¸²à¸¡
   admin:
     accounts:
@@ -53,10 +49,6 @@ th:
       most_recent_activity: à¸à¸´à¸ˆà¸à¸£à¸£à¸¡à¸¥à¹ˆà¸²à¸ªà¸¸à¸”
       most_recent_ip: IP à¸¥à¹ˆà¸²à¸ªà¸¸à¸”
       not_subscribed: Not subscribed
-      order:
-        alphabetic: à¸•à¸²à¸¡à¸•à¸±à¸§à¸à¸±à¸à¸©à¸£
-        most_recent: à¸¥à¹ˆà¸²à¸ªà¸¸à¸”
-        title: à¸ˆà¸±à¸”à¹€à¸£à¸µà¸¢à¸‡
       perform_full_suspension: Perform full suspension
       profile_url: Profile URL
       public: à¸ªà¸²à¸˜à¸²à¸£à¸“à¸°
@@ -69,7 +61,6 @@ th:
       salmon_url: Salmon URL
       show:
         created_reports: à¸£à¸²à¸¢à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸–à¸¹à¸à¸ªà¸£à¹‰à¸²à¸‡à¹‚à¸”à¸¢ à¹à¸à¸„à¹€à¸„à¸²à¸—à¹Œà¸™à¸µà¹‰
-        report: à¸£à¸²à¸¢à¸‡à¸²à¸™
         targeted_reports: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¹à¸à¸„à¹€à¸„à¸²à¸—à¹Œà¸™à¸µà¹‰
       silence: à¸›à¸´à¸”à¹€à¸ªà¸µà¸¢à¸‡
       statuses: à¸ªà¸–à¸²à¸™à¸°
@@ -93,10 +84,6 @@ th:
         title: à¸à¸²à¸£à¸šà¸¥à¹Šà¸à¸à¹‚à¸”à¹€à¸¡à¸™à¹ƒà¸«à¸¡à¹ˆ
       reject_media: à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸¡à¸±à¸•à¸´à¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸
       reject_media_hint: à¸¥à¸šà¹„à¸Ÿà¸¥à¹Œà¸ªà¸·à¹ˆà¸à¸—à¸µà¹ˆà¹€à¸à¹‡à¸šà¹„à¸§à¹‰à¹ƒà¸™à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡ à¹à¸¥à¸° à¸›à¹‰à¸à¸‡à¸à¸±à¸™à¸à¸²à¸£à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹ƒà¸™à¸à¸™à¸²à¸„à¸•. Irrelevant for suspensions
-      severities:
-        silence: à¸›à¸´à¸”à¹€à¸ªà¸µà¸¢à¸‡
-        suspend: à¸«à¸¢à¸¸à¸”à¹„à¸§à¹‰
-      severity: Severity
       show:
         affected_accounts:
           one: à¸¡à¸µà¸œà¸¥à¸•à¹ˆà¸à¸«à¸™à¸¶à¹ˆà¸‡à¹à¸à¸„à¹€à¸„à¹Šà¸²à¸—à¹Œà¹ƒà¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥
@@ -106,29 +93,20 @@ th:
           suspend: à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸«à¸¢à¸¸à¸”à¸—à¸¸à¸à¹à¸à¸„à¹€à¸„à¹Šà¸²à¸—à¹Œà¸ˆà¸²à¸à¹‚à¸”à¹€à¸¡à¸™
         title: à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸šà¸¥à¹Šà¸à¸à¹‚à¸”à¹€à¸¡à¸™ %{domain}
         undo: à¸¢à¸à¹€à¸¥à¸´à¸
-      title: à¸šà¸¥à¹Šà¸à¸à¹‚à¸”à¹€à¸¡à¸™
       undo: à¸¢à¸à¹€à¸¥à¸´à¸
     instances:
-      account_count: Known accounts
-      domain_name: à¸Šà¸·à¹ˆà¸à¹‚à¸”à¹€à¸¡à¸™
       title: Known Instances
     reports:
       comment:
         none: None
-      id: à¹„à¸à¸”à¸µ
       mark_as_resolved: à¸—à¸³à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸«à¸¡à¸²à¸¢à¸§à¹ˆà¸²à¸ˆà¸±à¸”à¸à¸²à¸£à¹à¸¥à¹‰à¸§
       report: 'Report #%{id}'
-      report_contents: à¹€à¸™à¸·à¹‰à¸à¸«à¸²
       reported_account: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹à¸à¸„à¹€à¸„à¸²à¸—à¹Œ
       reported_by: à¸£à¸²à¸¢à¸‡à¸²à¸™à¹‚à¸”à¸¢
       resolved: à¸ˆà¸±à¸”à¸à¸²à¸£à¹à¸¥à¹‰à¸§
-      silence_account: à¹à¸à¸„à¹€à¸„à¹Šà¸²à¸—à¹Œà¸—à¸µà¹ˆà¸›à¸´à¸”à¹€à¸ªà¸µà¸¢à¸‡
       status: à¸ªà¸–à¸²à¸™à¸°
-      suspend_account: à¹à¸à¸„à¹€à¸„à¹Šà¸²à¸—à¹Œà¸—à¸µà¹ˆà¸«à¸¢à¸¸à¸”à¹„à¸§à¹‰
-      target: à¹€à¸›à¹‰à¸²à¸«à¸¡à¸²à¸¢
       title: à¸£à¸²à¸¢à¸‡à¸²à¸™
       unresolved: Unresolved
-      view: à¸§à¸´à¸§
     settings:
       contact_information:
         email: à¸à¸£à¸à¸à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸ªà¸²à¸˜à¸²à¸£à¸“à¸°
@@ -216,7 +194,6 @@ th:
     unlocked_warning_title: à¹à¸à¸„à¹€à¸„à¹Šà¸²à¸—à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸¥à¹Šà¸à¸„
   generic:
     changes_saved_msg: à¸šà¸±à¸™à¸—à¸¶à¸à¸à¸²à¸£à¹à¸à¹‰à¹„à¸‚à¹à¸¥à¹‰à¸§!
-    powered_by: powered by %{link}
     save_changes: à¸šà¸±à¸™à¸—à¸¶à¸à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡
     validation_errors:
       one: Something isn't quite right yet! Please review the error below
@@ -229,15 +206,13 @@ th:
       following: Following list
       muting: Muting list
     upload: Upload
-  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
-  landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   media_attachments:
     validations:
       images_and_video: Cannot attach a video to a status that already contains images
       too_many: à¹à¸™à¸šà¸¡à¸²à¸à¸à¸§à¹ˆà¸² 4 à¹„à¸Ÿà¸¥à¹Œà¹„à¸¡à¹ˆà¹„à¸”à¹‰
   notification_mailer:
     digest:
-      body: 'Here is a brief summary of what you missed on %{instance} since your last visit on %{since}:'
+      body: Here is a brief summary of the messages you missed since your last visit on %{since}
       mention: "%{name} à¸ªà¹ˆà¸‡à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸–à¸¶à¸‡à¸„à¸¸à¸“:"
       new_followers_summary:
         one: à¸¢à¸´à¸™à¸”à¸µà¸”à¹‰à¸§à¸¢à¸„à¸¸à¸“à¹„à¸”à¹‰à¸œà¸¹à¹‰à¸•à¸´à¸”à¸•à¸²à¸¡à¸„à¸™à¹ƒà¸«à¸¡à¹ˆ! Yay!
@@ -302,7 +277,6 @@ th:
       unlisted: Unlisted
       unlisted_long: Everyone can see, but not listed on public timelines
   stream_entries:
-    click_to_show: à¸„à¸¥à¸´à¸à¹€à¸žà¸·à¹ˆà¸à¹à¸ªà¸”à¸‡
     reblogged: boosted
     sensitive_content: Sensitive content
   time:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 8bafbface2f7ee69907359db5a152768aa456960..c38b73f2e25152ec365175a939cab7f97ecbdea4 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -5,9 +5,6 @@ tr:
     about_this: Bu sunucu hakkÄ±nda
     closed_registrations: Bu sunucu ÅŸu anda yeni kayÄ±t almamaktadÄ±r.
     contact: Ä°letiÅŸim
-    description_headline: Peki %{domain} nedir?
-    domain_count_after: sunucu var.
-    domain_count_before: BaÄŸlÄ± olduÄŸu
     other_instances: DiÄŸer sunucular
     source_code: Kaynak kodu
     status_count_after: adet gÃ¶nderi yazÄ±ldÄ±.
@@ -22,7 +19,6 @@ tr:
     people_followed_by: KullanÄ±cÄ± %{name}'in takip ettikleri
     people_who_follow: KullanÄ±cÄ± %{name}'i takip edenler
     posts: GÃ¶nderiler
-    remote_follow: Uzaktan takip et
     unfollow: Takibi bÄ±rak
   admin:
     accounts:
@@ -52,10 +48,6 @@ tr:
       most_recent_activity: Son aktivite
       most_recent_ip: Son IP
       not_subscribed: Abone edilmedi
-      order:
-        alphabetic: Alfabetik
-        most_recent: En son
-        title: SÄ±ralama
       perform_full_suspension: Tamamen uzaklaÅŸtÄ±r
       profile_url: Profil linki
       public: Herkese aÃ§Ä±k
@@ -68,7 +60,6 @@ tr:
       salmon_url: Salmon Linki
       show:
         created_reports: Bu hesap tarafÄ±ndan gelen ÅŸikayetler
-        report: ÅŸikayet
         targeted_reports: Bu hesaba gelen ÅŸikayetler
       silence: Sustur
       statuses: Durumlar
@@ -91,50 +82,37 @@ tr:
           suspend: UzaklaÅŸtÄ±r
         title: Yeni domain bloÄŸu
       reject_media: Ortam dosyalarÄ±nÄ± reddetme
-      reject_media_hint: Yerel olarak depolanmÄ±ÅŸ ortam dosyalarÄ±nÄ± ve gelecekte indirilecek olanlarÄ± reddeder. UzaklaÅŸtÄ±rma iÃ§in uygun deÄŸildir.
-      severities:
-        silence: Sustur
-        suspend: UzaklaÅŸtÄ±r
-      severity: Ä°ÅŸlem
+      reject_media_hint: Yerel olarak depolanmÄ±ÅŸ ortam dosyalarÄ±nÄ± ve gelecekte indirilecek olanlarÄ± reddeder. UzaklaÅŸtÄ±rma iÃ§in uygun deÄŸildir
       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.
+          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
-      title: Domain BloklarÄ±
       undo: Geri al
     instances:
-      account_count: Bilinen hesaplar
-      domain_name: Domain
       title: Bilinen Sunucular
     reports:
       comment:
         none: Yok
-      id: ID
       mark_as_resolved: Giderildi olarak iÅŸaretle
       report: 'Åžikayet #%{id}'
-      report_contents: Ä°Ã§erik
       reported_account: Åžikayet edilen hesap
       reported_by: Åžikayet eden
       resolved: Giderildi
-      silence_account: HesabÄ± sustur
       status: Durum
-      suspend_account: HesabÄ± uzaklaÅŸtÄ±r
-      target: Hedef
       title: Åžikayetler
       unresolved: Giderilmedi
-      view: GÃ¶rÃ¼ntÃ¼le
     settings:
       contact_information:
         email: Herkese aÃ§Ä±k e-posta adresiniz
         username: Bir kullanÄ±cÄ± adÄ± giriniz
       registrations:
         closed_message:
-          desc_html: KayÄ±t alÄ±mlarÄ± kapatÄ±ldÄ±ÄŸÄ±nda ana sayfada gÃ¶rÃ¼ntÃ¼lenecek mesajdÄ±r. <br> HTML etiketleri kullanabilirsiniz.
+          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Ä±
         open:
           title: KayÄ±t alÄ±mlarÄ±
@@ -142,7 +120,7 @@ tr:
         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.
+        desc_html: Harici bilgi sayfasÄ±nda gÃ¶sterilir.<br>HTML etiketleri girebilirsiniz
         title: Sunucu hakkÄ±nda detaylÄ± bilgi
       site_title: Site baÅŸlÄ±ÄŸÄ±
       title: Site AyarlarÄ±
@@ -170,7 +148,7 @@ tr:
     security: Kimlik bilgileri
     set_new_password: Yeni parola oluÅŸtur
   authorize_follow:
-    error: Uzak hesap aranÄ±rken bir hata oluÅŸtu.
+    error: Uzak hesap aranÄ±rken bir hata oluÅŸtu
     follow: Takip et
     title: "%{acct}'i takip et"
   datetime:
@@ -214,7 +192,6 @@ tr:
     unlocked_warning_title: HesabÄ±nÄ±z kilitlendi
   generic:
     changes_saved_msg: DeÄŸiÅŸiklikler baÅŸarÄ±yla kaydedildi!
-    powered_by: powered by %{link}
     save_changes: DeÄŸiÅŸiklikleri kaydet
     validation_errors:
       one: Bir ÅŸeyler ters gitti! LÃ¼tfen aÅŸaÄŸÄ±daki hatayÄ± gÃ¶zden geÃ§iriniz
@@ -227,15 +204,13 @@ tr:
       following: Takip edilenler listesi
       muting: Susturulanlar listesi
     upload: YÃ¼kle
-  landing_strip_html: "<strong>%{name}</strong>, %{link_to_root_path} sunucusundaki bir kullanÄ±cÄ±dÄ±r. Onu takip edebilir, veya Mastodon aÄŸÄ±ndaki bir hesabÄ±nÄ±zÄ± kullanarak etkileÅŸime geÃ§ebilirsiniz."
-  landing_strip_signup_html: EÄŸer hesabÄ±nÄ±z yoksa <a href="%{sign_up_path}">buradan kaydolabilirsiniz</a>.
   media_attachments:
     validations:
-      images_and_video: HalihazÄ±rda gÃ¶rsel iÃ§eren bir gÃ¶nderiye video ekleyemezsiniz.
+      images_and_video: HalihazÄ±rda gÃ¶rsel iÃ§eren bir gÃ¶nderiye video ekleyemezsiniz
       too_many: 4'ten fazla dosya ekleyemezsiniz
   notification_mailer:
     digest:
-      body: 'Son ziyaretiniz olan %{since}''den beri %{instance}''da kaÃ§Ä±rdÄ±ÄŸÄ±nÄ±z ÅŸeylerin Ã¶zeti:'
+      body: Son ziyaretiniz olan %{since}'den beri'da kaÃ§Ä±rdÄ±ÄŸÄ±nÄ±z ÅŸeylerin Ã¶zeti
       mention: "%{name} senden bahsetti:"
       new_followers_summary:
         one: Yeni bir takipÃ§iniz var!
@@ -298,9 +273,8 @@ tr:
       public: Herkese aÃ§Ä±k
       public_long: Herkese aÃ§Ä±k zaman tÃ¼neline gÃ¶nder
       unlisted: ListelenmemiÅŸ
-      unlisted_long: Herkes gÃ¶rebilir fakat herkese aÃ§Ä±k zaman tÃ¼nellerinde listelenmez.
+      unlisted_long: Herkes gÃ¶rebilir fakat herkese aÃ§Ä±k zaman tÃ¼nellerinde listelenmez
   stream_entries:
-    click_to_show: GÃ¶rÃ¼ntÃ¼lemek iÃ§in tÄ±klayÄ±nÄ±z
     reblogged: boost edildi
     sensitive_content: Hassas iÃ§erik
   time:
@@ -311,7 +285,7 @@ tr:
     description_html: EÄŸer <strong>iki-faktÃ¶rlÃ¼ kimlik doÄŸrulamayÄ±</strong> aktif ederseniz, giriÅŸ yaparken sizin iÃ§in giriÅŸ kodu Ã¼reten telefonunuza ihtiyaÃ§ duyacaksÄ±nÄ±z.
     disable: Devre dÄ±ÅŸÄ± bÄ±rak
     enable: AktifleÅŸtir
-    enabled_success: Ä°ki-faktÃ¶rlÃ¼ kimlik doÄŸrulama baÅŸarÄ±yla aktif edildi.
+    enabled_success: Ä°ki-faktÃ¶rlÃ¼ kimlik doÄŸrulama baÅŸarÄ±yla aktif edildi
     generate_recovery_codes: Kurtarma KodlarÄ±nÄ± OluÅŸtur
     instructions_html: <strong>Bu QR kodunu, telefonunuzdaki <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a> veya benzer bir TOTP uygulamasÄ±yla taratÄ±nÄ±z</strong>. Bundan sonra giriÅŸ yaparken uygulamanÄ±n Ã¼rettiÄŸi kodu kullanarak giriÅŸ yapacaksÄ±nÄ±z.
     lost_recovery_codes: Kurtarma kodlarÄ± telefonunuzu kaybettiÄŸiniz durumlarda hesabÄ±nÄ±za eriÅŸim yapabilmenize olanak tanÄ±r. EÄŸer kurtarma kodlarÄ±nÄ±zÄ± kaybettiyseniz burada tekrar oluÅŸturabilirsiniz. Eski kurtarma kodlarÄ±nÄ±z geÃ§ersiz hale gelecektir.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 6fe46b4d981655ad39129247141ed5c6a453c7b3..9a63854b5821a064a667315c72153a88d2956699 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1,70 +1,226 @@
 ---
 uk:
   about:
+    about_hashtag_html: ÐÐµÐ¼Ð°Ñ” Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ñ… Ð¿Ð¾ÑÑ‚Ñ–Ð² Ð· Ñ…ÐµÑˆÑ‚ÐµÐ³Ð¾Ð¼<strong>#%{hashtag}</strong>. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ  You can interact with them if you have an account anywhere in the fediverse.
     about_mastodon_html: Mastodon - Ñ†Ðµ <em>Ð²Ñ–Ð»ÑŒÐ½Ð°</em> ÑÐ¾Ñ†Ñ–Ð°Ð»ÑŒÐ½Ð° Ð¼ÐµÑ€ÐµÐ¶Ð° Ð· <em>Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸Ð¼ Ð²Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¾Ð¼</em>. Ð’Ð¾Ð½Ð° Ñ” <em>Ð´ÐµÑ†ÐµÐ½Ñ‚Ñ€Ð°Ð»Ñ–Ð·Ð¾Ð²Ð°Ð½Ð¾ÑŽ</em> Ð°Ð»ÑŒÑ‚ÐµÑ€Ð½Ð°Ñ‚Ð¸Ð²Ð¾ÑŽ ÐºÐ¾Ð¼ÐµÑ€Ñ†Ñ–Ð¹Ð½Ð¸Ð¼ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°Ð¼, Ñ‰Ð¾ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ” ÑƒÐ½Ð¸ÐºÐ½ÑƒÑ‚Ð¸ Ñ€Ð¸Ð·Ð¸ÐºÑ–Ð² Ð¼Ð¾Ð½Ð¾Ð¿Ð¾Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ— Ð²Ð°ÑˆÐ¾Ð³Ð¾ ÑÐ¿Ñ–Ð»ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð´Ð½Ñ–Ñ”ÑŽ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ñ–Ñ”ÑŽ. Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ÑÐµÑ€Ð²ÐµÑ€, ÑÐºÐ¾Ð¼Ñƒ Ð²Ð¸ Ð´Ð¾Ð²Ñ–Ñ€ÑÑ”Ñ‚Ðµ &mdash; Ñ‰Ð¾ Ð± Ð²Ð¸ Ð½Ðµ Ð²Ð¸Ð±Ñ€Ð°Ð»Ð¸, Ð’Ð¸ Ð·Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑÐ¿Ñ–Ð»ÐºÑƒÐ²Ð°Ñ‚Ð¸ÑÑŒ Ð· ÑƒÑÑ–Ð¼Ð° Ñ–Ð½ÑˆÐ¸Ð¼Ð¸. Ð‘ÑƒÐ´ÑŒ-ÑÐºÐ¸Ð¹ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ð¸ Ð²Ð»Ð°ÑÐ½Ñƒ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–ÑŽ Mastodon Ñ‚Ð° Ð±ÐµÐ· Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ð±Ñ€Ð°Ñ‚Ð¸ ÑƒÑ‡Ð°ÑÑ‚ÑŒ Ð² <em>ÑÐ¾Ñ†Ñ–Ð°Ð»ÑŒÐ½Ñ–Ð¹ Ð¼ÐµÑ€ÐµÐ¶Ñ–</em>.
     about_this: ÐŸÑ€Ð¾ Ñ†ÑŽ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–ÑŽ
+    administered_by: 'ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€:'
+    api: API
     closed_registrations: ÐÐ° Ð´Ð°Ð½Ð¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚ Ñ€ÐµÑ”ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð½Ð° Ñ†Ñ–Ð¹ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ— Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð°.
     contact: Ð—Ð²'ÑÐ·Ð°Ñ‚Ð¸ÑÑ
-    description_headline: Ð©Ð¾ Ñ‚Ð°ÐºÐµ %{domain}?
-    domain_count_after: Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–ÑÐ¼Ð¸
-    domain_count_before: Ð—Ð²'ÑÐ·Ð°Ð½Ð¸Ð¹ Ð·
+    contact_missing: ÐÐµ Ð·Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾
+    contact_unavailable: ÐÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾
+    documentation: Ð”Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ñ–Ñ
+    extended_description_html: |
+      <h3>Ð“Ð°Ñ€Ð½Ðµ Ð¼Ñ–ÑÑ†Ðµ Ð´Ð»Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»</h3>
+      <p>Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ð¾Ð¿Ð¸Ñ Ñ‰Ðµ Ð½Ðµ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹.</p>
+    features:
+      humane_approach_body: ÐÐ°Ð²Ñ‡Ð°ÑŽÑ‡Ð¸ÑÑŒ Ð· Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº Ñ–Ð½ÑˆÐ¸Ñ… ÑÐ¾Ñ†Ñ–Ð°Ð»ÑŒÐ½Ð¸Ñ… Ð¼ÐµÑ€ÐµÐ¶, Mastodon Ð½Ð°Ñ†Ñ–Ð»ÐµÐ½Ð¸Ð¹ Ð½Ð° ÐµÑ‚Ð¸Ñ‡Ð½Ñ– Ñ€Ñ–ÑˆÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð±Ð¾Ñ€Ð¾Ñ‚ÑŒÐ±Ð¸ Ð· Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¼ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½ÑÐ¼ ÑÐ¾Ñ†Ñ–Ð°Ð»ÑŒÐ½Ð¸Ñ… Ð¼ÐµÐ´Ñ–Ð°.
+      humane_approach_title: Ð‘Ñ–Ð»ÑŒÑˆ Ð»ÑŽÐ´ÑÑŒÐºÐ¸Ð¹ Ð¿Ñ–Ð´Ñ…Ñ–Ð´
+      not_a_product_body: Mastodon - Ñ†Ðµ Ð½ÐµÐºÐ¾Ð¼ÐµÑ€Ñ†Ñ–Ð¹Ð½Ð° Ð¼ÐµÑ€ÐµÐ¶Ð°. ÐÑ–ÑÐºÐ¾Ñ— Ñ€ÐµÐºÐ»Ð°Ð¼Ð¸, Ð·Ð±Ð¾Ñ€Ñƒ Ð´Ð°Ð½Ð¸Ñ… Ñ– Ð·Ð°Ð»Ñ–Ð·Ð½Ð¸Ñ… ÑÑ‚Ñ–Ð½. Ð¢ÑƒÑ‚ Ð½ÐµÐ¼Ð°Ñ” Ñ†ÐµÐ½Ñ‚Ñ€Ð°Ð»ÑŒÐ½Ð¾Ñ— Ð²Ð»Ð°Ð´Ð¸.
+      not_a_product_title: Ð’Ð¸ - Ð¾ÑÐ¾Ð±Ð¸ÑÑ‚Ñ–ÑÑ‚ÑŒ, Ð° Ð½Ðµ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚
+      real_conversation_body: Ð’Ð¸ÑÐ»Ð¾Ð²Ð»ÑŽÐ¹Ñ‚Ðµ ÑÐ²Ð¾Ñ— Ð´ÑƒÐ¼ÐºÐ¸ ÑÐµÐ±Ðµ Ñƒ Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¸Ð¹ ÑÐ¿Ð¾ÑÑ–Ð± Ð¼Ð°ÑŽÑ‡Ð¸ Ð² Ñ€Ð¾Ð·Ð¿Ð¾Ñ€ÑÐ´Ð¶ÐµÐ½Ð½Ñ– 500 ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ–Ð² Ð· Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÐºÐ¾ÑŽ Ð³Ñ€Ð°Ð½ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ñƒ Ñ‚Ð° Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½ÑŒ Ð¼ÐµÐ´Ñ–Ð°.
+      real_conversation_title: ÐŸÐ¾Ð±ÑƒÐ´Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð´Ð»Ñ ÑÐ¿Ñ€Ð°Ð²Ð¶Ð½ÑŒÐ¾Ñ— Ñ€Ð¾Ð·Ð¼Ð¾Ð²Ð¸
+      within_reach_body: Ð’ÐµÐ»Ð¸ÐºÐ° ÐºÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÑ–Ð² Ð´Ð»Ñ iOS, Android Ñ‚Ð° Ñ–Ð½ÑˆÐ¸Ñ… Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼, Ð·Ð°Ð²Ð´ÑÐºÐ¸ Ð´Ñ€ÑƒÐ¶Ð½Ñ–Ð¹ Ð´Ð¾ Ñ€Ð¾Ð·Ñ€Ð¾Ð±Ð½Ð¸ÐºÐ° ÐµÐºÐ¾ÑÐ¸ÑÑ‚ÐµÐ¼Ñ– Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ” Ð±ÑƒÑ‚Ð¸ Ð½Ð° Ð·Ð²ÑÐ·ÐºÑƒ Ð· Ð´Ñ€ÑƒÐ·ÑÐ¼Ð¸ Ð·Ð²Ñ–Ð´ÑƒÑÑ–Ð»ÑŒ.
+      within_reach_title: Ð—Ð°Ð²Ð¶Ð´Ð¸ Ð½Ð° Ð·Ð²ÑÐ·ÐºÑƒ
+    generic_description: "%{domain} Ñ” Ð¾Ð´Ð½Ð¸Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼ Ñƒ Ð¼ÐµÑ€ÐµÐ¶Ñ–"
+    hosted_on: Mastodon Ñ€Ð¾Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð¾ Ð½Ð° %{domain}
+    learn_more: Ð”Ñ–Ð·Ð½Ð°Ñ‚Ð¸ÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ
     other_instances: Ð†Ð½ÑˆÑ– Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
+    privacy_policy: ÐŸÐ¾Ð»Ñ–Ñ‚Ð¸ÐºÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ–
     source_code: Ð’Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ð¹ ÐºÐ¾Ð´
     status_count_after: ÑÑ‚Ð°Ñ‚ÑƒÑÑ–Ð²
     status_count_before: ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾
+    terms: ÐŸÑ€Ð°Ð²Ð¸Ð»Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ
     user_count_after: ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð²
     user_count_before: Ð¢ÑƒÑ‚ Ð¶Ð¸Ð²Ðµ
+    what_is_mastodon: Ð©Ð¾ Ñ‚Ð°ÐºÐµ Mastodon?
   accounts:
     follow: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
     followers: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸
     following: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹(-Ð°)
+    joined: ÐŸÑ€Ð¸Ñ”Ð´Ð½Ð°Ð²ÑÑ %{date}
+    media: ÐœÐµÐ´Ñ–Ð°
+    moved_html: "%{name} Ð¿ÐµÑ€ÐµÑ—Ñ…Ð°Ð² Ð½Ð° %{new_profile_link}:"
+    network_hidden: Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð½ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð°
     nothing_here: Ð¢ÑƒÑ‚ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”!
     people_followed_by: Ð›ÑŽÐ´Ð¸, Ð½Ð° ÑÐºÐ¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹(-Ð°) %{name}
     people_who_follow: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸ %{name}
     posts: ÐŸÐ¾ÑÑ‚Ð¸
-    remote_follow: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð½Ð° Ñ–Ð½ÑˆÑ–Ð¹ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
+    posts_with_replies: ÐŸÐ¾ÑÑ‚Ð¸ Ñ– Ð²Ñ–Ð´Ð¿Ð¾Ð²Ñ–Ð´Ñ–
+    reserved_username: Ð¦Ðµ Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ðµ
+    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: ÐÐ¾Ð²Ð¸Ð¹ e-mail
+        submit: Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ñƒ Ð°Ð´Ñ€ÐµÑÑƒ
+        title: Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ñƒ Ð°Ð´Ñ€ÐµÑÑƒ Ð´Ð»Ñ %{username}
+      confirm: Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸
+      confirmed: Ð—Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¾
+      confirming: Ð—Ð±ÐµÑ€Ñ–Ð³Ð°Ñ”Ñ‚ÑŒÑÑ
+      demote: Ð£ÑÑƒÐ½ÑƒÑ‚Ð¸
+      disable: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸
+      disable_two_factor_authentication: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ñƒ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–ÑŽ
+      disabled: Ð’Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾
       display_name: Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÑƒÐ²Ð°Ð½Ðµ Ñ–Ð¼'Ñ
       domain: Ð”Ð¾Ð¼ÐµÐ½
       edit: Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸
       email: Email
+      email_status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ e-mail
+      enable: Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸
+      enabled: Ð£Ð²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð¾
       feed_url: URL Ñ„Ñ–Ð´Ñƒ
       followers: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸
+      followers_url: URL Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²
       follows: ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸
+      inbox_url: Ð’Ñ…Ñ–Ð´Ð½Ð¸Ð¹ URL
+      ip: IP
       location:
         all: Ð£ÑÑ–
         local: Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ–
         remote: Ð’Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ñ–
         title: Ð Ð¾Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ
+      login_status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ—
       media_attachments: ÐœÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ñ–Ð¹Ð½Ñ– Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ
+      memorialize: Ð—Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð¿Ð°Ð¼'ÑÑ‚Ð½Ð¸ÐºÐ¾Ð¼
       moderation:
         all: Ð£ÑÑ–
         silenced: Ð—Ð°Ð³Ð»ÑƒÑˆÐµÐ½Ñ–
         suspended: Ð—Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ñ–
         title: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ†Ñ–Ñ
+      moderation_notes: ÐŸÑ€Ð¸Ð¼Ñ–Ñ‚ÐºÐ¸ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ñ–Ð²
       most_recent_activity: ÐžÑÑ‚Ð°Ð½Ð½Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ
       most_recent_ip: ÐžÑÑ‚Ð°Ð½Ð½Ñ–Ð¹ IP
       not_subscribed: ÐÐµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ–
-      order:
-        alphabetic: Ð—Ð° Ð°Ð»Ñ„Ð°Ð²Ñ–Ñ‚Ð¾Ð¼
-        most_recent: Ð—Ð° Ð´Ð°Ñ‚Ð¾ÑŽ
-        title: ÐŸÐ¾Ñ€ÑÐ´Ð¾Ðº
+      outbox_url: Ð’Ð¸Ñ…Ñ–Ð´Ð½Ð¸Ð¹ URL
       perform_full_suspension: ÐŸÐ¾Ð²Ð½Ðµ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
       profile_url: URL Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ
+      promote: ÐŸÑ€Ð¾ÑÑƒÐ½ÑƒÑ‚Ð¸
+      protocol: ÐŸÑ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»
       public: ÐŸÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¹
       push_subscription_expires: ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ° PuSH ÑÐ¿Ð»Ð¸Ð²Ð°Ñ”
+      redownload: ÐžÐ½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð°Ð²Ð°Ñ‚Ð°Ñ€
+      remove_avatar: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð°Ð²Ð°Ñ‚Ð°Ñ€
+      resend_confirmation:
+        already_confirmed: Ð¦ÐµÐ¹ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ ÑƒÐ¶Ðµ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð¸Ð¹
+        send: ÐÐ°Ð´Ñ–ÑÐ»Ð°Ñ‚Ð¸ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ñ‰Ðµ Ñ€Ð°Ð·
+        success: ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½ÑÐ¼ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð½Ð°Ð´Ñ–ÑÐ»Ð°Ð½Ð¾!
+      reset: Ð¡ÐºÐ¸Ð½ÑƒÑ‚Ð¸
       reset_password: Ð—ÐºÐ¸Ð½ÑƒÑ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
+      resubscribe: ÐŸÐµÑ€ÐµÐ¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
+      role: Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸
+      roles:
+        admin: ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€
+        moderator: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€
+        staff: ÐŸÐµÑ€ÑÐ¾Ð½Ð°Ð»
+        user: ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡
       salmon_url: Salmon URL
+      search: ÐŸÐ¾ÑˆÑƒÐº
+      shared_inbox_url: URL ÑÐ¿Ñ–Ð»ÑŒÐ½Ð¾Ð³Ð¾ Ð²Ñ…Ñ–Ð´Ð½Ð¾Ð³Ð¾ ÐºÐ¾ÑˆÐ¸ÐºÐ°
+      show:
+        created_reports: Ð¡ÐºÐ°Ñ€Ð³Ð¸ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ñ– Ñ†Ð¸Ð¼ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð¾Ð¼
+        targeted_reports: Ð¡ÐºÐ°Ñ€Ð³Ð¸ Ñ‰Ð¾Ð´Ð¾ Ñ†ÑŒÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ
       silence: Ð“Ð»ÑƒÑˆÐµÐ½Ð½Ñ
       statuses: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÐ¸
+      subscribe: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
       title: ÐÐºÐ°ÑƒÐ½Ñ‚Ð¸
+      unconfirmed_email: ÐÐµÐ¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð¸Ð¹ e-mail
       undo_silenced: Ð—Ð½ÑÑ‚Ð¸ Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ
       undo_suspension: Ð—Ð½ÑÑ‚Ð¸ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
+      unsubscribe: Ð’Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
       username: Ð†Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
       web: WWW
+    action_logs:
+      actions:
+        assigned_to_self_report: "%{name} Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ð²(-Ð»Ð°) ÑÐºÐ°Ñ€Ð³Ñƒ %{target} Ð½Ð° ÑÐµÐ±Ðµ"
+        change_email_user: "%{name} Ð·Ð¼Ñ–Ð½Ð¸Ð²(-Ð»Ð°) Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ñƒ Ð°Ð´Ñ€ÐµÑÑƒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        confirm_user: "%{name} Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ð²(-Ð»Ð°) ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¾Ñ— Ð°Ð´Ñ€ÐµÑÐ¸ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        create_custom_emoji: "%{name} Ð²Ð¸Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ð²(-Ð»Ð°) Ð½Ð¾Ð²Ðµ ÐµÐ¼Ð¾Ð´Ð·Ñ– %{target}"
+        create_domain_block: "%{name} Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð²(-Ð»Ð°) Ð´Ð¾Ð¼ÐµÐ½ %{target}"
+        create_email_domain_block: "%{name} Ð´Ð¾Ð´Ð°Ð²(-Ð»Ð°) Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ %{target} Ð´Ð¾ Ñ‡Ð¾Ñ€Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ"
+        demote_user: "%{name} Ð¿Ð¾Ð½Ð¸Ð·Ð¸Ð²(-Ð»Ð°) %{target}"
+        destroy_domain_block: "%{name} Ñ€Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð²(-Ð»Ð°) Ð´Ð¾Ð¼ÐµÐ½ %{target}"
+        destroy_email_domain_block: "%{name} Ð´Ð¾Ð´Ð°Ð²(-Ð»Ð°) Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ %{target} Ð´Ð¾ Ð±Ñ–Ð»Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ"
+        destroy_status: "%{name} Ð²Ð¸Ð´Ð°Ð»Ð¸Ð²(-Ð»Ð°) ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        disable_2fa_user: "%{name} Ð²Ð¸Ð¼ÐºÐ½ÑƒÐ²(-Ð»Ð°) Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ñƒ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–ÑŽ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        disable_custom_emoji: "%{name} Ð²Ð¸Ð¼ÐºÐ½ÑƒÐ²(-Ð»Ð°) ÐµÐ¼Ð¾Ð´Ð·Ñ– %{target}"
+        disable_user: "%{name} Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ð²(-Ð»Ð°) Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–ÑŽ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñƒ %{target}"
+        enable_custom_emoji: "%{name} ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÐ²(-Ð»Ð°) ÐµÐ¼Ð¾Ð´Ð·Ñ– %{target}"
+        enable_user: "%{name} ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÐ²(-Ð»Ð°) Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–ÑŽ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñƒ %{target}"
+        memorialize_account: "%{name} Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€Ð¸Ð²(-Ð»Ð°) ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ %{target} Ñƒ Ð¿Ð°Ð¼'ÑÑ‚Ð½Ð¸Ðº"
+        promote_user: "%{name} Ð¿Ñ–Ð´Ð²Ð¸Ñ‰Ð¸Ð²(-Ð»Ð°) ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        remove_avatar_user: "%{name} Ð¿Ñ€Ð¸Ð±Ñ€Ð°Ð²(-Ð»Ð°) Ð°Ð²Ð°Ñ‚Ð°Ñ€ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        reopen_report: "%{name} Ð¿ÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ð²(-Ð»Ð°) ÑÐºÐ°Ñ€Ð³Ñƒ %{target}"
+        reset_password_user: "%{name} ÑÐºÐ¸Ð½ÑƒÐ²(-Ð»Ð°) Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        resolve_report: "%{name} Ñ€Ð¾Ð·Ð²'ÑÐ·Ð°Ð²(-Ð»Ð°) ÑÐºÐ°Ñ€Ð³Ñƒ %{target}"
+        silence_account: "%{name} Ð·Ð°Ð³Ð»ÑƒÑˆÐ¸Ð²(-Ð»Ð°) Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ %{target}"
+        suspend_account: "%{name} Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð² Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        unassigned_report: "%{name} Ð·Ð½ÑÐ²(-Ð»Ð°) Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÑÐºÐ°Ñ€Ð³Ð¸ %{target}"
+        unsilence_account: "%{name} Ñ€Ð¾Ð·Ð³Ð»ÑƒÑˆÐ¸Ð²(-Ð»Ð°) Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ %{target}"
+        unsuspend_account: "%{name} Ñ€Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð² Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° %{target}"
+        update_custom_emoji: "%{name} Ð¾Ð½Ð¾Ð²Ð¸Ð²(-Ð»Ð°) ÐµÐ¼Ð¾Ð´Ð·Ñ– %{target}"
+        update_status: "%{name} Ð·Ð¼Ñ–Ð½Ð¸Ð²(-Ð»Ð°) ÑÑ‚Ð°Ñ‚ÑƒÑ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ°Ñ‡Ð° %{target}"
+      title: Ð–ÑƒÑ€Ð½Ð°Ð» Ð¿Ð¾Ð´Ñ–Ð¹
+    custom_emojis:
+      by_domain: Ð”Ð¾Ð¼ÐµÐ½
+      copied_msg: Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð° ÐºÐ¾Ð¿Ñ–Ñ ÐµÐ¼Ð¾Ð´Ð·Ñ– ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð°
+      copy: ÐšÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸
+      copy_failed_msg: ÐÐµ Ð²Ð¸Ð¹ÑˆÐ»Ð¾ ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñƒ ÐºÐ¾Ð¿Ñ–ÑŽ ÐµÐ¼Ð¾Ð´Ð·Ñ–
+      created_msg: Ð•Ð¼Ð¾Ð´Ð·Ñ– ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ðµ!
+      delete: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸
+      destroyed_msg: Ð•Ð¼Ð¾Ð´Ð·Ñ– ÑƒÑÑ–Ð¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ðµ!
+      disable: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸
+      disabled_msg: Ð•Ð¼Ð¾Ð´Ð·Ñ– ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾
+      emoji: Ð•Ð¼Ð¾Ð´Ð·Ñ–
+      enable: Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸
+      enabled_msg: Ð•Ð¼Ð¾Ð´Ð·Ñ– ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ðµ
+      image_hint: PNG Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ Ð´Ð¾ 50 ÐšÐ‘
+      listed: Ð£ ÑÐ¿Ð¸ÑÐºÑƒ
+      new:
+        title: Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ ÐµÐ¼Ð¾Ð´Ð·Ñ–
+      overwrite: ÐŸÐµÑ€ÐµÐ¿Ð¸ÑÐ°Ñ‚Ð¸
+      shortcode: Ð¨Ð¾Ñ€Ñ‚ÐºÐ¾Ð´
+      shortcode_hint: ÐœÑ–Ð½Ñ–Ð¼ÑƒÐ¼ Ð´Ð²Ð° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸, Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ñ†Ð¸Ñ„Ñ€Ð¾Ð²Ñ– Ð¹ Ð»Ð°Ñ‚Ð¸Ð½ÑÑŒÐºÑ– ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸ Ð°Ð±Ð¾ Ð½Ð¸Ð¶Ð½Ñ– Ð¿Ñ–Ð´ÐºÑ€ÐµÑÐ»ÐµÐ½Ð½Ñ
+      title: ÐžÑÐ¾Ð±Ð»Ð¸Ð²Ñ– ÐµÐ¼Ð¾Ð´Ð·Ñ–
+      unlisted: ÐÐµ Ñƒ ÑÐ¿Ð¸ÑÐºÑƒ
+      update_failed_msg: ÐÐµ Ð²Ð¸Ð¹ÑˆÐ»Ð¾ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ ÐµÐ¼Ð¾Ð·Ð´Ñ–
+      updated_msg: Ð•Ð¼Ð¾Ð´Ð·Ñ– ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ðµ!
+      upload: Ð’Ð¸Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸
+    dashboard:
+      config: ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ
+      feature_deletions: Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð²
+      feature_invites: ÐŸÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ-Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ
+      feature_registrations: Ð ÐµÑ”ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ—
+      features: ÐœÐ¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑ‚Ñ–
+      hidden_service: Ð¤ÐµÐ´ÐµÑ€Ð°Ñ†Ñ–Ñ Ð· Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¸Ð¼Ð¸ ÑÐµÑ€Ð²Ñ–ÑÐ°Ð¼Ð¸
+      open_reports: Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ– ÑÐºÐ°Ñ€Ð³Ð¸
+      recent_users: ÐžÑÑ‚Ð°Ð½Ð½Ñ– ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–
+      search: ÐŸÐ¾Ð²Ð½Ð¾Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ð¸Ð¹ Ð¿Ð¾ÑˆÑƒÐº
+      single_user_mode: Ð ÐµÐ¶Ð¸Ð¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
+      software: ÐŸÑ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½Ñ
+      space: Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€Ñƒ
+      title: Ð”Ð°ÑˆÐ±Ð¾Ñ€Ð´
+      total_users: ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ð·Ð°Ð³Ð°Ð»Ð¾Ð¼
+      trends: Ð¢Ñ€ÐµÐ½Ð´Ð¸
+      week_interactions: Ð´Ñ–Ð¹ Ð·Ð° Ñ†ÐµÐ¹ Ñ‚Ð¸Ð¶Ð´ÐµÐ½ÑŒ
+      week_users_active: Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ Ð¿Ñ€Ð¾Ñ‚ÑÐ³Ð¾Ð¼ Ñ‚Ð¸Ð¶Ð½Ñ
+      week_users_new: ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ†ÑŒÐ¾Ð³Ð¾ Ñ‚Ð¸Ð¶Ð½Ñ
     domain_blocks:
       add_new: Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð½Ð¾Ð²Ðµ
       created_msg: Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ð¾Ð±Ñ€Ð¾Ð±Ð»ÑŽÑ”Ñ‚ÑŒÑÑ
@@ -72,18 +228,15 @@ uk:
       domain: Ð”Ð¾Ð¼ÐµÐ½
       new:
         create: Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
-        hint: Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ð½Ðµ Ð·Ð°Ð¿Ð¾Ð±Ñ–Ð¶Ð¸Ñ‚ÑŒ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½ÑŽ Ð½Ð¾Ð²Ð¸Ñ… Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð² Ñƒ Ð±Ð°Ð·Ñ– Ð´Ð°Ð½Ð¸Ñ…, Ð°Ð»Ðµ Ñ€ÐµÑ‚Ñ€Ð¾Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ Ñ‚Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÑ” ÑƒÐºÐ°Ð·Ð°Ð½Ñ– Ð¼ÐµÑ‚Ð¾Ð´Ð¸ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ†Ñ–Ñ— Ð´Ð»Ñ Ñ†Ð¸Ñ… Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð².
+        hint: Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ Ð½Ðµ Ð·Ð°Ð²Ð°Ð´Ð¸Ñ‚ÑŒ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½ÑŽ Ð½Ð¾Ð²Ð¸Ñ… Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð² Ñƒ Ð±Ð°Ð·Ñ– Ð´Ð°Ð½Ð¸Ñ…, Ð°Ð»Ðµ Ñ€ÐµÑ‚Ñ€Ð¾Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ Ñ‚Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÑ” Ð²ÐºÐ°Ð·Ð°Ð½Ñ– Ð¼ÐµÑ‚Ð¾Ð´Ð¸ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ†Ñ–Ñ— Ð´Ð»Ñ Ñ†Ð¸Ñ… Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð².
         severity:
-          desc_html: "<strong>Ð“Ð»ÑƒÑˆÐµÐ½Ð½Ñ</strong> Ð·Ñ€Ð¾Ð±Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ Ð½ÐµÐ²Ð¸Ð´Ð¸Ð¼Ð¸Ð¼Ð¸ Ð´Ð»Ñ Ð²ÑÑ–Ñ…, ÐºÑ€Ñ–Ð¼ Ñ—Ñ…Ð½Ñ–Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð². <strong>Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ</strong> Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÑÑŒ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ, Ð²ÐºÐ»ÑŽÑ‡Ð°ÑŽÑ‡Ð¸ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ñ–Ð¹Ð½Ñ– Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ Ñ‚Ð° Ð´Ð°Ð½Ñ– Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ."
+          desc_html: "<strong>Ð“Ð»ÑƒÑˆÐµÐ½Ð½Ñ</strong> Ð·Ñ€Ð¾Ð±Ð¸Ñ‚ÑŒ ÑÑ‚Ð°Ñ‚ÑƒÑÐ¸ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ Ð½ÐµÐ²Ð¸Ð´Ð¸Ð¼Ð¸Ð¼Ð¸ Ð´Ð»Ñ Ð²ÑÑ–Ñ…, Ð¾ÐºÑ€Ñ–Ð¼ Ñ—Ñ…Ð½Ñ–Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð². <strong>Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ</strong> Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÑƒÐ²ÐµÑÑŒ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ, Ð²ÐºÐ»ÑŽÑ‡Ð°ÑŽÑ‡Ð¸ Ð¼ÑƒÐ»ÑŒÑ‚Ð¸Ð¼ÐµÐ´Ñ–Ð¹Ð½Ñ– Ð²ÐºÐ»Ð°Ð´ÐµÐ½Ð½Ñ Ñ‚Ð° Ð´Ð°Ð½Ñ– Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ."
+          noop: ÐÑ–Ñ‡Ð¾Ð³Ð¾
           silence: Ð“Ð»ÑƒÑˆÐµÐ½Ð½Ñ
           suspend: Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
-        title: ÐÐ¾Ð²Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð½Ðµ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
+        title: ÐÐ¾Ð²Ðµ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ
       reject_media: Ð—Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚Ð¸ Ð¼ÐµÐ´Ñ–Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
-      reject_media_hint: Ð’Ð¸Ð´Ð°Ð»ÑÑ” Ð¼ÐµÐ´Ñ–Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚, Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¸Ð¹ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾, Ñ– Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½ÑÑ” Ð¹Ð¾Ð³Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñƒ Ð¼Ð°Ð¹Ð±ÑƒÑ‚Ð½ÑŒÐ¾Ð¼Ñƒ. ÐÐµ Ð¼Ð°Ñ” Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ.
-      severities:
-        silence: Ð“Ð»ÑƒÑˆÐµÐ½Ð½Ñ
-        suspend: Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
-      severity: Ð¡ÑƒÐ²Ð¾Ñ€Ñ–ÑÑ‚ÑŒ
+      reject_media_hint: Ð’Ð¸Ð´Ð°Ð»ÑÑ” Ð¼ÐµÐ´Ñ–Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚, Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¸Ð¹ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾, Ñ– Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½ÑÑ” Ð¹Ð¾Ð³Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñƒ Ð¼Ð°Ð¹Ð±ÑƒÑ‚Ð½ÑŒÐ¾Ð¼Ñƒ. ÐÐµ Ð¼Ð°Ñ” Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
       show:
         affected_accounts:
           few: Ð’Ð¿Ð»Ð¸Ð²Ð°Ñ” Ð½Ð° %{count} Ð°ÐºÐ°ÑƒÐ½Ñ‚Ð¸ Ñƒ Ð±Ð°Ð·Ñ– Ð´Ð°Ð½Ð¸Ñ…
@@ -95,42 +248,129 @@ uk:
           suspend: Ð—Ð½ÑÑ‚Ð¸ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð· ÑƒÑÑ–Ñ… Ñ–ÑÐ½ÑƒÑŽÑ‡Ð¸Ñ… Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð² Ñ†ÑŒÐ¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ
         title: Ð—Ð½ÑÑ‚Ð¸ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð· Ð´Ð¾Ð¼ÐµÐ½Ð° %{domain}
         undo: Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸
-      title: Ð”Ð¾Ð¼ÐµÐ½Ð½Ñ– Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ
       undo: Ð’Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸
+    email_domain_blocks:
+      add_new: Ð”Ð¾Ð´Ð°Ñ‚Ð¸
+      created_msg: Ð£ÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð´Ð¾Ð´Ð°Ð½Ð¾ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð´Ð¾ Ñ‡Ð¾Ñ€Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ
+      delete: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸
+      destroyed_msg: Ð£ÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð· Ñ‡Ð¾Ñ€Ð½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÑƒ
+      domain: Ð”Ð¾Ð¼ÐµÐ½
+      new:
+        create: Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð´Ð¾Ð¼ÐµÐ½
+        title: ÐÐ¾Ð²Ðµ Ð´Ð¾Ð¼ÐµÐ½Ð½Ðµ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼ÐµÐ½Ñƒ email
+      title: Ð§Ð¾Ñ€Ð½Ð¸Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾ÑˆÑ‚Ð¾Ð²Ð¸Ñ… Ð´Ð¾Ð¼ÐµÐ½Ñ–Ð²
+    instances:
+      title: Ð’Ñ–Ð´Ð¾Ð¼Ñ– Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
+    invites:
+      filter:
+        all: Ð’ÑÐµ
+        available: Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ð¾
+        expired: ÐŸÑ€Ð¾ÑÑ€Ð¾Ñ‡ÐµÐ½Ð¾
+        title: Ð¤Ñ–Ð»ÑŒÑ‚Ñ€
+      title: Ð—Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ
+    relays:
+      status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ
+    report_notes:
+      created_msg: Ð¡ÐºÐ°Ñ€Ð³Ð° ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð°!
+      destroyed_msg: Ð¡ÐºÐ°Ñ€Ð³Ð° ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð°!
     reports:
+      account:
+        note: Ð¿Ñ€Ð¸Ð¼Ñ–Ñ‚ÐºÐ°
+        report: ÑÐºÐ°Ñ€Ð³Ð°
+      action_taken_by: Ð”Ñ–Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð°
+      are_you_sure: Ð’Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ–?
+      assign_to_self: ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ Ð¼ÐµÐ½Ñ–
+      assigned: ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ Ð¼Ð¾Ð´ÐµÑ€Ð°Ñ‚Ð¾Ñ€
       comment:
         none: ÐÐµÐ¼Ð°Ñ”
-      id: ID
+      created_at: Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð¾
       mark_as_resolved: Ð’Ñ–Ð´Ð¼Ñ–Ñ‚Ð¸Ñ‚Ð¸ ÑÐº Ð²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ñƒ
+      mark_as_unresolved: Ð’Ñ–Ð´Ð¼Ñ–Ñ‚Ð¸Ñ‚Ð¸ ÑÐº Ð½ÐµÐ²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ñƒ
+      notes:
+        create: Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¸Ð¼Ñ–Ñ‚ÐºÑƒ
+        create_and_resolve: Ð Ð¾Ð·Ð²'ÑÐ·Ð°Ñ‚Ð¸ Ð· Ð¿Ñ€Ð¸Ð¼Ñ–Ñ‚ÐºÐ¾ÑŽ
+        create_and_unresolve: ÐŸÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð· Ð¿Ñ€Ð¸Ð¼Ñ–Ñ‚ÐºÐ¾ÑŽ
+        delete: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸
+        placeholder: ÐžÐ¿Ð¸ÑˆÑ–Ñ‚ÑŒ, ÑÐºÑ– Ð´Ñ–Ñ— Ð±ÑƒÐ»Ð¸ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ñ–, Ð°Ð±Ð¾ Ñ–Ð½ÑˆÑ– Ð·Ð¼Ñ–Ð½Ð¸, Ñ‰Ð¾ ÑÑ‚Ð¾ÑÑƒÑŽÑ‚ÑŒÑÑ ÑÐ¿Ñ€Ð°Ð²Ð¸...
+      reopen: ÐŸÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ ÑÐºÐ°Ñ€Ð³Ñƒ
       report: 'Ð¡ÐºÐ°Ñ€Ð³Ð° #%{id}'
       reported_account: ÐÐºÐ°ÑƒÐ½Ñ‚ Ð¿Ð¾Ñ€ÑƒÑˆÐ½Ð¸ÐºÐ°
       reported_by: Ð’Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð½Ð¸Ðº ÑÐºÐ°Ñ€Ð³Ð¸
       resolved: Ð’Ð¸Ñ€Ñ–ÑˆÐµÐ½Ð¾
-      silence_account: Ð—Ð°Ð³Ð»ÑƒÑˆÐ¸Ñ‚Ð¸ Ð°ÐºÐ°ÑƒÐ½Ñ‚
+      resolved_msg: Ð¡ÐºÐ°Ñ€Ð³Ñƒ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ð¾!
       status: Ð¡Ñ‚Ð°Ñ‚ÑƒÑ
-      suspend_account: Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð°ÐºÐ°ÑƒÐ½Ñ‚
-      target: Ð¦Ñ–Ð»ÑŒ
       title: Ð¡ÐºÐ°Ñ€Ð³Ð¸
+      unassign: Ð—Ð½ÑÑ‚Ð¸ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ
       unresolved: ÐÐµÐ²Ð¸Ñ€Ñ–ÑˆÐµÐ½Ñ–
-      view: ÐŸÐ¾Ð´Ð¸Ð²Ð¸Ñ‚Ð¸ÑÑ
+      updated_at: ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ñ–
     settings:
+      activity_api_enabled:
+        desc_html: ÐšÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ñ… Ð¿Ð¾ÑÑ‚Ñ–Ð², Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¸Ñ… Ñ‚Ð° Ð½Ð¾Ð²Ð¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñƒ Ñ‚Ð¸Ð¶Ð½ÐµÐ²Ð¸Ñ… Ñ€Ð¾Ð·Ñ€Ñ–Ð·Ð°Ñ…
+        title: ÐŸÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð°Ð³Ñ€ÐµÐ³Ð¾Ð²Ð°Ð½Ð¾Ñ— ÑÑ‚Ð°Ñ‚Ð¸ÑÑ‚Ð¸ÐºÐ¸ Ð¿Ñ€Ð¾ Ð°ÐºÑ‚Ð¸Ð²Ð½Ñ–ÑÑ‚ÑŒ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð²
+      bootstrap_timeline_accounts:
+        title: ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ… ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð²
       contact_information:
         email: Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¹ email
         username: Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
+      hero:
+        desc_html: Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ”Ñ‚ÑŒÑÑ Ð½Ð° Ð³Ð¾Ð»Ð¾Ð²Ð½Ñ–Ð¹ ÑÑ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ–. Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð¾Ð²Ð°Ð½Ð° ÑÐº Ð¼Ñ–Ð½Ñ–Ð¼ÑƒÐ¼ 600x100 Ð¿Ñ–ÐºÑÐµÐ»Ñ–Ð². Ð¯ÐºÑ‰Ð¾ Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾, Ð±ÑƒÐ´Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð¾ Ð¿ÐµÑ€ÐµÐ´Ð¿Ð¾ÐºÐ°Ð· Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
+        title: Ð‘Ð°Ð½ÐµÑ€ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
+      peers_api_enabled:
+        desc_html: Ð”Ð¾Ð¼ÐµÐ½Ð½Ñ– Ñ–Ð¼'Ñ, Ð¿Ð¾Ð¼Ñ–Ñ‡ÐµÐ½Ñ– Ñ†Ñ–Ñ”ÑŽ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ”ÑŽ Ñ„ÐµÐ´Ð¸ÑÐ²Ñ–Ñ‚Ñƒ
+        title: ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¸Ñ… Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ð¹
+      preview_sensitive_media:
+        desc_html: ÐŸÐµÑ€ÐµÐ´Ð¿Ð¾ÐºÐ°Ð· Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° Ñ–Ð½ÑˆÐ¸Ñ… ÑÐ°Ð¹Ñ‚Ð°Ñ… Ð±ÑƒÐ´Ðµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð¼Ñ–Ð½Ñ–Ð°Ñ‚ÑŽÑ€Ñƒ Ð½Ð°Ð²Ñ–Ñ‚ÑŒ ÑÐºÑ‰Ð¾ Ð¼ÐµÐ´Ñ–Ð° Ð²Ñ–Ð´Ð¼Ñ–Ñ‡ÐµÐ½Ðµ ÑÐº Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ðµ
+        title: ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ñ€Ð°Ð·Ð»Ð¸Ð²Ðµ Ð¼ÐµÐ´Ñ–Ñ Ñƒ Ð¿ÐµÑ€ÐµÐ¿Ð¾ÐºÐ°Ð·Ñ– OpenGraph
       registrations:
         closed_message:
           desc_html: Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ”Ñ‚ÑŒÑÑ Ð½Ð° Ñ‚Ð¸Ñ‚ÑƒÐ»ÑŒÐ½Ñ–Ð¹ ÑÑ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ–, ÐºÐ¾Ð»Ð¸ Ñ€ÐµÑ”ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð° <br>ÐœÐ¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ HTML-Ñ‚ÐµÐ³Ð¸
           title: ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ñƒ Ñ€ÐµÑ”ÑÑ‚Ñ€Ð°Ñ†Ñ–ÑŽ
+        deletion:
+          desc_html: Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð±ÑƒÐ´ÑŒ-ÐºÐ¾Ð¼Ñƒ Ð²Ð¸Ð´Ð°Ð»ÑÑ‚Ð¸ ÑÐ²Ñ–Ð¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
+          title: Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð²
+        min_invite_role:
+          disabled: ÐÑ–Ñ…Ñ‚Ð¾
+          title: Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ Ð²Ñ–Ð´
         open:
+          desc_html: Ð”Ð¾Ð·Ð²Ð¾Ð»Ð¸Ñ‚Ð¸ Ð±ÑƒÐ´ÑŒ-ÐºÐ¾Ð¼ ÑÑ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ñ‚Ð¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
           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: ÐžÐ¿Ð¸Ñ ÑÐ°Ð¹Ñ‚Ñƒ
+        title: ÐžÐ¿Ð¸Ñ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
       site_description_extended:
         desc_html: Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ”Ñ‚ÑŒÑÑ Ð½Ð° ÑÑ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ– Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ—<br>ÐœÐ¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ HTML-Ñ‚ÐµÐ³Ð¸
         title: Ð Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ð¹ Ð¾Ð¿Ð¸Ñ ÑÐ°Ð¹Ñ‚Ñƒ
+      site_terms:
+        desc_html: |-
+          Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÐ½Ðµ Ð½Ð°Ð¿Ð¸ÑÐ°Ñ‚Ð¸ Ð²Ð»Ð°ÑÐ½Ñƒ Ð¿Ð¾Ð»Ñ–Ñ‚Ð¸ÐºÑƒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ–, ÑƒÐ¼Ð¾Ð²Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ– Ñ‚Ð° Ñ–Ð½ÑˆÑ– Ð·Ð°ÐºÐ¾Ð½Ð½Ñ– ÑˆÑ‚ÑƒÐºÐ¸<br>
+          ÐœÐ¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ HTML Ñ‚ÐµÐ³Ð¸
+        title: ÐžÑÐ¾Ð±Ð»Ð¸Ð²Ñ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ
       site_title: ÐÐ°Ð·Ð²Ð° ÑÐ°Ð¹Ñ‚Ñƒ
+      thumbnail:
+        desc_html: Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÑ”Ñ‚ÑŒÑÑ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð¿Ð¾ÐºÐ°Ð·Ñ–Ð² Ñ‡ÐµÑ€ÐµÐ· OpenGraph Ñ‚Ð° API. Ð‘Ð°Ð¶Ð°Ð½Ð¾ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ 1200Ñ…640 Ð¿Ñ–ÐºÑÐµÐ»Ñ–Ð²
+        title: ÐœÑ–Ð½Ñ–Ð°Ñ‚ÑŽÑ€Ð° Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—
+      timeline_preview:
+        desc_html: ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¹ Ñ„Ñ–Ð´ Ð½Ð° Ð³Ð¾Ð»Ð¾Ð²Ð½Ñ–Ð¹ ÑÑ‚Ð¾Ñ€Ñ–Ð½Ñ†Ñ–
+        title: ÐŸÐµÑ€ÐµÐ´Ð¿Ð¾ÐºÐ°Ð· Ñ„Ñ–Ð´Ñƒ
       title: ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ñ‚Ñƒ
+    statuses:
+      back_to_account: ÐÐ°Ð·Ð°Ð´ Ð½Ð° ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ
+      batch:
+        delete: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸
+        nsfw_off: Ð’Ñ–Ð´Ð¼Ñ–Ñ‚Ð¸Ñ‚Ð¸ ÑÐ¿Ñ€Ð¸Ð¹Ð½ÑÑ‚Ð»Ð¸Ð²Ð¸Ð¼
+        nsfw_on: Ð’Ñ–Ð´Ð¼Ñ–Ñ‚Ð¸Ñ‚Ð¸ Ð½ÐµÑÐ¿Ñ€Ð¸Ð¹Ð½ÑÑ‚Ð»Ð¸Ð²Ð¸Ð¼
+      failed_to_execute: ÐÐµ Ð²Ð¸Ð¹ÑˆÐ»Ð¾
+      media:
+        title: ÐœÐµÐ´Ñ–Ð°
+      no_media: ÐÐµÐ¼Ð°Ñ” Ð¼ÐµÐ´Ñ–Ð°
+      title: Ð¡Ñ‚Ð°Ñ‚ÑƒÑÐ¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñ–Ð²
+      with_media: Ð— Ð¼ÐµÐ´Ñ–Ð°
     subscriptions:
       callback_url: Callback URL
       confirmed: ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð¾
@@ -139,24 +379,60 @@ uk:
       title: WebSub
       topic: Ð¢ÐµÐ¼Ð°
     title: ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ
+  admin_mailer:
+    new_report:
+      body: "%{reporter} Ð¿Ð¾ÑÐºÐ°Ñ€Ð¶Ð¸Ð²ÑÑ(-Ð»Ð°ÑÑ) %{target}"
+      body_remote: Ð¥Ñ‚Ð¾ÑÑŒ Ð· Ð´Ð¾Ð¼ÐµÐ½Ñƒ %{domain} Ð¿Ð¾ÑÐºÐ°Ñ€Ð¶Ð¸Ð²ÑÑ(-Ð»Ð°ÑÑ) %{target}
+      subject: ÐÐ¾Ð²Ð° ÑÐºÐ°Ñ€Ð³Ð° Ð´Ð¾ %{instance} (#%{id})
   application_mailer:
-    settings: 'Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ email: %{link}'
+    notification_preferences: Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ e-mail
+    salutation: "%{name},"
+    settings: 'Ð—Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ e-mail: %{link}'
     view: 'ÐŸÐµÑ€ÐµÐ³Ð»ÑÐ´:'
+    view_profile: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ
+    view_status: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ ÑÑ‚Ð°Ñ‚ÑƒÑ
   applications:
+    created: Ð—Ð°ÑÑ‚Ð¾ÑÑƒÐ½Ð¾Ðº ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ð¹
+    destroyed: Ð—Ð°ÑÑ‚Ð¾ÑÑƒÐ½Ð¾Ðº ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¸Ð¹
     invalid_url: Ð’Ð²ÐµÐ´ÐµÐ½Ð° URL Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°
+    regenerate_token: ÐŸÐµÑ€ÐµÐ³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚Ð¾ÐºÐµÐ½ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ
+    token_regenerated: Ð¢Ð¾ÐºÐµÐ½ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ ÑƒÑÐ¿Ñ–ÑˆÐ½Ðµ Ð¿ÐµÑ€ÐµÐ³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ð¾
+    warning: Ð‘ÑƒÐ´ÑŒÑ‚Ðµ Ð´ÑƒÐ¶Ðµ Ð¾Ð±ÐµÑ€ÐµÐ¶Ð½Ñ– Ð· Ñ†Ð¸Ð¼Ð¸ Ð´Ð°Ð½Ð¸Ð¼Ð¸. ÐÑ–ÐºÐ¾Ð»Ð¸ Ð½Ðµ Ð´Ñ–Ð»Ñ–Ñ‚ÑŒÑÑ Ð½Ð¸Ð¼Ð¸ Ð½Ñ– Ð· ÐºÐ¸Ð¼!
+    your_token: Ð’Ð°Ñˆ Ñ‚Ð¾ÐºÐµÐ½ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ
   auth:
+    agreement_html: Ð ÐµÑ”ÑÑ‚Ñ€ÑƒÑŽÑ‡Ð¸ÑÑŒ, Ð²Ð¸ Ð¿Ð¾Ð³Ð¾Ð´Ð¶ÑƒÑ”Ñ‚ÐµÑÑ Ð²Ð¸ÐºÐ¾Ð½ÑƒÐ²Ð°Ñ‚Ð¸ <a href="%{rules_path}">Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—</a> Ñ‚Ð° <a href="%{terms_path}">Ð½Ð°ÑˆÑ– ÑƒÐ¼Ð¾Ð²Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ</a>.
+    change_password: ÐŸÐ°Ñ€Ð¾Ð»ÑŒ
+    confirm_email: ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´ÑŒÑ‚Ðµ e-mail Ð°Ð´Ñ€ÐµÑÑƒ
+    delete_account: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
+    delete_account_html: Ð¯ÐºÑ‰Ð¾ Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href="%{path}">Ð¿ÐµÑ€ÐµÐ¹Ñ‚Ð¸ ÑÑŽÐ´Ð¸</a>. Ð’Ð°Ñ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÑÑ‚ÑŒ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ð¸ Ð´Ñ–ÑŽ.
     didnt_get_confirmation: Ð’Ð¸ Ð½Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð»Ð¸ Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð· Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ?
     forgot_password: Ð—Ð°Ð±ÑƒÐ»Ð¸ ÑÐ²Ñ–Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ?
+    invalid_reset_password_token: Ð¢Ð¾ÐºÐµÐ½ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŽ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð°Ð±Ð¾ Ð¿Ñ€Ð¾ÑÑ€Ð¾Ñ‡ÐµÐ½Ð¸Ð¹. Ð¡Ð¿Ñ€Ð¾Ð±ÑƒÐ¹Ñ‚Ðµ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹.
     login: Ð£Ð²Ñ–Ð¹Ñ‚Ð¸
     logout: Ð’Ð¸Ð¹Ñ‚Ð¸
+    migrate_account: ÐŸÐµÑ€ÐµÑ—Ñ…Ð°Ñ‚Ð¸ Ð´Ð¾ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ
+    migrate_account_html: Ð¯ÐºÑ‰Ð¾ Ð²Ð¸ Ð±Ð°Ð¶Ð°Ñ”Ñ‚Ðµ, Ñ‰Ð¾Ð± Ð²Ñ–Ð´Ð²Ñ–Ð´ÑƒÐ²Ð°Ñ‡Ñ– Ñ†ÑŒÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°Ð½Ñ‚Ñƒ Ð±ÑƒÐ»Ð¸ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ñ– Ð´Ð¾ Ñ–Ð½ÑˆÐ¾Ð³Ð¾, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href="%{path}">Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ñ†Ðµ Ñ‚ÑƒÑ‚</a>.
+    or: Ð°Ð±Ð¾
+    or_log_in_with: ÐÐ±Ð¾ ÑƒÐ²Ñ–Ð¹Ð´Ñ–Ñ‚ÑŒ Ð·
+    providers:
+      cas: CAS
+      saml: SAML
     register: Ð—Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ÑÑ
+    register_elsewhere: Ð—Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð½Ð° Ñ–Ð½ÑˆÐ¾Ð¼Ñƒ ÑÐµÑ€Ð²ÐµÑ€Ñ–
     resend_confirmation: ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ Ñ–Ð½ÑÑ‚Ñ€ÑƒÐºÑ†Ñ–Ñ— Ð· Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ
     reset_password: Ð¡ÐºÐ¸Ð½ÑƒÑ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
     security: Ð—Ð¼Ñ–Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»ÑŽ
     set_new_password: Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð½Ð¾Ð²Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
   authorize_follow:
+    already_following: Ð’Ð¸ Ð²Ð¶Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– Ð½Ð° Ñ†ÐµÐ¹ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
     error: ÐÐ° Ð¶Ð°Ð»ÑŒ, Ð¿Ñ€Ð¸ Ð¿Ð¾ÑˆÑƒÐºÑƒ Ð²Ñ–Ð´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ Ð²Ð¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°
     follow: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
+    follow_request: 'Ð’Ð°Ð¼ Ð½Ð°Ð´Ñ–ÑÐ»Ð°Ð»Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ:'
+    following: 'Ð£Ñ€Ð°! Ð’Ð¸ Ñ‚ÐµÐ¿ÐµÑ€ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– Ð½Ð°:'
+    post_follow:
+      close: ÐÐ±Ð¾, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ð¾ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸ Ð²Ñ–ÐºÐ½Ð¾.
+      return: ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŽ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð°
+      web: ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð²ÐµÐ±Ñƒ
     title: ÐŸÑ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð½Ð° %{acct}
   datetime:
     distance_in_words:
@@ -164,46 +440,77 @@ uk:
       about_x_months: "%{count}Ð¼Ñ–Ñ"
       about_x_years: "%{count}Ñ€"
       almost_x_years: "%{count}Ñ€"
-      half_a_minute: Ð¢Ñ–Ð»ÑŒÐºÐ¸ Ñ‰Ð¾
+      half_a_minute: Ð©Ð¾Ð¹Ð½Ð¾
       less_than_x_minutes: "%{count}Ñ…Ð²"
-      less_than_x_seconds: Ð¢Ñ–Ð»ÑŒÐºÐ¸ Ñ‰Ð¾
+      less_than_x_seconds: Ð©Ð¾Ð¹Ð½Ð¾
       over_x_years: "%{count}Ñ€"
       x_days: "%{count}Ð´"
       x_minutes: "%{count}Ñ…Ð²"
       x_months: "%{count}Ð¼Ñ–Ñ"
       x_seconds: "%{count}ÑÐµÐº"
+  deletes:
+    bad_password_msg: Ð“Ð°Ñ€Ð½Ð° ÑÐ¿Ñ€Ð¾Ð±Ð°, Ð³Ð°ÐºÐµÑ€Ð¸! ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ
+    confirm_password: Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ñ‰Ð¾Ð± Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ Ñ‰Ð¾ Ð²Ð¸ Ñ†Ðµ Ð²Ð¸
+    description_html: Ð¦Ðµ <strong>Ð±ÐµÐ·Ð²Ñ–Ð´Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ð¾ Ñ– Ð½Ð°Ð·Ð°Ð²Ð¶Ð´Ð¸</strong> Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚ Ð· Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ Ñ‚Ð° Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²ÑƒÑ” Ð¹Ð¾Ð³Ð¾. Ð’Ð°ÑˆÐµ Ñ–Ð¼'Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ð° Ð±ÑƒÐ´Ðµ Ð·Ð°Ð»Ð¸ÑˆÐ°Ñ‚Ð¸ÑÑ Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¾Ð²Ð°Ð½Ð¸Ð¼ Ð´Ð»Ñ ÑƒÐ½Ð¸ÐºÐ½ÐµÐ½Ð½Ñ Ð²Ð°ÑˆÐ¾Ñ— Ð´ÐµÐ¿ÐµÑ€ÑÐ¾Ð½Ð°Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ—.
+    proceed: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚
+    success_msg: Ð’Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð±ÑƒÐ»Ð¾ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾
+    warning_html: ÐœÐ¸ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð³Ð°Ñ€Ð°Ð½Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ð¸ <b>Ð»Ð¸ÑˆÐµ Ð· Ñ†ÑŒÐ¾Ð³Ð¾ ÑÐ°Ð¹Ñ‚Ñƒ</b>. ÐšÐ¾Ð½Ñ‚ÐµÐ½Ñ‚, Ñ‰Ð¾ Ð±ÑƒÐ² Ð¿Ð¾ÑˆÐ¸Ñ€ÐµÐ½Ð¸Ð¹ Ð·Ð°Ð»Ð¸ÑˆÐ°Ñ” ÑÐ»Ñ–Ð´Ð¸. Ð¡ÐµÑ€Ð²ÐµÑ€Ð¸, Ñ‰Ð¾ Ñ” Ð¾Ñ„Ð»Ð°Ð¹Ð½ Ñ‚Ð° Ñ‚Ñ–, Ñ‰Ð¾ Ð²Ñ–Ð´Ð¿Ð¸ÑÐ°Ð»Ð¸ÑÑ Ð²Ñ–Ð´ Ð½Ð°ÑˆÐ¸Ñ… Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½ÑŒ Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑˆÑƒÑ‚ÑŒ Ð·Ð¼Ñ–Ð½ Ð´Ð¾ ÑÐ²Ð¾Ñ—Ñ… Ð±Ð°Ð· Ð´Ð°Ð½Ð¸Ñ….
+    warning_title: ÐŸÑ€Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ–ÑÑ‚ÑŒ Ð¿Ð¾ÑˆÐ¸Ñ€ÐµÐ½Ð¾Ð³Ð¾ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ñƒ
   errors:
     '403': Ð£ Ð’Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð´Ð¾ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ñƒ Ð´Ð°Ð½Ð¾Ñ— ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸.
     '404': Ð¡Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÐ°, ÑÐºÑƒ Ð’Ð¸ ÑˆÑƒÐºÐ°Ð»Ð¸, Ð½Ðµ Ñ–ÑÐ½ÑƒÑ”.
     '410': Ð¡Ñ‚Ð¾Ñ€Ñ–Ð½ÐºÐ°, ÑÐºÑƒ Ð’Ð¸ ÑˆÑƒÐºÐ°Ð»Ð¸, Ð±Ñ–Ð»ÑŒÑˆÐµ Ð½Ðµ Ñ–ÑÐ½ÑƒÑ”.
     '422':
       content: ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð½Ðµ Ð²Ð´Ð°Ð»Ð°ÑÑ. ÐœÐ¾Ð¶Ð»Ð¸Ð²Ð¾, Ð’Ð¸ Ð±Ð»Ð¾ÐºÑƒÑ”Ñ‚Ðµ cookies?
-      title: ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð½Ðµ Ð²Ð´Ð°Ð»Ð°ÑÑ.
+      title: ÐŸÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ° Ð±ÐµÐ·Ð¿ÐµÐºÐ¸ Ð½Ðµ Ð²Ð´Ð°Ð»Ð°ÑÑ
+    '429': Ð—Ð°Ð±Ð°Ð³Ð°Ñ‚Ð¾ Ð·Ð°Ð¿Ð¸Ñ‚Ñ–Ð²
+    '500':
+      content: ÐŸÑ€Ð¾Ð±Ð°Ñ‡Ñ‚Ðµ, Ñ‚Ð° Ñ‰Ð¾ÑÑŒ Ð¿Ñ–ÑˆÐ»Ð¾ Ð½Ðµ Ñ‚Ð°Ðº Ð· Ð½Ð°ÑˆÐ¾Ð³Ð¾ Ð±Ð¾ÐºÑƒ.
+      title: Ð¦Ñ ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ° Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°
+    noscript_html: Ð”Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð²ÐµÐ±-Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÑƒ Mastodon, Ð±ÑƒÐ´ÑŒ-Ð»Ð°ÑÐºÐ° ÑƒÐ²Ñ–Ð¼ÐºÐ½Ñ–Ñ‚ÑŒ JavaScript. Ð¯ÐºÑ‰Ð¾ Ñƒ Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” Ñ‚Ð°ÐºÐ¾Ñ— Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑ‚Ñ–, ÑÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð¹Ñ‚ÐµÑÑŒ Ð¾Ð´Ð½Ð¸Ð¼ Ñ–Ð· <a href="%{apps_path}">Ð½Ð°Ñ‚Ð¸Ð²Ð½Ð¸Ñ… Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÑ–Ð²</a> Ð´Ð»Ñ Mastodon Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ñ— Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¸.
   exports:
+    archive_takeout:
+      date: Ð”Ð°Ñ‚Ð°
+      download: Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð²Ð°Ñˆ Ð°Ñ€Ñ…Ñ–Ð²
+      hint_html: Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð°Ñ€Ñ…Ñ–Ð² Ð²Ð°ÑˆÐ¸Ñ… <strong>Ð¿Ð¾ÑÑ‚Ñ–Ð² Ñ‚Ð° Ð²Ð¸Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾Ð³Ð¾ Ð¼ÐµÐ´Ñ–Ð° ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ñƒ</strong>. Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ñ– Ð´Ð°Ð½Ñ– Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ñƒ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñ– ActivityPub, Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ– Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ð±ÑƒÐ´ÑŒ-ÑÐºÐ¸Ð¼ ÑÑƒÐ¼Ñ–ÑÐ½Ð¸Ð¼ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¸Ð¼ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½ÑÐ¼. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð°Ñ€Ñ…Ñ–Ð² ÐºÐ¾Ð¶Ð½Ñ– 7 Ð´Ð½Ñ–Ð².
+      in_progress: Ð—Ð±Ð¸Ñ€Ð°Ñ”Ð¼Ð¾ Ð²Ð°Ñˆ Ð°Ñ€Ñ…Ñ–Ð²...
+      request: Ð—Ñ€Ð¾Ð±Ð¸Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð°Ñ€Ñ…Ñ–Ð²
+      size: Ð Ð¾Ð·Ð¼Ñ–Ñ€
     blocks: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½ÑŒ
     csv: CSV
     follows: ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸
     mutes: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ
     storage: Ð’Ð°Ñˆ Ð¼ÐµÐ´Ñ–Ð°ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
+  filters:
+    contexts:
+      home: Ð’Ð°Ñˆ Ñ„Ñ–Ð´
+      notifications: Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ
+      public: ÐŸÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¹ Ñ„Ñ–Ð´
+      thread: ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ
+    edit:
+      title: Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€
+    errors:
+      invalid_context: ÐšÐ¾Ð½Ñ‚ÐµÐºÑÑ‚ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ Ð°Ð±Ð¾ Ð½Ðµ Ð±ÑƒÐ² Ð½Ð°Ð´Ð°Ð½Ð¸Ð¹
+      invalid_irreversible: ÐÐµÐ·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ðµ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð°Ñ†ÑŽÑ” Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð² ÐºÐ¾Ð½Ñ‚ÐµÐºÑÑ‚Ñ– ÑÐ²Ð¾Ð³Ð¾ Ñ„Ñ–Ð´Ñƒ Ð°Ð±Ð¾ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ
+    index:
+      delete: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸
+      title: Ð¤Ñ–Ð»ÑŒÑ‚Ñ€Ð¸
+    new:
+      title: Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ñ„Ñ–Ð»ÑŒÑ‚Ñ€
   followers:
     domain: Ð”Ð¾Ð¼ÐµÐ½
-    explanation_html: Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ– Ð² Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ– Ð’Ð°ÑˆÐ¸Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÑ–Ð², Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¼Ð°Ñ‚Ð¸ Ñ‡Ñ–Ñ‚ÐºÐµ ÑƒÑÐ²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñ‚Ðµ, Ñ…Ñ‚Ð¾ Ð½Ð° Ð’Ð°Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹. <strong>Ð’Ð°ÑˆÑ– Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ– ÑÑ‚Ð°Ñ‚ÑƒÑÑ– Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‚ÑŒÑÑ ÑƒÑÑ–Ð¼ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–ÑÐ¼, Ð½Ð° ÑÐºÐ¸Ñ… Ñƒ Ð’Ð°Ñ Ñ” Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸</strong>. Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð· Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð² ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ð¹, Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ— Ñ‡Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð¼Ñƒ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½ÑŽ ÑÐºÐ¸Ñ… Ð’Ð¸ Ð½Ðµ Ð´Ð¾Ð²Ñ–Ñ€ÑÑ”Ñ‚Ðµ.
+    explanation_html: Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ñ– Ð² Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ– Ð’Ð°ÑˆÐ¸Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÑ–Ð², Ð’Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð¼Ð°Ñ‚Ð¸ Ñ‡Ñ–Ñ‚ÐºÐµ ÑƒÑÐ²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ñ‚Ðµ, Ñ…Ñ‚Ð¾ Ð½Ð° Ð’Ð°Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹. <strong>Ð’Ð°ÑˆÑ– Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ñ– ÑÑ‚Ð°Ñ‚ÑƒÑÑ– Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð»ÑÑŽÑ‚ÑŒÑÑ ÑƒÑÑ–Ð¼ ÑÐ°Ð¹Ñ‚Ð°Ð¼, Ð½Ð° ÑÐºÐ¸Ñ… Ñƒ Ð’Ð°Ñ Ñ” Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸</strong>. Ð ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÑ”Ð¼Ð¾ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð· Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð² ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ð¹, Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ— Ñ‡Ð¸ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð½Ð¾Ð¼Ñƒ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑ‡ÐµÐ½Ð½ÑŽ ÑÐºÐ¸Ñ… Ð’Ð¸ Ð½Ðµ Ð´Ð¾Ð²Ñ–Ñ€ÑÑ”Ñ‚Ðµ.
     followers_count: ÐšÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²
     lock_link: Ð—Ð°ÐºÑ€Ð¸Ð¹Ñ‚Ðµ Ð°ÐºÐ°ÑƒÐ½Ñ‚
     purge: Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ð· Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²
-    success:
-      one: Ð£ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ– Ð¼'ÑÐºÐ¾Ð³Ð¾ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð² Ð· Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð´Ð¾Ð¼ÐµÐ½Ñƒ...
-      other: Ð£ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ– Ð¼'ÑÐºÐ¾Ð³Ð¾ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð² Ð· %{count} Ð´Ð¾Ð¼ÐµÐ½Ñ–Ð²...
+    success: Ð£ Ð¿Ñ€Ð¾Ñ†ÐµÑÑ– Ð¼'ÑÐºÐ¾Ð³Ð¾ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð² Ð· %{count} Ð´Ð¾Ð¼ÐµÐ½Ñ–Ð²...
     true_privacy_html: Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ð¾Ð¼Ñ–Ñ‚ÑŒÑ‚Ðµ, Ñ‰Ð¾ <strong>ÑÐ¿Ñ€Ð°Ð²Ð¶Ð½ÑÑ ÐºÐ¾Ð½Ñ„Ñ–Ð´ÐµÐ½Ñ†Ñ–Ð¹Ð½Ñ–ÑÑ‚ÑŒ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑÐ³Ð½ÐµÐ½Ð° Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ end-to-end ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ</strong>.
     unlocked_warning_html: Ð¥Ñ‚Ð¾ Ð·Ð°Ð²Ð³Ð¾Ð´Ð½Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð½Ð° Ð’Ð°Ñ Ñ‚Ð° Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¿ÐµÑ€ÐµÐ³Ð»ÑÐ´Ñƒ Ð’Ð°ÑˆÐ¸Ñ… Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¸Ñ… ÑÑ‚Ð°Ñ‚ÑƒÑÑ–Ð². %{lock_link}, Ñ‰Ð¾Ð± Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ñ–ÑÑ‚ÑŒ Ñ€Ð¾Ð·Ð´Ð¸Ð²Ð»ÑÑ‚Ð¸ÑÑ Ñ‚Ð° Ð²Ñ€ÑƒÑ‡Ð½Ñƒ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚Ð¸ Ñ‰Ð¾Ð´Ð¾ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÐ¸.
     unlocked_warning_title: Ð’Ð°Ñˆ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚ Ð½Ðµ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¸Ð¹ Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÐ¸
   generic:
     changes_saved_msg: Ð—Ð¼Ñ–Ð½Ð¸ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ñ–!
-    powered_by: Ð¿Ñ€Ð°Ñ†ÑŽÑ” Ð½Ð° %{link}
     save_changes: Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ð·Ð¼Ñ–Ð½Ð¸
-    validation_errors:
-      one: Ð©Ð¾ÑÑŒ Ñ‚ÑƒÑ‚ Ð½Ðµ Ñ‚Ð°Ðº! Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð·Ð½Ð°Ð¹Ð¾Ð¼Ñ‚ÐµÑÑ Ð· Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾ÑŽ Ð½Ð¸Ð¶Ñ‡Ðµ
-      other: Ð©Ð¾ÑÑŒ Ñ‚ÑƒÑ‚ Ð½Ðµ Ñ‚Ð°Ðº! Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð·Ð½Ð°Ð¹Ð¾Ð¼Ñ‚ÐµÑÑ Ð· %{count} Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°Ð¼Ð¸ Ð½Ð¸Ð¶Ñ‡Ðµ
+    validation_errors: Ð©Ð¾ÑÑŒ Ñ‚ÑƒÑ‚ Ð½Ðµ Ñ‚Ð°Ðº! Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¾Ð·Ð½Ð°Ð¹Ð¾Ð¼Ñ‚ÐµÑÑ Ð· %{count} Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°Ð¼Ð¸ Ð½Ð¸Ð¶Ñ‡Ðµ
   imports:
     preface: Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð´ÐµÑÐºÑ– Ð´Ð°Ð½Ñ–, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´, ÑÐ¿Ð¸ÑÐºÐ¸ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÑÐºÐ¸Ñ… Ð’Ð¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– Ñ‡Ð¸ ÑÐºÐ¸Ñ… Ð±Ð»Ð¾ÐºÑƒÑ”Ñ‚Ðµ, Ð² Ð’Ð°Ñˆ Ð°ÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð° Ñ†Ñ–Ð¹ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ— Ð· Ñ„Ð°Ð¹Ð»Ñ–Ð², ÐµÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¾Ð²Ð°Ð½Ð¸Ñ… Ð· Ñ–Ð½ÑˆÐ¾Ñ— Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ—.
     success: Ð’Ð°ÑˆÑ– Ð´Ð°Ð½Ñ– Ð±ÑƒÐ»Ð¸ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ– Ñ‚Ð° Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð¾Ð±Ñ€Ð¾Ð±Ð»ÐµÐ½Ñ– Ð² Ð½Ð°Ð¹Ð±Ð»Ð¸Ð¶Ñ‡Ð¸Ð¹ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚
@@ -212,103 +519,243 @@ uk:
       following: ÐŸÑ–Ð´Ð¿Ð¸ÑÐºÐ¸
       muting: Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð³Ð»ÑƒÑˆÐµÐ½Ð½Ñ
     upload: Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸
-  landing_strip_html: "<strong>%{name}</strong> - ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ Ð½Ð° %{link_to_root_path}. Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð½Ð° Ð½ÑŒÐ¾Ð³Ð¾/Ð½ÐµÑ— Ñ‚Ð° ÑÐ¿Ñ–Ð»ÐºÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ð· Ð½Ð¸Ð¼/Ð½ÐµÑŽ, ÑÐºÑ‰Ð¾ Ñƒ Ð’Ð°Ñ Ñ” Ð°ÐºÐ°ÑƒÐ½Ñ‚ Ð½Ð° Ð±ÑƒÐ´ÑŒ-ÑÐºÑ–Ð¹ Ñ–Ð½ÑÑ‚Ð°Ð½Ñ†Ñ–Ñ— Ð·Ð°Ð³Ð°Ð»ÑŒÐ½Ð¾Ñ— Ð¼ÐµÑ€ÐµÐ¶Ñ–."
-  landing_strip_signup_html: Ð¯ÐºÑ‰Ð¾ Ð¹Ð¾Ð³Ð¾ Ñƒ Ð’Ð°Ñ Ð½ÐµÐ¼Ð°Ñ”, Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href="%{sign_up_path}">Ð·Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ÑÑ Ñ‚ÑƒÑ‚</a>.
+  in_memoriam_html: ÐŸÐ°Ð¼'ÑÑ‚Ð½Ð¸Ðº.
+  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: "%{count} Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½ÑŒ"
+    max_uses_prompt: Ð‘ÐµÐ· Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ
+    prompt: Ð“ÐµÐ½ÐµÑ€ÑƒÐ¹Ñ‚Ðµ Ñ‚Ð° Ð´Ñ–Ð»Ñ–Ñ‚ÑŒÑÑ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½ÑÐ¼ Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ Ð´Ð»Ñ Ð½Ð°Ð´Ð°Ð½Ð½Ñ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð´Ð¾ ÑÐ°Ð¹Ñ‚Ñƒ
+    table:
+      expires_at: Ð§Ð°Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸
+      uses: Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ
+    title: Ð—Ð°Ð¿Ñ€Ð¾ÑÐ¸Ñ‚Ð¸ Ð»ÑŽÐ´ÐµÐ¹
+  lists:
+    errors:
+      limit: Ð’Ð¸ Ð´Ð¾ÑÑÐ³Ð½ÑƒÐ»Ð¸ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ñ— ÐºÑ–Ð»ÑŒÐºÐ¾ÑÑ‚Ñ– ÑÐ¿Ð¸ÑÐºÑ–Ð²
   media_attachments:
     validations:
       images_and_video: ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð²Ñ–Ð´ÐµÐ¾ Ð´Ð¾ ÑÑ‚Ð°Ñ‚ÑƒÑÑƒ Ð· Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½ÑÐ¼Ð¸
       too_many: ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ð±Ñ–Ð»ÑŒÑˆÐµ 4 Ñ„Ð°Ð¹Ð»Ñ–Ð²
+  migrations:
+    acct: username@domain Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ
+    currently_redirecting: 'Ð’Ð°Ñˆ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ Ð½Ð°Ð»Ð°ÑˆÑ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚Ð¸ Ð½Ð°:'
+    proceed: Ð—Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸
+    updated_msg: ÐŸÐµÑ€ÐµÑ—Ð·Ð´ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹!
+  moderation:
+    title: ÐœÐ¾Ð´ÐµÑ€Ð°Ñ†Ñ–Ñ
   notification_mailer:
     digest:
-      body: 'ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ¾ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ðµ Ð’Ð°Ð¼Ð¸ Ð½Ð° %{instance} Ð· Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ…Ð¾Ð´Ñƒ %{since}:'
+      action: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸ ÑƒÑÑ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ
+      body: ÐšÐ¾Ñ€Ð¾Ñ‚ÐºÐ¾ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¾Ð¿ÑƒÑ‰ÐµÐ½Ðµ Ð²Ð°Ð¼Ð¸ Ð· Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ…Ð¾Ð´Ñƒ %{since}
       mention: "%{name} Ð·Ð³Ð°Ð´Ð°Ð²(-Ð»Ð°) Ð’Ð°Ñ Ð²:"
       new_followers_summary:
         few: Ð£ Ð’Ð°Ñ Ð·'ÑÐ²Ð¸Ð»Ð¾ÑÑŒ %{count} Ð½Ð¾Ð²Ð¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸! Ð§ÑƒÐ´Ð¾Ð²Ð¾!
         many: Ð£ Ð’Ð°Ñ Ð·'ÑÐ²Ð¸Ð»Ð¾ÑÑŒ %{count} Ð½Ð¾Ð²Ð¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²! Ð§ÑƒÐ´Ð¾Ð²Ð¾!
-        one: Ð£ Ð’Ð°Ñ Ð·'ÑÐ²Ð¸Ð²ÑÑ Ð½Ð¾Ð²Ð¸Ð¹ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸Ðº! Ð£Ñ€Ð°!
-        other: Ð£ Ð’Ð°Ñ Ð·'ÑÐ²Ð¸Ð»Ð¾ÑÑŒ %{count} Ð½Ð¾Ð²Ð¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²! Ð§ÑƒÐ´Ð¾Ð²Ð¾!
+        one: Ð¢Ð°ÐºÐ¾Ð¶, Ñƒ Ð’Ð°Ñ Ð·'ÑÐ²Ð¸Ð²ÑÑ Ð½Ð¾Ð²Ð¸Ð¹ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸Ðº, ÐºÐ¾Ð»Ð¸ Ð²Ð¸ Ð±ÑƒÐ»Ð¸ Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–! Ð£Ñ€Ð°!
+        other: Ð¢Ð°ÐºÐ¾Ð¶, Ñƒ Ð’Ð°Ñ Ð·'ÑÐ²Ð¸Ð»Ð¾ÑÑŒ %{count} Ð½Ð¾Ð²Ð¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð², Ð¿Ð¾ÐºÐ¸ Ð²Ð¸ Ð±ÑƒÐ»Ð¸ Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–! Ð§ÑƒÐ´Ð¾Ð²Ð¾!
       subject:
         few: "%{count} Ð½Ð¾Ð²Ñ– ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð· Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ…Ð¾Ð´Ñƒ \U0001F418"
         many: "%{count} Ð½Ð¾Ð²Ð¸Ñ… ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ Ð· Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ…Ð¾Ð´Ñƒ \U0001F418"
         one: "1 Ð½Ð¾Ð²Ðµ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð· Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ…Ð¾Ð´Ñƒ \U0001F418"
         other: "%{count} Ð½Ð¾Ð²Ð¸Ñ… ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½ÑŒ Ð· Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð¾ÑÑ‚Ð°Ð½Ð½ÑŒÐ¾Ð³Ð¾ Ð²Ñ…Ð¾Ð´Ñƒ \U0001F418"
+      title: ÐŸÐ¾ÐºÐ¸ Ð²Ð¸ Ð±ÑƒÐ»Ð¸ Ð²Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–...
     favourite:
       body: 'Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¿Ð¾Ð´Ð¾Ð±Ð°Ñ”Ñ‚ÑŒÑÑ %{name}:'
       subject: ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñƒ %{name} ÑÐ¿Ð¾Ð´Ð¾Ð±Ð°Ð²ÑÑ Ð²Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ
+      title: ÐÐ¾Ð²Ðµ Ð²Ð¿Ð¾Ð´Ð¾Ð±Ð°Ð½Ð½Ñ
     follow:
       body: "%{name} Ñ‚ÐµÐ¿ÐµÑ€ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹ Ð½Ð° Ð²Ð°Ñ!"
       subject: "%{name} Ñ‚ÐµÐ¿ÐµÑ€ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹(-Ð°) Ð½Ð° Ð²Ð°Ñ"
+      title: ÐÐ¾Ð²Ð¸Ð¹ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸Ðº
     follow_request:
+      action: ÐšÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð¼Ð¸ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ
       body: "%{name} Ð·Ð°Ð¿Ð¸Ñ‚Ð°Ð² Ð’Ð°Ñ Ð¿Ñ€Ð¾ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ"
       subject: "%{name} Ñ…Ð¾Ñ‡Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð½Ð° Ð’Ð°Ñ"
+      title: ÐÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ
     mention:
-      body: 'Ð’Ð¸ Ð±ÑƒÐ»Ð¸ Ð·Ð³Ð°Ð´Ð°Ð½Ñ– %{name} Ð²:'
-      subject: Ð’Ð¸ Ð±ÑƒÐ»Ð¸ Ð·Ð³Ð°Ð´Ð°Ð½Ñ– %{name}
+      action: Ð’Ñ–Ð´Ð¿Ð¾Ð²Ñ–ÑÑ‚Ð¸
+      body: 'Ð’Ð°Ñ Ð·Ð³Ð°Ð´Ð°Ð²(-Ð»Ð°) %{name} Ð²:'
+      subject: Ð’Ð°Ñ Ð·Ð³Ð°Ð´Ð°Ð²(-Ð»Ð°) %{name}
+      title: ÐÐ¾Ð²Ð° Ð·Ð³Ð°Ð´ÐºÐ°
     reblog:
       body: 'Ð’Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ Ð±ÑƒÐ»Ð¾ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÑ‚Ð¾ %{name}:'
       subject: "%{name} Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÐ² Ð²Ð°Ñˆ ÑÑ‚Ð°Ñ‚ÑƒÑ"
+      title: ÐÐ¾Ð²Ðµ Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…ÑƒÐ²Ð°Ð½Ð½Ñ
   number:
     human:
       decimal_units:
         format: "%n%u"
         units:
-          billion: B
-          million: M
-          quadrillion: Q
-          thousand: K
-          trillion: T
+          billion: Ð¼Ð»Ñ€Ð´
+          million: Ð¼Ð»Ð½
+          quadrillion: ÐºÐ²Ð´Ñ€Ð»
+          thousand: Ñ‚Ð¸Ñ
+          trillion: Ñ‚Ñ€Ð»Ð½
           unit: ''
   pagination:
+    newer: ÐÐ¾Ð²Ñ–ÑˆÐµ
     next: Ð”Ð°Ð»Ñ–
     prev: ÐÐ°Ð·Ð°Ð´
     truncate: "&hellip;"
+  preferences:
+    languages: ÐœÐ¾Ð²Ð¸
+    other: Ð†Ð½ÑˆÐµ
+    publishing: ÐŸÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ
+    web: Ð’ÐµÐ±
   remote_follow:
-    acct: Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ username@domain, Ð·Ð²Ñ–Ð´ÐºÐ¸ Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
-    missing_resource: ÐŸÐ¾ÑˆÑƒÐº Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ URL Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð²ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð¾ÑŽ
-    proceed: ÐŸÑ€Ð¾Ð´Ð¾Ð²Ð¶Ð¸Ñ‚Ð¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÑƒ
+    acct: Ð’Ð²ÐµÐ´Ñ–Ñ‚ÑŒ username@domain, ÑÐºÐ¸Ð¼ Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ
+    missing_resource: ÐŸÐ¾ÑˆÑƒÐº Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¾Ð³Ð¾ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ URL Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð° Ð·Ð°ÐºÑ–Ð½Ñ‡Ð¸Ð²ÑÑ Ð½ÐµÐ²Ð´Ð°Ñ‡ÐµÑŽ
+    no_account_html: ÐÐµ Ð¼Ð°Ñ”Ñ‚Ðµ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ? ÐÐµ Ð±Ñ–Ð´Ð°, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ <a href='%{sign_up_path}' target='_blank'>Ð·Ð°Ñ€ÐµÑ”ÑÑ‚Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ÑÑ</a>
+    proceed: ÐŸÐµÑ€ÐµÐ¹Ñ‚Ð¸ Ð´Ð¾ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐºÐ¸
     prompt: 'Ð’Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ñ‚Ð¸ÑÑ Ð½Ð°:'
+  remote_unfollow:
+    error: ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°
+    title: Ð—Ð°Ð³Ð¾Ð»Ð¾Ð²Ð¾Ðº
+    unfollowed: Ð’Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ–
+  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: UCBrowser
+      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: Mac
+      other: Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Ð—Ð°ÐºÑ–Ð½Ñ‡Ð¸Ñ‚Ð¸
+    revoke_success: Ð¡ÐµÑÑ–Ñ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð°
+    title: Ð¡ÐµÑÑ–Ñ—
   settings:
-    authorized_apps: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ
-    back: ÐÐ°Ð·Ð°Ð´ Ð² Mastodon
+    authorized_apps: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ñ– Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÐ¸
+    back: ÐÐ°Ð·Ð°Ð´ Ñƒ Mastodon
+    delete: Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ
+    development: Ð Ð¾Ð·Ñ€Ð¾Ð±ÐºÐ°
     edit_profile: Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ„Ñ–Ð»ÑŒ
     export: Ð•ÐºÑÐ¿Ð¾Ñ€Ñ‚ Ð´Ð°Ð½Ð¸Ñ…
     followers: ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ñ– Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ¸
     import: Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚
+    migrate: ÐœÑ–Ð³Ñ€Ð°Ñ†Ñ–Ñ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ
+    notifications: Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ
     preferences: ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ
     settings: ÐžÐ¿Ñ†Ñ–Ñ—
-    two_factor_authentication: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ
+    two_factor_authentication: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ
+    your_apps: Ð’Ð°ÑˆÑ– Ð·Ð°Ñ‚Ð¾ÑÑƒÐ½ÐºÐ¸
   statuses:
-    open_in_web: Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ð² WWW
+    attached:
+      description: 'ÐŸÑ€Ð¸ÐºÑ€Ñ–Ð¿Ð»ÐµÐ½Ð¾: %{attached}'
+      image: "%{count} ÐºÐ°Ñ€Ñ‚Ð¸Ð½ÐºÐ¸"
+      video: "%{count} Ð²Ñ–Ð´ÐµÐ¾"
+    boosted_from_html: ÐŸÑ€Ð¾ÑÑƒÐ½ÑƒÑ‚Ð¾ Ð²Ñ–Ð´ %{acct_link}
+    content_warning: 'ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚: %{warning}'
+    disallowed_hashtags: 'Ð¼Ñ–ÑÑ‚Ð¸Ð² Ð·Ð°Ð±Ð¾Ñ€Ð¾Ð½ÐµÐ½Ñ– Ñ…ÐµÑˆÑ‚ÐµÒ‘Ð¸: %{tags}'
+    language_detection: ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð°Ñ‚Ð¸ Ð¼Ð¾Ð²Ñƒ
+    open_in_web: Ð’Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ Ñƒ Ð²ÐµÐ±Ñ–
     over_character_limit: Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÐµÐ½Ð¾ Ð»Ñ–Ð¼Ñ–Ñ‚ ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ–Ð² (%{max})
+    pin_errors:
+      limit: Ð’Ð¸ Ð²Ð¶Ðµ Ð·Ð°ÐºÑ€Ñ–Ð¿Ð¸Ð»Ð¸ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ñƒ ÐºÑ–Ð»ÑŒÐºÑ–ÑÑ‚ÑŒ Ð¿Ð¾ÑÑ‚Ñ–Ð²
+      ownership: ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð°ÐºÑ€Ñ–Ð¿Ð¸Ñ‚Ð¸ Ñ‡ÑƒÐ¶Ð¸Ð¹ Ð¿Ð¾ÑÑ‚
+      private: ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð°ÐºÑ€Ñ–Ð¿Ð¸Ñ‚Ð¸ Ð½ÐµÐ¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ð¹ Ð¿Ð¾ÑÑ‚
+      reblog: ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð°ÐºÑ€Ñ–Ð¿Ð¸Ñ‚Ð¸ Ð¿Ñ€Ð¾ÑÑƒÐ½ÑƒÑ‚Ð¸Ð¹ Ð¿Ð¾ÑÑ‚
     show_more: Ð”ÐµÑ‚Ð°Ð»ÑŒÐ½Ñ–ÑˆÐµ
+    title: '%{name}: "%{quote}"'
     visibilities:
       private: Ð”Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÑ–Ð²
-      private_long: ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚Ñ–Ð»ÑŒÐºÐ¾Ð¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ°Ð¼
+      private_long: ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ½Ð¸ÐºÐ°Ð¼
       public: Ð”Ð»Ñ Ð²ÑÑ–Ñ…
       public_long: ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÑÑ–Ð¼
-      unlisted: ÐŸÑ€Ð¸Ñ…Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ñ– ÑÑ‚Ñ€Ñ–Ð¾Ðº
+      unlisted: ÐŸÑ€Ð¸Ñ…Ð¾Ð²ÑƒÐ²Ð°Ñ‚Ð¸ Ð·Ñ– ÑÑ‚Ñ€Ñ–Ñ‡Ð¾Ðº
       unlisted_long: ÐŸÐ¾ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð²ÑÑ–Ð¼, Ð°Ð»Ðµ Ð½Ðµ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶Ð°Ñ‚Ð¸ Ð² Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¸Ñ… ÑÑ‚Ñ€Ñ–Ñ‡ÐºÐ°Ñ…
   stream_entries:
-    click_to_show: ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚Ð¸
+    pinned: Ð—Ð°ÐºÑ€Ñ–Ð¿Ð»ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ÑÑ‚
     reblogged: Ð¿ÐµÑ€ÐµÐ´Ð¼ÑƒÑ…Ð½ÑƒÐ²(-Ð»Ð°)
-    sensitive_content: ÐÐµÐ¿Ñ€Ð¸ÑÑ‚Ð¾Ð¹Ð½Ð¸Ð¹ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
+    sensitive_content: ÐÐµÑÐ¿Ñ€Ð¸Ð¹Ð½ÑÑ‚Ð»Ð¸Ð²Ð¸Ð¹ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚
+  terms:
+    title: Ð£Ð¼Ð¾Ð²Ð¸ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ñ‚Ð° ÐŸÐ¾Ð»Ñ–Ñ‚Ð¸ÐºÐ° Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ– %{instance}
+  themes:
+    contrast: Ð’Ð¸ÑÐ¾ÐºÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð°ÑÐ½Ñ–ÑÑ‚ÑŒ
+    default: Mastodon
+    mastodon-light: Mastodon (ÑÐ²Ñ–Ñ‚Ð»Ð°)
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
   two_factor_authentication:
-    code_hint: Ð”Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð½Ñ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ ÐºÐ¾Ð´, Ð·Ð³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð¼ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¾Ñ€Ð°
+    code_hint: Ð”Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð½Ñ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ ÐºÐ¾Ð´, Ð·Ð³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÐ¾Ð¼ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ‚Ð¾Ñ€Ð°
     description_html: ÐŸÑ€Ð¸ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð½Ñ– <strong>Ð´Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð¾Ñ— Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—</strong>, Ð²Ñ…Ñ–Ð´ Ð±ÑƒÐ´Ðµ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ‚Ð¸ Ð²Ñ–Ð´ Ð’Ð°Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð°, ÑÐºÐ¸Ð¹ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÑ” Ð²Ñ…Ñ–Ð´Ð½Ð¸Ð¹ ÐºÐ¾Ð´.
     disable: Ð’Ð¸Ð¼ÐºÐ½ÑƒÑ‚Ð¸
     enable: Ð£Ð²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸
+    enabled: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°
     enabled_success: Ð”Ð²Ð¾Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð°
     generate_recovery_codes: Ð—Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ
-    instructions_html: "<strong>Ð’Ñ–Ð´ÑÐºÐ°Ð½ÑƒÐ¹Ñ‚Ðµ Ñ†ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ Google Authenticator Ñ‡Ð¸ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ TOTP-Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ° Ð½Ð° Ð’Ð°ÑˆÐ¾Ð¼Ñƒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ–</strong>. Ð’Ñ–Ð´ Ñ†ÑŒÐ¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ñƒ Ð´Ð¾Ð´Ð°Ñ‚Ð¾Ðº Ð±ÑƒÐ´Ðµ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ð´Ð¸, ÑÐºÑ– Ð±ÑƒÐ´Ðµ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ."
-    lost_recovery_codes: ÐšÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ÑŒ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ. Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸Ð»Ð¸ Ð’Ð°ÑˆÑ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð½Ð¾Ð²Ñƒ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñ—Ñ… Ñ‚ÑƒÑ‚. Ð’Ð°ÑˆÑ– ÑÑ‚Ð°Ñ€Ñ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð°Ð½ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ñ–.
+    instructions_html: "<strong>Ð’Ñ–Ð´ÑÐºÐ°Ð½ÑƒÐ¹Ñ‚Ðµ Ñ†ÐµÐ¹ QR-ÐºÐ¾Ð´ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾ÑŽ Google Authenticator Ñ‡Ð¸ Ñ–Ð½ÑˆÐ¾Ð³Ð¾ TOTP-Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÑƒ Ð½Ð° Ð’Ð°ÑˆÐ¾Ð¼Ñƒ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñ–</strong>. Ð— Ñ†ÑŒÐ¾Ð³Ð¾ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ñƒ Ð²Ñ–Ð½ Ð±ÑƒÐ´Ðµ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ ÐºÐ¾Ð´Ð¸, ÑÐºÑ– Ð±ÑƒÐ´Ðµ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ."
+    lost_recovery_codes: ÐšÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑŽÑ‚ÑŒ Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ Ñƒ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ. Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸Ð»Ð¸ Ð’Ð°ÑˆÑ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð½Ð¾Ð²Ñƒ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñ—Ñ… Ñ‚ÑƒÑ‚. Ð¢Ð¾Ð´Ñ– Ð²Ð°ÑˆÑ– ÑÑ‚Ð°Ñ€Ñ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ Ð°Ð½ÑƒÐ»ÑŒÐ¾Ð²Ð°Ð½Ñ–.
     manual_instructions: 'Ð¯ÐºÑ‰Ð¾ Ð’Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ñ–Ð´ÑÐºÐ°Ð½ÑƒÐ²Ð°Ñ‚Ð¸ QR-ÐºÐ¾Ð´ Ñ‚Ð° Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²Ð²ÐµÑÑ‚Ð¸ Ð¹Ð¾Ð³Ð¾ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ, ÑÐµÐºÑ€ÐµÑ‚ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ð¹ Ñ‚ÑƒÑ‚ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸Ð¼ Ñ‚ÐµÐºÑÑ‚Ð¾Ð¼:'
+    recovery_codes: Ð—Ð°Ð¿Ð°ÑÐ½Ñ– ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ
     recovery_codes_regenerated: ÐšÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð·Ð³ÐµÐ½ÐµÑ€Ð¾Ð²Ð°Ð½Ñ–
-    recovery_instructions_html: Ð£ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð´Ð¾ Ð’Ð°ÑˆÐ¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ð° Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ð¾Ð´Ð¸Ð½ Ð· ÐºÐ¾Ð´Ñ–Ð² Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ… Ð½Ð¸Ð¶Ñ‡Ðµ, Ñ‰Ð¾Ð± Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ. Ð¢Ñ€Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ Ð±ÐµÐ·Ð¿ÐµÑ†Ñ–, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´, Ñ€Ð¾Ð·Ð´Ñ€ÑƒÐºÑƒÐ²Ð°Ð²ÑˆÐ¸ Ñ—Ñ… Ñ‚Ð° Ñ‚Ñ€Ð¸Ð¼Ð°ÑŽÑ‡Ð¸ Ñ—Ñ… Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ Ð²Ð°Ð¶Ð»Ð¸Ð²Ð¸Ð¼Ð¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸.
+    recovery_instructions_html: Ð£ Ð²Ð¸Ð¿Ð°Ð´ÐºÑƒ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ Ð´Ð¾ Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ñ‚ÐµÐ»ÐµÑ„Ð¾Ð½Ñƒ Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ñ‚Ð¸ Ð¾Ð´Ð¸Ð½ Ð· ÐºÐ¾Ð´Ñ–Ð² Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ… Ð½Ð¸Ð¶Ñ‡Ðµ, Ñ‰Ð¾Ð± Ð¿Ð¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð°ÐºÐ°ÑƒÐ½Ñ‚Ñƒ. Ð¢Ñ€Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ ÐºÐ¾Ð´Ð¸ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñƒ Ð±ÐµÐ·Ð¿ÐµÑ†Ñ–, Ð½Ð°Ð¿Ñ€Ð¸ÐºÐ»Ð°Ð´, Ñ€Ð¾Ð·Ð´Ñ€ÑƒÐ¹Ñ‚Ðµ Ñ—Ñ… Ñ‚Ð° Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð¹Ñ‚Ðµ Ñ—Ñ… Ð· Ñ–Ð½ÑˆÐ¸Ð¼Ð¸ Ð²Ð°Ð¶Ð»Ð¸Ð²Ð¸Ð¼Ð¸ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ð¼Ð¸.
     setup: ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ñ‚Ð¸
-    wrong_code: Ð’Ð²ÐµÐ´ÐµÐ½Ð¸Ð¹ ÐºÐ¾Ð´ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹! Ð§Ð¸ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ– ÑÐµÑ€Ð²ÐµÑ€Ð½Ð¸Ð¹ Ñ‡Ð°Ñ Ñ‚Ð° Ñ‡Ð°Ñ Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ð¾ÑŽ?
+    wrong_code: Ð’Ð²ÐµÐ´ÐµÐ½Ð¸Ð¹ ÐºÐ¾Ð´ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹! Ð§Ð¸ Ð¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹ Ñ‡Ð°Ñ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€Ñ– Ñ‚Ð° Ð¿Ñ€Ð¸ÑÑ‚Ñ€Ð¾Ñ—?
+  user_mailer:
+    backup_ready:
+      explanation: Ð’Ð¸ Ð·Ñ€Ð¾Ð±Ð¸Ð»Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚ Ð½Ð° Ð¿Ð¾Ð²Ð½Ð¸Ð¹ Ð°Ñ€Ñ…Ñ–Ð² Ð²Ð°ÑˆÐ¾Ð³Ð¾ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ñƒ Mastodon. Ð’Ñ–Ð½ Ð²Ð¶Ðµ Ð³Ð¾Ñ‚Ð¾Ð²Ð¸Ð¹ Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ!
+      subject: Ð’Ð°Ñˆ Ð°Ñ€Ñ…Ñ–Ð² Ð³Ð¾Ñ‚Ð¾Ð²Ð¸Ð¹ Ð´Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ
+      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: ÐŸÐµÑ€ÐµÐºÐ¾Ð½Ð°Ð¹Ñ‚ÐµÑÑ Ñƒ Ñ‚Ð¾Ð¼Ñƒ, Ñ‰Ð¾ Ð²Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð»Ð¸ Ð²ÑÐµ Ð½ÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ðµ, ÑÐº Ð¾Ñ‚ ÑÐºÑ– e-mail Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼ÑƒÐ²Ð°Ñ‚Ð¸, Ð°Ð±Ð¾ ÑÐºÐ¸Ð¹ Ñ€Ñ–Ð²ÐµÐ½ÑŒ Ð¿Ñ€Ð¸Ð²Ð°Ñ‚Ð½Ð¾ÑÑ‚Ñ– Ð²Ð¸ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð²Ð°ÑˆÐ¸Ð¼ Ð¿Ð¾ÑÑ‚Ð°Ð¼ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼. Ð¯ÐºÑ‰Ð¾ Ñ…Ð¾Ñ‡ÐµÑ‚Ðµ, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÑƒÑ‚Ð¸ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð²Ð°Ð½Ð½Ñ GIF Ð°Ð½Ñ–Ð¼Ð°Ñ†Ñ–Ð¹.
+      subject: Ð›Ð°ÑÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾ÑÐ¸Ð¼Ð¾ Ð´Ð¾ Mastodon
+      tip_federated_timeline: Ð¤ÐµÐ´ÐµÑ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ñ„Ñ–Ð´ Ñ” ÑˆÐ¸Ñ€Ð¾ÐºÐ¸Ð¼ Ð¿Ð¾Ð³Ð»ÑÐ´Ð¾Ð¼ Ð½Ð° Ð¼ÐµÑ€ÐµÐ¶Ñƒ Mastodon. ÐÐ»Ðµ Ð²Ñ–Ð½ Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ” Ð»Ð¸ÑˆÐµ Ð»ÑŽÐ´ÐµÐ¹, Ð½Ð° ÑÐºÐ¸Ñ… Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– Ð²Ð°ÑˆÑ– ÑÑƒÑÑ–Ð´Ð¸ Ð¿Ð¾ ÑÐ°Ð¹Ñ‚Ñƒ, Ñ‚Ð¾Ð¼Ñƒ Ð²Ñ–Ð½ Ð½Ðµ Ñ” Ð¿Ð¾Ð²Ð½Ð¸Ð¼.
+      tip_following: Ð’Ð¸ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ñ– Ð½Ð° Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°(-Ñ–Ð²) ÑÐµÑ€Ð²ÐµÑ€Ð°. Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, Ñ‰Ð¾Ð± Ð·Ð½Ð°Ð¹Ñ‚Ð¸ Ñ‰Ðµ Ñ†Ñ–ÐºÐ°Ð²Ð¸Ñ… Ð»ÑŽÐ´ÐµÐ¹, Ð´Ð¾ÑÐ»Ñ–Ð´Ñ–Ñ‚ÑŒ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ñ‚Ð° Ñ„ÐµÐ´ÐµÑ€Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ñ„Ñ–Ð´Ð¸.
+      tip_local_timeline: Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¸Ð¹ Ñ„Ñ–Ð´ - Ñ†Ðµ Ð¿Ð¾Ð³Ð»ÑÐ´ Ð·Ð³Ð¾Ñ€Ð¸ Ð½Ð° Ð»ÑŽÐ´ÐµÐ¹ Ð½Ð° %{instance}. Ð¦Ðµ Ð²Ð°ÑˆÑ– Ð¿Ñ€ÑÐ¼Ñ– ÑÑƒÑÑ–Ð´Ð¸!
+      tip_mobile_webapp: Ð¯ÐºÑ‰Ð¾ Ð²Ð°Ñˆ Ð¼Ð¾Ð±Ñ–Ð»ÑŒÐ½Ð¸Ð¹ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€ Ð¿Ñ€Ð¾Ð¿Ð¾Ð½ÑƒÑ” Ð²Ð°Ð¼ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Mastodon Ð½Ð° Ñ€Ð¾Ð±Ð¾Ñ‡Ð¸Ð¹ ÑÑ‚Ñ–Ð», Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼ÑƒÐ²Ð°Ñ‚Ð¸ push-ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ. Ð’ÑÐµ Ð¼Ð¾Ð¶Ðµ Ð²Ð¸Ð³Ð»ÑÐ´Ð°Ñ‚Ð¸ ÑÐº Ð½Ð°Ñ‚Ð¸Ð²Ð½Ð¸Ð¹ Ð·Ð°ÑÑ‚Ð¾ÑÑƒÐ½Ð¾Ðº Ñƒ Ð±Ð°Ð³Ð°Ñ‚ÑŒÐ¾Ñ… Ñ€ÐµÑ‡Ð°Ñ….
+      tips: ÐŸÐ¾Ñ€Ð°Ð´Ð¸
+      title: Ð›Ð°ÑÐºÐ°Ð²Ð¾ Ð¿Ñ€Ð¾ÑÐ¸Ð¼Ð¾, %{name}!
   users:
-    invalid_email: Ð’Ð²ÐµÐ´ÐµÐ½Ð¸Ð¹ email Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹
+    invalid_email: Ð’Ð²ÐµÐ´ÐµÐ½Ð° Ð°Ð´Ñ€ÐµÑÐ° e-mail Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð°
     invalid_otp_token: Ð’Ð²ÐµÐ´ÐµÐ½Ð¾ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¸Ð¹ ÐºÐ¾Ð´
+    otp_lost_help_html: Ð¯ÐºÑ‰Ð¾ Ð²Ð¸ Ð²Ñ‚Ñ€Ð°Ñ‚Ð¸Ð»Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð¾ Ð¾Ð±Ð¾Ñ…, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð· %{email}
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 59858534d4954c2016537c97e4f3389af3ac75df..076bdb17e26fb3e98fe4d79341edc621137833e1 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -5,13 +5,13 @@ zh-CN:
     about_mastodon_html: Mastodonï¼ˆé•¿æ¯›è±¡ï¼‰æ˜¯ä¸€ä¸ªå»ºç«‹åœ¨å¼€æ”¾å¼ç½‘ç»œåè®®å’Œè‡ªç”±ã€å¼€æºè½¯ä»¶ä¹‹ä¸Šçš„ç¤¾äº¤ç½‘ç»œï¼Œæœ‰ç€ç±»ä¼¼äºŽç”µåé‚®ä»¶çš„åˆ†å¸ƒå¼è®¾è®¡ã€‚
     about_this: å…³äºŽæœ¬å®žä¾‹
     administered_by: æœ¬å®žä¾‹çš„ç®¡ç†å‘˜ï¼š
+    api: API
+    apps: ç§»åŠ¨åº”ç”¨
     closed_registrations: è¿™ä¸ªå®žä¾‹ç›®å‰æ²¡æœ‰å¼€æ”¾æ³¨å†Œã€‚ä¸è¿‡ï¼Œä½ å¯ä»¥å‰å¾€å…¶ä»–å®žä¾‹æ³¨å†Œä¸€ä¸ªå¸æˆ·ï¼ŒåŒæ ·å¯ä»¥åŠ å…¥åˆ°è¿™ä¸ªç½‘ç»œä¸å“¦ï¼
     contact: è”ç³»æ–¹å¼
     contact_missing: æœªè®¾å®š
     contact_unavailable: æœªå…¬å¼€
-    description_headline: å…³äºŽ %{domain}
-    domain_count_after: ä¸ªå…¶å®ƒå®žä¾‹
-    domain_count_before: çŽ°å·²æŽ¥å…¥
+    documentation: æ–‡æ¡£
     extended_description_html: |
       <h3>è¿™é‡Œå¯ä»¥å†™ä¸€äº›è§„å®š</h3>
       <p>æœ¬ç«™å°šæœªè®¾ç½®è¯¦ç»†ä»‹ç»ã€‚</p>
@@ -28,25 +28,32 @@ zh-CN:
     hosted_on: ä¸€ä¸ªåœ¨ %{domain} ä¸Šè¿è¡Œçš„ Mastodon å®žä¾‹
     learn_more: äº†è§£è¯¦æƒ…
     other_instances: å…¶ä»–å®žä¾‹
+    privacy_policy: éšç§æ”¿ç–
     source_code: æºä»£ç 
     status_count_after: æ¡å˜Ÿæ–‡
     status_count_before: ä»–ä»¬å…±å˜Ÿå‡ºäº†
+    terms: ä½¿ç”¨æ¡æ¬¾
     user_count_after: ä½ç”¨æˆ·
     user_count_before: è¿™é‡Œå…±æ³¨å†Œæœ‰
     what_is_mastodon: Mastodon æ˜¯ä»€ä¹ˆï¼Ÿ
   accounts:
     follow: å…³æ³¨
-    followers: å…³æ³¨è€…
+    followers:
+      one: å…³æ³¨è€…
+      other: å…³æ³¨è€…
     following: æ£åœ¨å…³æ³¨
+    joined: åŠ å…¥äºŽ %{date}
     media: åª’ä½“
     moved_html: "%{name} å·²ç»è¿ç§»åˆ° %{new_profile_link}ï¼š"
-    network_hidden: æ¤ä¿¡æ¯ä¸å¯ç”¨ã€‚
+    network_hidden: æ¤ä¿¡æ¯ä¸å¯ç”¨
     nothing_here: è¿™é‡Œç¥žé©¬éƒ½æ²¡æœ‰ï¼
     people_followed_by: "%{name} å…³æ³¨çš„äºº"
     people_who_follow: å…³æ³¨ %{name} çš„äºº
-    posts: å˜Ÿæ–‡
+    posts:
+      one: å˜Ÿæ–‡
+      other: å˜Ÿæ–‡
+    posts_tab_heading: å˜Ÿæ–‡
     posts_with_replies: å˜Ÿæ–‡å’Œå›žå¤
-    remote_follow: è·¨ç«™å…³æ³¨
     reserved_username: æ¤ç”¨æˆ·åå·²è¢«ä¿ç•™
     roles:
       admin: ç®¡ç†å‘˜
@@ -107,10 +114,6 @@ zh-CN:
       most_recent_activity: æœ€åŽä¸€æ¬¡æ´»è·ƒçš„æ—¶é—´
       most_recent_ip: æœ€åŽä¸€æ¬¡æ´»è·ƒçš„ IP åœ°å€
       not_subscribed: æœªè®¢é˜…
-      order:
-        alphabetic: æŒ‰å—æ¯
-        most_recent: æŒ‰æ—¶é—´
-        title: æŽ’åº
       outbox_url: å‘ä»¶ç®±ï¼ˆOutboxï¼‰URL
       perform_full_suspension: æ°¸ä¹…å°ç¦
       profile_url: ä¸ªäººèµ„æ–™é¡µé¢ URL
@@ -138,7 +141,6 @@ zh-CN:
       shared_inbox_url: å…¬ç”¨æ”¶ä»¶ç®±ï¼ˆShared Inboxï¼‰URL
       show:
         created_reports: è¿™ä¸ªå¸æˆ·æäº¤çš„ä¸¾æŠ¥
-        report: ä¸ªä¸¾æŠ¥
         targeted_reports: é’ˆå¯¹è¿™ä¸ªå¸æˆ·çš„ä¸¾æŠ¥
       silence: éšè—
       statuses: å˜Ÿæ–‡
@@ -180,6 +182,7 @@ zh-CN:
         unsuspend_account: "%{name} è§£é™¤äº†ç”¨æˆ· %{target} çš„å°ç¦çŠ¶æ€"
         update_custom_emoji: "%{name} æ›´æ–°äº†è‡ªå®šä¹‰è¡¨æƒ… %{target}"
         update_status: "%{name} åˆ·æ–°äº† %{target} çš„å˜Ÿæ–‡"
+      deleted_status: "ï¼ˆå˜Ÿæ–‡å·²åˆ é™¤ï¼‰"
       title: è¿è¥æ—¥å¿—
     custom_emojis:
       by_domain: åŸŸå
@@ -206,6 +209,27 @@ zh-CN:
       update_failed_msg: è¡¨æƒ…æ›´æ–°å¤±è´¥ï¼
       updated_msg: è¡¨æƒ…æ›´æ–°æˆåŠŸï¼
       upload: ä¸Šä¼ æ–°è¡¨æƒ…
+    dashboard:
+      backlog: æœªå¤„ç†ä»»åŠ¡æ•°
+      config: æœåŠ¡å™¨é…ç½®
+      feature_deletions: å¸æˆ·åˆ é™¤
+      feature_invites: é‚€è¯·é“¾æŽ¥
+      feature_registrations: å…¬å¼€æ³¨å†Œ
+      feature_relay: åŒæ¥ä¸ç»§
+      features: åŠŸèƒ½
+      hidden_service: åŒ¿åæœåŠ¡è¿žé€šæ€§
+      open_reports: å¾…å¤„ç†ä¸¾æŠ¥æ•°
+      recent_users: æ–°ç”¨æˆ·
+      search: å…¨æ–‡æœç´¢
+      single_user_mode: å•ç”¨æˆ·æ¨¡å¼
+      software: è½¯ä»¶
+      space: å˜å‚¨ä½¿ç”¨æƒ…å†µ
+      title: ä»ªè¡¨ç›˜
+      total_users: æ€»ç”¨æˆ·æ•°
+      trends: è¶‹åŠ¿
+      week_interactions: æœ¬å‘¨äº’åŠ¨æ•°
+      week_users_active: æœ¬å‘¨æ´»è·ƒç”¨æˆ·æ•°
+      week_users_new: æœ¬å‘¨æ–°ç”¨æˆ·æ•°
     domain_blocks:
       add_new: æ·»åŠ æ–°æ¡ç›®
       created_msg: æ£åœ¨è¿›è¡ŒåŸŸåå±è”½
@@ -222,19 +246,15 @@ zh-CN:
         title: æ·»åŠ åŸŸåå±è”½
       reject_media: æ‹’ç»æŽ¥æ”¶åª’ä½“æ–‡ä»¶
       reject_media_hint: åˆ é™¤æœ¬åœ°å·²ç¼“å˜çš„åª’ä½“æ–‡ä»¶ï¼Œå¹¶ä¸”ä¸å†æŽ¥æ”¶æ¥è‡ªè¯¥åŸŸåçš„ä»»ä½•åª’ä½“æ–‡ä»¶ã€‚æ¤é€‰é¡¹ä¸å½±å“å°ç¦
-      severities:
-        noop: æ— 
-        silence: è‡ªåŠ¨éšè—
-        suspend: è‡ªåŠ¨å°ç¦
-      severity: å±è”½çº§åˆ«
       show:
-        affected_accounts: å°†ä¼šå½±å“åˆ°æ•°æ®åº“ä¸çš„ %{count} ä¸ªå¸æˆ·
+        affected_accounts:
+          one: å°†ä¼šå½±å“åˆ°æ•°æ®åº“ä¸çš„ 1 ä¸ªå¸æˆ·
+          other: å°†ä¼šå½±å“åˆ°æ•°æ®åº“ä¸çš„ %{count} ä¸ªå¸æˆ·
         retroactive:
           silence: å¯¹æ¤åŸŸåçš„æ‰€æœ‰å¸æˆ·è§£é™¤éšè—
           suspend: å¯¹æ¤åŸŸåçš„æ‰€æœ‰å¸æˆ·è§£é™¤å°ç¦
         title: æ’¤é”€å¯¹ %{domain} çš„åŸŸåå±è”½
         undo: æ’¤é”€
-      title: åŸŸåå±è”½
       undo: æ’¤é”€
     email_domain_blocks:
       add_new: æ·»åŠ æ–°æ¡ç›®
@@ -247,18 +267,25 @@ zh-CN:
         title: æ·»åŠ ç”µåé‚®ä»¶åŸŸåå±è”½
       title: ç”µåé‚®ä»¶åŸŸåå±è”½
     instances:
-      account_count: å·²çŸ¥å¸æˆ·
-      domain_name: åŸŸå
-      reset: é‡ç½®
-      search: æœç´¢
       title: å·²çŸ¥å®žä¾‹
     invites:
+      deactivate_all: æ’¤é”€æ‰€æœ‰é‚€è¯·é“¾æŽ¥
       filter:
         all: å…¨éƒ¨
         available: å¯ç”¨
         expired: å·²å¤±æ•ˆ
         title: ç›é€‰
       title: é‚€è¯·ç”¨æˆ·
+    relays:
+      add_new: æ·»åŠ æ–°çš„ä¸ç»§
+      description_html: "<strong>åŒæ¥ä¸ç»§</strong>æ˜¯ä¸€ç§ä¸é—´æœåŠ¡å™¨ï¼Œå„å®žä¾‹å¯ä»¥é€šè¿‡è®¢é˜…ä¸ç»§å’Œå‘ä¸ç»§æŽ¨é€ä¿¡æ¯çš„æ–¹å¼æ¥å¤§é‡äº¤æ¢å…¬å¼€å˜Ÿæ–‡ã€‚<strong>å®ƒå¯ä»¥å¸®åŠ©ä¸å°åž‹å®žä¾‹å‘çŽ°ç½‘ç»œä¸çš„å†…å®¹</strong>ï¼Œè€Œæ— éœ€æœ¬åœ°ç”¨æˆ·æ‰‹åŠ¨å…³æ³¨å…¶ä»–è¿œç¨‹å®žä¾‹ä¸Šçš„ç”¨æˆ·ã€‚"
+      enable_hint: å¯ç”¨æ¤åŠŸèƒ½åŽï¼Œä½ çš„å®žä¾‹ä¼šè®¢é˜…æ¤ä¸ç»§çš„æ‰€æœ‰å…¬å¼€å˜Ÿæ–‡ï¼Œå¹¶åŒæ—¶å‘å…¶æŽ¨é€æœ¬æœåŠ¡å™¨çš„å…¬å¼€å˜Ÿæ–‡ã€‚
+      inbox_url: ä¸ç»§ URL
+      pending: ç‰å¾…ä¸ç»§ç¡®è®¤
+      save_and_enable: ä¿å˜å¹¶å¯ç”¨
+      setup: è®¾ç½®ä¸ç»§è¿žæŽ¥
+      status: çŠ¶æ€
+      title: ä¸ç»§
     report_notes:
       created_msg: ä¸¾æŠ¥è®°å½•å»ºç«‹æˆåŠŸï¼
       destroyed_msg: ä¸¾æŠ¥è®°å½•åˆ é™¤æˆåŠŸï¼
@@ -273,7 +300,6 @@ zh-CN:
       comment:
         none: æ²¡æœ‰
       created_at: ä¸¾æŠ¥æ—¶é—´
-      id: ID
       mark_as_resolved: æ ‡è®°ä¸ºâ€œå·²å¤„ç†â€
       mark_as_unresolved: æ ‡è®°ä¸ºâ€œæœªå¤„ç†â€
       notes:
@@ -281,23 +307,18 @@ zh-CN:
         create_and_resolve: æ·»åŠ è®°å½•å¹¶æ ‡è®°ä¸ºâ€œå·²å¤„ç†â€
         create_and_unresolve: æ·»åŠ è®°å½•å¹¶é‡å¼€
         delete: åˆ é™¤
-        placeholder: æè¿°å·²ç»æ‰§è¡Œçš„æ“ä½œï¼Œæˆ–å…¶ä»–ä»»ä½•ç›¸å…³çš„è·Ÿè¿›æƒ…å†µ
+        placeholder: æè¿°å·²ç»æ‰§è¡Œçš„æ“ä½œï¼Œæˆ–å…¶ä»–ä»»ä½•ç›¸å…³çš„è·Ÿè¿›æƒ…å†µâ€¦
       reopen: é‡å¼€ä¸¾æŠ¥
       report: 'ä¸¾æŠ¥ #%{id}'
-      report_contents: å†…å®¹
       reported_account: ä¸¾æŠ¥ç”¨æˆ·
       reported_by: ä¸¾æŠ¥äºº
       resolved: å·²å¤„ç†
       resolved_msg: ä¸¾æŠ¥å¤„ç†æˆåŠŸï¼
-      silence_account: éšè—ç”¨æˆ·
       status: çŠ¶æ€
-      suspend_account: å°ç¦ç”¨æˆ·
-      target: è¢«ä¸¾æŠ¥äºº
       title: ä¸¾æŠ¥
       unassign: å–æ¶ˆæŽ¥ç®¡
       unresolved: æœªå¤„ç†
       updated_at: æ›´æ–°æ—¶é—´
-      view: æŸ¥çœ‹
     settings:
       activity_api_enabled:
         desc_html: æœ¬ç«™ç”¨æˆ·å‘å¸ƒçš„å˜Ÿæ–‡æ•°ï¼Œä»¥åŠæœ¬ç«™çš„æ´»è·ƒç”¨æˆ·æ•°å’Œä¸€å‘¨å†…æ–°ç”¨æˆ·æ•°
@@ -308,12 +329,18 @@ zh-CN:
       contact_information:
         email: ç”¨äºŽè”ç³»çš„å…¬å¼€ç”µåé‚®ä»¶åœ°å€
         username: ç”¨äºŽè”ç³»çš„å…¬å¼€ç”¨æˆ·å
+      custom_css:
+        desc_html: é€šè¿‡ CSS ä»£ç è°ƒæ•´æ‰€æœ‰é¡µé¢çš„æ˜¾ç¤ºæ•ˆæžœ
+        title: è‡ªå®šä¹‰ CSS
       hero:
         desc_html: ç”¨äºŽåœ¨é¦–é¡µå±•ç¤ºã€‚æŽ¨èåˆ†è¾¨çŽ‡ 600Ã—100px ä»¥ä¸Šã€‚æœªæŒ‡å®šçš„æƒ…å†µä¸‹å°†é»˜è®¤ä½¿ç”¨æœ¬ç«™ç¼©ç•¥å›¾
         title: ä¸»é¢˜å›¾ç‰‡
       peers_api_enabled:
         desc_html: æˆªè‡³ç›®å‰æœ¬å®žä¾‹åœ¨ç½‘ç»œä¸å·²å‘çŽ°çš„åŸŸå
         title: å…¬å¼€å·²çŸ¥å®žä¾‹çš„åˆ—è¡¨
+      preview_sensitive_media:
+        desc_html: å§‹ç»ˆåœ¨ç«™å¤–é“¾æŽ¥é¢„è§ˆä¸å±•ç¤ºç¼©ç•¥å›¾ï¼Œæ— è®ºåª’ä½“å†…å®¹æ˜¯å¦æ ‡è®°ä¸ºæ•æ„Ÿ
+        title: åœ¨ OpenGraph é¢„è§ˆä¸æ˜¾ç¤ºæ•æ„Ÿåª’ä½“å†…å®¹
       registrations:
         closed_message:
           desc_html: æœ¬ç«™å…³é—æ³¨å†ŒæœŸé—´çš„æç¤ºä¿¡æ¯ã€‚å¯ä»¥ä½¿ç”¨ HTML æ ‡ç¾
@@ -328,7 +355,7 @@ zh-CN:
           desc_html: å…è®¸æ‰€æœ‰äººå»ºç«‹å¸æˆ·
           title: å¼€æ”¾æ³¨å†Œ
       show_known_fediverse_at_about_page:
-        desc_html: å¯ç”¨æ¤é€‰é¡¹å°†ä¼šåœ¨é¢„è§ˆä¸æ˜¾ç¤ºæ¥è‡ªå·²çŸ¥å®žä¾‹çš„å˜Ÿæ–‡ï¼Œå¦åˆ™åªä¼šæ˜¾ç¤ºæœ¬ç«™æ—¶é—´è½´çš„å†…å®¹
+        desc_html: å¯ç”¨æ¤é€‰é¡¹å°†ä¼šåœ¨é¢„è§ˆä¸æ˜¾ç¤ºæ¥è‡ªå·²çŸ¥å®žä¾‹çš„å˜Ÿæ–‡ï¼Œå¦åˆ™åªä¼šæ˜¾ç¤ºæœ¬ç«™æ—¶é—´è½´çš„å†…å®¹.
         title: åœ¨æ—¶é—´è½´é¢„è§ˆä¸æ˜¾ç¤ºå·²çŸ¥å®žä¾‹
       show_staff_badge:
         desc_html: åœ¨ä¸ªäººèµ„æ–™é¡µä¸Šæ˜¾ç¤ºç®¡ç†äººå‘˜æ ‡å¿—
@@ -458,7 +485,7 @@ zh-CN:
     '500':
       content: æŠ±æ‰ï¼Œæˆ‘ä»¬çš„åŽå°å‡ºé”™äº†ã€‚
       title: è¿™ä¸ªé¡µé¢æœ‰é—®é¢˜
-    noscript_html: ä½¿ç”¨ Mastodon ç½‘é¡µç‰ˆåº”ç”¨éœ€è¦å¯ç”¨ JavaScriptã€‚ä½ ä¹Ÿå¯ä»¥é€‰æ‹©é€‚ç”¨äºŽä½ çš„å¹³å°çš„ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Mastodon åº”ç”¨</a>ã€‚
+    noscript_html: ä½¿ç”¨ Mastodon ç½‘é¡µç‰ˆåº”ç”¨éœ€è¦å¯ç”¨ JavaScriptã€‚ä½ ä¹Ÿå¯ä»¥é€‰æ‹©é€‚ç”¨äºŽä½ çš„å¹³å°çš„ <a href="%{apps_path}">Mastodon åº”ç”¨</a>ã€‚
   exports:
     archive_takeout:
       date: æ—¥æœŸ
@@ -472,6 +499,21 @@ zh-CN:
     follows: å…³æ³¨çš„ç”¨æˆ·
     mutes: éšè—çš„ç”¨æˆ·
     storage: åª’ä½“æ–‡ä»¶å˜å‚¨
+  filters:
+    contexts:
+      home: ä¸»é¡µæ—¶é—´è½´
+      notifications: é€šçŸ¥
+      public: å…¬å…±æ—¶é—´è½´
+      thread: å¯¹è¯
+    edit:
+      title: ç¼–è¾‘è¿‡æ»¤å™¨
+    errors:
+      invalid_irreversible: æ¤åŠŸèƒ½åªé€‚ç”¨äºŽä¸»é¡µæ—¶é—´è½´æˆ–é€šçŸ¥
+    index:
+      delete: åˆ é™¤
+      title: è¿‡æ»¤å™¨
+    new:
+      title: æ·»åŠ æ–°çš„è¿‡æ»¤å™¨
   followers:
     domain: åŸŸå
     explanation_html: ä¸ºä¿è¯ä½ çš„å˜Ÿæ–‡çš„éšç§å®‰å…¨ï¼Œä½ åº”å½“ç»å¸¸æ£€æŸ¥ä½ çš„å…³æ³¨è€…åˆ—è¡¨ã€‚<strong>å—ä¿æŠ¤çš„å˜Ÿæ–‡å°†ä¼šå‘é€åˆ°æ‰€æœ‰å…³æ³¨è€…æ‰€åœ¨çš„å®žä¾‹ä¸Š</strong>ã€‚æœ‰äº›å®žä¾‹ä½¿ç”¨çš„è½¯ä»¶ä»£ç æˆ–å…¶ç®¡ç†å‘˜å¯èƒ½ä¸ä¼šå°Šé‡ä½ çš„éšç§è®¾ç½®ï¼Œå› æ¤ä½ åº”å½“å¤æŸ¥ä¸€ä¸‹å…³æ³¨è€…åˆ—è¡¨ï¼Œå¹¶ç§»é™¤é‚£äº›ä½ æ— æ³•ä¿¡ä»»çš„å…³æ³¨è€…ã€‚
@@ -484,7 +526,6 @@ zh-CN:
     unlocked_warning_title: ä½ çš„å¸æˆ·æœªå—åˆ°ä¿æŠ¤
   generic:
     changes_saved_msg: æ›´æ”¹ä¿å˜æˆåŠŸï¼
-    powered_by: åŸºäºŽ %{link} æž„å»º
     save_changes: ä¿å˜æ›´æ”¹
     validation_errors:
       one: å‡ºé”™å•¦ï¼æ£€æŸ¥ä¸€ä¸‹ä¸‹é¢å‡ºé”™çš„åœ°æ–¹å§
@@ -511,15 +552,15 @@ zh-CN:
     expires_in_prompt: æ°¸ä¸è¿‡æœŸ
     generate: ç”Ÿæˆé‚€è¯·é“¾æŽ¥
     invited_by: ä½ çš„é‚€è¯·äººæ˜¯ï¼š
-    max_uses: "%{count} æ¬¡"
+    max_uses:
+      one: 1 æ¬¡
+      other: "%{count} æ¬¡"
     max_uses_prompt: æ— é™åˆ¶
     prompt: ç”Ÿæˆåˆ†äº«é“¾æŽ¥ï¼Œé‚€è¯·ä»–äººåœ¨æœ¬å®žä¾‹æ³¨å†Œ
     table:
       expires_at: å¤±æ•ˆæ—¶é—´
       uses: å·²ä½¿ç”¨æ¬¡æ•°
     title: é‚€è¯·ç”¨æˆ·
-  landing_strip_html: "<strong>%{name}</strong> æ˜¯ä¸€ä½æ¥è‡ª %{link_to_root_path} çš„ç”¨æˆ·ã€‚å¦‚æžœä½ æƒ³å…³æ³¨ä»–ä»¬æˆ–è€…ä¸Žä»–ä»¬äº’åŠ¨ï¼Œä½ éœ€è¦åœ¨ä»»æ„ä¸€ä¸ª Mastodon å®žä¾‹æˆ–ä¸Žå…¶å…¼å®¹çš„ç½‘ç«™ä¸Šæ‹¥æœ‰ä¸€ä¸ªå¸æˆ·ã€‚"
-  landing_strip_signup_html: è¿˜æ²¡æœ‰è¿™ç§å¸æˆ·ï¼Ÿä½ å¯ä»¥<a href="%{sign_up_path}">åœ¨æœ¬ç«™æ³¨å†Œä¸€ä¸ª</a>ã€‚
   lists:
     errors:
       limit: ä½ æ‰€å»ºç«‹çš„åˆ—è¡¨æ•°é‡å·²ç»è¾¾åˆ°ä¸Šé™
@@ -591,6 +632,7 @@ zh-CN:
   remote_follow:
     acct: è¯·è¾“å…¥ä½ çš„â€œç”¨æˆ·å@å®žä¾‹åŸŸåâ€
     missing_resource: æ— æ³•ç¡®å®šä½ çš„å¸æˆ·çš„è·³è½¬ URL
+    no_account_html: è¿˜æ²¡æœ‰å¸å·ï¼Ÿä½ å¯ä»¥<a href='%{sign_up_path}' target='_blank'>æ³¨å†Œä¸€ä¸ª</a>
     proceed: ç¡®è®¤å…³æ³¨
     prompt: ä½ æ£å‡†å¤‡å…³æ³¨ï¼š
   remote_unfollow:
@@ -656,8 +698,12 @@ zh-CN:
   statuses:
     attached:
       description: é™„åŠ åª’ä½“ï¼š%{attached}
-      image: "%{count} å¼ å›¾ç‰‡"
-      video: "%{count} ä¸ªè§†é¢‘"
+      image:
+        one: "%{count} å¼ å›¾ç‰‡"
+        other: "%{count} å¼ å›¾ç‰‡"
+      video:
+        one: "%{count} æ®µè§†é¢‘"
+        other: "%{count} æ®µè§†é¢‘"
     boosted_from_html: è½¬å˜Ÿè‡ª %{acct_link}
     content_warning: å†…å®¹è¦å‘Šï¼š%{warning}
     disallowed_hashtags:
@@ -681,7 +727,6 @@ zh-CN:
       unlisted: ä¸å…¬å¼€
       unlisted_long: æ‰€æœ‰äººå¯è§ï¼Œä½†ä¸ä¼šå‡ºçŽ°åœ¨å…¬å…±æ—¶é—´è½´ä¸Š
   stream_entries:
-    click_to_show: ç‚¹å‡»æ˜¾ç¤º
     pinned: ç½®é¡¶å˜Ÿæ–‡
     reblogged: è½¬å˜Ÿ
     sensitive_content: æ•æ„Ÿå†…å®¹
@@ -696,7 +741,7 @@ zh-CN:
       default: "%Yå¹´%-mæœˆ%dæ—¥ %H:%M"
   two_factor_authentication:
     code_hint: è¾“å…¥è®¤è¯å™¨ç”Ÿæˆçš„ä»£ç ä»¥ç¡®è®¤æ“ä½œ
-    description_html: å¯ç”¨<strong>åŒé‡è®¤è¯</strong>åŽï¼Œä½ éœ€è¦è¾“å…¥æ‰‹æœºè®¤è¯å™¨ç”Ÿæˆçš„ä»£ç æ‰èƒ½ç™»å½•
+    description_html: å¯ç”¨<strong>åŒé‡è®¤è¯</strong>åŽï¼Œä½ éœ€è¦è¾“å…¥æ‰‹æœºè®¤è¯å™¨ç”Ÿæˆçš„ä»£ç æ‰èƒ½ç™»å½•.
     disable: åœç”¨
     enable: å¯ç”¨
     enabled: åŒé‡è®¤è¯å·²å¯ç”¨
@@ -726,7 +771,6 @@ zh-CN:
       review_preferences_action: æ›´æ”¹é¦–é€‰é¡¹
       review_preferences_step: è®°å¾—è°ƒæ•´ä½ çš„åå¥½è®¾ç½®ï¼Œæ¯”å¦‚ä½ æƒ³æŽ¥æ”¶ä»€ä¹ˆç±»åž‹çš„é‚®ä»¶ï¼Œæˆ–è€…ä½ æƒ³æŠŠä½ çš„å˜Ÿæ–‡å¯è§èŒƒå›´é»˜è®¤è®¾ç½®ä¸ºä»€ä¹ˆçº§åˆ«ã€‚å¦‚æžœä½ æ²¡æœ‰æ™•åŠ¨ç—…çš„è¯ï¼Œè€ƒè™‘ä¸€ä¸‹å¯ç”¨â€œè‡ªåŠ¨æ’æ”¾ GIF åŠ¨ç”»â€è¿™ä¸ªé€‰é¡¹å§ã€‚
       subject: æ¬¢è¿Žæ¥åˆ° Mastodon
-      tip_bridge_html: å¦‚æžœä½ åˆšä»Ž Twitter æ¥åˆ°è¿™é‡Œï¼Œä½ å¯ä»¥åœ¨<a href="%{bridge_url}">æ¡¥æ¢ç«™ï¼ˆbridge appï¼‰</a>ä¸Šå¯»æ‰¾ä½ çš„æœ‹å‹ã€‚å½“ç„¶ï¼Œå‰ææ˜¯ä»–ä»¬ä¹Ÿç™»å½•äº†æ¡¥æ¢ç«™ï¼
       tip_federated_timeline: è·¨ç«™å…¬å…±æ—¶é—´è½´å¯ä»¥è®©ä½ ä¸€çª¥æ›´å¹¿é˜”çš„ Mastodon ç½‘ç»œã€‚ä¸è¿‡ï¼Œç”±äºŽå®ƒåªæ˜¾ç¤ºä½ çš„é‚»å±…ä»¬æ‰€è®¢é˜…çš„å†…å®¹ï¼Œæ‰€ä»¥å¹¶ä¸æ˜¯å…¨éƒ¨ã€‚
       tip_following: é»˜è®¤æƒ…å†µä¸‹ï¼Œä½ ä¼šè‡ªåŠ¨å…³æ³¨ä½ æ‰€åœ¨å®žä¾‹çš„ç®¡ç†å‘˜ã€‚æƒ³ç»“äº¤æ›´å¤šæœ‰è¶£çš„äººçš„è¯ï¼Œè®°å¾—å¤šé€›é€›æœ¬ç«™æ—¶é—´è½´å’Œè·¨ç«™å…¬å…±æ—¶é—´è½´å“¦ã€‚
       tip_local_timeline: æœ¬ç«™æ—¶é—´è½´å¯ä»¥è®©ä½ ä¸€çª¥ %{instance} ä¸Šçš„ç”¨æˆ·ã€‚ä»–ä»¬å°±æ˜¯ç¦»ä½ æœ€è¿‘çš„é‚»å±…ï¼
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index ceeeb948caff83e46ac5e4199a7a81417ad67fab..97adfe84d3625baa9ba149146286faaba252831b 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -9,9 +9,6 @@ zh-HK:
     contact: è¯çµ¡
     contact_missing: æœªè¨å®š
     contact_unavailable: æœªå…¬é–‹
-    description_headline: ç”šéº¼æ˜¯ %{domain} ï¼Ÿ
-    domain_count_after: å€‹å…¶ä»–æœå‹™ç«™
-    domain_count_before: å·²é€£æŽ¥è‡³
     extended_description_html: |
       <h3>é€™è£¡å¯ä»¥å¯«ä¸€äº›ç¶²ç«™è¦å‰‡</h3>
       <p>æœ¬ç«™æœªæœ‰è©³ç´°ä»‹ç´¹</p>
@@ -46,7 +43,6 @@ zh-HK:
     people_who_follow: é—œæ³¨ %{name} çš„äºº
     posts: æ–‡ç« 
     posts_with_replies: æ–‡ç« å’Œå›žè¦†
-    remote_follow: è·¨ç«™é—œæ³¨
     reserved_username: æ¤ç”¨æˆ¶åå·²è¢«ä¿ç•™
     roles:
       admin: ç®¡ç†å“¡
@@ -107,10 +103,6 @@ zh-HK:
       most_recent_activity: æœ€æ–°æ´»å‹•
       most_recent_ip: æœ€æ–° IP ä½åŸŸ
       not_subscribed: æœªè¨‚é–±
-      order:
-        alphabetic: æŒ‰å—æ¯
-        most_recent: æŒ‰æ™‚é–“
-        title: æŽ’åº
       outbox_url: å¯„ä»¶ç®±ï¼ˆOutboxï¼‰URL
       perform_full_suspension: å®Œå…¨åœæ¬Š
       profile_url: å€‹äººæª”æ¡ˆ URL
@@ -138,7 +130,6 @@ zh-HK:
       shared_inbox_url: å…¬å…±æ”¶ä»¶ç®±ï¼ˆShared Inboxï¼‰URL
       show:
         created_reports: æ¤ç”¨æˆ¶æ‰€æèˆ‰å ±çš„ç´€éŒ„
-        report: èˆ‰å ±
         targeted_reports: æ¤ç”¨æˆ¶è¢«èˆ‰å ±çš„ç´€éŒ„
       silence: éœéŸ³
       statuses: æ–‡ç« 
@@ -221,22 +212,14 @@ zh-HK:
           suspend: è‡ªå‹•åˆªé™¤
         title: æ–°å¢žåŸŸåé˜»éš”
       reject_media: æ‹’çµ•åª’é«”æª”æ¡ˆ
-      reject_media_hint: åˆªé™¤æœ¬åœ°ç·©å˜çš„åª’é«”æª”æ¡ˆï¼Œå†ä¹Ÿä¸åœ¨æœªä¾†ä¸‹è¼‰é€™å€‹ç«™é»žçš„æª”æ¡ˆã€‚å’Œè‡ªå‹•åˆªé™¤ç„¡é—œã€‚
-      severities:
-        noop: ç„¡
-        silence: è‡ªå‹•éœéŸ³
-        suspend: è‡ªå‹•åˆªé™¤
-      severity: é˜»éš”åˆ†ç´š
+      reject_media_hint: åˆªé™¤æœ¬åœ°ç·©å˜çš„åª’é«”æª”æ¡ˆï¼Œå†ä¹Ÿä¸åœ¨æœªä¾†ä¸‹è¼‰é€™å€‹ç«™é»žçš„æª”æ¡ˆã€‚å’Œè‡ªå‹•åˆªé™¤ç„¡é—œ
       show:
-        affected_accounts:
-          one: è³‡æ–™åº«ä¸æœ‰ %{count} å€‹ç”¨æˆ¶å—å½±éŸ¿
-          other: è³‡æ–™åº«ä¸æœ‰%{count}å€‹ç”¨æˆ¶å—å½±éŸ¿
+        affected_accounts: è³‡æ–™åº«ä¸æœ‰%{count}å€‹ç”¨æˆ¶å—å½±éŸ¿
         retroactive:
           silence: å°æ¤åŸŸåçš„æ‰€æœ‰ç”¨æˆ¶å–æ¶ˆéœéŸ³
           suspend: å°æ¤åŸŸåçš„æ‰€æœ‰ç”¨æˆ¶å–æ¶ˆé™¤å
         title: æ’¤éŠ· %{domain} çš„åŸŸåé˜»éš”
         undo: æ’¤éŠ·
-      title: åŸŸåé˜»éš”
       undo: æ’¤éŠ·
     email_domain_blocks:
       add_new: åŠ å…¥æ–°é …ç›®
@@ -249,10 +232,6 @@ zh-HK:
         title: æ–°å¢žé›»éƒµç¶²åŸŸé˜»éš”
       title: é›»éƒµç¶²åŸŸé˜»éš”
     instances:
-      account_count: å·²çŸ¥å¸³è™Ÿ
-      domain_name: åŸŸå
-      reset: é‡è¨
-      search: æœç´¢
       title: å·²çŸ¥æœå‹™ç«™
     invites:
       filter:
@@ -275,7 +254,6 @@ zh-HK:
       comment:
         none: æ²’æœ‰
       created_at: æ—¥æœŸ
-      id: ID
       mark_as_resolved: æ¨™ç¤ºç‚ºã€Œå·²è™•ç†ã€
       mark_as_unresolved: æ¨™ç¤ºç‚ºã€Œæœªè™•ç†ã€
       notes:
@@ -286,20 +264,15 @@ zh-HK:
         placeholder: è¨˜éŒ„å·²åŸ·è¡Œçš„å‹•ä½œï¼Œæˆ–å…¶ä»–ç›¸é—œçš„æ›´æ–°â€¦â€¦
       reopen: é‡é–‹èˆ‰å ±
       report: 'èˆ‰å ± #%{id}'
-      report_contents: èˆ‰å ±å…§å®¹
       reported_account: èˆ‰å ±ç”¨æˆ¶
       reported_by: èˆ‰å ±è€…
       resolved: å·²è™•ç†
       resolved_msg: èˆ‰å ±å·²è™•ç†ã€‚
-      silence_account: å°‡ç”¨æˆ¶éœéŸ³
       status: ç‹€æ…‹
-      suspend_account: å°‡ç”¨æˆ¶åœæ¬Š
-      target: å°è±¡
       title: èˆ‰å ±
       unassign: å–æ¶ˆæŒ‡æ´¾
       unresolved: æœªè™•ç†
       updated_at: æ›´æ–°
-      view: æª¢è¦–
     settings:
       activity_api_enabled:
         desc_html: æœ¬ç«™ç”¨æˆ¶ç™¼ä½ˆçš„æ–‡ç« ï¼Œä»¥åŠæœ¬ç«™çš„æ´»èºç”¨æˆ¶å’Œä¸€é€±å…§æ–°ç”¨æˆ¶æ•¸
@@ -311,7 +284,7 @@ zh-HK:
         email: è¼¸å…¥ä¸€å€‹å…¬é–‹çš„é›»éƒµåœ°å€
         username: è¼¸å…¥ç”¨æˆ¶åç¨±
       hero:
-        desc_html: åœ¨é¦–é é¡¯ç¤ºã€‚æŽ¨è–¦æœ€å° 600x100pxã€‚å¦‚æžœç•™ç©ºï¼Œå°±æœƒé»˜èªç‚ºæœå‹™ç«™ç¸®åœ–ã€‚
+        desc_html: åœ¨é¦–é é¡¯ç¤ºã€‚æŽ¨è–¦æœ€å° 600x100pxã€‚å¦‚æžœç•™ç©ºï¼Œå°±æœƒé»˜èªç‚ºæœå‹™ç«™ç¸®åœ–
         title: ä¸»é¡Œåœ–ç‰‡
       peers_api_enabled:
         desc_html: ç¾æ™‚æœ¬æœå‹™ç«™åœ¨ç¶²çµ¡ä¸å·²ç™¼ç¾çš„åŸŸå
@@ -460,7 +433,7 @@ zh-HK:
     '500':
       content: æŠ±æ‰ï¼Œæˆ‘å€‘çš„å¾Œå°å‡ºéŒ¯äº†ã€‚
       title: é€™å€‹é é¢æœ‰å•é¡Œ
-    noscript_html: ä½¿ç”¨ Mastodon ç¶²é ç‰ˆæ‡‰ç”¨éœ€è¦å•Ÿç”¨ JavaScriptã€‚ä½ ä¹Ÿå¯ä»¥é¸æ“‡é©ç”¨æ–¼ä½ çš„å¹³å°çš„ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Mastodon æ‡‰ç”¨</a>ã€‚
+    noscript_html: ä½¿ç”¨ Mastodon ç¶²é ç‰ˆæ‡‰ç”¨éœ€è¦å•Ÿç”¨ JavaScriptã€‚ä½ ä¹Ÿå¯ä»¥é¸æ“‡é©ç”¨æ–¼ä½ çš„å¹³å°çš„ <a href="%{apps_path}">Mastodon æ‡‰ç”¨</a>ã€‚
   exports:
     archive_takeout:
       date: æ—¥æœŸ
@@ -488,7 +461,6 @@ zh-HK:
     unlocked_warning_title: ä½ çš„ç”¨æˆ¶ç›®å‰ç‚ºã€Œå…¬å…±ã€
   generic:
     changes_saved_msg: å·²æˆåŠŸå„²å˜ä¿®æ”¹ã€‚
-    powered_by: ç¶²ç«™ç”± %{link} é–‹ç™¼
     save_changes: å„²å˜ä¿®æ”¹
     validation_errors:
       one: æäº¤çš„è³‡æ–™æœ‰å•é¡Œ
@@ -524,8 +496,6 @@ zh-HK:
       expires_at: å¤±æ•ˆæ™‚é–“
       uses: å·²ä½¿ç”¨æ¬¡æ•¸
     title: é‚€è«‹ç”¨æˆ¶
-  landing_strip_html: "<strong>%{name}</strong> æ˜¯ä¸€å€‹åœ¨ %{link_to_root_path} çš„ç”¨æˆ¶ã€‚åªè¦ä½ æœ‰ä»»ä½• Mastodon æœå‹™ç«™ã€æˆ–è€…è¯ç›Ÿç¶²ç«™çš„ç”¨æˆ¶ï¼Œä¾¿å¯ä»¥è·¨ç«™é—œæ³¨æ¤ç«™ç”¨æˆ¶ï¼Œæˆ–è€…èˆ‡ä»–å€‘äº’å‹•ã€‚"
-  landing_strip_signup_html: å¦‚æžœä½ æ²’æœ‰é€™é¡žç”¨æˆ¶ï¼Œæ¡è¿Žåœ¨<a href="%{sign_up_path}">æ¤è™•ç™»è¨˜</a>ã€‚
   lists:
     errors:
       limit: ä½ æ‰€å»ºç«‹çš„åˆ—è¡¨æ•¸é‡å·²ç¶“é”åˆ°ä¸Šé™
@@ -543,7 +513,7 @@ zh-HK:
   notification_mailer:
     digest:
       action: æŸ¥çœ‹æ‰€æœ‰é€šçŸ¥
-      body: é€™æ˜¯è‡ªå¾žä½ åœ¨%{since}ä½¿ç”¨%{instance}ä»¥å¾Œï¼Œä½ éŒ¯å¤±äº†çš„è¨Šæ¯ï¸°
+      body: é€™æ˜¯è‡ªå¾žä½ åœ¨%{since}ä½¿ç”¨ä»¥å¾Œï¼Œä½ éŒ¯å¤±äº†çš„è¨Šæ¯ï¸°
       mention: "%{name} åœ¨æ¤æåŠäº†ä½ ï¸°"
       new_followers_summary:
         one: ä½ æ–°ç²å¾—äº† 1 ä½é—œæ³¨è€…äº†ï¼æå–œï¼
@@ -692,7 +662,6 @@ zh-HK:
       unlisted: å…¬é–‹ï¼Œä½†ä¸åœ¨å…¬å…±æ™‚é–“è»¸é¡¯ç¤º
       unlisted_long: æ‰€æœ‰äººéƒ½èƒ½çœ‹åˆ°ï¼Œä½†ä¸åœ¨å…¬å…±æ™‚é–“è»¸ï¼ˆæœ¬ç«™æ™‚é–“è»¸ã€è·¨ç«™æ™‚é–“è»¸ï¼‰é¡¯ç¤º
   stream_entries:
-    click_to_show: é»žæ“Šé¡¯ç¤º
     pinned: ç½®é ‚æ–‡ç« 
     reblogged: è½‰æŽ¨
     sensitive_content: æ•æ„Ÿå…§å®¹
@@ -737,7 +706,6 @@ zh-HK:
       review_preferences_action: æ›´æ”¹é¦–é¸é …
       review_preferences_step: è¨˜å¾—èª¿æ•´ä½ çš„åå¥½è¨ç½®ï¼Œæ¯”å¦‚ä½ æƒ³æŽ¥æ”¶ä»€éº¼é¡žåž‹çš„éƒµä»¶ï¼Œæˆ–è€…ä½ æƒ³æŠŠä½ çš„æ–‡ç« å¯è¦‹ç¯„åœé»˜èªè¨å®šç‚ºä»€éº¼ç´šåˆ¥ã€‚å¦‚æžœä½ æ²’æœ‰æšˆè»Šçš„è©±ï¼Œè€ƒæ…®ä¸€ä¸‹å•Ÿç”¨ã€Œè‡ªå‹•æ’æ”¾ GIF å‹•ç•«ã€é€™å€‹é¸é …å§ã€‚
       subject: æ¡è¿Žä¾†åˆ° Mastodon
-      tip_bridge_html: å¦‚æžœä½ å‰›å¾ž Twitter ä¾†åˆ°é€™è£¡ï¼Œä½ å¯ä»¥åœ¨<a href="%{bridge_url}">æ©‹æ¨‘ç«™ï¼ˆbridge appï¼‰</a>ä¸Šå°‹æ‰¾ä½ çš„æœ‹å‹ã€‚ç•¶ç„¶ï¼Œå‰ææ˜¯ä»–å€‘ä¹Ÿç™»éŒ„äº†æ©‹æ¨‘ç«™ï¼
       tip_federated_timeline: è·¨ç«™å…¬å…±æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªºæ›´å»£é—Šçš„ Mastodon ç¶²çµ¡ã€‚ä¸éŽï¼Œç”±æ–¼å®ƒåªé¡¯ç¤ºä½ çš„é„°å±…å€‘æ‰€è¨‚é–±çš„å…§å®¹ï¼Œæ‰€ä»¥ä¸¦ä¸æ˜¯å…¨éƒ¨ã€‚
       tip_following: é»˜èªæƒ…æ³ä¸‹ï¼Œä½ æœƒè‡ªå‹•é—œæ³¨ä½ æ‰€åœ¨æœå‹™ç«™çš„ç®¡ç†å“¡ã€‚æƒ³çµäº¤æ›´å¤šæœ‰è¶£çš„äººçš„è©±ï¼Œè¨˜å¾—å¤šé€›é€›æœ¬ç«™æ™‚é–“è»¸å’Œè·¨ç«™å…¬å…±æ™‚é–“è»¸å“¦ã€‚
       tip_local_timeline: æœ¬ç«™æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªº %{instance} ä¸Šçš„ç”¨æˆ¶ã€‚ä»–å€‘å°±æ˜¯é›¢ä½ æœ€è¿‘çš„é„°å±…ï¼
@@ -747,6 +715,6 @@ zh-HK:
   users:
     invalid_email: é›»éƒµåœ°å€æ ¼å¼ä¸æ£ç¢º
     invalid_otp_token: é›™é‡èªè‰ç¢ºèªç¢¼ä¸æ£ç¢º
-    otp_lost_help_html: å¦‚æžœä½ ç„¡æ³•è¨ªå•é€™å…©è€…ï¼Œå¯ä»¥é€šéŽ %{email} èˆ‡æˆ‘å€‘è¯ç¹«ã€‚
+    otp_lost_help_html: å¦‚æžœä½ ç„¡æ³•è¨ªå•é€™å…©è€…ï¼Œå¯ä»¥é€šéŽ %{email} èˆ‡æˆ‘å€‘è¯ç¹«
     seamless_external_login: ç”±æ–¼ä½ æ˜¯å¾žå¤–éƒ¨ç³»çµ±ç™»å…¥ï¼Œæ‰€ä»¥ä¸èƒ½è¨å®šå¯†ç¢¼å’Œé›»éƒµã€‚
     signed_in_as: ç›®å‰ç™»å…¥çš„å¸³æˆ¶ï¼š
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e2b376a3f9f8c728de1cfe109c3ef1209441caee..f4bda0f348fb12dbfef7333bc5222ee5967f6e62 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -5,13 +5,13 @@ zh-TW:
     about_mastodon_html: Mastodon ï¼ˆé•·æ¯›è±¡ï¼‰æ˜¯ä¸€å€‹<em>è‡ªç”±ã€é–‹æ”¾åŽŸå§‹ç¢¼</em>çš„ç¤¾ç¾¤ç¶²ç«™ã€‚å®ƒæ˜¯ä¸€å€‹åˆ†æ•£å¼çš„æœå‹™ï¼Œé¿å…æ‚¨çš„é€šè¨Šè¢«å–®ä¸€å•†æ¥æ©Ÿæ§‹å£Ÿæ–·æ“æŽ§ã€‚è«‹æ‚¨é¸æ“‡ä¸€å®¶æ‚¨ä¿¡ä»»çš„ Mastodon ç«™é»žï¼Œåœ¨ä¸Šé¢å»ºç«‹å¸³è™Ÿï¼Œç„¶å¾Œæ‚¨å°±å¯ä»¥å’Œä»»ä¸€ Mastodon ç«™é»žä¸Šçš„ä½¿ç”¨è€…äº’é€šï¼Œäº«å—ç„¡ç¸«çš„<em>ç¤¾ç¾¤ç¶²è·¯</em>äº¤æµã€‚
     about_this: é—œæ–¼æœ¬ç«™
     administered_by: ç®¡ç†è€…ï¼š
+    api: API
+    apps: Mobile apps
     closed_registrations: æœ¬ç«™æš«æ™‚åœæ¢æŽ¥å—è¨»å†Šã€‚
     contact: è¯çµ¡æˆ‘å€‘
     contact_missing: æœªè¨å®š
     contact_unavailable: æœªå…¬é–‹
-    description_headline: é—œæ–¼ %{domain}ï¼Ÿ
-    domain_count_after: å€‹ç«™é»žç›¸é€£
-    domain_count_before: èˆ‡å…¶ä»–
+    documentation: æ–‡ä»¶
     extended_description_html: |
       <h3>é€™è£¡å¯ä»¥å¯«ä¸€äº›ç¶²ç«™è¦å‰‡</h3>
       <p>æœ¬ç«™é»žæœªæœ‰è©³ç´°ä»‹ç´¹</p>
@@ -29,9 +29,10 @@ zh-TW:
     learn_more: äº†è§£è©³ç´°
     other_instances: å…¶ä»–ç«™é»ž
     source_code: åŽŸå§‹ç¢¼
-    status_count_after: æ¢å˜Ÿå˜Ÿ
+    status_count_after: ç‹€æ…‹
     status_count_before: ä»–å€‘å…±å˜Ÿå‡ºäº†
-    user_count_after: ä½ä½¿ç”¨è€…
+    terms: ä½¿ç”¨æ¢æ¬¾
+    user_count_after: ä½¿ç”¨è€…
     user_count_before: é€™è£¡å…±è¨»å†Šæœ‰
     what_is_mastodon: ä»€éº¼æ˜¯ Mastodon?
   accounts:
@@ -45,8 +46,8 @@ zh-TW:
     people_followed_by: "%{name} é—œæ³¨çš„äºº"
     people_who_follow: é—œæ³¨ %{name} çš„äºº
     posts: å˜Ÿæ–‡
+    posts_tab_heading: å˜Ÿæ–‡
     posts_with_replies: å˜Ÿæ–‡èˆ‡å›žè¦†
-    remote_follow: è·¨ç«™é—œæ³¨
     reserved_username: æ¤ç”¨æˆ¶åå·²è¢«ä¿ç•™
     roles:
       admin: ç®¡ç†å“¡
@@ -107,10 +108,6 @@ zh-TW:
       most_recent_activity: æœ€è¿‘æ´»å‹•
       most_recent_ip: æœ€è¿‘ IP ä½å€
       not_subscribed: æœªè¨‚é–±
-      order:
-        alphabetic: æŒ‰å—æ¯
-        most_recent: æŒ‰æ™‚é–“
-        title: æŽ’åº
       outbox_url: å¯„ä»¶ç®± (Outbox) URL
       perform_full_suspension: é€²è¡Œåœæ¬Š
       profile_url: å€‹äººæª”æ¡ˆ URL
@@ -138,7 +135,6 @@ zh-TW:
       shared_inbox_url: å…¬å…±æ”¶ä»¶ç®± (Shared Inbox) URL
       show:
         created_reports: é€™å€‹ä½¿ç”¨è€…æäº¤çš„æª¢èˆ‰
-        report: æª¢èˆ‰
         targeted_reports: é‡å°é€™å€‹ä½¿ç”¨è€…çš„æª¢èˆ‰
       silence: éœéŸ³
       statuses: å˜Ÿæ–‡
@@ -222,21 +218,13 @@ zh-TW:
         title: æ–°å¢žå°éŽ–ç¶²åŸŸ
       reject_media: æ‹’çµ•åª’é«”æª”æ¡ˆ
       reject_media_hint: åˆªé™¤æœ¬åœ°ç·©å˜çš„åª’é«”æª”æ¡ˆï¼Œä¸¦ä¸”ä¸å†æŽ¥æ”¶ä¾†è‡ªè©²ç¶²åŸŸçš„ä»»ä½•åª’é«”æª”æ¡ˆã€‚èˆ‡è‡ªå‹•å°éŽ–ç„¡é—œ
-      severities:
-        noop: ç„¡
-        silence: è‡ªå‹•éœéŸ³
-        suspend: è‡ªå‹•å°éŽ–
-      severity: åš´é‡åº¦
       show:
-        affected_accounts:
-          one: è³‡æ–™åº«ä¸æœ‰ä¸€å€‹ä½¿ç”¨è€…å—åˆ°å½±éŸ¿
-          other: è³‡æ–™åº«ä¸æœ‰%{count}å€‹ä½¿ç”¨è€…å—å½±éŸ¿
+        affected_accounts: è³‡æ–™åº«ä¸æœ‰%{count}å€‹ä½¿ç”¨è€…å—å½±éŸ¿
         retroactive:
           silence: å°æ¤ç¶²åŸŸçš„æ‰€æœ‰ä½¿ç”¨è€…å–æ¶ˆéœéŸ³
           suspend: å°æ¤ç¶²åŸŸçš„æ‰€æœ‰ä½¿ç”¨è€…å–æ¶ˆå°éŽ–
         title: æ’¤éŠ· %{domain} çš„ç¶²åŸŸå°éŽ–
         undo: æ’¤éŠ·
-      title: ç¶²åŸŸå°éŽ–
       undo: æ’¤éŠ·
     email_domain_blocks:
       add_new: åŠ å…¥æ–°é …ç›®
@@ -249,10 +237,6 @@ zh-TW:
         title: æ–°å¢žE-mailå°éŽ–
       title: E-mailå°éŽ–
     instances:
-      account_count: å·²çŸ¥å¸³æˆ¶
-      domain_name: ç¶²åŸŸ
-      reset: é‡è¨
-      search: æœå°‹
       title: å·²çŸ¥ç«™é»ž
     invites:
       filter:
@@ -275,7 +259,6 @@ zh-TW:
       comment:
         none: ç„¡
       created_at: æ—¥æœŸ
-      id: ID
       mark_as_resolved: æ¨™è¨˜ç‚ºã€Œå·²è§£æ±ºã€
       mark_as_unresolved: æ¨™è¨˜ç‚ºã€Œæœªè§£æ±ºã€
       notes:
@@ -286,20 +269,15 @@ zh-TW:
         placeholder: è¨˜éŒ„å·²åŸ·è¡Œçš„å‹•ä½œï¼Œæˆ–å…¶ä»–ç›¸é—œçš„æ›´æ–°...
       reopen: é‡é–‹æª¢èˆ‰
       report: 'æª¢èˆ‰ #%{id}'
-      report_contents: æª¢èˆ‰å…§å®¹
       reported_account: è¢«æª¢èˆ‰ä½¿ç”¨è€…
       reported_by: æª¢èˆ‰äºº
       resolved: å·²è§£æ±º
       resolved_msg: æª¢èˆ‰å·²è™•ç†!
-      silence_account: éœéŸ³ä½¿ç”¨è€…
       status: ç‹€æ…‹
-      suspend_account: åœæ¬Šä½¿ç”¨è€…
-      target: å°è±¡
       title: æª¢èˆ‰
       unassign: å–æ¶ˆæŒ‡æ´¾
       unresolved: æœªè§£æ±º
       updated_at: æ›´æ–°
-      view: æª¢è¦–
     settings:
       activity_api_enabled:
         desc_html: æœ¬ç«™ä½¿ç”¨è€…ç™¼ä½ˆçš„å˜Ÿæ–‡æ•¸é‡ï¼Œä»¥åŠæœ¬ç«™çš„æ´»èºä½¿ç”¨è€…èˆ‡ä¸€é€±å…§æ–°ä½¿ç”¨è€…æ•¸é‡
@@ -460,7 +438,7 @@ zh-TW:
     '500':
       content: æŠ±æ‰ï¼Œæˆ‘å€‘çš„å¾Œå°å‡ºç¾å•é¡Œäº†ã€‚
       title: é€™å€‹é é¢æœ‰å•é¡Œ
-    noscript_html: ä½¿ç”¨ Mastodon ç¶²é ç‰ˆæ‡‰ç”¨éœ€è¦å•Ÿç”¨ JavaScriptã€‚ä½ ä¹Ÿå¯ä»¥é¸æ“‡é©ç”¨æ–¼ä½ çš„å¹³å°çš„ <a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md">Mastodon æ‡‰ç”¨</a>ã€‚
+    noscript_html: ä½¿ç”¨ Mastodon ç¶²é ç‰ˆæ‡‰ç”¨éœ€è¦å•Ÿç”¨ JavaScriptã€‚ä½ ä¹Ÿå¯ä»¥é¸æ“‡é©ç”¨æ–¼ä½ çš„å¹³å°çš„ <a href="%{apps_path}">Mastodon æ‡‰ç”¨</a>ã€‚
   exports:
     archive_takeout:
       date: æ—¥æœŸ
@@ -480,19 +458,14 @@ zh-TW:
     followers_count: é—œæ³¨è€…æ•¸é‡
     lock_link: å°‡ä½ çš„å¸³æˆ¶è¨å®šç‚ºç§äºº
     purge: ç§»é™¤é—œæ³¨è€…
-    success:
-      one: æ£æº–å‚™è»Ÿæ€§å°éŽ– 1 å€‹ç¶²åŸŸçš„é—œæ³¨è€…â€¦â€¦
-      other: æ£æº–å‚™è»Ÿæ€§å°éŽ– %{count} å€‹ç¶²åŸŸçš„é—œæ³¨è€…â€¦â€¦
+    success: æ£æº–å‚™è»Ÿæ€§å°éŽ– %{count} å€‹ç¶²åŸŸçš„é—œæ³¨è€…â€¦â€¦
     true_privacy_html: è«‹è¬¹è¨˜ï¼Œå”¯æœ‰<strong>é»žå°é»žåŠ å¯†æ–¹å¯ä»¥çœŸæ£ç¢ºä¿ä½ çš„éš±ç§</strong>ã€‚
     unlocked_warning_html: ä»»ä½•äººéƒ½å¯ä»¥åœ¨é—œæ³¨ä½ å¾Œç«‹å³æŸ¥çœ‹éžå…¬é–‹çš„å˜Ÿæ–‡ã€‚åªè¦%{lock_link}ï¼Œä½ å°±å¯ä»¥å¯©æ ¸ä¸¦æ‹’çµ•é—œæ³¨è«‹æ±‚ã€‚
     unlocked_warning_title: ä½ çš„å¸³æˆ¶æ˜¯å…¬é–‹çš„
   generic:
     changes_saved_msg: å·²æˆåŠŸå„²å˜ä¿®æ”¹!
-    powered_by: ç¶²ç«™ç”± %{link} é–‹ç™¼
     save_changes: å„²å˜ä¿®æ”¹
-    validation_errors:
-      one: é€å‡ºçš„è³‡æ–™æœ‰å•é¡Œ
-      other: é€å‡ºçš„è³‡æ–™æœ‰ %{count} å€‹å•é¡Œ
+    validation_errors: é€å‡ºçš„è³‡æ–™æœ‰ %{count} å€‹å•é¡Œ
   imports:
     preface: æ‚¨å¯ä»¥åœ¨æ¤åŒ¯å…¥æ‚¨åœ¨å…¶ä»–ç«™é»žæ‰€åŒ¯å‡ºçš„è³‡æ–™æª”ï¼ŒåŒ…æ‹¬é—œæ³¨çš„ä½¿ç”¨è€…ã€å°éŽ–çš„ä½¿ç”¨è€…åå–®ã€‚
     success: è³‡æ–™æª”ä¸Šå‚³æˆåŠŸï¼Œæ£åœ¨åŒ¯å…¥ï¼Œè«‹ç¨å€™
@@ -515,17 +488,13 @@ zh-TW:
     expires_in_prompt: æ°¸ä¸éŽæœŸ
     generate: å»ºç«‹é‚€è«‹é€£çµ
     invited_by: ä½ çš„é‚€è«‹äººæ˜¯ï¼š
-    max_uses:
-      one: 1 æ¬¡
-      other: "%{count} æ¬¡"
+    max_uses: "%{count} æ¬¡"
     max_uses_prompt: ç„¡é™åˆ¶
     prompt: å»ºç«‹åˆ†äº«é€£çµï¼Œé‚€è«‹ä»–äººåœ¨æœ¬ç«™é»žè¨»å†Š
     table:
       expires_at: å¤±æ•ˆæ™‚é–“
       uses: å·²ä½¿ç”¨æ¬¡æ•¸
     title: é‚€è«‹ä½¿ç”¨è€…
-  landing_strip_html: "<strong>%{name}</strong> æ˜¯ä¸€å€‹åœ¨ %{link_to_root_path} çš„ä½¿ç”¨è€…ã€‚åªè¦æ‚¨æœ‰ä»»ä½• Mastodon ç«™é»žã€æˆ–è€…è¯ç›Ÿç«™é»žçš„å¸³æˆ¶ï¼Œä¾¿å¯ä»¥è·¨ç«™é—œæ³¨æ¤ç«™ä½¿ç”¨è€…ï¼Œæˆ–è€…èˆ‡ä»–å€‘äº’å‹•ã€‚"
-  landing_strip_signup_html: å¦‚æžœæ‚¨æ²’æœ‰é€™äº›å¸³æˆ¶ï¼Œæ¡è¿Žåœ¨<a href="%{sign_up_path}">é€™è£¡è¨»å†Š</a>ã€‚
   lists:
     errors:
       limit: ä½ æ‰€å»ºç«‹çš„åˆ—è¡¨æ•¸é‡å·²ç¶“é”åˆ°ä¸Šé™
@@ -545,12 +514,8 @@ zh-TW:
       action: é–±è¦½æ‰€æœ‰é€šçŸ¥
       body: ä»¥ä¸‹æ˜¯è‡ª%{since}ä½ æœ€å¾Œä¸€æ¬¡ç™»å…¥ä»¥ä¾†éŒ¯éŽçš„è¨Šæ¯æ‘˜è¦
       mention: "%{name} åœ¨æ¤æåŠäº†ä½ :"
-      new_followers_summary:
-        one: è€Œä¸”ï¼Œä½ ä¸åœ¨çš„æ™‚å€™ï¼Œæœ‰ä¸€å€‹äººé—œæ³¨ä½ ! è€¶!
-        other: è€Œä¸”ï¼Œä½ ä¸åœ¨çš„æ™‚å€™ï¼Œæœ‰ %{count} å€‹äººé—œæ³¨ä½ äº†! å¥½æ£’!
-      subject:
-        one: "è‡ªå¾žä¸Šæ¬¡ç™»å…¥ä»¥ä¾†ï¼Œä½ æ”¶åˆ° 1 å‰‡æ–°çš„é€šçŸ¥ \U0001F418"
-        other: "è‡ªå¾žä¸Šæ¬¡ç™»å…¥ä»¥ä¾†ï¼Œä½ æ”¶åˆ° %{count} å‰‡æ–°çš„é€šçŸ¥ \U0001F418"
+      new_followers_summary: è€Œä¸”ï¼Œä½ ä¸åœ¨çš„æ™‚å€™ï¼Œæœ‰ %{count} å€‹äººé—œæ³¨ä½ äº†! å¥½æ£’!
+      subject: "è‡ªå¾žä¸Šæ¬¡ç™»å…¥ä»¥ä¾†ï¼Œä½ æ”¶åˆ° %{count} å‰‡æ–°çš„é€šçŸ¥ \U0001F418"
       title: ä½ ä¸åœ¨çš„æ™‚å€™...
     favourite:
       body: 'ä½ çš„å˜Ÿæ–‡è¢« %{name} åŠ å…¥äº†æœ€æ„›:'
@@ -656,17 +621,11 @@ zh-TW:
   statuses:
     attached:
       description: é™„ä»¶ï¼š %{attached}
-      image:
-        one: "%{count} å¹…åœ–ç‰‡"
-        other: "%{count} å¹…åœ–ç‰‡"
-      video:
-        one: "%{count} æ®µå½±ç‰‡"
-        other: "%{count} æ®µå½±ç‰‡"
+      image: "%{count} å¹…åœ–ç‰‡"
+      video: "%{count} æ®µå½±ç‰‡"
     boosted_from_html: è½‰å˜Ÿè‡ª %{acct_link}
     content_warning: å…§å®¹è¦å‘Šï¼š %{warning}
-    disallowed_hashtags:
-      one: åŒ…å«ä¸å…è¨±çš„æ¨™ç±¤ï¼š %{tags}
-      other: åŒ…å«ä¸å…è¨±çš„æ¨™ç±¤ï¼š %{tags}
+    disallowed_hashtags: åŒ…å«ä¸å…è¨±çš„æ¨™ç±¤ï¼š %{tags}
     language_detection: è‡ªå‹•åµæ¸¬èªžè¨€
     open_in_web: ä»¥ç¶²é é–‹å•Ÿ
     over_character_limit: è¶…éŽäº† %{max} å—çš„é™åˆ¶
@@ -685,7 +644,6 @@ zh-TW:
       unlisted: å…¬é–‹ï¼Œä½†ä¸åœ¨å…¬å…±æ™‚é–“è»¸é¡¯ç¤º
       unlisted_long: æ‰€æœ‰äººéƒ½èƒ½çœ‹åˆ°ï¼Œä½†ä¸æœƒå‡ºç¾åœ¨å…¬å…±æ™‚é–“è»¸ä¸Š
   stream_entries:
-    click_to_show: é»žé¸é¡¯ç¤º
     pinned: ç½®é ‚å˜Ÿæ–‡
     reblogged: è½‰å˜Ÿ
     sensitive_content: æ•æ„Ÿå…§å®¹
@@ -729,7 +687,6 @@ zh-TW:
       review_preferences_action: æ›´æ”¹åå¥½è¨å®š
       review_preferences_step: è¨˜å¾—èª¿æ•´ä½ çš„åå¥½è¨å®šï¼Œæ¯”å¦‚ä½ æƒ³æŽ¥æ”¶ä»€éº¼é¡žåž‹çš„é›»åéƒµä»¶ï¼Œæˆ–è‘—ä½ æƒ³æŠŠä½ çš„å˜Ÿæ–‡å¯è¦‹ç¯„åœé è¨è¨å®šä»€éº¼ç´šåˆ¥ã€‚å¦‚æžœä½ æ²’æœ‰æšˆè»Šçš„è©±ï¼Œè€ƒæ…®ä¸€ä¸‹å•Ÿç”¨ã€Œè‡ªå‹•æ’æ”¾ GIF å‹•ç•«ã€é€™å€‹é¸é …å§ã€‚
       subject: æ¡è¿Žä¾†åˆ° Mastodon
-      tip_bridge_html: å¦‚æžœä½ å‰›å¾ž Twitter ä¾†åˆ°é€™è£¡ï¼Œä½ å¯ä»¥åœ¨<a href="%{bridge_url}">æ©‹æ¨‘ç«™ï¼ˆbridge appï¼‰</a>ä¸Šå°‹æ‰¾ä½ çš„æœ‹å‹ã€‚ç•¶ç„¶ï¼Œå‰ææ˜¯ä»–å€‘ä¹Ÿç™»å…¥äº†æ©‹æ¨‘ç«™ï¼
       tip_federated_timeline: è·¨ç«™å…¬å…±æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªºæ›´å»£é—Šçš„ Mastodon ç¶²è·¯ã€‚ä¸éŽï¼Œç”±æ–¼å®ƒå€‘åªé¡¯ç¤ºä½ çš„é„°å±…å€‘æ‰€è¨‚é–±çš„å…§å®¹ï¼Œæ‰€ä»¥ä¸¦ä¸æ˜¯å…¨éƒ¨ã€‚
       tip_following: é è¨æƒ…æ³ä¸‹ï¼Œä½ æœƒè‡ªå‹•é—œæ³¨ä½ æ‰€åœ¨ç«™é»žçš„ç®¡ç†å“¡ã€‚æƒ³çµäº¤æ›´å¤šæœ‰è¶£çš„äººçš„è©±ï¼Œè¨˜å¾—å¤šé€›é€›æœ¬ç«™æ™‚é–“è»¸èˆ‡è·¨ç«™å…¬å…±æ™‚é–“è»¸å“¦ã€‚
       tip_local_timeline: æœ¬ç«™æ™‚é–“è»¸å¯ä»¥è®“ä½ ä¸€çªº %{instance} ä¸Šçš„ä½¿ç”¨è€…ã€‚ä»–å€‘å°±æ˜¯é›¢ä½ æœ€è¿‘çš„é„°å±…ï¼
diff --git a/config/navigation.rb b/config/navigation.rb
index 3f2e913c62903205e297b60e8fb8fc1e9e2dc25d..a9521f956d0293433b9a19084dd79d6f74db76a9 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -28,14 +28,16 @@ SimpleNavigation::Configuration.run do |navigation|
       admin.item :reports, safe_join([fa_icon('flag fw'), t('admin.reports.title')]), admin_reports_url, highlights_on: %r{/admin/reports}
       admin.item :accounts, safe_join([fa_icon('users fw'), t('admin.accounts.title')]), admin_accounts_url, highlights_on: %r{/admin/accounts}
       admin.item :invites, safe_join([fa_icon('user-plus fw'), t('admin.invites.title')]), admin_invites_path
-      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url, highlights_on: %r{/admin/instances}, if: -> { current_user.admin? }
-      admin.item :domain_blocks, safe_join([fa_icon('lock fw'), t('admin.domain_blocks.title')]), admin_domain_blocks_url, highlights_on: %r{/admin/domain_blocks}, if: -> { current_user.admin? }
+      admin.item :tags, safe_join([fa_icon('tag fw'), t('admin.tags.title')]), admin_tags_path
+      admin.item :instances, safe_join([fa_icon('cloud fw'), t('admin.instances.title')]), admin_instances_url(limited: '1'), highlights_on: %r{/admin/instances|/admin/domain_blocks}, if: -> { current_user.admin? }
       admin.item :email_domain_blocks, safe_join([fa_icon('envelope fw'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_url, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.admin? }
     end
 
-    primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), proc { current_user.admin? ? edit_admin_settings_url : admin_custom_emojis_url }, if: proc { current_user.staff? } do |admin|
+    primary.item :admin, safe_join([fa_icon('cogs fw'), t('admin.title')]), admin_dashboard_url, if: proc { current_user.staff? } do |admin|
+      admin.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url
       admin.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }
       admin.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}
+      admin.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/relays}
       admin.item :subscriptions, safe_join([fa_icon('paper-plane-o fw'), t('admin.subscriptions.title')]), admin_subscriptions_url, if: -> { current_user.admin? }
       admin.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? }
       admin.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? }
diff --git a/config/puma.rb b/config/puma.rb
index 0397b892048588048784cf95181d61d560f4ed05..1afdb1c6dfbc0900051690c33a2013482398132a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,7 +1,7 @@
 threads_count = ENV.fetch('MAX_THREADS') { 5 }.to_i
 threads threads_count, threads_count
 
-if ENV['SOCKET'] then
+if ENV['SOCKET']
   bind 'unix://' + ENV['SOCKET']
 else
   port ENV.fetch('PORT') { 3000 }
@@ -13,7 +13,9 @@ workers     ENV.fetch('WEB_CONCURRENCY') { 2 }
 preload_app!
 
 on_worker_boot do
-  ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.establish_connection
+  end
 end
 
 plugin :tmp_restart
diff --git a/config/routes.rb b/config/routes.rb
index fd26b4aa74cac3105f5e2c8108fe0d1c64e4e4ca..af49845ccbe77e3abc501abb4fb45eb98f56029b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,8 +21,10 @@ Rails.application.routes.draw do
 
   get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' }
   get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger
+  get '.well-known/change-password', to: redirect('/auth/edit')
   get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
   get 'intent', to: 'intents#show'
+  get 'custom.css', to: 'custom_css#show', as: :custom_css
 
   devise_scope :user do
     get '/invite/:invite_code', to: 'auth/registrations#new', as: :public_invite
@@ -38,6 +40,7 @@ Rails.application.routes.draw do
   }
 
   get '/users/:username', to: redirect('/@%{username}'), 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
     resources :stream_entries, path: 'updates', only: [:show] do
@@ -74,6 +77,12 @@ Rails.application.routes.draw do
   get '/@:account_username/:id', to: 'statuses#show', as: :short_account_status
   get '/@:account_username/:id/embed', to: 'statuses#embed', as: :embed_short_account_status
 
+  get  '/interact/:id', to: 'remote_interaction#new', as: :remote_interaction
+  post '/interact/:id', to: 'remote_interaction#create'
+
+  get '/explore', to: 'directories#index', as: :explore
+  get '/explore/:id', to: 'directories#show', as: :explore_hashtag
+
   namespace :settings do
     resource :profile, only: [:show, :update]
     resource :preferences, only: [:show, :update]
@@ -85,6 +94,8 @@ Rails.application.routes.draw do
       resources :follows, only: :index, controller: :following_accounts
       resources :blocks, only: :index, controller: :blocked_accounts
       resources :mutes, only: :index, controller: :muted_accounts
+      resources :lists, only: :index, controller: :lists
+      resources :domain_blocks, only: :index, controller: :blocked_domains
     end
 
     resource :two_factor_authentication, only: [:show, :create, :destroy]
@@ -120,24 +131,42 @@ Rails.application.routes.draw do
 
   # Remote follow
   resource :remote_unfollow, only: [:create]
-  resource :authorize_follow, only: [:show, :create]
+  resource :authorize_interaction, only: [:show, :create]
   resource :share, only: [:show, :create]
 
   namespace :admin do
+    get '/dashboard', to: 'dashboard#index'
+
     resources :subscriptions, only: [:index]
-    resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
+    resources :domain_blocks, only: [:new, :create, :show, :destroy]
     resources :email_domain_blocks, only: [:index, :new, :create, :destroy]
     resources :action_logs, only: [:index]
+    resources :warning_presets, except: [:new]
     resource :settings, only: [:edit, :update]
-    resources :invites, only: [:index, :create, :destroy]
 
-    resources :instances, only: [:index] do
+    resources :invites, only: [:index, :create, :destroy] do
       collection do
-        post :resubscribe
+        post :deactivate_all
+      end
+    end
+
+    resources :relays, only: [:index, :new, :create, :destroy] do
+      member do
+        post :enable
+        post :disable
       end
     end
 
-    resources :reports, only: [:index, :show, :update] do
+    resources :instances, only: [:index, :show], constraints: { id: /[^\/]+/ }
+
+    resources :reports, only: [:index, :show] do
+      member do
+        post :assign_to_self
+        post :unassign
+        post :reopen
+        post :resolve
+      end
+
       resources :reported_statuses, only: [:create]
     end
 
@@ -148,17 +177,19 @@ Rails.application.routes.draw do
         post :subscribe
         post :unsubscribe
         post :enable
-        post :disable
+        post :unsilence
+        post :unsuspend
         post :redownload
         post :remove_avatar
+        post :remove_header
         post :memorialize
       end
 
       resource :change_email, only: [:show, :update]
       resource :reset, only: [:create]
-      resource :silence, only: [:create, :destroy]
-      resource :suspension, only: [:create, :destroy]
-      resources :statuses, only: [:index, :create, :update, :destroy]
+      resource :action, only: [:new, :create], controller: 'account_actions'
+      resources :statuses, only: [:index, :show, :create, :update, :destroy]
+      resources :followers, only: [:index]
 
       resource :confirmation, only: [:create] do
         collection do
@@ -187,15 +218,16 @@ Rails.application.routes.draw do
     end
 
     resources :account_moderation_notes, only: [:create, :destroy]
-  end
 
-  authenticate :user, lambda { |u| u.admin? } do
-    get '/admin', to: redirect('/admin/settings/edit', status: 302)
+    resources :tags, only: [:index] do
+      member do
+        post :hide
+        post :unhide
+      end
+    end
   end
 
-  authenticate :user, lambda { |u| u.moderator? } do
-    get '/admin', to: redirect('/admin/reports', status: 302)
-  end
+  get '/admin', to: redirect('/admin/dashboard', status: 302)
 
   namespace :api do
     # PubSubHubbub outgoing subscriptions
@@ -247,16 +279,24 @@ Rails.application.routes.draw do
       resources :streaming, only: [:index]
       resources :custom_emojis, only: [:index]
       resources :suggestions, only: [:index, :destroy]
+      resources :scheduled_statuses, only: [:index, :show, :update, :destroy]
+
+      resources :conversations, only: [:index, :destroy] do
+        member do
+          post :read
+        end
+      end
 
       get '/search', to: 'search#index', as: :search
 
-      resources :follows,    only: [:create]
-      resources :media,      only: [:create, :update]
-      resources :blocks,     only: [:index]
-      resources :mutes,      only: [:index]
-      resources :favourites, only: [:index]
-      resources :reports,    only: [:index, :create]
-      resources :filters,    only: [:index, :create, :show, :update, :destroy]
+      resources :follows,      only: [:create]
+      resources :media,        only: [:create, :update]
+      resources :blocks,       only: [:index]
+      resources :mutes,        only: [:index]
+      resources :favourites,   only: [:index]
+      resources :reports,      only: [:create]
+      resources :filters,      only: [:index, :create, :show, :update, :destroy]
+      resources :endorsements, only: [:index]
 
       namespace :apps do
         get :verify_credentials, to: 'credentials#show'
@@ -281,6 +321,10 @@ Rails.application.routes.draw do
       resources :notifications, only: [:index, :show] do
         collection do
           post :clear
+          post :dismiss # Deprecated
+        end
+
+        member do
           post :dismiss
         end
       end
@@ -292,7 +336,7 @@ Rails.application.routes.draw do
         resources :relationships, only: :index
       end
 
-      resources :accounts, only: [:show] do
+      resources :accounts, only: [:create, :show] do
         resources :statuses, only: :index, controller: 'accounts/statuses'
         resources :followers, only: :index, controller: 'accounts/follower_accounts'
         resources :following, only: :index, controller: 'accounts/following_accounts'
@@ -306,6 +350,9 @@ Rails.application.routes.draw do
           post :mute
           post :unmute
         end
+
+        resource :pin, only: :create, controller: 'accounts/pins'
+        post :unpin, to: 'accounts/pins#destroy'
       end
 
       resources :lists, only: [:index, :create, :show, :update, :destroy] do
diff --git a/config/settings.yml b/config/settings.yml
index 190f6afcd1ab9cd7af78dd2d06a3696660dc17ed..4f7c2c8f32cc04348d89ec056a091b9b3eace7bf 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,19 +1,16 @@
-# config/app.yml for rails-settings-cached
-#
-# This file contains default values, and does not need to be edited
-# when configuring an instance.  These settings may be changed by an
-# Administrator using the Web UI.
-#
-# For more information, see docs/Running-Mastodon/Administration-guide.md
-#
+# This file contains default values, and does not need to be edited. All
+# important settings can be changed from the admin interface.
+
 defaults: &defaults
   site_title: Mastodon
+  site_short_description: ''
   site_description: ''
   site_extended_description: ''
   site_terms: ''
   site_contact_username: ''
   site_contact_email: ''
   open_registrations: true
+  profile_directory: true
   closed_registrations_message: ''
   open_deletion: true
   min_invite_role: 'admin'
@@ -25,12 +22,14 @@ defaults: &defaults
   boost_modal: false
   delete_modal: true
   auto_play_gif: false
-  display_sensitive_media: false
+  display_media: 'default'
+  expand_spoilers: false
   preview_sensitive_media: false
   reduce_motion: false
   system_font_ui: false
   noindex: false
   theme: 'default'
+  aggregate_reblogs: true
   notification_emails:
     follow: false
     reblog: false
@@ -38,6 +37,7 @@ defaults: &defaults
     mention: false
     follow_request: true
     digest: true
+    report: true
   interactions:
     must_be_follower: false
     must_be_following: false
@@ -49,11 +49,14 @@ defaults: &defaults
     - root
     - webmaster
     - administrator
+    - mod
+    - moderator
   disallowed_hashtags: # space separated string or list of hashtags without the hash
   bootstrap_timeline_accounts: ''
   activity_api_enabled: true
   peers_api_enabled: true
   show_known_fediverse_at_about_page: true
+
 development:
   <<: *defaults
 
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 244e9ea48b422c5bf5d9b10cbb878ff541ebe679..0ec1742abfeb2547627c6691f972e553ff36dd58 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -1,11 +1,14 @@
 ---
 :concurrency: 5
 :queues:
-  - default
-  - push
-  - pull
-  - mailers
+  - [default, 6]
+  - [push, 4]
+  - [mailers, 2]
+  - [pull]
 :schedule:
+  scheduled_statuses_scheduler:
+    every: '5m'
+    class: Scheduler::ScheduledStatusesScheduler
   subscriptions_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(4..6) %> * * *'
     class: Scheduler::SubscriptionsScheduler
@@ -33,3 +36,6 @@
   backup_cleanup_scheduler:
     cron: '<%= Random.rand(0..59) %> <%= Random.rand(3..5) %> * * *'
     class: Scheduler::BackupCleanupScheduler
+  pghero_scheduler:
+    cron: '0 0 * * *'
+    class: Scheduler::PgheroScheduler
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index cf8c0c7e1d33bd4a9a1c6c16107901b0958ca163..4d325a82877197bc37aa1e61606866f7c7766c48 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -7,7 +7,7 @@ const { readFileSync } = require('fs');
 
 const configPath = resolve('config', 'webpacker.yml');
 const loadersDir = join(__dirname, 'loaders');
-const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV];
+const settings = safeLoad(readFileSync(configPath), 'utf8')[env.RAILS_ENV || env.NODE_ENV];
 
 const themePath = resolve('config', 'themes.yml');
 const themes = safeLoad(readFileSync(themePath), 'utf8');
diff --git a/config/webpack/development.js b/config/webpack/development.js
index 12670f5cd08ef634e8b816b5aa09a27296dad168..d54d919eca59ca5e79a48cc34e5a70c66b0b60d7 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -16,6 +16,8 @@ if (process.env.VAGRANT) {
 }
 
 module.exports = merge(sharedConfig, {
+  mode: 'development',
+
   devtool: 'cheap-module-eval-source-map',
 
   stats: {
diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index e17d2fa7013ba5fc6812379ff253245654804185..7509617fdaa2a9e86d4b3bced21b7215f45dbffd 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -7,7 +7,6 @@ module.exports = {
   exclude: /node_modules/,
   loader: 'babel-loader',
   options: {
-    forceEnv: env,
     cacheDirectory: env === 'development' ? false : resolve(__dirname, '..', '..', '..', 'tmp', 'cache', 'babel-loader'),
   },
 };
diff --git a/config/webpack/loaders/sass.js b/config/webpack/loaders/sass.js
index 88d94c6846a80912abbb3af10946bad03015f082..67a1890b8f822117ff21d304f90494118a10ae4f 100644
--- a/config/webpack/loaders/sass.js
+++ b/config/webpack/loaders/sass.js
@@ -1,15 +1,23 @@
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const { env } = require('../configuration.js');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
-  test: /\.(scss|sass|css)$/i,
-  use: ExtractTextPlugin.extract({
-    fallback: 'style-loader',
-    use: [
-      { loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
-      { loader: 'postcss-loader', options: { sourceMap: true } },
-      'resolve-url-loader',
-      'sass-loader',
-    ],
-  }),
+  test: /\.s?css$/i,
+  use: [
+    MiniCssExtractPlugin.loader,
+    'css-loader',
+    {
+      loader: 'postcss-loader',
+      options: {
+        sourceMap: true,
+      },
+    },
+    {
+      loader: 'sass-loader',
+      options: {
+        fiber: require('fibers'),
+        implementation: require('sass'),
+        sourceMap: true,
+      },
+    },
+  ],
 };
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 037a76a59206ee2d26706fcb5d842a2119483cbb..d37e11792b5b5fb2da800175b50ddd0b3a67e938 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,30 +1,21 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
-const webpack = require('webpack');
 const merge = require('webpack-merge');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
+const zopfli = require('@gfx/zopfli');
 const sharedConfig = require('./shared.js');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const OfflinePlugin = require('offline-plugin');
 const { publicPath } = require('./configuration.js');
 const path = require('path');
-const { URL } = require('whatwg-url');
-
-let compressionAlgorithm;
-try {
-  const zopfli = require('node-zopfli');
-  compressionAlgorithm = (content, options, fn) => {
-    zopfli.gzip(content, options, fn);
-  };
-} catch (error) {
-  compressionAlgorithm = 'gzip';
-}
+const { URL } = require('url');
 
 let attachmentHost;
 
 if (process.env.S3_ENABLED === 'true') {
-  if (process.env.S3_CLOUDFRONT_HOST) {
-    attachmentHost = process.env.S3_CLOUDFRONT_HOST;
+  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`;
   }
@@ -36,6 +27,8 @@ if (process.env.S3_ENABLED === 'true') {
 }
 
 module.exports = merge(sharedConfig, {
+  mode: 'production',
+
   output: {
     filename: '[name]-[chunkhash].js',
     chunkFilename: '[name]-[chunkhash].js',
@@ -44,22 +37,32 @@ module.exports = merge(sharedConfig, {
   devtool: 'source-map', // separate sourcemap file, suitable for production
   stats: 'normal',
 
-  plugins: [
-    new webpack.optimize.UglifyJsPlugin({
-      sourceMap: true,
-      mangle: true,
+  optimization: {
+    minimize: true,
+    minimizer: [
+      new UglifyJsPlugin({
+        cache: true,
+        parallel: true,
+        sourceMap: true,
 
-      compress: {
-        warnings: false,
-      },
+        uglifyOptions: {
+          compress: {
+            warnings: false,
+          },
 
-      output: {
-        comments: false,
-      },
-    }),
+          output: {
+            comments: false,
+          },
+        },
+      }),
+    ],
+  },
+
+  plugins: [
     new CompressionPlugin({
-      asset: '[path].gz[query]',
-      algorithm: compressionAlgorithm,
+      algorithm(input, compressionOptions, callback) {
+        return zopfli.gzip(input, compressionOptions, callback);
+      },
       test: /\.(js|css|html|json|ico|svg|eot|otf|ttf)$/,
     }),
     new BundleAnalyzerPlugin({ // generates report.html and stats.json
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index 50fa4817594cd2d7fe08cc724b8dd2838d699d38..d6199373b8458c9086e0a90dbbe261e145d76612 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -1,10 +1,10 @@
 // Note: You must restart bin/webpack-dev-server for changes to take effect
 
 const webpack = require('webpack');
-const { basename, dirname, join, relative, resolve, sep } = require('path');
+const { basename, dirname, join, relative, resolve } = require('path');
 const { sync } = require('glob');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const ManifestPlugin = require('webpack-manifest-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const AssetsManifestPlugin = require('webpack-assets-manifest');
 const extname = require('path-complete-extname');
 const { env, settings, themes, output, loadersDir } = require('./configuration.js');
 const localePackPaths = require('./generateLocalePacks');
@@ -39,6 +39,26 @@ module.exports = {
     publicPath: output.publicPath,
   },
 
+  optimization: {
+    runtimeChunk: {
+      name: 'common',
+    },
+    splitChunks: {
+      cacheGroups: {
+        default: false,
+        vendors: false,
+        common: {
+          name: 'common',
+          chunks: 'all',
+          minChunks: 2,
+          minSize: 0,
+          test: /^(?!.*[\\\/]node_modules[\\\/]react-intl[\\\/]).+$/,
+        },
+      },
+    },
+    occurrenceOrder: true,
+  },
+
   module: {
     rules: sync(join(loadersDir, '*.js')).map(loader => require(loader)),
   },
@@ -52,25 +72,12 @@ module.exports = {
         resource.request = resource.request.replace(/^history/, 'history/es');
       }
     ),
-    new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[contenthash].css' : '[name].css'),
-    new ManifestPlugin({
-      publicPath: output.publicPath,
-      writeToFileEmit: true,
+    new MiniCssExtractPlugin({
+      filename: env.NODE_ENV === 'production' ? '[name]-[contenthash].css' : '[name].css',
     }),
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'common',
-      minChunks: (module, count) => {
-        const reactIntlPathRegexp = new RegExp(`node_modules\\${sep}react-intl`);
-
-        if (module.resource && reactIntlPathRegexp.test(module.resource)) {
-          // skip react-intl because it's useless to put in the common chunk,
-          // e.g. because "shared" modules between zh-TW and zh-CN will never
-          // be loaded together
-          return false;
-        }
-
-        return count >= 2;
-      },
+    new AssetsManifestPlugin({
+      publicPath: true,
+      writeToDisk: true,
     }),
   ],
 
diff --git a/config/webpack/test.js b/config/webpack/test.js
index 6b2b073bb957e82c7bf01a88d46b459714b5ff6b..8b56eb92f29f37294e26df6f5ab1fda96d21d39f 100644
--- a/config/webpack/test.js
+++ b/config/webpack/test.js
@@ -3,4 +3,6 @@
 const merge = require('webpack-merge');
 const sharedConfig = require('./shared.js');
 
-module.exports = merge(sharedConfig, {});
+module.exports = merge(sharedConfig, {
+  mode: 'development',
+});
diff --git a/config/webpacker.yml b/config/webpacker.yml
index 8d8470651ac41cc583317e49cecd0b0502b763f0..ea814a0e65f6156c250551d3174205b2a5243689 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -40,6 +40,10 @@ test:
   # Compile test packs to a separate directory
   public_output_path: packs-test
 
+  # CircleCI precompiles packs prior to running the tests.
+  # Also avoids race conditions in parallel_tests.
+  compile: false
+
 production:
   <<: *default
 
diff --git a/db/migrate/20160306172223_create_doorkeeper_tables.rb b/db/migrate/20160306172223_create_doorkeeper_tables.rb
index 9e173a43f32ea53675cc6711caa58d1259c5d17c..462343e888c917bbfa541a017485ae6c8b4182e1 100644
--- a/db/migrate/20160306172223_create_doorkeeper_tables.rb
+++ b/db/migrate/20160306172223_create_doorkeeper_tables.rb
@@ -34,12 +34,12 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
       # https://github.com/doorkeeper-gem/doorkeeper/tree/v3.0.0.rc1#custom-access-token-generator
       #
       # t.text     :token,             null: false
-      t.string   :token,             null: false
+      t.string   :token, null: false
 
       t.string   :refresh_token
       t.integer  :expires_in
       t.datetime :revoked_at
-      t.datetime :created_at,        null: false
+      t.datetime :created_at, null: false
       t.string   :scopes
     end
 
diff --git a/db/migrate/20160314164231_add_owner_to_application.rb b/db/migrate/20160314164231_add_owner_to_application.rb
index 1919f09a170d9364fab77dbda30b37fe0399cab3..553c18b5ebeff9022bad4d1d798dd1982f925317 100644
--- a/db/migrate/20160314164231_add_owner_to_application.rb
+++ b/db/migrate/20160314164231_add_owner_to_application.rb
@@ -4,4 +4,4 @@ class AddOwnerToApplication < ActiveRecord::Migration[4.2]
     add_column :oauth_applications, :owner_type, :string, null: true
     add_index :oauth_applications, [:owner_id, :owner_type]
   end
-end
\ No newline at end of file
+end
diff --git a/db/migrate/20161006213403_rails_settings_migration.rb b/db/migrate/20161006213403_rails_settings_migration.rb
index 3b2e637fc7c3b6d7d8f996cf18c527266f6abe80..42875d7cbda3e0a78ac22036e4d6cf45a1649c10 100644
--- a/db/migrate/20161006213403_rails_settings_migration.rb
+++ b/db/migrate/20161006213403_rails_settings_migration.rb
@@ -7,7 +7,7 @@ end
 class RailsSettingsMigration < MIGRATION_BASE_CLASS
   def self.up
     create_table :settings do |t|
-      t.string     :var,    :null => false
+      t.string     :var, :null => false
       t.text       :value
       t.references :target, :null => false, :polymorphic => true
       t.timestamps :null => true
diff --git a/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb b/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
index 2685ae150ec62b6ecf09c376829ddb400c14ec61..fba46a4b63b3510e788265d3a277a4026027caad 100644
--- a/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
+++ b/db/migrate/20170105224407_add_shortcode_to_media_attachments.rb
@@ -8,7 +8,7 @@ class AddShortcodeToMediaAttachments < ActiveRecord::Migration[5.0]
   end
 
   def down
-  	remove_index :media_attachments, :shortcode
-  	remove_column :media_attachments, :shortcode
+    remove_index :media_attachments, :shortcode
+    remove_column :media_attachments, :shortcode
   end
 end
diff --git a/db/migrate/20170606113804_change_tag_search_index_to_btree.rb b/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
index 5248e17202606a5c75d94d06da497cc18bd97189..979df2e74422857bac60ee50e8c114cfe93de708 100644
--- a/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
+++ b/db/migrate/20170606113804_change_tag_search_index_to_btree.rb
@@ -1,5 +1,4 @@
 class ChangeTagSearchIndexToBtree < ActiveRecord::Migration[5.1]
-
   def up
     remove_index :tags, name: :hashtag_search_index
     execute 'CREATE INDEX hashtag_search_index ON tags (name text_pattern_ops);'
diff --git a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
index 0410938c9b8cadc95b23d0c82d129c794cb567f4..a498396b75e209b63cef8ff4f1174b0aa691ca39 100644
--- a/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
+++ b/db/migrate/20170716191202_add_hide_notifications_to_mute.rb
@@ -8,7 +8,7 @@ class AddHideNotificationsToMute < ActiveRecord::Migration[5.1]
   def up
     add_column_with_default :mutes, :hide_notifications, :boolean, default: true, allow_null: false
   end
-  
+
   def down
     remove_column :mutes, :hide_notifications
   end
diff --git a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
index 439c5fca08bb8bac35e88a416f639834cef51d96..5654bf6f8773070de06863bf2dc68700f8dcdc2c 100644
--- a/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
+++ b/db/migrate/20170920032311_fix_reblogs_in_feeds.rb
@@ -28,7 +28,7 @@ class FixReblogsInFeeds < ActiveRecord::Migration[5.1]
 
       -- So, first, we iterate over the user's feed to find any reblogs.
       local items = redis.call('zrange', timeline_key, 0, -1, 'withscores')
-      
+
       for i = 1, #items, 2 do
         local reblogged_id = items[i]
         local reblogging_id = items[i + 1]
diff --git a/db/migrate/20171028221157_add_reblogs_to_follows.rb b/db/migrate/20171028221157_add_reblogs_to_follows.rb
index 4b5d5b7ff362971ed00b88eb2edf7d1a9c5c8f7b..3b2e46ed8a6d15941a9de1b0feff9c285f889dad 100644
--- a/db/migrate/20171028221157_add_reblogs_to_follows.rb
+++ b/db/migrate/20171028221157_add_reblogs_to_follows.rb
@@ -11,7 +11,7 @@ class AddReblogsToFollows < ActiveRecord::Migration[5.1]
       add_column_with_default :follow_requests, :show_reblogs, :boolean, default: true, allow_null: false
     end
   end
-  
+
   def down
     remove_column :follows, :show_reblogs
     remove_column :follow_requests, :show_reblogs
diff --git a/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb b/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb
index 120f744026418bceb4b982ac6d9165bb41dfaa96..3369e3b9e97ab7f28fbf69584c908807e5437756 100644
--- a/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb
+++ b/db/migrate/20171201000000_change_account_id_nonnullable_in_lists.rb
@@ -1,5 +1,3 @@
-require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-
 class ChangeAccountIdNonnullableInLists < ActiveRecord::Migration[5.1]
   def change
     change_column_null :lists, :account_id, false
diff --git a/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb b/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb
index 4a8761fec3d2126e2a431cf47250fd564663b3fc..ccd2ec7eac575646d673e0cbc8f35a0212f4d4c9 100644
--- a/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb
+++ b/db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb
@@ -5,7 +5,7 @@ class RevertIndexChangeOnStatusesForApiV1AccountsAccountIdStatuses < ActiveRecor
 
   def change
     safety_assured do
-      add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 unless index_exists?(:statuses, name: "index_statuses_20180106")
+      add_index :statuses, [:account_id, :id, :visibility, :updated_at], order: { id: :desc }, algorithm: :concurrently, name: :index_statuses_20180106 unless index_name_exists?(:statuses, "index_statuses_20180106")
     end
 
     # These index may not exists (see migration 20180514130000)
diff --git a/db/migrate/20180528141303_fix_accounts_unique_index.rb b/db/migrate/20180528141303_fix_accounts_unique_index.rb
index 96cee37f9cba16c0b24f8777aca210888641836f..bd4e158b7ecccc39892957ceab8b869b452d41b0 100644
--- a/db/migrate/20180528141303_fix_accounts_unique_index.rb
+++ b/db/migrate/20180528141303_fix_accounts_unique_index.rb
@@ -1,4 +1,17 @@
 class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
+  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
+
   disable_ddl_transaction!
 
   def up
diff --git a/db/migrate/20180711152640_create_relays.rb b/db/migrate/20180711152640_create_relays.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8762f473a29e11e8e96afce553ff78650f5dd4b2
--- /dev/null
+++ b/db/migrate/20180711152640_create_relays.rb
@@ -0,0 +1,12 @@
+class CreateRelays < ActiveRecord::Migration[5.2]
+  def change
+    create_table :relays do |t|
+      t.string :inbox_url, default: '', null: false
+      t.boolean :enabled, default: false, null: false, index: true
+
+      t.string :follow_activity_id
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180808175627_create_account_pins.rb b/db/migrate/20180808175627_create_account_pins.rb
new file mode 100644
index 0000000000000000000000000000000000000000..43d8185be9d459caf21498a7bac95eeb50083011
--- /dev/null
+++ b/db/migrate/20180808175627_create_account_pins.rb
@@ -0,0 +1,12 @@
+class CreateAccountPins < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_pins do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }
+      t.belongs_to :target_account, foreign_key: { on_delete: :cascade, to_table: :accounts }
+
+      t.timestamps
+    end
+
+    add_index :account_pins, [:account_id, :target_account_id], unique: true
+  end
+end
diff --git a/db/migrate/20180812123222_change_relays_enabled.rb b/db/migrate/20180812123222_change_relays_enabled.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c4fd8179be628eabd07d16c5de8caedf76f59f56
--- /dev/null
+++ b/db/migrate/20180812123222_change_relays_enabled.rb
@@ -0,0 +1,19 @@
+class ChangeRelaysEnabled < ActiveRecord::Migration[5.2]
+  def up
+    # The relays table is supposed to be very small,
+    # single-digit number of rows, so this should be fine
+    safety_assured do
+      add_column :relays, :state, :integer, default: 0, null: false
+
+      # At the time of this migration, no relays reject anyone, so if
+      # there are enabled ones, they are accepted
+      execute 'UPDATE relays SET state = 2 WHERE enabled = true'
+      remove_column :relays, :enabled
+    end
+  end
+
+  def down
+    remove_column :relays, :state
+    add_column :relays, :enabled, :boolean, default: false, null: false
+  end
+end
diff --git a/db/migrate/20180812162710_create_status_stats.rb b/db/migrate/20180812162710_create_status_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d4da36fe7860c12cfd75e87489ba06acee3b79ef
--- /dev/null
+++ b/db/migrate/20180812162710_create_status_stats.rb
@@ -0,0 +1,12 @@
+class CreateStatusStats < ActiveRecord::Migration[5.2]
+  def change
+    create_table :status_stats do |t|
+      t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
+      t.bigint :replies_count, null: false, default: 0
+      t.bigint :reblogs_count, null: false, default: 0
+      t.bigint :favourites_count, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20180812173710_copy_status_stats.rb b/db/migrate/20180812173710_copy_status_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ff10c18d9d6b847cead9510b77ea4090fd903ef8
--- /dev/null
+++ b/db/migrate/20180812173710_copy_status_stats.rb
@@ -0,0 +1,54 @@
+class CopyStatusStats < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      if supports_upsert?
+        up_fast
+      else
+        up_slow
+      end
+    end
+  end
+
+  def down
+    # Nothing
+  end
+
+  private
+
+  def supports_upsert?
+    version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
+    version >= 90500
+  end
+
+  def up_fast
+    say 'Upsert is available, importing counters using the fast method'
+
+    Status.unscoped.select('id').find_in_batches(batch_size: 5_000) do |statuses|
+      execute <<-SQL.squish
+        INSERT INTO status_stats (status_id, reblogs_count, favourites_count, created_at, updated_at)
+        SELECT id, reblogs_count, favourites_count, created_at, updated_at
+        FROM statuses
+        WHERE id IN (#{statuses.map(&:id).join(', ')})
+        ON CONFLICT (status_id) DO UPDATE
+        SET reblogs_count = EXCLUDED.reblogs_count, favourites_count = EXCLUDED.favourites_count
+      SQL
+    end
+  end
+
+  def up_slow
+    say 'Upsert is not available in PostgreSQL below 9.5, falling back to slow import of counters'
+
+    # We cannot use bulk INSERT or overarching transactions here because of possible
+    # uniqueness violations that we need to skip over
+    Status.unscoped.select('id, reblogs_count, favourites_count, created_at, updated_at').find_each do |status|
+      begin
+        params = [[nil, status.id], [nil, status.reblogs_count], [nil, status.favourites_count], [nil, status.created_at], [nil, status.updated_at]]
+        exec_insert('INSERT INTO status_stats (status_id, reblogs_count, favourites_count, created_at, updated_at) VALUES ($1, $2, $3, $4, $5)', nil, params)
+      rescue ActiveRecord::RecordNotUnique
+        next
+      end
+    end
+  end
+end
diff --git a/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7077a4e659778ae95c66aa867a313eaafe08149b
--- /dev/null
+++ b/db/migrate/20180814171349_add_confidential_to_doorkeeper_application.rb
@@ -0,0 +1,23 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddConfidentialToDoorkeeperApplication < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default(
+        :oauth_applications,
+        :confidential,
+        :boolean,
+        allow_null: false,
+        default: true # maintaining backwards compatibility: require secrets
+      )
+    end
+  end
+
+  def down
+    remove_column :oauth_applications, :confidential
+  end
+end
diff --git a/db/migrate/20180820232245_add_foreign_key_indices.rb b/db/migrate/20180820232245_add_foreign_key_indices.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e346c1f5bddd163098d3851765b68fac5a619867
--- /dev/null
+++ b/db/migrate/20180820232245_add_foreign_key_indices.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddForeignKeyIndices < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :follows, :target_account_id, algorithm: :concurrently
+    add_index :blocks, :target_account_id, algorithm: :concurrently
+    add_index :mutes, :target_account_id, algorithm: :concurrently
+    add_index :notifications, :from_account_id, algorithm: :concurrently
+    add_index :accounts, :moved_to_account_id, algorithm: :concurrently
+    add_index :statuses, :in_reply_to_account_id, algorithm: :concurrently
+    add_index :session_activations, :access_token_id, algorithm: :concurrently
+    add_index :oauth_access_grants, :resource_owner_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20180929222014_create_account_conversations.rb b/db/migrate/20180929222014_create_account_conversations.rb
new file mode 100644
index 0000000000000000000000000000000000000000..53fa137e1547b4cb7f8df6b8f9bab81e5fe55618
--- /dev/null
+++ b/db/migrate/20180929222014_create_account_conversations.rb
@@ -0,0 +1,14 @@
+class CreateAccountConversations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_conversations do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }
+      t.belongs_to :conversation, foreign_key: { on_delete: :cascade }
+      t.bigint :participant_account_ids, array: true, null: false, default: []
+      t.bigint :status_ids, array: true, null: false, default: []
+      t.bigint :last_status_id, null: true, default: nil
+      t.integer :lock_version, null: false, default: 0
+    end
+
+    add_index :account_conversations, [:account_id, :conversation_id, :participant_account_ids], unique: true, name: 'index_unique_conversations'
+  end
+end
diff --git a/db/migrate/20181007025445_create_pghero_space_stats.rb b/db/migrate/20181007025445_create_pghero_space_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6198a6f84680e7705cefe9317426a4e00e006771
--- /dev/null
+++ b/db/migrate/20181007025445_create_pghero_space_stats.rb
@@ -0,0 +1,13 @@
+class CreatePgheroSpaceStats < ActiveRecord::Migration[5.2]
+  def change
+    create_table :pghero_space_stats do |t|
+      t.text :database
+      t.text :schema
+      t.text :relation
+      t.integer :size, limit: 8
+      t.timestamp :captured_at
+    end
+
+    add_index :pghero_space_stats, [:database, :captured_at]
+  end
+end
diff --git a/db/migrate/20181010141500_add_silent_to_mentions.rb b/db/migrate/20181010141500_add_silent_to_mentions.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dbb4fba263714d398df7804c94a4ae112266c744
--- /dev/null
+++ b/db/migrate/20181010141500_add_silent_to_mentions.rb
@@ -0,0 +1,23 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddSilentToMentions < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default(
+        :mentions,
+        :silent,
+        :boolean,
+        allow_null: false,
+        default: false
+      )
+    end
+  end
+
+  def down
+    remove_column :mentions, :silent
+  end
+end
diff --git a/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb b/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f05d50fcd9371ea9b85853f82f6dcba4cd69bf8a
--- /dev/null
+++ b/db/migrate/20181017170937_add_reject_reports_to_domain_blocks.rb
@@ -0,0 +1,17 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddRejectReportsToDomainBlocks < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default :domain_blocks, :reject_reports, :boolean, default: false, allow_null: false
+    end
+  end
+
+  def down
+    remove_column :domain_blocks, :reject_reports
+  end
+end
diff --git a/db/migrate/20181018205649_add_unread_to_account_conversations.rb b/db/migrate/20181018205649_add_unread_to_account_conversations.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3c28b9a64169320d2a18c5d62202b0f8febe1a31
--- /dev/null
+++ b/db/migrate/20181018205649_add_unread_to_account_conversations.rb
@@ -0,0 +1,23 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class AddUnreadToAccountConversations < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      add_column_with_default(
+        :account_conversations,
+        :unread,
+        :boolean,
+        allow_null: false,
+        default: false
+      )
+    end
+  end
+
+  def down
+    remove_column :account_conversations, :unread, :boolean
+  end
+end
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b718f9e1d524e73782bc5824372307c8cc24944b
--- /dev/null
+++ b/db/migrate/20181024224956_migrate_account_conversations.rb
@@ -0,0 +1,57 @@
+class MigrateAccountConversations < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    say ''
+    say 'WARNING: This migration may take a *long* time for large instances'
+    say 'It will *not* lock tables for any significant time, but it may run'
+    say 'for a very long time. We will pause for 10 seconds to allow you to'
+    say 'interrupt this migration if you are not ready.'
+    say ''
+
+    10.downto(1) do |i|
+      say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
+      sleep 1
+    end
+
+    migrated  = 0
+    last_time = Time.zone.now
+
+    local_direct_statuses.includes(:account, mentions: :account).find_each do |status|
+      AccountConversation.add_status(status.account, status)
+      migrated += 1
+
+      if Time.zone.now - last_time > 1
+        say_progress(migrated)
+        last_time = Time.zone.now
+      end
+    end
+
+    notifications_about_direct_statuses.includes(:account, mention: { status: [:account, mentions: :account] }).find_each do |notification|
+      AccountConversation.add_status(notification.account, notification.target_status)
+      migrated += 1
+
+      if Time.zone.now - last_time > 1
+        say_progress(migrated)
+        last_time = Time.zone.now
+      end
+    end
+  end
+
+  def down
+  end
+
+  private
+
+  def say_progress(migrated)
+    say "Migrated #{migrated} rows", true
+  end
+
+  def local_direct_statuses
+    Status.unscoped.local.where(visibility: :direct)
+  end
+
+  def notifications_about_direct_statuses
+    Notification.joins(mention: :status).where(activity_type: 'Mention', statuses: { visibility: :direct })
+  end
+end
diff --git a/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bd4f4c2a36852fb03fc9c002594f6436bfd60043
--- /dev/null
+++ b/db/migrate/20181026034033_remove_faux_remote_account_duplicates.rb
@@ -0,0 +1,16 @@
+class RemoveFauxRemoteAccountDuplicates < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    local_domain = Rails.configuration.x.local_domain
+
+    # Just a safety measure to ensure that under no circumstance
+    # we will query `domain IS NULL` because that would return
+    # actually local accounts, the originals
+    return if local_domain.nil?
+
+    Account.where(domain: local_domain).in_batches.destroy_all
+  end
+
+  def down; end
+end
diff --git a/db/migrate/20181116165755_create_account_stats.rb b/db/migrate/20181116165755_create_account_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a798e8166e981e3555e2e6d132a3c40cae6d01ab
--- /dev/null
+++ b/db/migrate/20181116165755_create_account_stats.rb
@@ -0,0 +1,12 @@
+class CreateAccountStats < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_stats do |t|
+      t.belongs_to :account, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
+      t.bigint :statuses_count, null: false, default: 0
+      t.bigint :following_count, null: false, default: 0
+      t.bigint :followers_count, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20181116173541_copy_account_stats.rb b/db/migrate/20181116173541_copy_account_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bb523fbbd31c3fadab0d3d5241100d0437391d02
--- /dev/null
+++ b/db/migrate/20181116173541_copy_account_stats.rb
@@ -0,0 +1,54 @@
+class CopyAccountStats < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      if supports_upsert?
+        up_fast
+      else
+        up_slow
+      end
+    end
+  end
+
+  def down
+    # Nothing
+  end
+
+  private
+
+  def supports_upsert?
+    version = select_one("SELECT current_setting('server_version_num') AS v")['v'].to_i
+    version >= 90500
+  end
+
+  def up_fast
+    say 'Upsert is available, importing counters using the fast method'
+
+    Account.unscoped.select('id').find_in_batches(batch_size: 5_000) do |accounts|
+      execute <<-SQL.squish
+        INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at)
+        SELECT id, statuses_count, following_count, followers_count, created_at, updated_at
+        FROM accounts
+        WHERE id IN (#{accounts.map(&:id).join(', ')})
+        ON CONFLICT (account_id) DO UPDATE
+        SET statuses_count = EXCLUDED.statuses_count, following_count = EXCLUDED.following_count, followers_count = EXCLUDED.followers_count
+      SQL
+    end
+  end
+
+  def up_slow
+    say 'Upsert is not available in PostgreSQL below 9.5, falling back to slow import of counters'
+
+    # We cannot use bulk INSERT or overarching transactions here because of possible
+    # uniqueness violations that we need to skip over
+    Account.unscoped.select('id, statuses_count, following_count, followers_count, created_at, updated_at').find_each do |account|
+      begin
+        params = [[nil, account.id], [nil, account.statuses_count], [nil, account.following_count], [nil, account.followers_count], [nil, account.created_at], [nil, account.updated_at]]
+        exec_insert('INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)', nil, params)
+      rescue ActiveRecord::RecordNotUnique
+        next
+      end
+    end
+  end
+end
diff --git a/db/migrate/20181127130500_identity_id_to_bigint.rb b/db/migrate/20181127130500_identity_id_to_bigint.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5f388aca7c7e6eb7b0a3279e28f70d0f4dc06f17
--- /dev/null
+++ b/db/migrate/20181127130500_identity_id_to_bigint.rb
@@ -0,0 +1,27 @@
+require Rails.root.join('lib', 'mastodon', 'migration_helpers')
+
+class IdentityIdToBigint < ActiveRecord::Migration[5.2]
+  include Mastodon::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    safety_assured do
+      change_column_type_concurrently :identities, :id, :bigint
+      cleanup_concurrent_column_type_change :identities, :id
+
+      change_column_type_concurrently :identities, :user_id, :bigint
+      cleanup_concurrent_column_type_change :identities, :user_id
+    end
+  end
+
+  def down
+    safety_assured do
+      change_column_type_concurrently :identities, :id, :integer
+      cleanup_concurrent_column_type_change :identities, :id
+
+      change_column_type_concurrently :identities, :user_id, :integer
+      cleanup_concurrent_column_type_change :identities, :user_id
+    end
+  end
+end
diff --git a/db/migrate/20181203003808_create_accounts_tags_join_table.rb b/db/migrate/20181203003808_create_accounts_tags_join_table.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3c275c2b785c2faa4a4eb2f521b81acd332cea17
--- /dev/null
+++ b/db/migrate/20181203003808_create_accounts_tags_join_table.rb
@@ -0,0 +1,8 @@
+class CreateAccountsTagsJoinTable < ActiveRecord::Migration[5.2]
+  def change
+    create_join_table :accounts, :tags do |t|
+      t.index [:account_id, :tag_id]
+      t.index [:tag_id, :account_id], unique: true
+    end
+  end
+end
diff --git a/db/migrate/20181203021853_add_discoverable_to_accounts.rb b/db/migrate/20181203021853_add_discoverable_to_accounts.rb
new file mode 100644
index 0000000000000000000000000000000000000000..5bbae2203e0861b0a18ba59c65959e7e7de8119c
--- /dev/null
+++ b/db/migrate/20181203021853_add_discoverable_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddDiscoverableToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :discoverable, :boolean
+  end
+end
diff --git a/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb b/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9466627071503682aba591344992e1663420870e
--- /dev/null
+++ b/db/migrate/20181204193439_add_last_status_at_to_account_stats.rb
@@ -0,0 +1,5 @@
+class AddLastStatusAtToAccountStats < ActiveRecord::Migration[5.2]
+  def change
+    add_column :account_stats, :last_status_at, :datetime
+  end
+end
diff --git a/db/migrate/20181204215309_create_account_tag_stats.rb b/db/migrate/20181204215309_create_account_tag_stats.rb
new file mode 100644
index 0000000000000000000000000000000000000000..15ed8587e39d2ab72a205c768d1e82a0935d5a76
--- /dev/null
+++ b/db/migrate/20181204215309_create_account_tag_stats.rb
@@ -0,0 +1,11 @@
+class CreateAccountTagStats < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_tag_stats do |t|
+      t.belongs_to :tag, null: false, foreign_key: { on_delete: :cascade }, index: { unique: true }
+      t.bigint :accounts_count, default: 0, null: false
+      t.boolean :hidden, default: false, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
new file mode 100644
index 0000000000000000000000000000000000000000..65f1fc8d938c835fd8b6742ac1918914f6059dbd
--- /dev/null
+++ b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
@@ -0,0 +1,15 @@
+class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    duplicates = CustomEmoji.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM custom_emojis GROUP BY shortcode, lower(domain) HAVING count(*) > 1').to_hash
+
+    duplicates.each do |row|
+      CustomEmoji.where(id: row['ids'].split(',')[0...-1]).destroy_all
+    end
+
+    CustomEmoji.in_batches.update_all('domain = lower(domain)')
+  end
+
+  def down; end
+end
diff --git a/db/migrate/20181213184704_create_account_warnings.rb b/db/migrate/20181213184704_create_account_warnings.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e768be27784c667720d8c503babf31da4965f68d
--- /dev/null
+++ b/db/migrate/20181213184704_create_account_warnings.rb
@@ -0,0 +1,12 @@
+class CreateAccountWarnings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_warnings do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :nullify }
+      t.belongs_to :target_account, foreign_key: { to_table: 'accounts', on_delete: :cascade }
+      t.integer :action, null: false, default: 0
+      t.text :text, null: false, default: ''
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20181213185533_create_account_warning_presets.rb b/db/migrate/20181213185533_create_account_warning_presets.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9c81f1b5e6a522aa143a37fe7ab60c4bb747167c
--- /dev/null
+++ b/db/migrate/20181213185533_create_account_warning_presets.rb
@@ -0,0 +1,9 @@
+class CreateAccountWarningPresets < ActiveRecord::Migration[5.2]
+  def change
+    create_table :account_warning_presets do |t|
+      t.text :text, null: false, default: ''
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20181219235220_add_created_by_application_id_to_users.rb b/db/migrate/20181219235220_add_created_by_application_id_to_users.rb
new file mode 100644
index 0000000000000000000000000000000000000000..17ce900af30ea8b4fb4c138c0b402f4600619068
--- /dev/null
+++ b/db/migrate/20181219235220_add_created_by_application_id_to_users.rb
@@ -0,0 +1,8 @@
+class AddCreatedByApplicationIdToUsers < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_reference :users, :created_by_application, foreign_key: { to_table: 'oauth_applications', on_delete: :nullify }, index: false
+    add_index :users, :created_by_application_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20181226021420_add_also_known_as_to_accounts.rb b/db/migrate/20181226021420_add_also_known_as_to_accounts.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1fd9566803ae8ff9f5997ff1b9e0f90f724cc720
--- /dev/null
+++ b/db/migrate/20181226021420_add_also_known_as_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddAlsoKnownAsToAccounts < ActiveRecord::Migration[5.2]
+  def change
+    add_column :accounts, :also_known_as, :string, array: true
+  end
+end
diff --git a/db/migrate/20190103124649_create_scheduled_statuses.rb b/db/migrate/20190103124649_create_scheduled_statuses.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2b78073b85e2dee942dadef72c0ac85750372707
--- /dev/null
+++ b/db/migrate/20190103124649_create_scheduled_statuses.rb
@@ -0,0 +1,9 @@
+class CreateScheduledStatuses < ActiveRecord::Migration[5.2]
+  def change
+    create_table :scheduled_statuses do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }
+      t.datetime :scheduled_at, index: true
+      t.jsonb :params
+    end
+  end
+end
diff --git a/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb b/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6f6cf23513465c33472498dbe23bc3810090d1bd
--- /dev/null
+++ b/db/migrate/20190103124754_add_scheduled_status_id_to_media_attachments.rb
@@ -0,0 +1,8 @@
+class AddScheduledStatusIdToMediaAttachments < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    add_reference :media_attachments, :scheduled_status, foreign_key: { on_delete: :nullify }, index: false
+    add_index :media_attachments, :scheduled_status_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20190117114553_create_tombstones.rb b/db/migrate/20190117114553_create_tombstones.rb
new file mode 100644
index 0000000000000000000000000000000000000000..06d6d8c5ad01aafe577c2ae160a9a81dc0c157c5
--- /dev/null
+++ b/db/migrate/20190117114553_create_tombstones.rb
@@ -0,0 +1,12 @@
+class CreateTombstones < ActiveRecord::Migration[5.2]
+  def change
+    create_table :tombstones do |t|
+      t.belongs_to :account, foreign_key: { on_delete: :cascade }
+      t.string :uri, null: false
+
+      t.timestamps
+    end
+
+    add_index :tombstones, :uri
+  end
+end
diff --git a/app/javascript/mastodon/.gitkeep b/db/post_migrate/.gitkeep
similarity index 100%
rename from app/javascript/mastodon/.gitkeep
rename to db/post_migrate/.gitkeep
diff --git a/db/post_migrate/20180813113448_copy_status_stats_cleanup.rb b/db/post_migrate/20180813113448_copy_status_stats_cleanup.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f3ae772c79e737e82a56f7304680a27abc131e14
--- /dev/null
+++ b/db/post_migrate/20180813113448_copy_status_stats_cleanup.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class CopyStatusStatsCleanup < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :statuses, :reblogs_count, :integer, default: 0, null: false
+      remove_column :statuses, :favourites_count, :integer, default: 0, null: false
+    end
+  end
+end
diff --git a/db/post_migrate/20181116184611_copy_account_stats_cleanup.rb b/db/post_migrate/20181116184611_copy_account_stats_cleanup.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9267e9b2c6e3d4faef6c3d0e69fe5cd9b6c29e8a
--- /dev/null
+++ b/db/post_migrate/20181116184611_copy_account_stats_cleanup.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CopyAccountStatsCleanup < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :accounts, :statuses_count, :integer, default: 0, null: false
+      remove_column :accounts, :following_count, :integer, default: 0, null: false
+      remove_column :accounts, :followers_count, :integer, default: 0, null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 02032c54826b47ae1dc0bf13bdfff0a133c7dcef..3487adf08852c02983c7408dbff3d84356aae99d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,11 +10,24 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_07_07_154237) do
+ActiveRecord::Schema.define(version: 2019_01_17_114553) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "account_conversations", force: :cascade do |t|
+    t.bigint "account_id"
+    t.bigint "conversation_id"
+    t.bigint "participant_account_ids", default: [], null: false, array: true
+    t.bigint "status_ids", default: [], null: false, array: true
+    t.bigint "last_status_id"
+    t.integer "lock_version", default: 0, null: false
+    t.boolean "unread", default: false, null: false
+    t.index ["account_id", "conversation_id", "participant_account_ids"], name: "index_unique_conversations", unique: true
+    t.index ["account_id"], name: "index_account_conversations_on_account_id"
+    t.index ["conversation_id"], name: "index_account_conversations_on_conversation_id"
+  end
+
   create_table "account_domain_blocks", force: :cascade do |t|
     t.string "domain"
     t.datetime "created_at", null: false
@@ -33,6 +46,53 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["target_account_id"], name: "index_account_moderation_notes_on_target_account_id"
   end
 
+  create_table "account_pins", force: :cascade do |t|
+    t.bigint "account_id"
+    t.bigint "target_account_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id", "target_account_id"], name: "index_account_pins_on_account_id_and_target_account_id", unique: true
+    t.index ["account_id"], name: "index_account_pins_on_account_id"
+    t.index ["target_account_id"], name: "index_account_pins_on_target_account_id"
+  end
+
+  create_table "account_stats", force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "statuses_count", default: 0, null: false
+    t.bigint "following_count", default: 0, null: false
+    t.bigint "followers_count", default: 0, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "last_status_at"
+    t.index ["account_id"], name: "index_account_stats_on_account_id", unique: true
+  end
+
+  create_table "account_tag_stats", force: :cascade do |t|
+    t.bigint "tag_id", null: false
+    t.bigint "accounts_count", default: 0, null: false
+    t.boolean "hidden", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["tag_id"], name: "index_account_tag_stats_on_tag_id", unique: true
+  end
+
+  create_table "account_warning_presets", force: :cascade do |t|
+    t.text "text", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "account_warnings", force: :cascade do |t|
+    t.bigint "account_id"
+    t.bigint "target_account_id"
+    t.integer "action", default: 0, null: false
+    t.text "text", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    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
+
   create_table "accounts", force: :cascade do |t|
     t.string "username", default: "", null: false
     t.string "domain"
@@ -62,9 +122,6 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.boolean "suspended", default: false, null: false
     t.boolean "locked", default: false, null: false
     t.string "header_remote_url", default: "", null: false
-    t.integer "statuses_count", default: 0, null: false
-    t.integer "followers_count", default: 0, null: false
-    t.integer "following_count", default: 0, null: false
     t.datetime "last_webfingered_at"
     t.string "inbox_url", default: "", null: false
     t.string "outbox_url", default: "", null: false
@@ -76,12 +133,22 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.string "featured_collection_url"
     t.jsonb "fields"
     t.string "actor_type"
+    t.boolean "discoverable"
+    t.string "also_known_as", array: true
     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), lower((domain)::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 ["uri"], name: "index_accounts_on_uri"
     t.index ["url"], name: "index_accounts_on_url"
   end
 
+  create_table "accounts_tags", id: false, force: :cascade do |t|
+    t.bigint "account_id", null: false
+    t.bigint "tag_id", null: false
+    t.index ["account_id", "tag_id"], name: "index_accounts_tags_on_account_id_and_tag_id"
+    t.index ["tag_id", "account_id"], name: "index_accounts_tags_on_tag_id_and_account_id", unique: true
+  end
+
   create_table "admin_action_logs", force: :cascade do |t|
     t.bigint "account_id"
     t.string "action", default: "", null: false
@@ -112,6 +179,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.bigint "target_account_id", null: false
     t.string "uri"
     t.index ["account_id", "target_account_id"], name: "index_blocks_on_account_id_and_target_account_id", unique: true
+    t.index ["target_account_id"], name: "index_blocks_on_target_account_id"
   end
 
   create_table "conversation_mutes", force: :cascade do |t|
@@ -149,9 +217,9 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.text "phrase", default: "", null: false
     t.string "context", default: [], null: false, array: true
     t.boolean "irreversible", default: false, null: false
-    t.boolean "whole_word", default: true, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "whole_word", default: true, null: false
     t.index ["account_id"], name: "index_custom_filters_on_account_id"
   end
 
@@ -161,6 +229,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.datetime "updated_at", null: false
     t.integer "severity", default: 0
     t.boolean "reject_media", default: false, null: false
+    t.boolean "reject_reports", default: false, null: false
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end
 
@@ -199,14 +268,15 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.boolean "show_reblogs", default: true, null: false
     t.string "uri"
     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
 
-  create_table "identities", id: :serial, force: :cascade do |t|
-    t.integer "user_id"
+  create_table "identities", force: :cascade do |t|
     t.string "provider", default: "", null: false
     t.string "uid", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "user_id"
     t.index ["user_id"], name: "index_identities_on_user_id"
   end
 
@@ -266,7 +336,9 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.json "file_meta"
     t.bigint "account_id"
     t.text "description"
+    t.bigint "scheduled_status_id"
     t.index ["account_id"], name: "index_media_attachments_on_account_id"
+    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 ["status_id"], name: "index_media_attachments_on_status_id"
   end
@@ -276,6 +348,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.bigint "account_id"
+    t.boolean "silent", default: false, null: false
     t.index ["account_id", "status_id"], name: "index_mentions_on_account_id_and_status_id", unique: true
     t.index ["status_id"], name: "index_mentions_on_status_id"
   end
@@ -287,6 +360,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.bigint "target_account_id", null: false
     t.boolean "hide_notifications", default: true, null: false
     t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
+    t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
   end
 
   create_table "notifications", force: :cascade do |t|
@@ -299,6 +373,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["account_id", "activity_id", "activity_type"], name: "account_activity", unique: true
     t.index ["account_id", "id"], name: "index_notifications_on_account_id_and_id", order: { id: :desc }
     t.index ["activity_id", "activity_type"], name: "index_notifications_on_activity_id_and_activity_type"
+    t.index ["from_account_id"], name: "index_notifications_on_from_account_id"
   end
 
   create_table "oauth_access_grants", force: :cascade do |t|
@@ -310,6 +385,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.string "scopes"
     t.bigint "application_id", null: false
     t.bigint "resource_owner_id", null: false
+    t.index ["resource_owner_id"], name: "index_oauth_access_grants_on_resource_owner_id"
     t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true
   end
 
@@ -339,10 +415,20 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.string "website"
     t.string "owner_type"
     t.bigint "owner_id"
+    t.boolean "confidential", default: true, null: false
     t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type"
     t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true
   end
 
+  create_table "pghero_space_stats", force: :cascade do |t|
+    t.text "database"
+    t.text "schema"
+    t.text "relation"
+    t.bigint "size"
+    t.datetime "captured_at"
+    t.index ["database", "captured_at"], name: "index_pghero_space_stats_on_database_and_captured_at"
+  end
+
   create_table "preview_cards", force: :cascade do |t|
     t.string "url", default: "", null: false
     t.string "title", default: "", null: false
@@ -371,6 +457,14 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["status_id", "preview_card_id"], name: "index_preview_cards_statuses_on_status_id_and_preview_card_id"
   end
 
+  create_table "relays", force: :cascade do |t|
+    t.string "inbox_url", default: "", null: false
+    t.string "follow_activity_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "state", default: 0, null: false
+  end
+
   create_table "report_notes", force: :cascade do |t|
     t.text "content", null: false
     t.bigint "report_id", null: false
@@ -395,6 +489,14 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
 
+  create_table "scheduled_statuses", force: :cascade do |t|
+    t.bigint "account_id"
+    t.datetime "scheduled_at"
+    t.jsonb "params"
+    t.index ["account_id"], name: "index_scheduled_statuses_on_account_id"
+    t.index ["scheduled_at"], name: "index_scheduled_statuses_on_scheduled_at"
+  end
+
   create_table "session_activations", force: :cascade do |t|
     t.string "session_id", null: false
     t.datetime "created_at", null: false
@@ -404,6 +506,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.bigint "access_token_id"
     t.bigint "user_id", null: false
     t.bigint "web_push_subscription_id"
+    t.index ["access_token_id"], name: "index_session_activations_on_access_token_id"
     t.index ["session_id"], name: "index_session_activations_on_session_id", unique: true
     t.index ["user_id"], name: "index_session_activations_on_user_id"
   end
@@ -438,6 +541,16 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["account_id", "status_id"], name: "index_status_pins_on_account_id_and_status_id", unique: true
   end
 
+  create_table "status_stats", force: :cascade do |t|
+    t.bigint "status_id", null: false
+    t.bigint "replies_count", default: 0, null: false
+    t.bigint "reblogs_count", default: 0, null: false
+    t.bigint "favourites_count", default: 0, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["status_id"], name: "index_status_stats_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
@@ -450,8 +563,6 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.integer "visibility", default: 0, null: false
     t.text "spoiler_text", default: "", null: false
     t.boolean "reply", default: false, null: false
-    t.integer "favourites_count", default: 0, null: false
-    t.integer "reblogs_count", default: 0, null: false
     t.string "language"
     t.bigint "conversation_id"
     t.boolean "local"
@@ -459,6 +570,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.bigint "application_id"
     t.bigint "in_reply_to_account_id"
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20180106", order: { id: :desc }
+    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 ["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
@@ -503,6 +615,15 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
+  create_table "tombstones", force: :cascade do |t|
+    t.bigint "account_id"
+    t.string "uri", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_tombstones_on_account_id"
+    t.index ["uri"], name: "index_tombstones_on_uri"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.datetime "created_at", null: false
@@ -536,8 +657,10 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.bigint "invite_id"
     t.string "remember_token"
     t.string "chosen_languages", array: true
+    t.bigint "created_by_application_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 ["email"], name: "index_users_on_email", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
@@ -563,9 +686,17 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
     t.index ["user_id"], name: "index_web_settings_on_user_id", unique: true
   end
 
+  add_foreign_key "account_conversations", "accounts", on_delete: :cascade
+  add_foreign_key "account_conversations", "conversations", on_delete: :cascade
   add_foreign_key "account_domain_blocks", "accounts", name: "fk_206c6029bd", on_delete: :cascade
   add_foreign_key "account_moderation_notes", "accounts"
   add_foreign_key "account_moderation_notes", "accounts", column: "target_account_id"
+  add_foreign_key "account_pins", "accounts", column: "target_account_id", on_delete: :cascade
+  add_foreign_key "account_pins", "accounts", on_delete: :cascade
+  add_foreign_key "account_stats", "accounts", on_delete: :cascade
+  add_foreign_key "account_tag_stats", "tags", 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 "accounts", "accounts", column: "moved_to_account_id", on_delete: :nullify
   add_foreign_key "admin_action_logs", "accounts", on_delete: :cascade
   add_foreign_key "backups", "users", on_delete: :nullify
@@ -580,7 +711,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
   add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
   add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
   add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
-  add_foreign_key "identities", "users", on_delete: :cascade
+  add_foreign_key "identities", "users", name: "fk_bea040f377", on_delete: :cascade
   add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
   add_foreign_key "invites", "users", on_delete: :cascade
   add_foreign_key "list_accounts", "accounts", on_delete: :cascade
@@ -588,6 +719,7 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
   add_foreign_key "list_accounts", "lists", on_delete: :cascade
   add_foreign_key "lists", "accounts", on_delete: :cascade
   add_foreign_key "media_attachments", "accounts", name: "fk_96dd81e81b", on_delete: :nullify
+  add_foreign_key "media_attachments", "scheduled_statuses", on_delete: :nullify
   add_foreign_key "media_attachments", "statuses", on_delete: :nullify
   add_foreign_key "mentions", "accounts", name: "fk_970d43f9d1", on_delete: :cascade
   add_foreign_key "mentions", "statuses", on_delete: :cascade
@@ -606,10 +738,12 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
   add_foreign_key "reports", "accounts", column: "assigned_account_id", on_delete: :nullify
   add_foreign_key "reports", "accounts", column: "target_account_id", name: "fk_eb37af34f0", on_delete: :cascade
   add_foreign_key "reports", "accounts", name: "fk_4b81f7522c", on_delete: :cascade
+  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_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 "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
@@ -618,8 +752,10 @@ ActiveRecord::Schema.define(version: 2018_07_07_154237) do
   add_foreign_key "statuses_tags", "tags", name: "fk_3081861e21", on_delete: :cascade
   add_foreign_key "stream_entries", "accounts", name: "fk_5659b17554", on_delete: :cascade
   add_foreign_key "subscriptions", "accounts", name: "fk_9847d1cbb5", on_delete: :cascade
+  add_foreign_key "tombstones", "accounts", 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 "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
diff --git a/db/seeds.rb b/db/seeds.rb
index 6adfeed8d37afed26b8ec0a1d0a35cfd018953a3..cf62ebf39ad562f88247682f069c37f47bbb724d 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -4,5 +4,5 @@ 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, admin: true, account: admin).save!
+  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).save!
 end
diff --git a/dist/mastodon-sidekiq.service b/dist/mastodon-sidekiq.service
new file mode 100644
index 0000000000000000000000000000000000000000..721a8660902ef6cb1e5cf36edb61beeffdfbdaa8
--- /dev/null
+++ b/dist/mastodon-sidekiq.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=mastodon-sidekiq
+After=network.target
+
+[Service]
+Type=simple
+User=mastodon
+WorkingDirectory=/home/mastodon/live
+Environment="RAILS_ENV=production"
+Environment="DB_POOL=25"
+Environment="MALLOC_ARENA_MAX=2"
+ExecStart=/home/mastodon/.rbenv/shims/bundle exec sidekiq -c 25
+TimeoutSec=15
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dist/mastodon-streaming.service b/dist/mastodon-streaming.service
new file mode 100644
index 0000000000000000000000000000000000000000..5d7c129dfbbff5d17e7535f25982e351259fca01
--- /dev/null
+++ b/dist/mastodon-streaming.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=mastodon-streaming
+After=network.target
+
+[Service]
+Type=simple
+User=mastodon
+WorkingDirectory=/home/mastodon/live
+Environment="NODE_ENV=production"
+Environment="PORT=4000"
+Environment="STREAMING_CLUSTER_NUM=1"
+ExecStart=/usr/bin/npm run start
+TimeoutSec=15
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dist/mastodon-web.service b/dist/mastodon-web.service
new file mode 100644
index 0000000000000000000000000000000000000000..30fcbec1e00603db49056779ee1015ba786170db
--- /dev/null
+++ b/dist/mastodon-web.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=mastodon-web
+After=network.target
+
+[Service]
+Type=simple
+User=mastodon
+WorkingDirectory=/home/mastodon/live
+Environment="RAILS_ENV=production"
+Environment="PORT=3000"
+ExecStart=/home/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+TimeoutSec=15
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dist/nginx.conf b/dist/nginx.conf
new file mode 100644
index 0000000000000000000000000000000000000000..3d57417657002af4d722ee3cfa11d82b0afc03d6
--- /dev/null
+++ b/dist/nginx.conf
@@ -0,0 +1,106 @@
+map $http_upgrade $connection_upgrade {
+  default upgrade;
+  ''      close;
+}
+
+proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
+
+server {
+  listen 80;
+  listen [::]:80;
+  server_name example.com;
+  root /home/mastodon/live/public;
+  location /.well-known/acme-challenge/ { allow all; }
+  location / { return 301 https://$host$request_uri; }
+}
+
+server {
+  listen 443 ssl http2;
+  listen [::]:443 ssl http2;
+  server_name example.com;
+
+  ssl_protocols TLSv1.2;
+  ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA;
+  ssl_prefer_server_ciphers on;
+  ssl_session_cache shared:SSL:10m;
+
+  # Uncomment these lines once you acquire a certificate:
+  # ssl_certificate     /etc/letsencrypt/live/example.com/fullchain.pem;
+  # ssl_certificate_key /etc/letsencrypt/live/example.com/privkey.pem;
+
+  keepalive_timeout    70;
+  sendfile             on;
+  client_max_body_size 80m;
+
+  root /home/mastodon/live/public;
+
+  gzip on;
+  gzip_disable "msie6";
+  gzip_vary on;
+  gzip_proxied any;
+  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";
+
+  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";
+    try_files $uri @proxy;
+  }
+
+  location /sw.js {
+    add_header Cache-Control "public, max-age=0";
+    add_header Strict-Transport-Security "max-age=31536000";
+    try_files $uri @proxy;
+  }
+
+  location @proxy {
+    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://127.0.0.1:3000;
+    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_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";
+
+    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 https;
+    proxy_set_header Proxy "";
+
+    proxy_pass http://127.0.0.1:4000;
+    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/docker-compose.yml b/docker-compose.yml
index c54c73e44a064cfddb0ac82b7024ed00a44a75c2..faa066149baf7938e027773ad8cab15e2146e203 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,18 +6,20 @@ services:
     image: postgres:9.6-alpine
     networks:
       - internal_network
-### Uncomment to enable DB persistance
-#    volumes:
-#      - ./postgres:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "postgres"]
+    volumes:
+      - ./postgres:/var/lib/postgresql/data
 
   redis:
     restart: always
     image: redis:4.0-alpine
     networks:
       - internal_network
-### Uncomment to enable REDIS persistance
-#    volumes:
-#      - ./redis:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+    volumes:
+      - ./redis:/data
 
 #  es:
 #    restart: always
@@ -26,9 +28,10 @@ services:
 #      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 #    networks:
 #      - internal_network
-#### Uncomment to enable ES persistance
-##    volumes:
-##      - ./elasticsearch:/usr/share/elasticsearch/data
+#    healthcheck:
+#      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+#    volumes:
+#      - ./elasticsearch:/usr/share/elasticsearch/data
 
   web:
     build: .
@@ -39,6 +42,8 @@ services:
     networks:
       - external_network
       - internal_network
+    healthcheck:
+      test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy off localhost:3000/api/v1/instance || exit 1"]
     ports:
       - "127.0.0.1:3000:3000"
     depends_on:
@@ -46,8 +51,6 @@ services:
       - redis
 #      - es
     volumes:
-      - ./public/assets:/mastodon/public/assets
-      - ./public/packs:/mastodon/public/packs
       - ./public/system:/mastodon/public/system
 
   streaming:
@@ -59,6 +62,8 @@ services:
     networks:
       - external_network
       - internal_network
+    healthcheck:
+      test: ["CMD-SHELL", "wget -q --spider --header 'x-forwarded-proto: https' --proxy off localhost:4000/api/v1/streaming/health || exit 1"]
     ports:
       - "127.0.0.1:4000:4000"
     depends_on:
@@ -70,7 +75,7 @@ services:
     image: tootsuite/mastodon
     restart: always
     env_file: .env.production
-    command: bundle exec sidekiq -q default -q mailers -q pull -q push
+    command: bundle exec sidekiq
     depends_on:
       - db
       - redis
@@ -78,20 +83,18 @@ services:
       - external_network
       - internal_network
     volumes:
-      - ./public/packs:/mastodon/public/packs
       - ./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:
-#    build: https://github.com/usbsnowcrash/docker-tor.git
+#    image: sirboops/tor
 #    networks:
 #      - external_network
 #      - internal_network
 #
 #  privoxy:
-#    build: https://github.com/usbsnowcrash/docker-privoxy.git
-#    command: /opt/sbin/privoxy --no-daemon --user privoxy.privoxy /opt/config
+#    image: sirboops/privoxy
 #    volumes:
 #      - ./priv-config:/opt/config
 #    networks:
diff --git a/docs/Contributing-to-Mastodon/Sponsors.md b/docs/Contributing-to-Mastodon/Sponsors.md
deleted file mode 100644
index 8fc22b6bbdde1fd7052a2eae1a30f735034487fb..0000000000000000000000000000000000000000
--- a/docs/Contributing-to-Mastodon/Sponsors.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Contributing-to-Mastodon/Sponsors.md)
diff --git a/docs/Contributing-to-Mastodon/Translating.md b/docs/Contributing-to-Mastodon/Translating.md
deleted file mode 100644
index 1671645eea4336ca660cdc6760233f66b10ebf07..0000000000000000000000000000000000000000
--- a/docs/Contributing-to-Mastodon/Translating.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Contributing-to-Mastodon/Translating.md)
diff --git a/docs/Extensions.md b/docs/Extensions.md
deleted file mode 100644
index be4c6eabd70e221070d1b89facddb83d4d2f1d66..0000000000000000000000000000000000000000
--- a/docs/Extensions.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Extensions.md)
diff --git a/docs/README.md b/docs/README.md
deleted file mode 100644
index 63bcf5a2480afc46cb2e37e38f233ea9f97286c1..0000000000000000000000000000000000000000
--- a/docs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/README.md)
diff --git a/docs/Running-Mastodon/Administration-guide.md b/docs/Running-Mastodon/Administration-guide.md
deleted file mode 100644
index e7571be3a2709911825116c6ba548790fdb808f0..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Administration-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md)
diff --git a/docs/Running-Mastodon/Development-guide.md b/docs/Running-Mastodon/Development-guide.md
deleted file mode 100644
index 10ed6408750ef734ec77663c441816630f815bae..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Development-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Development-guide.md)
diff --git a/docs/Running-Mastodon/Heroku-guide.md b/docs/Running-Mastodon/Heroku-guide.md
deleted file mode 100644
index aa5abc1f558b83a1f9db20627a3e24b93cacf08f..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Heroku-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Heroku-guide.md)
diff --git a/docs/Running-Mastodon/Production-guide.md b/docs/Running-Mastodon/Production-guide.md
deleted file mode 100644
index 08649e9ce5b8da2dc9c0406e801f40f93457803b..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Production-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Production-guide.md)
diff --git a/docs/Running-Mastodon/Scalingo-guide.md b/docs/Running-Mastodon/Scalingo-guide.md
deleted file mode 100644
index 8c986f75091a75f1e98f9c6f4de48c3425243a26..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Scalingo-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Scalingo-guide.md)
diff --git a/docs/Running-Mastodon/Tuning.md b/docs/Running-Mastodon/Tuning.md
deleted file mode 100644
index 5e5474194a5f01f98cbe13161243caec2f60e63b..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Tuning.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Tuning.md)
diff --git a/docs/Running-Mastodon/Vagrant-guide.md b/docs/Running-Mastodon/Vagrant-guide.md
deleted file mode 100644
index c5823b09b2d43f195924df86899488b3ba6cdfe6..0000000000000000000000000000000000000000
--- a/docs/Running-Mastodon/Vagrant-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Vagrant-guide.md)
diff --git a/docs/Specs-and-RFCs-used.md b/docs/Specs-and-RFCs-used.md
deleted file mode 100644
index 89a4dd313efe43ea5cefeac76d973bc36cdbfdba..0000000000000000000000000000000000000000
--- a/docs/Specs-and-RFCs-used.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Specs-and-RFCs-used.md)
diff --git a/docs/Using-Mastodon/2FA.md b/docs/Using-Mastodon/2FA.md
deleted file mode 100644
index d5c6985b70ccfc8717c00f8a4fadb3f60079cca6..0000000000000000000000000000000000000000
--- a/docs/Using-Mastodon/2FA.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/2FA.md)
diff --git a/docs/Using-Mastodon/Apps.md b/docs/Using-Mastodon/Apps.md
deleted file mode 100644
index c2ced44576d978de1d6463d800bc54850e136779..0000000000000000000000000000000000000000
--- a/docs/Using-Mastodon/Apps.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md)
diff --git a/docs/Using-Mastodon/FAQ.md b/docs/Using-Mastodon/FAQ.md
deleted file mode 100644
index d50e63b93d040233877219d5fedc006e2b9e5096..0000000000000000000000000000000000000000
--- a/docs/Using-Mastodon/FAQ.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md)
diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md
deleted file mode 100644
index 0e2d08643eb245ce4789c4f02db6835076a9208c..0000000000000000000000000000000000000000
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/List-of-Mastodon-instances.md)
diff --git a/docs/Using-Mastodon/User-guide.md b/docs/Using-Mastodon/User-guide.md
deleted file mode 100644
index 7ef5a117b08ea0baacc9f8677c2c585b206cde58..0000000000000000000000000000000000000000
--- a/docs/Using-Mastodon/User-guide.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md)
diff --git a/docs/Using-the-API/API.md b/docs/Using-the-API/API.md
deleted file mode 100644
index 6de61e19615c403bc95e9e80506904ca87fff22b..0000000000000000000000000000000000000000
--- a/docs/Using-the-API/API.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-the-API/API.md)
diff --git a/docs/Using-the-API/OAuth-details.md b/docs/Using-the-API/OAuth-details.md
deleted file mode 100644
index 6a6926bb9cc06873971083936a6f45fb48b852b9..0000000000000000000000000000000000000000
--- a/docs/Using-the-API/OAuth-details.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-the-API/OAuth-details.md)
diff --git a/docs/Using-the-API/Push-notifications.md b/docs/Using-the-API/Push-notifications.md
deleted file mode 100644
index 3292c0a6e45fdd9c6811a904552874c9155245e8..0000000000000000000000000000000000000000
--- a/docs/Using-the-API/Push-notifications.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-the-API/Push-notifications.md)
diff --git a/docs/Using-the-API/Streaming-API.md b/docs/Using-the-API/Streaming-API.md
deleted file mode 100644
index 482f901c0f151cebcedd82a0f40aaf29eab068a6..0000000000000000000000000000000000000000
--- a/docs/Using-the-API/Streaming-API.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-the-API/Streaming-API.md)
diff --git a/docs/Using-the-API/Testing-with-cURL.md b/docs/Using-the-API/Testing-with-cURL.md
deleted file mode 100644
index 04c7c87b2defb0ed6220421508482f9c85bcc337..0000000000000000000000000000000000000000
--- a/docs/Using-the-API/Testing-with-cURL.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-the-API/Testing-with-cURL.md)
diff --git a/docs/Using-the-API/Tips-for-app-developers.md b/docs/Using-the-API/Tips-for-app-developers.md
deleted file mode 100644
index 36a28da2ea530485010360a9da3dead85ff3dafb..0000000000000000000000000000000000000000
--- a/docs/Using-the-API/Tips-for-app-developers.md
+++ /dev/null
@@ -1 +0,0 @@
-[The documentation has moved to its own repository](https://github.com/tootsuite/documentation/blob/master/Using-the-API/Tips-for-app-developers.md)
diff --git a/lib/cli.rb b/lib/cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6036adfbed7e03b1f9943d44793d2a15dca96138
--- /dev/null
+++ b/lib/cli.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'thor'
+require_relative 'mastodon/media_cli'
+require_relative 'mastodon/emoji_cli'
+require_relative 'mastodon/accounts_cli'
+require_relative 'mastodon/feeds_cli'
+require_relative 'mastodon/settings_cli'
+require_relative 'mastodon/domains_cli'
+require_relative 'mastodon/version'
+
+module Mastodon
+  class CLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    desc 'media SUBCOMMAND ...ARGS', 'Manage media files'
+    subcommand 'media', Mastodon::MediaCLI
+
+    desc 'emoji SUBCOMMAND ...ARGS', 'Manage custom emoji'
+    subcommand 'emoji', Mastodon::EmojiCLI
+
+    desc 'accounts SUBCOMMAND ...ARGS', 'Manage accounts'
+    subcommand 'accounts', Mastodon::AccountsCLI
+
+    desc 'feeds SUBCOMMAND ...ARGS', 'Manage feeds'
+    subcommand 'feeds', Mastodon::FeedsCLI
+
+    desc 'settings SUBCOMMAND ...ARGS', 'Manage dynamic settings'
+    subcommand 'settings', Mastodon::SettingsCLI
+
+    desc 'domains SUBCOMMAND ...ARGS', 'Manage account domains'
+    subcommand 'domains', Mastodon::DomainsCLI
+
+    map %w(--version -v) => :version
+
+    desc 'version', 'Show version'
+    def version
+      say(Mastodon::Version.to_s)
+    end
+  end
+end
diff --git a/lib/devise/ldap_authenticatable.rb b/lib/devise/ldap_authenticatable.rb
index ef786fbb77a26674ae1df42f3cf7a4c0d371243e..6903d468dc4958a8d2cf504f626e3f3871591be4 100644
--- a/lib/devise/ldap_authenticatable.rb
+++ b/lib/devise/ldap_authenticatable.rb
@@ -24,11 +24,13 @@ module Devise
             connect_timeout: 10
           )
 
-          if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: "(#{Devise.ldap_uid}=#{email})", password: password))
+          filter = format(Devise.ldap_search_filter, uid: Devise.ldap_uid, email: email)
+
+          if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: password))
             user = User.ldap_get_user(user_info.first)
             success!(user)
           else
-            return fail(:invalid_login)
+            return fail(:invalid)
           end
         end
       end
diff --git a/lib/generators/post_deployment_migration_generator.rb b/lib/generators/post_deployment_migration_generator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..798c01b883ac46814338c1b8049ceb610d8e1776
--- /dev/null
+++ b/lib/generators/post_deployment_migration_generator.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Rails
+  class PostDeploymentMigrationGenerator < Rails::Generators::NamedBase
+    def create_migration_file
+      timestamp = Time.zone.now.strftime('%Y%m%d%H%M%S')
+
+      template 'migration.rb', "db/post_migrate/#{timestamp}_#{file_name}.rb"
+    end
+
+    def migration_class_name
+      file_name.camelize
+    end
+  end
+end
diff --git a/lib/json_ld/security.rb b/lib/json_ld/security.rb
new file mode 100644
index 0000000000000000000000000000000000000000..1230206f035d1e315fec6522ac06eab6877163a5
--- /dev/null
+++ b/lib/json_ld/security.rb
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+# This file generated automatically from https://w3id.org/security/v1
+require 'json/ld'
+class JSON::LD::Context
+  add_preloaded("https://w3id.org/security/v1") do
+    new(processingMode: "json-ld-1.0", term_definitions: {
+      "CryptographicKey" => TermDefinition.new("CryptographicKey", id: "https://w3id.org/security#Key", simple: true),
+      "EcdsaKoblitzSignature2016" => TermDefinition.new("EcdsaKoblitzSignature2016", id: "https://w3id.org/security#EcdsaKoblitzSignature2016", simple: true),
+      "EncryptedMessage" => TermDefinition.new("EncryptedMessage", id: "https://w3id.org/security#EncryptedMessage", simple: true),
+      "GraphSignature2012" => TermDefinition.new("GraphSignature2012", id: "https://w3id.org/security#GraphSignature2012", simple: true),
+      "LinkedDataSignature2015" => TermDefinition.new("LinkedDataSignature2015", id: "https://w3id.org/security#LinkedDataSignature2015", simple: true),
+      "LinkedDataSignature2016" => TermDefinition.new("LinkedDataSignature2016", id: "https://w3id.org/security#LinkedDataSignature2016", simple: true),
+      "authenticationTag" => TermDefinition.new("authenticationTag", id: "https://w3id.org/security#authenticationTag", simple: true),
+      "canonicalizationAlgorithm" => TermDefinition.new("canonicalizationAlgorithm", id: "https://w3id.org/security#canonicalizationAlgorithm", simple: true),
+      "cipherAlgorithm" => TermDefinition.new("cipherAlgorithm", id: "https://w3id.org/security#cipherAlgorithm", simple: true),
+      "cipherData" => TermDefinition.new("cipherData", id: "https://w3id.org/security#cipherData", simple: true),
+      "cipherKey" => TermDefinition.new("cipherKey", id: "https://w3id.org/security#cipherKey", simple: true),
+      "created" => TermDefinition.new("created", id: "http://purl.org/dc/terms/created", type_mapping: "http://www.w3.org/2001/XMLSchema#dateTime"),
+      "creator" => TermDefinition.new("creator", id: "http://purl.org/dc/terms/creator", type_mapping: "@id"),
+      "dc" => TermDefinition.new("dc", id: "http://purl.org/dc/terms/", simple: true, prefix: true),
+      "digestAlgorithm" => TermDefinition.new("digestAlgorithm", id: "https://w3id.org/security#digestAlgorithm", simple: true),
+      "digestValue" => TermDefinition.new("digestValue", id: "https://w3id.org/security#digestValue", simple: true),
+      "domain" => TermDefinition.new("domain", id: "https://w3id.org/security#domain", simple: true),
+      "encryptionKey" => TermDefinition.new("encryptionKey", id: "https://w3id.org/security#encryptionKey", simple: true),
+      "expiration" => TermDefinition.new("expiration", id: "https://w3id.org/security#expiration", type_mapping: "http://www.w3.org/2001/XMLSchema#dateTime"),
+      "expires" => TermDefinition.new("expires", id: "https://w3id.org/security#expiration", type_mapping: "http://www.w3.org/2001/XMLSchema#dateTime"),
+      "id" => TermDefinition.new("id", id: "@id", simple: true),
+      "initializationVector" => TermDefinition.new("initializationVector", id: "https://w3id.org/security#initializationVector", simple: true),
+      "iterationCount" => TermDefinition.new("iterationCount", id: "https://w3id.org/security#iterationCount", simple: true),
+      "nonce" => TermDefinition.new("nonce", id: "https://w3id.org/security#nonce", simple: true),
+      "normalizationAlgorithm" => TermDefinition.new("normalizationAlgorithm", id: "https://w3id.org/security#normalizationAlgorithm", simple: true),
+      "owner" => TermDefinition.new("owner", id: "https://w3id.org/security#owner", type_mapping: "@id"),
+      "password" => TermDefinition.new("password", id: "https://w3id.org/security#password", simple: true),
+      "privateKey" => TermDefinition.new("privateKey", id: "https://w3id.org/security#privateKey", type_mapping: "@id"),
+      "privateKeyPem" => TermDefinition.new("privateKeyPem", id: "https://w3id.org/security#privateKeyPem", simple: true),
+      "publicKey" => TermDefinition.new("publicKey", id: "https://w3id.org/security#publicKey", type_mapping: "@id"),
+      "publicKeyPem" => TermDefinition.new("publicKeyPem", id: "https://w3id.org/security#publicKeyPem", simple: true),
+      "publicKeyService" => TermDefinition.new("publicKeyService", id: "https://w3id.org/security#publicKeyService", type_mapping: "@id"),
+      "revoked" => TermDefinition.new("revoked", id: "https://w3id.org/security#revoked", type_mapping: "http://www.w3.org/2001/XMLSchema#dateTime"),
+      "salt" => TermDefinition.new("salt", id: "https://w3id.org/security#salt", simple: true),
+      "sec" => TermDefinition.new("sec", id: "https://w3id.org/security#", simple: true, prefix: true),
+      "signature" => TermDefinition.new("signature", id: "https://w3id.org/security#signature", simple: true),
+      "signatureAlgorithm" => TermDefinition.new("signatureAlgorithm", id: "https://w3id.org/security#signingAlgorithm", simple: true),
+      "signatureValue" => TermDefinition.new("signatureValue", id: "https://w3id.org/security#signatureValue", simple: true),
+      "type" => TermDefinition.new("type", id: "@type", simple: true),
+      "xsd" => TermDefinition.new("xsd", id: "http://www.w3.org/2001/XMLSchema#", simple: true, prefix: true)
+    })
+  end
+end
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..dca31cdca3e7bf4840ddb955662de4b0c578e8bd
--- /dev/null
+++ b/lib/mastodon/accounts_cli.rb
@@ -0,0 +1,377 @@
+# frozen_string_literal: true
+
+require 'set'
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class AccountsCLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    option :all, type: :boolean
+    desc 'rotate [USERNAME]', 'Generate and broadcast new keys'
+    long_desc <<-LONG_DESC
+      Generate and broadcast new RSA keys as part of security
+      maintenance.
+
+      With the --all option, all local accounts will be subject
+      to the rotation. Otherwise, and by default, only a single
+      account specified by the USERNAME argument will be
+      processed.
+    LONG_DESC
+    def rotate(username = nil)
+      if options[:all]
+        processed = 0
+        delay     = 0
+
+        Account.local.without_suspended.find_in_batches do |accounts|
+          accounts.each do |account|
+            rotate_keys_for_account(account, delay)
+            processed += 1
+            say('.', :green, false)
+          end
+
+          delay += 5.minutes
+        end
+
+        say
+        say("OK, rotated keys for #{processed} accounts", :green)
+      elsif username.present?
+        rotate_keys_for_account(Account.find_local(username))
+        say('OK', :green)
+      else
+        say('No account(s) given', :red)
+        exit(1)
+      end
+    end
+
+    option :email, required: true
+    option :confirmed, type: :boolean
+    option :role, default: 'user'
+    option :reattach, type: :boolean
+    option :force, type: :boolean
+    desc 'create USERNAME', 'Create a new user'
+    long_desc <<-LONG_DESC
+      Create a new user account with a given USERNAME and an
+      e-mail address provided with --email.
+
+      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 --reattach option, the new user will be reattached
+      to a given existing username of an old account. If the old
+      account is still in use by someone else, you can supply
+      the --force option to delete the old record and reattach the
+      username to the new account anyway.
+    LONG_DESC
+    def create(username)
+      account  = Account.new(username: username)
+      password = SecureRandom.hex
+      user     = User.new(email: options[:email], password: password, agreement: true, admin: options[:role] == 'admin', moderator: options[:role] == 'moderator', confirmed_at: options[:confirmed] ? Time.now.utc : nil)
+
+      if options[:reattach]
+        account = Account.find_local(username) || Account.new(username: username)
+
+        if account.user.present? && !options[:force]
+          say('The chosen username is currently in use', :red)
+          say('Use --force to reattach it anyway and delete the other user')
+          return
+        elsif account.user.present?
+          account.user.destroy!
+        end
+      end
+
+      account.suspended = false
+      user.account      = account
+
+      if user.save
+        if options[:confirmed]
+          user.confirmed_at = nil
+          user.confirm!
+        end
+
+        say('OK', :green)
+        say("New password: #{password}")
+      else
+        user.errors.to_h.each do |key, error|
+          say('Failure/Error: ', :red)
+          say(key)
+          say('    ' + error, :red)
+        end
+
+        exit(1)
+      end
+    end
+
+    option :role
+    option :email
+    option :confirm, type: :boolean
+    option :enable, type: :boolean
+    option :disable, type: :boolean
+    option :disable_2fa, type: :boolean
+    desc 'modify USERNAME', 'Modify a user'
+    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 --email option, update the user's e-mail address. With
+      the --confirm option, mark the user's e-mail as confirmed.
+
+      With the --disable option, lock the user out of their account. The
+      --enable option is the opposite.
+
+      With the --disable-2fa option, the two-factor authentication
+      requirement for the user can be removed.
+    LONG_DESC
+    def modify(username)
+      user = Account.find_local(username)&.user
+
+      if user.nil?
+        say('No user with such username', :red)
+        exit(1)
+      end
+
+      if options[:role]
+        user.admin = options[:role] == 'admin'
+        user.moderator = options[:role] == 'moderator'
+      end
+
+      user.email = options[:email] if options[:email]
+      user.disabled = false if options[:enable]
+      user.disabled = true if options[:disable]
+      user.otp_required_for_login = false if options[:disable_2fa]
+      user.confirm if options[:confirm]
+
+      if user.save
+        say('OK', :green)
+      else
+        user.errors.to_h.each do |key, error|
+          say('Failure/Error: ', :red)
+          say(key)
+          say('    ' + error, :red)
+        end
+
+        exit(1)
+      end
+    end
+
+    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)
+        exit(1)
+      end
+
+      say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
+      SuspendAccountService.new.call(account, including_user: true)
+      say('OK', :green)
+    end
+
+    desc 'backup USERNAME', 'Request a backup for a user'
+    long_desc <<-LONG_DESC
+      Request a new backup for an account with a given USERNAME.
+
+      The backup will be created in Sidekiq asynchronously, and
+      the user will receive an e-mail with a link to it once
+      it's done.
+    LONG_DESC
+    def backup(username)
+      account = Account.find_local(username)
+
+      if account.nil?
+        say('No user with such username', :red)
+        exit(1)
+      end
+
+      backup = account.user.backups.create!
+      BackupWorker.perform_async(backup.id)
+      say('OK', :green)
+    end
+
+    option :dry_run, type: :boolean
+    desc 'cull', 'Remove remote accounts that no longer exist'
+    long_desc <<-LONG_DESC
+      Query every single remote account in the database to determine
+      if it still exists on the origin server, and if it doesn't,
+      remove it from the database.
+
+      Accounts that have had confirmed activity within the last week
+      are excluded from the checks.
+
+      Domains that are unreachable are not checked.
+
+      With the --dry-run option, no deletes will actually be carried
+      out.
+    LONG_DESC
+    def cull
+      skip_threshold = 7.days.ago
+      culled         = 0
+      skip_domains   = Set.new
+      dry_run        = options[:dry_run] ? ' (DRY RUN)' : ''
+
+      Account.remote.where(protocol: :activitypub).partitioned.find_each do |account|
+        next if account.updated_at >= skip_threshold || (account.last_webfingered_at.present? && account.last_webfingered_at >= skip_threshold)
+
+        unless skip_domains.include?(account.domain)
+          begin
+            code = Request.new(:head, account.uri).perform(&:code)
+          rescue HTTP::ConnectionError
+            skip_domains << account.domain
+          rescue StandardError
+            next
+          end
+        end
+
+        if [404, 410].include?(code)
+          unless options[:dry_run]
+            SuspendAccountService.new.call(account)
+            account.destroy
+          end
+
+          culled += 1
+          say('+', :green, false)
+        else
+          account.touch # Touch account even during dry run to avoid getting the account into the window again
+          say('.', nil, false)
+        end
+      end
+
+      say
+      say("Removed #{culled} accounts. #{skip_domains.size} servers skipped#{dry_run}", skip_domains.empty? ? :green : :yellow)
+
+      unless skip_domains.empty?
+        say('The following servers were not available during the check:', :yellow)
+        skip_domains.each { |domain| say('    ' + domain) }
+      end
+    end
+
+    option :all, type: :boolean
+    option :domain
+    desc 'refresh [USERNAME]', 'Fetch remote user data and files'
+    long_desc <<-LONG_DESC
+      Fetch remote user data and files for one or multiple accounts.
+
+      With the --all option, all remote accounts will be processed.
+      Through the --domain option, this can be narrowed down to a
+      specific domain only. Otherwise, a single remote account must
+      be specified with USERNAME.
+
+      All processing is done in the background through Sidekiq.
+    LONG_DESC
+    def refresh(username = nil)
+      if options[:domain] || options[:all]
+        queued = 0
+        scope  = Account.remote
+        scope  = scope.where(domain: options[:domain]) if options[:domain]
+
+        scope.select(:id).reorder(nil).find_in_batches do |accounts|
+          Maintenance::RedownloadAccountMediaWorker.push_bulk(accounts.map(&:id))
+          queued += accounts.size
+        end
+
+        say("Scheduled refreshment of #{queued} accounts", :green, true)
+      elsif username.present?
+        username, domain = username.split('@')
+        account = Account.find_remote(username, domain)
+
+        if account.nil?
+          say('No such account', :red)
+          exit(1)
+        end
+
+        Maintenance::RedownloadAccountMediaWorker.perform_async(account.id)
+        say('OK', :green)
+      else
+        say('No account(s) given', :red)
+        exit(1)
+      end
+    end
+
+    desc 'follow ACCT', 'Make all local accounts follow account specified by ACCT'
+    long_desc <<-LONG_DESC
+      Make all local accounts follow an account specified by ACCT. ACCT can be
+      a simple username, in case of a local user. It can also be in the format
+      username@domain, in case of a remote user.
+    LONG_DESC
+    def follow(acct)
+      target_account = ResolveAccountService.new.call(acct)
+      processed      = 0
+      failed         = 0
+
+      if target_account.nil?
+        say("Target account (#{acct}) could not be resolved", :red)
+        exit(1)
+      end
+
+      Account.local.without_suspended.find_each do |account|
+        begin
+          FollowService.new.call(account, target_account)
+          processed += 1
+          say('.', :green, false)
+        rescue StandardError
+          failed += 1
+          say('.', :red, false)
+        end
+      end
+
+      say("OK, followed target from #{processed} accounts, skipped #{failed}", :green)
+    end
+
+    desc 'unfollow ACCT', 'Make all local accounts unfollow account specified by ACCT'
+    long_desc <<-LONG_DESC
+      Make all local accounts unfollow an account specified by ACCT. ACCT can be
+      a simple username, in case of a local user. It can also be in the format
+      username@domain, in case of a remote user.
+    LONG_DESC
+    def unfollow(acct)
+      target_account = Account.find_remote(*acct.split('@'))
+      processed      = 0
+      failed         = 0
+
+      if target_account.nil?
+        say("Target account (#{acct}) was not found", :red)
+        exit(1)
+      end
+
+      target_account.followers.local.find_each do |account|
+        begin
+          UnfollowService.new.call(account, target_account)
+          processed += 1
+          say('.', :green, false)
+        rescue StandardError
+          failed += 1
+          say('.', :red, false)
+        end
+      end
+
+      say("OK, unfollowed target from #{processed} accounts, skipped #{failed}", :green)
+    end
+
+    private
+
+    def rotate_keys_for_account(account, delay = 0)
+      if account.nil?
+        say('No such account', :red)
+        exit(1)
+      end
+
+      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)
+    end
+  end
+end
diff --git a/lib/mastodon/cli_helper.rb b/lib/mastodon/cli_helper.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2f807d08c84f94dbefc9f304dcff4dc8616cd6f8
--- /dev/null
+++ b/lib/mastodon/cli_helper.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+dev_null = Logger.new('/dev/null')
+
+Rails.logger                 = dev_null
+ActiveRecord::Base.logger    = dev_null
+ActiveJob::Base.logger       = dev_null
+HttpLog.configuration.logger = dev_null
+Paperclip.options[:log]      = false
diff --git a/lib/mastodon/domains_cli.rb b/lib/mastodon/domains_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..303b8a94a0f0be6cf5eaaed54dcb2421375152fb
--- /dev/null
+++ b/lib/mastodon/domains_cli.rb
@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+require 'concurrent'
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class DomainsCLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    option :dry_run, type: :boolean
+    desc 'purge DOMAIN', 'Remove accounts from a DOMAIN without a trace'
+    long_desc <<-LONG_DESC
+      Remove all accounts from a given DOMAIN without leaving behind any
+      records. Unlike a suspension, if the DOMAIN still exists in the wild,
+      it means the accounts could return if they are resolved again.
+    LONG_DESC
+    def purge(domain)
+      removed = 0
+      dry_run = options[:dry_run] ? ' (DRY RUN)' : ''
+
+      Account.where(domain: domain).find_each do |account|
+        SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
+        removed += 1
+        say('.', :green, false)
+      end
+
+      DomainBlock.where(domain: domain).destroy_all
+
+      say
+      say("Removed #{removed} accounts#{dry_run}", :green)
+    end
+
+    option :concurrency, type: :numeric, default: 50, aliases: [:c]
+    option :silent, type: :boolean, default: false, aliases: [:s]
+    option :format, type: :string, default: 'summary', aliases: [:f]
+    desc 'crawl [START]', 'Crawl all known peers, optionally beginning at START'
+    long_desc <<-LONG_DESC
+      Crawl the fediverse by using the Mastodon REST API endpoints that expose
+      all known peers, and collect statistics from those peers, as long as those
+      peers support those API endpoints. When no START is given, the command uses
+      this server's own database of known peers to seed the crawl.
+
+      The --concurrency (-c) option controls the number of threads performing HTTP
+      requests at the same time. More threads means the crawl may complete faster.
+
+      The --silent (-s) option controls progress output.
+
+      The --format (-f) option controls how the data is displayed at the end. By
+      default (`summary`), a summary of the statistics is returned. The other options
+      are `domains`, which returns a newline-delimited list of all discovered peers,
+      and `json`, which dumps all the aggregated data raw.
+    LONG_DESC
+    def crawl(start = nil)
+      stats     = Concurrent::Hash.new
+      processed = Concurrent::AtomicFixnum.new(0)
+      failed    = Concurrent::AtomicFixnum.new(0)
+      start_at  = Time.now.to_f
+      seed      = start ? [start] : Account.remote.domains
+
+      pool = Concurrent::ThreadPoolExecutor.new(min_threads: 0, max_threads: options[:concurrency], idletime: 10, auto_terminate: true, max_queue: 0)
+
+      work_unit = ->(domain) do
+        next if stats.key?(domain)
+        stats[domain] = nil
+        processed.increment
+
+        begin
+          Request.new(:get, "https://#{domain}/api/v1/instance").perform do |res|
+            next unless res.code == 200
+            stats[domain] = Oj.load(res.to_s)
+          end
+
+          Request.new(:get, "https://#{domain}/api/v1/instance/peers").perform do |res|
+            next unless res.code == 200
+
+            Oj.load(res.to_s).reject { |peer| stats.key?(peer) }.each do |peer|
+              pool.post(peer, &work_unit)
+            end
+          end
+
+          Request.new(:get, "https://#{domain}/api/v1/instance/activity").perform do |res|
+            next unless res.code == 200
+            stats[domain]['activity'] = Oj.load(res.to_s)
+          end
+
+          say('.', :green, false) unless options[:silent]
+        rescue StandardError
+          failed.increment
+          say('.', :red, false) unless options[:silent]
+        end
+      end
+
+      seed.each do |domain|
+        pool.post(domain, &work_unit)
+      end
+
+      sleep 20
+      sleep 20 until pool.queue_length.zero?
+
+      pool.shutdown
+      pool.wait_for_termination(20)
+    ensure
+      pool.shutdown
+
+      say unless options[:silent]
+
+      case options[:format]
+      when 'summary'
+        stats_to_summary(stats, processed, failed, start_at)
+      when 'domains'
+        stats_to_domains(stats)
+      when 'json'
+        stats_to_json(stats)
+      end
+    end
+
+    private
+
+    def stats_to_summary(stats, processed, failed, start_at)
+      stats.compact!
+
+      total_domains = stats.size
+      total_users   = stats.reduce(0) { |sum, (_key, val)| val.is_a?(Hash) && val['stats'].is_a?(Hash) ? sum + val['stats']['user_count'].to_i : sum }
+      total_active  = stats.reduce(0) { |sum, (_key, val)| val.is_a?(Hash) && val['activity'].is_a?(Array) && val['activity'].size > 2 && val['activity'][1].is_a?(Hash) ? sum + val['activity'][1]['logins'].to_i : sum }
+      total_joined  = stats.reduce(0) { |sum, (_key, val)| val.is_a?(Hash) && val['activity'].is_a?(Array) && val['activity'].size > 2 && val['activity'][1].is_a?(Hash) ? sum + val['activity'][1]['registrations'].to_i : sum }
+
+      say("Visited #{processed.value} domains, #{failed.value} failed (#{(Time.now.to_f - start_at).round}s elapsed)", :green)
+      say("Total servers: #{total_domains}", :green)
+      say("Total registered: #{total_users}", :green)
+      say("Total active last week: #{total_active}", :green)
+      say("Total joined last week: #{total_joined}", :green)
+    end
+
+    def stats_to_domains(stats)
+      say(stats.keys.join("\n"))
+    end
+
+    def stats_to_json(stats)
+      stats.compact!
+      say(Oj.dump(stats))
+    end
+  end
+end
diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2262040d49cbb0f0e3f8c0fc8e1a07e36497da3e
--- /dev/null
+++ b/lib/mastodon/emoji_cli.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'rubygems/package'
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class EmojiCLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    option :prefix
+    option :suffix
+    option :overwrite, type: :boolean
+    option :unlisted, type: :boolean
+    desc 'import PATH', 'Import emoji from a TAR archive at PATH'
+    long_desc <<-LONG_DESC
+      Imports custom emoji from a TAR archive specified by PATH.
+
+      Existing emoji will be skipped unless the --overwrite option
+      is provided, in which case they will be overwritten.
+
+      With the --prefix option, a prefix can be added to all
+      generated shortcodes. Likewise, the --suffix option controls
+      the suffix of all shortcodes.
+
+      With the --unlisted option, the processed emoji will not be
+      visible in the emoji picker (but still usable via other means)
+    LONG_DESC
+    def import(path)
+      imported = 0
+      skipped  = 0
+      failed   = 0
+
+      Gem::Package::TarReader.new(Zlib::GzipReader.open(path)) do |tar|
+        tar.each do |entry|
+          next unless entry.file? && entry.full_name.end_with?('.png')
+
+          shortcode    = [options[:prefix], File.basename(entry.full_name, '.*'), options[:suffix]].compact.join
+          custom_emoji = CustomEmoji.local.find_by(shortcode: shortcode)
+
+          if custom_emoji && !options[:overwrite]
+            skipped += 1
+            next
+          end
+
+          custom_emoji ||= CustomEmoji.new(shortcode: shortcode, domain: nil)
+          custom_emoji.image = StringIO.new(entry.read)
+          custom_emoji.image_file_name = File.basename(entry.full_name)
+          custom_emoji.visible_in_picker = !options[:unlisted]
+
+          if custom_emoji.save
+            imported += 1
+          else
+            failed += 1
+            say('Failure/Error: ', :red)
+            say(entry.full_name)
+            say('    ' + custom_emoji.errors[:image].join(', '), :red)
+          end
+        end
+      end
+
+      puts
+      say("Imported #{imported}, skipped #{skipped}, failed to import #{failed}", color(imported, skipped, failed))
+    end
+
+    private
+
+    def color(green, _yellow, red)
+      if !green.zero? && red.zero?
+        :green
+      elsif red.zero?
+        :yellow
+      else
+        :red
+      end
+    end
+  end
+end
diff --git a/lib/mastodon/feeds_cli.rb b/lib/mastodon/feeds_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..fe11c3df400c1890d8d20b61911a11064b01b0be
--- /dev/null
+++ b/lib/mastodon/feeds_cli.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class FeedsCLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    option :all, type: :boolean, default: false
+    option :background, type: :boolean, default: false
+    option :dry_run, type: :boolean, default: false
+    option :verbose, type: :boolean, default: false
+    desc 'build [USERNAME]', 'Build home and list feeds for one or all users'
+    long_desc <<-LONG_DESC
+      Build home and list feeds that are stored in Redis from the database.
+
+      With the --all option, all active users will be processed.
+      Otherwise, a single user specified by USERNAME.
+
+      With the --background option, regeneration will be queued into Sidekiq,
+      and the command will exit as soon as possible.
+
+      With the --dry-run option, no work will be done.
+
+      With the --verbose option, when accounts are processed sequentially in the
+      foreground, the IDs of the accounts will be printed.
+    LONG_DESC
+    def build(username = nil)
+      dry_run = options[:dry_run] ? '(DRY RUN)' : ''
+
+      if options[:all] || username.nil?
+        processed = 0
+        queued    = 0
+
+        User.active.select(:id, :account_id).reorder(nil).find_in_batches do |users|
+          if options[:background]
+            RegenerationWorker.push_bulk(users.map(&:account_id)) unless options[:dry_run]
+            queued += users.size
+          else
+            users.each do |user|
+              RegenerationWorker.new.perform(user.account_id) unless options[:dry_run]
+              options[:verbose] ? say(user.account_id) : say('.', :green, false)
+              processed += 1
+            end
+          end
+        end
+
+        if options[:background]
+          say("Scheduled feed regeneration for #{queued} accounts #{dry_run}", :green, true)
+        else
+          say
+          say("Regenerated feeds for #{processed} accounts #{dry_run}", :green, true)
+        end
+      elsif username.present?
+        account = Account.find_local(username)
+
+        if account.nil?
+          say('No such account', :red)
+          exit(1)
+        end
+
+        if options[:background]
+          RegenerationWorker.perform_async(account.id) unless options[:dry_run]
+        else
+          RegenerationWorker.new.perform(account.id) unless options[:dry_run]
+        end
+
+        say("OK #{dry_run}", :green, true)
+      else
+        say('No account(s) given', :red)
+        exit(1)
+      end
+    end
+
+    desc 'clear', 'Remove all home and list feeds from Redis'
+    def clear
+      keys = Redis.current.keys('feed:*')
+
+      Redis.current.pipelined do
+        keys.each { |key| Redis.current.del(key) }
+      end
+
+      say('OK', :green)
+    end
+  end
+end
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6152d5a0950ccaf42502d6b0ca5908abaec65290
--- /dev/null
+++ b/lib/mastodon/media_cli.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class MediaCLI < Thor
+    include ActionView::Helpers::NumberHelper
+
+    def self.exit_on_failure?
+      true
+    end
+
+    option :days, type: :numeric, default: 7
+    option :background, type: :boolean, default: false
+    option :verbose, type: :boolean, default: false
+    option :dry_run, type: :boolean, default: false
+    desc 'remove', 'Remove remote media files'
+    long_desc <<-DESC
+      Removes locally cached copies of media attachments from other servers.
+
+      The --days option specifies how old media attachments have to be before
+      they are removed. It defaults to 7 days.
+
+      With the --background option, instead of deleting the files sequentially,
+      they will be queued into Sidekiq and the command will exit as soon as
+      possible. In Sidekiq they will be processed with higher concurrency, but
+      it may impact other operations of the Mastodon server, and it may overload
+      the underlying file storage.
+
+      With the --dry-run option, no work will be done.
+
+      With the --verbose option, when media attachments are processed sequentially in the
+      foreground, the IDs of the media attachments will be printed.
+    DESC
+    def remove
+      time_ago  = options[:days].days.ago
+      queued    = 0
+      processed = 0
+      size      = 0
+      dry_run   = options[:dry_run] ? '(DRY RUN)' : ''
+
+      if options[:background]
+        MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).select(:id, :file_file_size).reorder(nil).find_in_batches do |media_attachments|
+          queued += media_attachments.size
+          size   += media_attachments.reduce(0) { |sum, m| sum + (m.file_file_size || 0) }
+          Maintenance::UncacheMediaWorker.push_bulk(media_attachments.map(&:id)) unless options[:dry_run]
+        end
+      else
+        MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).reorder(nil).find_in_batches do |media_attachments|
+          media_attachments.each do |m|
+            size += m.file_file_size || 0
+            Maintenance::UncacheMediaWorker.new.perform(m) unless options[:dry_run]
+            options[:verbose] ? say(m.id) : say('.', :green, false)
+            processed += 1
+          end
+        end
+      end
+
+      say
+
+      if options[:background]
+        say("Scheduled the deletion of #{queued} media attachments (approx. #{number_to_human_size(size)}) #{dry_run}", :green, true)
+      else
+        say("Removed #{processed} media attachments (approx. #{number_to_human_size(size)}) #{dry_run}", :green, true)
+      end
+    end
+  end
+end
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index e154b5a2cd7cd0b2194eef1cadf190300623777d..f5dc7e1c6ec15c3613a36212bf2f99f303077614 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -342,8 +342,8 @@ module Mastodon
 
       say "Migrating #{table_name}.#{column} (~#{total.to_i} rows)"
 
-      started_time = Time.now
-      last_time = Time.now
+      started_time = Time.zone.now
+      last_time = Time.zone.now
       migrated = 0
       loop do
         stop_row = nil
@@ -375,13 +375,13 @@ module Mastodon
         end
 
         migrated += batch_size
-        if Time.now - last_time > 1
+        if Time.zone.now - last_time > 1
           status = "Migrated #{migrated} rows"
 
           percentage = 100.0 * migrated / total
           status += " (~#{sprintf('%.2f', percentage)}%, "
 
-          remaining_time = (100.0 - percentage) * (Time.now - started_time) / percentage
+          remaining_time = (100.0 - percentage) * (Time.zone.now - started_time) / percentage
 
           status += "#{(remaining_time / 60).to_i}:"
           status += sprintf('%02d', remaining_time.to_i % 60)
@@ -397,7 +397,7 @@ module Mastodon
           status += ')'
 
           say status, true
-          last_time = Time.now
+          last_time = Time.zone.now
         end
 
         # There are no more rows left to update.
@@ -835,7 +835,7 @@ module Mastodon
       columns(table).find { |column| column.name == name }
     end
 
-    # This will replace the first occurance of a string in a column with
+    # This will replace the first occurrence of a string in a column with
     # the replacement
     # On postgresql we can use `regexp_replace` for that.
     # On mysql we find the location of the pattern, and overwrite it
diff --git a/lib/mastodon/settings_cli.rb b/lib/mastodon/settings_cli.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c81cfbe520148ba0a3e91973555511ed5595577d
--- /dev/null
+++ b/lib/mastodon/settings_cli.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative '../../config/boot'
+require_relative '../../config/environment'
+require_relative 'cli_helper'
+
+module Mastodon
+  class RegistrationsCLI < Thor
+    def self.exit_on_failure?
+      true
+    end
+
+    desc 'open', 'Open registrations'
+    def open
+      Setting.open_registrations = true
+      say('OK', :green)
+    end
+
+    desc 'close', 'Close registrations'
+    def close
+      Setting.open_registrations = false
+      say('OK', :green)
+    end
+  end
+
+  class SettingsCLI < Thor
+    desc 'registrations SUBCOMMAND ...ARGS', 'Manage state of registrations'
+    subcommand 'registrations', RegistrationsCLI
+  end
+end
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 04894d34d7e216ea2a66b36568c3f5819d7878cf..abbc31178d2d5770a994720bbd1031eec23cc961 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,11 +9,11 @@ module Mastodon
     end
 
     def minor
-      4
+      7
     end
 
     def patch
-      3
+      0
     end
 
     def pre
@@ -32,8 +32,12 @@ module Mastodon
       [to_a.join('.'), flags].join
     end
 
+    def repository
+      'tootsuite/mastodon'
+    end
+
     def source_base_url
-      'https://github.com/tootsuite/mastodon'
+      "https://github.com/#{repository}"
     end
 
     # specify git tag or commit hash here
diff --git a/lib/paperclip/gif_transcoder.rb b/lib/paperclip/gif_transcoder.rb
index 62787983c472afcbee7d3c06ecbc156ae7c46bc1..cbab6fd99a29e7ac7f95a966c0614ee5f27904b9 100644
--- a/lib/paperclip/gif_transcoder.rb
+++ b/lib/paperclip/gif_transcoder.rb
@@ -5,14 +5,7 @@ module Paperclip
   # to convert animated gifs to webm
   class GifTranscoder < Paperclip::Processor
     def make
-      num_frames = identify('-format %n :file', file: file.path).to_i
-
-      unless options[:style] == :original && num_frames > 1
-        tmp_file = Paperclip::TempfileFactory.new.generate(attachment.instance.file_file_name)
-        tmp_file << file.read
-        tmp_file.flush
-        return tmp_file
-      end
+      return File.open(@file.path) unless needs_convert?
 
       final_file = Paperclip::Transcoder.make(file, options, attachment)
 
@@ -22,5 +15,12 @@ module Paperclip
 
       final_file
     end
+
+    private
+
+    def needs_convert?
+      num_frames = identify('-format %n :file', file: file.path).to_i
+      options[:style] == :original && num_frames > 1
+    end
   end
 end
diff --git a/lib/paperclip/lazy_thumbnail.rb b/lib/paperclip/lazy_thumbnail.rb
index aafa213439853bf52826fd24f7141c6a995c4949..542c17fb20efdfab33f4f3402fa38927c39ac634 100644
--- a/lib/paperclip/lazy_thumbnail.rb
+++ b/lib/paperclip/lazy_thumbnail.rb
@@ -5,8 +5,14 @@ module Paperclip
     def make
       return File.open(@file.path) unless needs_convert?
 
-      min_side = [@current_geometry.width, @current_geometry.height].min
-      options[:geometry] = "#{min_side.to_i}x#{min_side.to_i}#" if @target_geometry.square? && min_side < @target_geometry.width
+      if options[:geometry]
+        min_side = [@current_geometry.width, @current_geometry.height].min.to_i
+        options[:geometry] = "#{min_side}x#{min_side}#" if @target_geometry.square? && min_side < @target_geometry.width
+      elsif options[:pixels]
+        width  = Math.sqrt(options[:pixels] * (@current_geometry.width.to_f / @current_geometry.height.to_f)).round.to_i
+        height = Math.sqrt(options[:pixels] * (@current_geometry.height.to_f / @current_geometry.width.to_f)).round.to_i
+        options[:geometry] = "#{width}x#{height}>"
+      end
 
       Paperclip::Thumbnail.make(file, options, attachment)
     end
@@ -14,15 +20,20 @@ module Paperclip
     private
 
     def needs_convert?
-      needs_different_geometry? || needs_different_format?
+      needs_different_geometry? || needs_different_format? || needs_metadata_stripping?
     end
 
     def needs_different_geometry?
-      !@target_geometry.nil? && @current_geometry.width != @target_geometry.width && @current_geometry.height != @target_geometry.height
+      (options[:geometry] && @current_geometry.width != @target_geometry.width && @current_geometry.height != @target_geometry.height) ||
+        (options[:pixels] && @current_geometry.width * @current_geometry.height > options[:pixels])
     end
 
     def needs_different_format?
       @format.present? && @current_format != @format
     end
+
+    def needs_metadata_stripping?
+      @attachment.instance.respond_to?(:local?) && @attachment.instance.local?
+    end
   end
 end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 32039c31d1b4b2a6318e7e6fef33879ad49f9327..b76e90131f210ff4227ffca696902b25df012c60 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -18,7 +18,7 @@ def each_schema_load_environment
   #    needing to do the same, and we can't even use the same method
   #    to do it.
 
-  if Rails.env == 'development'
+  if Rails.env.development?
     test_conf = ActiveRecord::Base.configurations['test']
 
     if test_conf['database']&.present?
diff --git a/lib/tasks/emojis.rake b/lib/tasks/emojis.rake
index 625a6e55d8bc68f2feb45c707fa83c436a7723c2..892afd89896bf72e0a7da3d575a8c7a75f583217 100644
--- a/lib/tasks/emojis.rake
+++ b/lib/tasks/emojis.rake
@@ -15,7 +15,7 @@ end
 namespace :emojis do
   desc 'Generate a unicode to filename mapping'
   task :generate do
-    source = 'http://www.unicode.org/Public/emoji/5.0/emoji-test.txt'
+    source = 'http://www.unicode.org/Public/emoji/11.0/emoji-test.txt'
     codes  = []
     dest   = Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json')
 
@@ -43,6 +43,8 @@ namespace :emojis do
     existence_maps.each do |group|
       existing_one = group.key(true)
 
+      next if existing_one.nil?
+
       group.each_key do |key|
         map[codepoints_to_unicode(key)] = codepoints_to_filename(existing_one)
       end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index de8c0bb8687ef3c941ce010f7fc5b6241a853dc3..ee9657b0eff06c272091bc7775b8c90e7b9850d2 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'optparse'
-require 'colorize'
 require 'tty-command'
 require 'tty-prompt'
 
@@ -222,7 +220,7 @@ namespace :mastodon do
         end
 
         if prompt.yes?('Do you want to access the uploaded files from your own domain?')
-          env['S3_CLOUDFRONT_HOST'] = prompt.ask('Domain for uploaded files:') do |q|
+          env['S3_ALIAS_HOST'] = prompt.ask('Domain for uploaded files:') do |q|
             q.required true
             q.default "files.#{env['LOCAL_DOMAIN']}"
             q.modify :strip
@@ -280,14 +278,14 @@ namespace :mastodon do
 
         begin
           ActionMailer::Base.smtp_settings = {
-            :port                 => env['SMTP_PORT'],
-            :address              => env['SMTP_SERVER'],
-            :user_name            => env['SMTP_LOGIN'].presence,
-            :password             => env['SMTP_PASSWORD'].presence,
-            :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,
+            port:                 env['SMTP_PORT'],
+            address:              env['SMTP_SERVER'],
+            user_name:            env['SMTP_LOGIN'].presence,
+            password:             env['SMTP_PASSWORD'].presence,
+            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,
           }
 
           ActionMailer::Base.default_options = {
@@ -326,13 +324,11 @@ namespace :mastodon do
 
         if prompt.yes?('Prepare the database now?')
           prompt.say 'Running `RAILS_ENV=production rails db:setup` ...'
-          prompt.say "\n"
+          prompt.say "\n\n"
 
           if cmd.run!({ RAILS_ENV: 'production', SAFETY_ASSURED: 1 }, :rails, 'db:setup').failure?
-            prompt.say "\n"
             prompt.error 'That failed! Perhaps your configuration is not right'
           else
-            prompt.say "\n"
             prompt.ok 'Done!'
           end
         end
@@ -343,13 +339,11 @@ namespace :mastodon do
 
         if prompt.yes?('Compile the assets now?')
           prompt.say 'Running `RAILS_ENV=production rails assets:precompile` ...'
-          prompt.say "\n"
+          prompt.say "\n\n"
 
           if cmd.run!({ RAILS_ENV: 'production' }, :rails, 'assets:precompile').failure?
-            prompt.say "\n"
             prompt.error 'That failed! Maybe you need swap space?'
           else
-            prompt.say "\n"
             prompt.say 'Done!'
           end
         end
@@ -394,213 +388,6 @@ namespace :mastodon do
     end
   end
 
-  desc 'Execute daily tasks (deprecated)'
-  task :daily do
-    # No-op
-    # All of these tasks are now executed via sidekiq-scheduler
-  end
-
-  desc 'Turn a user into an admin, identified by the USERNAME environment variable'
-  task make_admin: :environment do
-    include RoutingHelper
-
-    account_username = ENV.fetch('USERNAME')
-    user             = User.joins(:account).where(accounts: { username: account_username })
-
-    if user.present?
-      user.update(admin: true)
-      puts "Congrats! #{account_username} is now an admin. \\o/\nNavigate to #{edit_admin_settings_url} to get started"
-    else
-      puts "User could not be found; please make sure an account with the `#{account_username}` username exists."
-    end
-  end
-
-  desc 'Turn a user into a moderator, identified by the USERNAME environment variable'
-  task make_mod: :environment do
-    account_username = ENV.fetch('USERNAME')
-    user             = User.joins(:account).where(accounts: { username: account_username })
-
-    if user.present?
-      user.update(moderator: true)
-      puts "Congrats! #{account_username} is now a moderator \\o/"
-    else
-      puts "User could not be found; please make sure an account with the `#{account_username}` username exists."
-    end
-  end
-
-  desc 'Remove admin and moderator privileges from user identified by the USERNAME environment variable'
-  task revoke_staff: :environment do
-    account_username = ENV.fetch('USERNAME')
-    user             = User.joins(:account).where(accounts: { username: account_username })
-
-    if user.present?
-      user.update(moderator: false, admin: false)
-      puts "#{account_username} is no longer admin or moderator."
-    else
-      puts "User could not be found; please make sure an account with the `#{account_username}` username exists."
-    end
-  end
-
-  desc 'Manually confirms a user with associated user email address stored in USER_EMAIL environment variable.'
-  task confirm_email: :environment do
-    email = ENV.fetch('USER_EMAIL')
-    user  = User.find_by(email: email)
-
-    if user
-      user.update(confirmed_at: Time.now.utc)
-      puts "#{email} confirmed"
-    else
-      abort "#{email} not found"
-    end
-  end
-
-  desc 'Add a user by providing their email, username and initial password.' \
-       'The user will receive a confirmation email, then they must reset their password before logging in.'
-  task add_user: :environment do
-    disable_log_stdout!
-
-    prompt = TTY::Prompt.new
-
-    begin
-      email = prompt.ask('E-mail:', required: true) do |q|
-        q.modify :strip
-      end
-
-      username = prompt.ask('Username:', required: true) do |q|
-        q.modify :strip
-      end
-
-      role = prompt.select('Role:', %w(user moderator admin))
-
-      if prompt.yes?('Proceed to create the user?')
-        user = User.new(email: email, password: SecureRandom.hex, admin: role == 'admin', moderator: role == 'moderator', account_attributes: { username: username })
-
-        if user.save
-          prompt.ok 'User created and confirmation mail sent to the user\'s email address.'
-          prompt.ok "Here is the random password generated for the user: #{user.password}"
-        else
-          prompt.warn 'User was not created because of the following errors:'
-
-          user.errors.each do |key, val|
-            prompt.error "#{key}: #{val}"
-          end
-        end
-      else
-        prompt.ok 'Aborting. Bye!'
-      end
-    rescue TTY::Reader::InputInterrupt
-      prompt.ok 'Aborting. Bye!'
-    end
-  end
-
-  namespace :media do
-    desc 'Removes media attachments that have not been assigned to any status for longer than a day (deprecated)'
-    task clear: :environment do
-      # No-op
-      # This task is now executed via sidekiq-scheduler
-    end
-
-    desc 'Remove media attachments attributed to silenced accounts'
-    task remove_silenced: :environment do
-      MediaAttachment.where(account: Account.silenced).select(:id).find_in_batches do |media_attachments|
-        Maintenance::DestroyMediaWorker.push_bulk(media_attachments.map(&:id))
-      end
-    end
-
-    desc 'Remove cached remote media attachments that are older than NUM_DAYS. By default 7 (week)'
-    task remove_remote: :environment do
-      time_ago = ENV.fetch('NUM_DAYS') { 7 }.to_i.days.ago
-
-      MediaAttachment.where.not(remote_url: '').where.not(file_file_name: nil).where('created_at < ?', time_ago).select(:id).find_in_batches do |media_attachments|
-        Maintenance::UncacheMediaWorker.push_bulk(media_attachments.map(&:id))
-      end
-    end
-
-    desc 'Set unknown attachment type for remote-only attachments'
-    task set_unknown: :environment do
-      puts 'Setting unknown attachment type for remote-only attachments...'
-      MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown)
-      puts 'Done!'
-    end
-
-    desc 'Redownload avatars/headers of remote users. Optionally limit to a particular domain with DOMAIN'
-    task redownload_avatars: :environment do
-      accounts = Account.remote
-      accounts = accounts.where(domain: ENV['DOMAIN']) if ENV['DOMAIN'].present?
-
-      accounts.select(:id).find_in_batches do |accounts_batch|
-        Maintenance::RedownloadAccountMediaWorker.push_bulk(accounts_batch.map(&:id))
-      end
-    end
-  end
-
-  namespace :push do
-    desc 'Unsubscribes from PuSH updates of feeds nobody follows locally'
-    task clear: :environment do
-      Pubsubhubbub::UnsubscribeWorker.push_bulk(Account.remote.without_followers.where.not(subscription_expires_at: nil).pluck(:id))
-    end
-
-    desc 'Re-subscribes to soon expiring PuSH subscriptions (deprecated)'
-    task refresh: :environment do
-      # No-op
-      # This task is now executed via sidekiq-scheduler
-    end
-  end
-
-  namespace :feeds do
-    desc 'Clear timelines of inactive users (deprecated)'
-    task clear: :environment do
-      # No-op
-      # This task is now executed via sidekiq-scheduler
-    end
-
-    desc 'Clear all timelines without regenerating them'
-    task clear_all: :environment do
-      Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
-    end
-
-    desc 'Generates home timelines for users who logged in in the past two weeks'
-    task build: :environment do
-      User.active.select(:id, :account_id).find_in_batches do |users|
-        RegenerationWorker.push_bulk(users.map(&:account_id))
-      end
-    end
-  end
-
-  namespace :emails do
-    desc 'Send out digest e-mails (deprecated)'
-    task digest: :environment do
-      # No-op
-      # This task is now executed via sidekiq-scheduler
-    end
-  end
-
-  namespace :users do
-    desc 'Clear out unconfirmed users (deprecated)'
-    task clear: :environment do
-      # No-op
-      # This task is now executed via sidekiq-scheduler
-    end
-
-    desc 'List e-mails of all admin users'
-    task admins: :environment do
-      puts 'Admin user emails:'
-      puts User.admins.map(&:email).join("\n")
-    end
-  end
-
-  namespace :settings do
-    desc 'Open registrations on this instance'
-    task open_registrations: :environment do
-      Setting.open_registrations = true
-    end
-
-    desc 'Close registrations on this instance'
-    task close_registrations: :environment do
-      Setting.open_registrations = false
-    end
-  end
-
   namespace :webpush do
     desc 'Generate VAPID key'
     task generate_vapid_key: :environment do
@@ -609,221 +396,6 @@ namespace :mastodon do
       puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}"
     end
   end
-
-  namespace :maintenance do
-    desc 'Update counter caches'
-    task update_counter_caches: :environment do
-      puts 'Updating counter caches for accounts...'
-
-      Account.unscoped.where.not(protocol: :activitypub).select('id').find_in_batches do |batch|
-        Account.where(id: batch.map(&:id)).update_all('statuses_count = (select count(*) from statuses where account_id = accounts.id), followers_count = (select count(*) from follows where target_account_id = accounts.id), following_count = (select count(*) from follows where account_id = accounts.id)')
-      end
-
-      puts 'Updating counter caches for statuses...'
-
-      Status.unscoped.select('id').find_in_batches do |batch|
-        Status.where(id: batch.map(&:id)).update_all('favourites_count = (select count(*) from favourites where favourites.status_id = statuses.id), reblogs_count = (select count(*) from statuses as reblogs where reblogs.reblog_of_id = statuses.id)')
-      end
-
-      puts 'Done!'
-    end
-
-    desc 'Generate static versions of GIF avatars/headers'
-    task add_static_avatars: :environment do
-      puts 'Generating static avatars/headers for GIF ones...'
-
-      Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account|
-        begin
-          account.avatar.reprocess! if account.avatar_content_type == 'image/gif' && !account.avatar.exists?(:static)
-          account.header.reprocess! if account.header_content_type == 'image/gif' && !account.header.exists?(:static)
-        rescue StandardError => e
-          Rails.logger.error "Error while generating static avatars/headers for account #{account.id}: #{e}"
-          next
-        end
-      end
-
-      puts 'Done!'
-    end
-
-    desc 'Ensure referencial integrity'
-    task prepare_for_foreign_keys: :environment do
-      # All the deletes:
-      ActiveRecord::Base.connection.execute('DELETE FROM statuses USING statuses s LEFT JOIN accounts a ON a.id = s.account_id WHERE statuses.id = s.id AND a.id IS NULL')
-
-      if ActiveRecord::Base.connection.table_exists? :account_domain_blocks
-        ActiveRecord::Base.connection.execute('DELETE FROM account_domain_blocks USING account_domain_blocks adb LEFT JOIN accounts a ON a.id = adb.account_id WHERE account_domain_blocks.id = adb.id AND a.id IS NULL')
-      end
-
-      if ActiveRecord::Base.connection.table_exists? :conversation_mutes
-        ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN accounts a ON a.id = cm.account_id WHERE conversation_mutes.id = cm.id AND a.id IS NULL')
-        ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN conversations c ON c.id = cm.conversation_id WHERE conversation_mutes.id = cm.id AND c.id IS NULL')
-      end
-
-      ActiveRecord::Base.connection.execute('DELETE FROM favourites USING favourites f LEFT JOIN accounts a ON a.id = f.account_id WHERE favourites.id = f.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM favourites USING favourites f LEFT JOIN statuses s ON s.id = f.status_id WHERE favourites.id = f.id AND s.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM blocks USING blocks b LEFT JOIN accounts a ON a.id = b.account_id WHERE blocks.id = b.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM blocks USING blocks b LEFT JOIN accounts a ON a.id = b.target_account_id WHERE blocks.id = b.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM follow_requests USING follow_requests fr LEFT JOIN accounts a ON a.id = fr.account_id WHERE follow_requests.id = fr.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM follow_requests USING follow_requests fr LEFT JOIN accounts a ON a.id = fr.target_account_id WHERE follow_requests.id = fr.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM follows USING follows f LEFT JOIN accounts a ON a.id = f.account_id WHERE follows.id = f.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM follows USING follows f LEFT JOIN accounts a ON a.id = f.target_account_id WHERE follows.id = f.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM mutes USING mutes m LEFT JOIN accounts a ON a.id = m.account_id WHERE mutes.id = m.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM mutes USING mutes m LEFT JOIN accounts a ON a.id = m.target_account_id WHERE mutes.id = m.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM imports USING imports i LEFT JOIN accounts a ON a.id = i.account_id WHERE imports.id = i.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM mentions USING mentions m LEFT JOIN accounts a ON a.id = m.account_id WHERE mentions.id = m.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM mentions USING mentions m LEFT JOIN statuses s ON s.id = m.status_id WHERE mentions.id = m.id AND s.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM notifications USING notifications n LEFT JOIN accounts a ON a.id = n.account_id WHERE notifications.id = n.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM notifications USING notifications n LEFT JOIN accounts a ON a.id = n.from_account_id WHERE notifications.id = n.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM preview_cards USING preview_cards pc LEFT JOIN statuses s ON s.id = pc.status_id WHERE preview_cards.id = pc.id AND s.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM reports USING reports r LEFT JOIN accounts a ON a.id = r.account_id WHERE reports.id = r.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM reports USING reports r LEFT JOIN accounts a ON a.id = r.target_account_id WHERE reports.id = r.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM statuses_tags USING statuses_tags st LEFT JOIN statuses s ON s.id = st.status_id WHERE statuses_tags.tag_id = st.tag_id AND statuses_tags.status_id = st.status_id AND s.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM statuses_tags USING statuses_tags st LEFT JOIN tags t ON t.id = st.tag_id WHERE statuses_tags.tag_id = st.tag_id AND statuses_tags.status_id = st.status_id AND t.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM stream_entries USING stream_entries se LEFT JOIN accounts a ON a.id = se.account_id WHERE stream_entries.id = se.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM subscriptions USING subscriptions s LEFT JOIN accounts a ON a.id = s.account_id WHERE subscriptions.id = s.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM users USING users u LEFT JOIN accounts a ON a.id = u.account_id WHERE users.id = u.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM web_settings USING web_settings ws LEFT JOIN users u ON u.id = ws.user_id WHERE web_settings.id = ws.id AND u.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_grants USING oauth_access_grants oag LEFT JOIN users u ON u.id = oag.resource_owner_id WHERE oauth_access_grants.id = oag.id AND oag.resource_owner_id IS NOT NULL AND u.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_grants USING oauth_access_grants oag LEFT JOIN oauth_applications a ON a.id = oag.application_id WHERE oauth_access_grants.id = oag.id AND oag.application_id IS NOT NULL AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_tokens USING oauth_access_tokens oat LEFT JOIN users u ON u.id = oat.resource_owner_id WHERE oauth_access_tokens.id = oat.id AND oat.resource_owner_id IS NOT NULL AND u.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM oauth_access_tokens USING oauth_access_tokens oat LEFT JOIN oauth_applications a ON a.id = oat.application_id WHERE oauth_access_tokens.id = oat.id AND oat.application_id IS NOT NULL AND a.id IS NULL')
-
-      # All the nullifies:
-      ActiveRecord::Base.connection.execute('UPDATE statuses SET in_reply_to_id = NULL FROM statuses s LEFT JOIN statuses rs ON rs.id = s.in_reply_to_id WHERE statuses.id = s.id AND s.in_reply_to_id IS NOT NULL AND rs.id IS NULL')
-      ActiveRecord::Base.connection.execute('UPDATE statuses SET in_reply_to_account_id = NULL FROM statuses s LEFT JOIN accounts a ON a.id = s.in_reply_to_account_id WHERE statuses.id = s.id AND s.in_reply_to_account_id IS NOT NULL AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('UPDATE media_attachments SET status_id = NULL FROM media_attachments ma LEFT JOIN statuses s ON s.id = ma.status_id WHERE media_attachments.id = ma.id AND ma.status_id IS NOT NULL AND s.id IS NULL')
-      ActiveRecord::Base.connection.execute('UPDATE media_attachments SET account_id = NULL FROM media_attachments ma LEFT JOIN accounts a ON a.id = ma.account_id WHERE media_attachments.id = ma.id AND ma.account_id IS NOT NULL AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('UPDATE reports SET action_taken_by_account_id = NULL FROM reports r LEFT JOIN accounts a ON a.id = r.action_taken_by_account_id WHERE reports.id = r.id AND r.action_taken_by_account_id IS NOT NULL AND a.id IS NULL')
-    end
-
-    desc 'Remove deprecated preview cards'
-    task remove_deprecated_preview_cards: :environment do
-      next unless ActiveRecord::Base.connection.table_exists? 'deprecated_preview_cards'
-
-      class DeprecatedPreviewCard < ActiveRecord::Base
-        self.inheritance_column = false
-
-        path = '/preview_cards/:attachment/:id_partition/:style/:filename'
-        if ENV['S3_ENABLED'] != 'true'
-          path = (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + path
-        end
-
-        has_attached_file :image, styles: { original: '280x120>' }, convert_options: { all: '-quality 80 -strip' }, path: path
-      end
-
-      puts 'Delete records and associated files from deprecated preview cards? [y/N]: '
-      confirm = STDIN.gets.chomp
-
-      if confirm.casecmp('y').zero?
-        DeprecatedPreviewCard.in_batches.destroy_all
-
-        puts 'Drop deprecated preview cards table? [y/N]: '
-        confirm = STDIN.gets.chomp
-
-        if confirm.casecmp('y').zero?
-          ActiveRecord::Migration.drop_table :deprecated_preview_cards
-        end
-      end
-    end
-
-    desc 'Migrate photo preview cards made before 2.1'
-    task migrate_photo_preview_cards: :environment do
-      status_ids = Status.joins(:preview_cards)
-                         .where(preview_cards: { embed_url: '', type: :photo })
-                         .reorder(nil)
-                         .group(:id)
-                         .pluck(:id)
-
-      PreviewCard.where(embed_url: '', type: :photo).delete_all
-      LinkCrawlWorker.push_bulk status_ids
-    end
-
-    desc 'Find case-insensitive username duplicates of local users'
-    task find_duplicate_usernames: :environment do
-      include RoutingHelper
-
-      disable_log_stdout!
-
-      duplicate_masters = Account.find_by_sql('SELECT * FROM accounts WHERE id IN (SELECT min(id) FROM accounts WHERE domain IS NULL GROUP BY lower(username) HAVING count(*) > 1)')
-      pastel = Pastel.new
-
-      duplicate_masters.each do |account|
-        puts pastel.yellow("First of their name: ") + pastel.bold(account.username) + " (#{admin_account_url(account.id)})"
-
-        Account.where('lower(username) = ?', account.username.downcase).where.not(id: account.id).each do |duplicate|
-          puts "  " + pastel.red("Duplicate: ") + admin_account_url(duplicate.id)
-        end
-      end
-    end
-
-    desc 'Remove all home feed regeneration markers'
-    task remove_regeneration_markers: :environment do
-      keys = Redis.current.keys('account:*:regeneration')
-
-      Redis.current.pipelined do
-        keys.each { |key| Redis.current.del(key) }
-      end
-    end
-
-    desc 'Check every known remote account and delete those that no longer exist in origin'
-    task purge_removed_accounts: :environment do
-      prepare_for_options!
-
-      options = {}
-
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: rails mastodon:maintenance:purge_removed_accounts [options]'
-
-        opts.on('-f', '--force', 'Remove all encountered accounts without asking for confirmation') do
-          options[:force] = true
-        end
-
-        opts.on('-h', '--help', 'Display this message') do
-          puts opts
-          exit
-        end
-      end.parse!
-
-      disable_log_stdout!
-
-      total        = Account.remote.where(protocol: :activitypub).count
-      progress_bar = ProgressBar.create(total: total, format: '%c/%C |%w>%i| %e')
-
-      Account.remote.where(protocol: :activitypub).partitioned.find_each do |account|
-        progress_bar.increment
-
-        begin
-          code = Request.new(:head, account.uri).perform(&:code)
-        rescue StandardError
-          # This could happen due to network timeout, DNS timeout, wrong SSL cert, etc,
-          # which should probably not lead to perceiving the account as deleted, so
-          # just skip till next time
-          next
-        end
-
-        if [404, 410].include?(code)
-          if options[:force]
-            SuspendAccountService.new.call(account)
-            account.destroy
-          else
-            progress_bar.pause
-            progress_bar.clear
-            print "\nIt seems like #{account.acct} no longer exists. Purge the account from the database? [Y/n]: ".colorize(:yellow)
-            confirm = STDIN.gets.chomp
-            puts ''
-            progress_bar.resume
-
-            if confirm.casecmp('n').zero?
-              next
-            else
-              SuspendAccountService.new.call(account)
-              account.destroy
-            end
-          end
-        end
-      end
-    end
-  end
 end
 
 def disable_log_stdout!
@@ -834,7 +406,3 @@ def disable_log_stdout!
   HttpLog.configuration.logger = dev_null
   Paperclip.options[:log]      = false
 end
-
-def prepare_for_options!
-  2.times { ARGV.shift }
-end
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
new file mode 100644
index 0000000000000000000000000000000000000000..8ceec3085461f3e556e10c829942f383968c17fc
--- /dev/null
+++ b/lib/tasks/repo.rake
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+namespace :repo do
+  desc 'Generate the AUTHORS.md file'
+  task :authors do
+    file = File.open(Rails.root.join('AUTHORS.md'), 'w')
+    file << <<~HEADER
+      Authors
+      =======
+
+      Mastodon is available on [GitHub](https://github.com/tootsuite/mastodon)
+      and provided thanks to the work of the following contributors:
+
+    HEADER
+
+    url = 'https://api.github.com/repos/tootsuite/mastodon/contributors?anon=1'
+    HttpLog.config.compact_log = true
+    while url.present?
+      response = HTTP.get(url)
+      contributors = Oj.load(response.body)
+      contributors.each do |c|
+        file << "* [#{c['login']}](#{c['html_url']})\n" if c['login']
+        file << "* [#{c['name']}](mailto:#{c['email']})\n" if c['name']
+      end
+      url = LinkHeader.parse(response.headers['Link']).find_link(%w(rel next))&.href
+    end
+
+    file << <<~FOOTER
+
+      This document is provided for informational purposes only. Since it is only updated once per release, the version you are looking at may be currently out of date. To see the full list of contributors, consider looking at the [git history](https://github.com/tootsuite/mastodon/graphs/contributors) instead.
+    FOOTER
+  end
+
+  desc 'Replace pull requests with authors in the CHANGELOG.md file'
+  task :changelog do
+    path = Rails.root.join('CHANGELOG.md')
+    tmp  = Tempfile.new
+
+    HttpLog.config.compact_log = true
+
+    begin
+      File.open(path, 'r') do |file|
+        file.each_line do |line|
+          if line.start_with?('-')
+            new_line = line.gsub(/#([[:digit:]]+)*/) do |pull_request_reference|
+              pull_request_number = pull_request_reference[1..-1]
+              response = nil
+
+              loop do
+                response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/tootsuite/mastodon/pulls/#{pull_request_number}")
+
+                if response.code == 403
+                  sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
+                  puts "Sleeping for #{sleep_for} seconds to get over rate limit"
+                  sleep sleep_for
+                else
+                  break
+                end
+              end
+
+              pull_request = Oj.load(response.to_s)
+              "[#{pull_request['user']['login']}](#{pull_request['html_url']})"
+            end
+
+            tmp.puts new_line
+          else
+            tmp.puts line
+          end
+        end
+      end
+
+      tmp.close
+      FileUtils.mv(tmp.path, path)
+    ensure
+      tmp.close
+      tmp.unlink
+    end
+  end
+end
diff --git a/lib/templates/rails/post_deployment_migration/migration.rb b/lib/templates/rails/post_deployment_migration/migration.rb
new file mode 100644
index 0000000000000000000000000000000000000000..503205b84158fa4cfdb7c4b9e2c1262b1c3bb11c
--- /dev/null
+++ b/lib/templates/rails/post_deployment_migration/migration.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class <%= migration_class_name %> < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def change
+  end
+end
diff --git a/nanobox/nginx-local.conf b/nanobox/nginx-local.conf
index f56339cac9b5faea16cc287fd8e355e05ea34b20..c0e883603d2b0026ffb4e3b1b13226ac50786c75 100644
--- a/nanobox/nginx-local.conf
+++ b/nanobox/nginx-local.conf
@@ -38,7 +38,7 @@ http {
 
         root /app/public;
 
-        client_max_body_size 8M;
+        client_max_body_size 80M;
 
         location / {
             try_files $uri @rails;
diff --git a/nanobox/nginx-stream.conf.erb b/nanobox/nginx-stream.conf.erb
index 2a047dd9f6dd5180df0f60cbeb751db0da18780e..12bcc8ca53ab5ba63074e797790753505af797bb 100644
--- a/nanobox/nginx-stream.conf.erb
+++ b/nanobox/nginx-stream.conf.erb
@@ -32,7 +32,7 @@ http {
         listen 8080;
 
         add_header Strict-Transport-Security "max-age=31536000";
-        add_header Content-Security-Policy "style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'self'; img-src data: https:; media-src data: https:; connect-src 'self' wss://<%= ENV["LOCAL_DOMAIN"] %>; upgrade-insecure-requests";
+        # add_header Content-Security-Policy "style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'self'; img-src data: https:; media-src data: https:; connect-src 'self' wss://<%= ENV["LOCAL_DOMAIN"] %>; upgrade-insecure-requests";
 
         root /app/public;
 
diff --git a/nanobox/nginx-web.conf.erb b/nanobox/nginx-web.conf.erb
index 797201eabf83561cc405f1cd4dedc8174ce2fd07..d96f1bfc7a740cfe90b60bb769b24e4f1eeb9968 100644
--- a/nanobox/nginx-web.conf.erb
+++ b/nanobox/nginx-web.conf.erb
@@ -32,11 +32,11 @@ http {
         listen 8080;
 
         add_header Strict-Transport-Security "max-age=31536000";
-        add_header Content-Security-Policy "style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'self'; img-src data: https:; media-src data: https:; connect-src 'self' wss://<%= ENV["LOCAL_DOMAIN"] %>; upgrade-insecure-requests";
+        # add_header Content-Security-Policy "style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'self'; img-src data: https:; media-src data: https:; connect-src 'self' wss://<%= ENV["LOCAL_DOMAIN"] %>; upgrade-insecure-requests";
 
         root /app/public;
 
-        client_max_body_size 8M;
+        client_max_body_size 80M;
 
         location / {
             try_files $uri @rails;
diff --git a/package.json b/package.json
index 5b39f015ea22c21f34f9dcab81c07323bca3f61b..5fa6fa8b7641700ae299f0b2ace36c3f4352dfad 100644
--- a/package.json
+++ b/package.json
@@ -2,146 +2,158 @@
   "name": "mastodon",
   "license": "AGPL-3.0-or-later",
   "engines": {
-    "node": ">=6"
+    "node": ">=8 <11"
   },
   "scripts": {
     "postversion": "git push --tags",
-    "build:development": "cross-env RAILS_ENV=development ./bin/webpack",
-    "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
+    "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
+    "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "node ./streaming/index.js",
-    "test": "npm-run-all test:lint test:jest",
-    "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ streaming/",
+    "test": "${npm_execpath} run test:lint && ${npm_execpath} run test:jest",
+    "test:lint": "eslint --ext=js .",
     "test:jest": "cross-env NODE_ENV=test jest --coverage"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/tootsuite/mastodon.git"
   },
+  "browserslist": [
+    "last 2 versions",
+    "IE >= 11",
+    "iOS >= 9",
+    "not dead"
+  ],
   "private": true,
   "dependencies": {
+    "@babel/core": "^7.2.2",
+    "@babel/plugin-proposal-class-properties": "^7.2.3",
+    "@babel/plugin-proposal-decorators": "^7.2.3",
+    "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/plugin-transform-react-inline-elements": "^7.2.0",
+    "@babel/plugin-transform-react-jsx-self": "^7.2.0",
+    "@babel/plugin-transform-react-jsx-source": "^7.2.0",
+    "@babel/plugin-transform-runtime": "^7.2.0",
+    "@babel/preset-env": "^7.2.3",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/runtime": "^7.2.0",
+    "@gfx/zopfli": "^1.0.10",
     "array-includes": "^3.0.3",
-    "autoprefixer": "^7.1.6",
-    "axios": "~0.16.2",
-    "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-lodash": "^3.3.2",
-    "babel-plugin-preval": "^1.6.1",
-    "babel-plugin-react-intl": "^2.3.1",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
-    "babel-plugin-transform-react-inline-elements": "^6.22.0",
-    "babel-plugin-transform-react-jsx-self": "^6.22.0",
-    "babel-plugin-transform-react-jsx-source": "^6.22.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.10",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-react": "^6.24.1",
+    "autoprefixer": "^9.4.3",
+    "axios": "^0.18.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-loader": "^8.0.4",
+    "babel-plugin-lodash": "^3.3.4",
+    "babel-plugin-preval": "^3.0.1",
+    "babel-plugin-react-intl": "^3.0.1",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.21",
+    "babel-runtime": "^6.26.0",
     "classnames": "^2.2.5",
-    "compression-webpack-plugin": "^1.0.1",
-    "cross-env": "^5.1.1",
-    "css-loader": "^0.28.4",
+    "compression-webpack-plugin": "^2.0.0",
+    "cross-env": "^5.1.4",
+    "css-loader": "^2.1.0",
+    "cssnano": "^4.1.8",
     "detect-passive-events": "^1.0.2",
-    "dotenv": "^4.0.0",
+    "dotenv": "^6.2.0",
     "emoji-mart": "Gargron/emoji-mart#build",
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
     "exif-js": "^2.3.0",
-    "express": "^4.16.2",
-    "extract-text-webpack-plugin": "^3.0.2",
-    "file-loader": "^0.11.2",
+    "express": "^4.16.4",
+    "fibers": "^3.1.1",
+    "file-loader": "^3.0.1",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
-    "http-link-header": "^0.8.0",
+    "history": "^4.7.2",
+    "http-link-header": "^1.0.2",
     "immutable": "^3.8.2",
     "imports-loader": "^0.8.0",
-    "intersection-observer": "^0.5.0",
+    "intersection-observer": "^0.5.1",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.2.0",
     "intl-relativeformat": "^2.1.0",
     "is-nan": "^1.2.1",
-    "js-yaml": "^3.9.0",
-    "lodash": "^4.17.4",
+    "js-yaml": "^3.11.0",
+    "lodash": "^4.7.11",
     "mark-loader": "^0.1.6",
-    "marky": "^1.2.0",
+    "marky": "^1.2.1",
+    "mini-css-extract-plugin": "^0.5.0",
     "mkdirp": "^0.5.1",
-    "node-sass": "^4.7.2",
-    "npm-run-all": "^4.1.2",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "object-fit-images": "^3.2.3",
     "object.values": "^1.0.4",
-    "offline-plugin": "^4.8.3",
-    "path-complete-extname": "^0.1.0",
+    "offline-plugin": "^5.0.6",
+    "path-complete-extname": "^1.0.0",
     "pg": "^6.4.0",
-    "postcss-loader": "^2.0.9",
+    "postcss-loader": "^3.0.0",
     "postcss-object-fit-images": "^1.1.2",
-    "postcss-smart-import": "^0.7.5",
-    "precss": "^2.0.0",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "rails-ujs": "^5.1.2",
-    "react": "^16.3.0",
-    "react-dom": "^16.3.0",
-    "react-hotkeys": "^0.10.0",
+    "rails-ujs": "^5.2.2",
+    "react": "^16.7.0",
+    "react-dom": "^16.7.0",
+    "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-pure-component": "^1.1.1",
-    "react-intl": "^2.4.0",
+    "react-intl": "^2.7.2",
+    "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
-    "react-notification": "^6.8.2",
+    "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
-    "react-redux": "^5.0.4",
-    "react-redux-loading-bar": "^2.9.3",
+    "react-redux": "^6.0.0",
+    "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
+    "react-select": "^2.2.0",
     "react-sparklines": "^1.7.0",
-    "react-swipeable-views": "^0.12.3",
-    "react-textarea-autosize": "^5.2.1",
+    "react-swipeable-views": "^0.13.0",
+    "react-textarea-autosize": "^7.1.0",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
-    "redux": "^3.7.1",
+    "redux": "^4.0.1",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
+    "rellax": "^1.7.1",
     "requestidlecallback": "^0.3.0",
-    "reselect": "^3.0.1",
-    "resolve-url-loader": "^2.2.0",
+    "reselect": "^4.0.0",
     "rimraf": "^2.6.1",
-    "sass-loader": "^6.0.6",
-    "stringz": "^0.3.0",
-    "style-loader": "^0.19.0",
+    "sass": "^1.15.2",
+    "sass-loader": "^7.0.3",
+    "stringz": "^1.0.0",
+    "style-loader": "0.23.1",
     "substring-trie": "^1.0.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
+    "uglifyjs-webpack-plugin": "^2.1.1",
     "uuid": "^3.1.0",
-    "uws": "^8.14.0",
-    "webpack": "^3.9.1",
-    "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-manifest-plugin": "^1.2.1",
-    "webpack-merge": "^4.1.1",
-    "websocket.js": "^0.1.12",
-    "whatwg-url": "^6.4.1"
+    "uws": "10.148.0",
+    "webpack": "^4.28.3",
+    "webpack-assets-manifest": "^3.1.1",
+    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-cli": "^3.1.2",
+    "webpack-merge": "^4.1.5",
+    "websocket.js": "^0.1.12"
   },
   "devDependencies": {
-    "babel-eslint": "^8.2.3",
-    "enzyme": "^3.2.0",
-    "enzyme-adapter-react-16": "^1.1.0",
-    "eslint": "^4.19.1",
-    "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-promise": "^3.8.0",
-    "eslint-plugin-react": "^7.8.2",
-    "jest": "^21.2.1",
-    "raf": "^3.4.0",
-    "react-intl-translations-manager": "^5.0.0",
-    "react-test-renderer": "^16.2.0",
-    "webpack-dev-server": "^2.9.5",
+    "babel-eslint": "^10.0.1",
+    "babel-jest": "^23.6.0",
+    "enzyme": "^3.8.0",
+    "enzyme-adapter-react-16": "^1.7.1",
+    "eslint": "^5.11.1",
+    "eslint-plugin-import": "~2.14.0",
+    "eslint-plugin-jsx-a11y": "~6.1.2",
+    "eslint-plugin-promise": "~4.0.1",
+    "eslint-plugin-react": "~7.12.1",
+    "jest": "^23.6.0",
+    "raf": "^3.4.1",
+    "react-intl-translations-manager": "^5.0.3",
+    "react-test-renderer": "^16.7.0",
+    "webpack-dev-server": "^3.1.14",
     "yargs": "^8.0.2"
   },
   "optionalDependencies": {
-    "fsevents": "*",
-    "node-zopfli": "^2.0.2"
+    "fsevents": "*"
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c820c3181b19f05ce82f4178b78950fea2212f9
--- /dev/null
+++ b/postcss.config.js
@@ -0,0 +1,7 @@
+module.exports = ({ env }) => ({
+  plugins: {
+    autoprefixer: {},
+    'postcss-object-fit-images': {},
+    cssnano: env === 'production' ? {} : false,
+  },
+});
diff --git a/scalingo.json b/scalingo.json
index 873731ac9a38e1bb5ee3884a715dd47f58d082e0..dd8fb5530cfd5494a205e6eae478082faffb5dec 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -91,6 +91,11 @@
       "description": "Internal scalingo configuration",
       "required": true,
       "value": "https://github.com/Scalingo/multi-buildpack.git"
+    },
+    "WITH_FFPROBE": {
+      "description": "Internal scalingo configuration to install ffprobe",
+      "required": true,
+      "value": "true"
     }
   },
   "scripts": {
diff --git a/spec/controllers/about_controller_spec.rb b/spec/controllers/about_controller_spec.rb
index 2089b3b1623c992eb6e2612da0735be0c3ae899a..03dddd8c13468c4a684cd6d4b734db387ba82639 100644
--- a/spec/controllers/about_controller_spec.rb
+++ b/spec/controllers/about_controller_spec.rb
@@ -8,10 +8,6 @@ RSpec.describe AboutController, type: :controller do
       get :show
     end
 
-    it 'assigns @body_classes' do
-      expect(assigns(:body_classes)).to eq 'about-body'
-    end
-
     it 'assigns @instance_presenter' do
       expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
     end
@@ -26,10 +22,6 @@ RSpec.describe AboutController, type: :controller do
       get :more
     end
 
-    it 'assigns @body_classes' do
-      expect(assigns(:body_classes)).to eq 'about-body'
-    end
-
     it 'assigns @instance_presenter' do
       expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
     end
@@ -44,10 +36,6 @@ RSpec.describe AboutController, type: :controller do
       get :terms
     end
 
-    it 'assigns @body_classes' do
-      expect(assigns(:body_classes)).to eq 'about-body'
-    end
-
     it 'returns http success' do
       expect(response).to have_http_status(200)
     end
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 18c249c07ebdd69b9b2cbe5a10468867cc625c1c..3ba5d8aec2d92bd6cc4b5fdd7b3edae1616e6348 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -3,8 +3,8 @@ require 'rails_helper'
 RSpec.describe AccountsController, type: :controller do
   render_views
 
-  let(:alice)  { Fabricate(:account, username: 'alice') }
-  let(:eve)  { Fabricate(:user) }
+  let(:alice) { Fabricate(:account, username: 'alice') }
+  let(:eve) { Fabricate(:user) }
 
   describe 'GET #show' do
     let!(:status1) { Status.create!(account: alice, text: 'Hello world') }
diff --git a/spec/controllers/activitypub/collections_controller_spec.rb b/spec/controllers/activitypub/collections_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..34114cc85c69954d766c8fa8773c97ba5fed58de
--- /dev/null
+++ b/spec/controllers/activitypub/collections_controller_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::CollectionsController, type: :controller do
+  describe 'POST #show' do
+    let(:account) { Fabricate(:account) }
+
+    context 'id is "featured"' do
+      it 'returns 200 with "application/activity+json"' do
+        post :show, params: { id: 'featured', account_username: account.username }
+
+        expect(response).to have_http_status(200)
+        expect(response.content_type).to eq 'application/activity+json'
+      end
+    end
+
+    context 'id is not "featured"' do
+      it 'returns 404' do
+        post :show, params: { id: 'hoge', account_username: account.username }
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/activitypub/inboxes_controller_spec.rb b/spec/controllers/activitypub/inboxes_controller_spec.rb
index 5c12fea7df8457451c4742d62b6231c7f1c28ad4..4055d93424c2682b983632c31e895ab99152ff8d 100644
--- a/spec/controllers/activitypub/inboxes_controller_spec.rb
+++ b/spec/controllers/activitypub/inboxes_controller_spec.rb
@@ -1,7 +1,29 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe ActivityPub::InboxesController, type: :controller do
   describe 'POST #create' do
-    pending
+    context 'if signed_request_account' do
+      it 'returns 202' do
+        allow(controller).to receive(:signed_request_account) do
+          Fabricate(:account)
+        end
+
+        post :create
+        expect(response).to have_http_status(202)
+      end
+    end
+
+    context 'not signed_request_account' do
+      it 'returns 401' do
+        allow(controller).to receive(:signed_request_account) do
+          false
+        end
+
+        post :create
+        expect(response).to have_http_status(401)
+      end
+    end
   end
 end
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 197e019fed3283beb0e505f6a67ba774c46183f3..a348ab3d75eddd9daf9805bf5372591c4c72a859 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -24,8 +24,8 @@ RSpec.describe Admin::AccountsController, type: :controller do
         expect(h[:local]).to eq '1'
         expect(h[:remote]).to eq '1'
         expect(h[:by_domain]).to eq 'domain'
+        expect(h[:active]).to eq '1'
         expect(h[:silenced]).to eq '1'
-        expect(h[:recent]).to eq '1'
         expect(h[:suspended]).to eq '1'
         expect(h[:username]).to eq 'username'
         expect(h[:display_name]).to eq 'display name'
@@ -39,8 +39,8 @@ RSpec.describe Admin::AccountsController, type: :controller do
         local: '1',
         remote: '1',
         by_domain: 'domain',
+        active: '1',
         silenced: '1',
-        recent: '1',
         suspended: '1',
         username: 'username',
         display_name: 'display name',
@@ -75,7 +75,6 @@ RSpec.describe Admin::AccountsController, type: :controller do
     end
   end
 
-
   describe 'POST #subscribe' do
     subject { post :subscribe, params: { id: account.id } }
 
@@ -192,58 +191,6 @@ RSpec.describe Admin::AccountsController, type: :controller do
     end
   end
 
-  describe 'POST #disable' do
-    subject { post :disable, params: { id: account.id } }
-
-    let(:current_user) { Fabricate(:user, admin: current_user_admin) }
-    let(:account) { Fabricate(:account, user: user) }
-    let(:user) { Fabricate(:user, disabled: false, admin: target_user_admin) }
-
-    context 'when user is admin' do
-      let(:current_user_admin) { true }
-
-      context 'when target user is admin' do
-        let(:target_user_admin) { true }
-
-        it 'fails to disable account' do
-          is_expected.to have_http_status :forbidden
-          expect(user.reload).not_to be_disabled
-        end
-      end
-
-      context 'when target user is not admin' do
-        let(:target_user_admin) { false }
-
-        it 'succeeds in disabling account' do
-          is_expected.to redirect_to admin_account_path(account.id)
-          expect(user.reload).to be_disabled
-        end
-      end
-    end
-
-    context 'when user is not admin' do
-      let(:current_user_admin) { false }
-
-      context 'when target user is admin' do
-        let(:target_user_admin) { true }
-
-        it 'fails to disable account' do
-          is_expected.to have_http_status :forbidden
-          expect(user.reload).not_to be_disabled
-        end
-      end
-
-      context 'when target user is not admin' do
-        let(:target_user_admin) { false }
-
-        it 'fails to disable account' do
-          is_expected.to have_http_status :forbidden
-          expect(user.reload).not_to be_disabled
-        end
-      end
-    end
-  end
-
   describe 'POST #redownload' do
     subject { post :redownload, params: { id: account.id } }
 
diff --git a/spec/controllers/admin/action_logs_controller_spec.rb b/spec/controllers/admin/action_logs_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4720ed2e2bbd3c0d8a4f0bcb0ca9346361d49ef3
--- /dev/null
+++ b/spec/controllers/admin/action_logs_controller_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::ActionLogsController, type: :controller do
+  describe 'GET #index' do
+    it 'returns 200' do
+      sign_in Fabricate(:user, admin: true)
+      get :index, params: { page: 1 }
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/controllers/admin/dashboard_controller_spec.rb b/spec/controllers/admin/dashboard_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..73b50e721881523b015dbaf668e1ba0eadf5020e
--- /dev/null
+++ b/spec/controllers/admin/dashboard_controller_spec.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Admin::DashboardController, type: :controller do
+  describe 'GET #index' do
+    it 'returns 200' do
+      sign_in Fabricate(:user, admin: true)
+      get :index
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 79e7fea42369a4896208518cf8777fc896310c19..129bf888370020bc10789f6c5e251dd0a72e377d 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -7,26 +7,6 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
     sign_in Fabricate(:user, admin: true), scope: :user
   end
 
-  describe 'GET #index' do
-    around do |example|
-      default_per_page = DomainBlock.default_per_page
-      DomainBlock.paginates_per 1
-      example.run
-      DomainBlock.paginates_per default_per_page
-    end
-
-    it 'renders domain blocks' do
-      2.times { Fabricate(:domain_block) }
-
-      get :index, params: { page: 2 }
-
-      assigned = assigns(:domain_blocks)
-      expect(assigned.count).to eq 1
-      expect(assigned.klass).to be DomainBlock
-      expect(response).to have_http_status(200)
-    end
-  end
-
   describe 'GET #new' do
     it 'assigns a new domain block' do
       get :new
@@ -53,7 +33,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
 
       expect(DomainBlockWorker).to have_received(:perform_async)
       expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
-      expect(response).to redirect_to(admin_domain_blocks_path)
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
     end
 
     it 'renders new when failed to save' do
@@ -76,7 +56,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
 
       expect(service).to have_received(:call).with(domain_block, true)
       expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
-      expect(response).to redirect_to(admin_domain_blocks_path)
+      expect(response).to redirect_to(admin_instances_path(limited: '1'))
     end
   end
 end
diff --git a/spec/controllers/admin/email_domain_blocks_controller_spec.rb b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
index 133d38ff103214baa5f401d4465f9a19b9a54e8f..52db56f4e8d9b4aea282816a9976fbaf3ac539ce 100644
--- a/spec/controllers/admin/email_domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/email_domain_blocks_controller_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe Admin::EmailDomainBlocksController, type: :controller do
 
   describe 'POST #create' do
     it 'blocks the domain when succeeded to save' do
-      post :create, params: { email_domain_block: { domain: 'example.com'} }
+      post :create, params: { email_domain_block: { domain: 'example.com' } }
 
       expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.created_msg')
       expect(response).to redirect_to(admin_email_domain_blocks_path)
@@ -50,7 +50,7 @@ RSpec.describe Admin::EmailDomainBlocksController, type: :controller do
   describe 'DELETE #destroy' do
     it 'unblocks the domain' do
       email_domain_block = Fabricate(:email_domain_block)
-      delete :destroy, params: { id: email_domain_block.id } 
+      delete :destroy, params: { id: email_domain_block.id }
 
       expect(flash[:notice]).to eq I18n.t('admin.email_domain_blocks.destroyed_msg')
       expect(response).to redirect_to(admin_email_domain_blocks_path)
diff --git a/spec/controllers/admin/invites_controller_spec.rb b/spec/controllers/admin/invites_controller_spec.rb
index e7d9954118f41a9c69201b68b8a7a5a018c7cd24..449a699e4038009be106cd46fd32ffb55d78f2a5 100644
--- a/spec/controllers/admin/invites_controller_spec.rb
+++ b/spec/controllers/admin/invites_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Admin::InvitesController do
@@ -24,7 +26,7 @@ describe Admin::InvitesController do
     subject { post :create, params: { invite: { max_uses: '10', expires_in: 1800 } } }
 
     it 'succeeds to create a invite' do
-      expect{ subject }.to change { Invite.count }.by(1)
+      expect { subject }.to change { Invite.count }.by(1)
       expect(subject).to redirect_to admin_invites_path
       expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
     end
@@ -40,4 +42,18 @@ describe Admin::InvitesController do
       expect(invite.reload).to be_expired
     end
   end
+
+  describe 'POST #deactivate_all' do
+    it 'expires all invites, then redirects to admin_invites_path' do
+      invites = Fabricate.times(2, :invite, expires_at: nil)
+
+      post :deactivate_all
+
+      invites.each do |invite|
+        expect(invite.reload).to be_expired
+      end
+
+      expect(response).to redirect_to admin_invites_path
+    end
+  end
 end
diff --git a/spec/controllers/admin/report_notes_controller_spec.rb b/spec/controllers/admin/report_notes_controller_spec.rb
index 2c32303fb39194784fa3823e32dda1f9fd87b6d6..ec5872c7d2a360cf54dbd7f88bf548a92d92f209 100644
--- a/spec/controllers/admin/report_notes_controller_spec.rb
+++ b/spec/controllers/admin/report_notes_controller_spec.rb
@@ -15,7 +15,6 @@ describe Admin::ReportNotesController do
     let(:report) { Fabricate(:report, action_taken: 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(:account_id) { nil }
@@ -24,7 +23,7 @@ describe Admin::ReportNotesController do
           let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_resolve: nil } }
 
           it 'creates a report note and resolves report' do
-            expect{ subject }.to change{ ReportNote.count }.by(1)
+            expect { subject }.to change { ReportNote.count }.by(1)
             expect(report.reload).to be_action_taken
             expect(subject).to redirect_to admin_reports_path
           end
@@ -34,7 +33,7 @@ describe Admin::ReportNotesController do
           let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
 
           it 'creates a report note and does not resolve report' do
-            expect{ subject }.to change{ ReportNote.count }.by(1)
+            expect { subject }.to change { ReportNote.count }.by(1)
             expect(report.reload).not_to be_action_taken
             expect(subject).to redirect_to admin_report_path(report)
           end
@@ -49,7 +48,7 @@ describe Admin::ReportNotesController do
           let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_unresolve: nil } }
 
           it 'creates a report note and unresolves report' do
-            expect{ subject }.to change{ ReportNote.count }.by(1)
+            expect { subject }.to change { ReportNote.count }.by(1)
             expect(report.reload).not_to be_action_taken
             expect(subject).to redirect_to admin_report_path(report)
           end
@@ -59,7 +58,7 @@ describe Admin::ReportNotesController do
           let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
 
           it 'creates a report note and does not unresolve report' do
-            expect{ subject }.to change{ ReportNote.count }.by(1)
+            expect { subject }.to change { ReportNote.count }.by(1)
             expect(report.reload).to be_action_taken
             expect(subject).to redirect_to admin_report_path(report)
           end
@@ -84,7 +83,7 @@ describe Admin::ReportNotesController do
     let!(:report_note) { Fabricate(:report_note) }
 
     it 'deletes note' do
-      expect{ subject }.to change{ ReportNote.count }.by(-1)
+      expect { subject }.to change { ReportNote.count }.by(-1)
       expect(subject).to redirect_to admin_report_path(report_note.report)
     end
   end
diff --git a/spec/controllers/admin/reported_statuses_controller_spec.rb b/spec/controllers/admin/reported_statuses_controller_spec.rb
index 7adbf36b9c9a80942bc33a79fcbd4908365f1b59..c358506d6dce88b136487dbefd266d00719aec8d 100644
--- a/spec/controllers/admin/reported_statuses_controller_spec.rb
+++ b/spec/controllers/admin/reported_statuses_controller_spec.rb
@@ -13,7 +13,7 @@ describe Admin::ReportedStatusesController do
 
   describe 'POST #create' do
     subject do
-      -> { post :create, params: { :report_id  => report, action => '', :form_status_batch => { status_ids: status_ids } } }
+      -> { post :create, params: { :report_id => report, action => '', :form_status_batch => { status_ids: status_ids } } }
     end
 
     let(:action) { 'nsfw_on' }
diff --git a/spec/controllers/admin/reports_controller_spec.rb b/spec/controllers/admin/reports_controller_spec.rb
index e50c02a729072e42e2dcdd7f96afd8f65a57cfab..b428299eeb0d38b3497d75b2f7a6d8f306894c95 100644
--- a/spec/controllers/admin/reports_controller_spec.rb
+++ b/spec/controllers/admin/reports_controller_spec.rb
@@ -46,88 +46,37 @@ describe Admin::ReportsController do
     end
   end
 
-  describe 'PUT #update' do
-    describe 'with an unknown outcome' do
-      it 'rejects the change' do
-        report = Fabricate(:report)
-        put :update, params: { id: report, outcome: 'unknown' }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    describe 'with an outcome of `resolve`' do
-      it 'resolves the report' do
-        report = Fabricate(:report)
-
-        put :update, params: { id: report, outcome: 'resolve' }
-        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
-    end
-
-    describe 'with an outcome of `suspend`' do
-      it 'suspends the reported account' do
-        report = Fabricate(:report)
-        allow(Admin::SuspensionWorker).to receive(:perform_async)
-
-        put :update, params: { id: report, outcome: 'suspend' }
-        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
-        expect(Admin::SuspensionWorker).
-          to have_received(:perform_async).with(report.target_account_id)
-      end
-    end
-
-    describe 'with an outsome of `silence`' do
-      it 'silences the reported account' do
-        report = Fabricate(:report)
-
-        put :update, params: { id: report, outcome: 'silence' }
-        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
-        expect(report.target_account).to be_silenced
-      end
-    end
-
-    describe 'with an outsome of `reopen`' do
-      it 'reopens the report' do
-        report = Fabricate(:report)
+  describe 'POST #reopen' do
+    it 'reopens the report' do
+      report = Fabricate(:report)
 
-        put :update, params: { id: report, outcome: 'reopen' }
-        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
-      end
+      put :reopen, params: { id: report }
+      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
     end
+  end
 
-    describe 'with an outsome of `assign_to_self`' do
-      it 'reopens the report' do
-        report = Fabricate(:report)
+  describe 'POST #assign_to_self' do
+    it 'reopens the report' do
+      report = Fabricate(:report)
 
-        put :update, params: { id: report, outcome: 'assign_to_self' }
-        expect(response).to redirect_to(admin_report_path(report))
-        report.reload
-        expect(report.assigned_account).to eq user.account
-      end
+      put :assign_to_self, params: { id: report }
+      expect(response).to redirect_to(admin_report_path(report))
+      report.reload
+      expect(report.assigned_account).to eq user.account
     end
+  end
 
-    describe 'with an outsome of `unassign`' do
-      it 'reopens the report' do
-        report = Fabricate(:report)
+  describe 'POST #unassign' do
+    it 'reopens the report' do
+      report = Fabricate(:report)
 
-        put :update, params: { id: report, outcome: 'unassign' }
-        expect(response).to redirect_to(admin_report_path(report))
-        report.reload
-        expect(report.assigned_account).to eq nil
-      end
+      put :unassign, params: { id: report }
+      expect(response).to redirect_to(admin_report_path(report))
+      report.reload
+      expect(report.assigned_account).to eq nil
     end
   end
 end
diff --git a/spec/controllers/admin/silences_controller_spec.rb b/spec/controllers/admin/silences_controller_spec.rb
deleted file mode 100644
index 78560eb393a483b5834698dee9141437d5a70d6b..0000000000000000000000000000000000000000
--- a/spec/controllers/admin/silences_controller_spec.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'rails_helper'
-
-describe Admin::SilencesController do
-  render_views
-
-  before do
-    sign_in Fabricate(:user, admin: true), scope: :user
-  end
-
-  describe 'POST #create' do
-    it 'redirects to admin accounts page' do
-      account = Fabricate(:account, silenced: false)
-
-      post :create, params: { account_id: account.id }
-
-      account.reload
-      expect(account.silenced?).to eq true
-      expect(response).to redirect_to(admin_accounts_path)
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    it 'redirects to admin accounts page' do
-      account = Fabricate(:account, silenced: true)
-
-      delete :destroy, params: { account_id: account.id }
-
-      account.reload
-      expect(account.silenced?).to eq false
-      expect(response).to redirect_to(admin_accounts_path)
-    end
-  end
-end
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
index 6afcc1442579b008349b45a27416bc0b5e8e8707..1a08c10b7e873fd1c2052419601e999d797acee3 100644
--- a/spec/controllers/admin/statuses_controller_spec.rb
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -24,7 +24,7 @@ describe Admin::StatusesController do
     end
 
     it 'returns http success with media' do
-      get :index, params: { account_id: account.id , media: true }
+      get :index, params: { account_id: account.id, media: true }
 
       statuses = assigns(:statuses).to_a
       expect(statuses.size).to eq 1
diff --git a/spec/controllers/admin/suspensions_controller_spec.rb b/spec/controllers/admin/suspensions_controller_spec.rb
deleted file mode 100644
index ddfc938d1876c10d6d57ad99d1dadc10c8c96253..0000000000000000000000000000000000000000
--- a/spec/controllers/admin/suspensions_controller_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'rails_helper'
-
-describe Admin::SuspensionsController do
-  render_views
-
-  before do
-    sign_in Fabricate(:user, admin: true), scope: :user
-  end
-
-  describe 'POST #create' do
-    it 'redirects to admin accounts page' do
-      account = Fabricate(:account, suspended: false)
-      expect(Admin::SuspensionWorker).to receive(:perform_async).with(account.id)
-
-      post :create, params: { account_id: account.id }
-
-      expect(response).to redirect_to(admin_accounts_path)
-    end
-  end
-
-  describe 'DELETE #destroy' do
-    it 'redirects to admin accounts page' do
-      account = Fabricate(:account, suspended: true)
-
-      delete :destroy, params: { account_id: account.id }
-
-      account.reload
-      expect(account.suspended?).to eq false
-      expect(response).to redirect_to(admin_accounts_path)
-    end
-  end
-end
diff --git a/spec/controllers/admin/tags_controller_spec.rb b/spec/controllers/admin/tags_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3af994071ce724cb09b66fd26f4d601cd1c39679
--- /dev/null
+++ b/spec/controllers/admin/tags_controller_spec.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Admin::TagsController, type: :controller do
+  render_views
+
+  before do
+    sign_in Fabricate(:user, admin: true)
+  end
+
+  describe 'GET #index' do
+    before do
+      account_tag_stat = Fabricate(:tag).account_tag_stat
+      account_tag_stat.update(hidden: hidden, accounts_count: 1)
+      get :index, params: { hidden: hidden }
+    end
+
+    context 'with hidden tags' do
+      let(:hidden) { true }
+
+      it 'returns status 200' do
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'without hidden tags' do
+      let(:hidden) { false }
+
+      it 'returns status 200' do
+        expect(response).to have_http_status(200)
+      end
+    end
+  end
+
+  describe 'POST #hide' do
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      tag.account_tag_stat.update(hidden: false)
+      post :hide, params: { id: tag.id }
+    end
+
+    it 'hides tag' do
+      tag.reload
+      expect(tag).to be_hidden
+    end
+
+    it 'redirects to admin_tags_path' do
+      expect(response).to redirect_to(admin_tags_path(controller.instance_variable_get(:@filter_params)))
+    end
+  end
+
+  describe 'POST #unhide' do
+    let(:tag) { Fabricate(:tag) }
+
+    before do
+      tag.account_tag_stat.update(hidden: true)
+      post :unhide, params: { id: tag.id }
+    end
+
+    it 'unhides tag' do
+      tag.reload
+      expect(tag).not_to be_hidden
+    end
+
+    it 'redirects to admin_tags_path' do
+      expect(response).to redirect_to(admin_tags_path(controller.instance_variable_get(:@filter_params)))
+    end
+  end
+end
diff --git a/spec/controllers/api/salmon_controller_spec.rb b/spec/controllers/api/salmon_controller_spec.rb
index 5f01f8073527750072a5937b96dc5848100eedcb..235a29af0041e5207b145b521867789fbd36ed65 100644
--- a/spec/controllers/api/salmon_controller_spec.rb
+++ b/spec/controllers/api/salmon_controller_spec.rb
@@ -15,8 +15,7 @@ RSpec.describe Api::SalmonController, type: :controller do
   describe 'POST #update' do
     context 'with valid post data' do
       before do
-        request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml'))
-        post :update, params: { id: account.id }
+        post :update, params: { id: account.id }, body: File.read(Rails.root.join('spec', 'fixtures', 'salmon', 'mention.xml'))
       end
 
       it 'contains XML in the request body' do
@@ -42,8 +41,7 @@ RSpec.describe Api::SalmonController, type: :controller do
 
     context 'with empty post data' do
       before do
-        request.env['RAW_POST_DATA'] = ''
-        post :update, params: { id: account.id }
+        post :update, params: { id: account.id }, body: ''
       end
 
       it 'returns http client error' do
@@ -56,8 +54,7 @@ RSpec.describe Api::SalmonController, type: :controller do
         service = double(call: false)
         allow(VerifySalmonService).to receive(:new).and_return(service)
 
-        request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml'))
-        post :update, params: { id: account.id }
+        post :update, params: { id: account.id }, body: File.read(Rails.root.join('spec', 'fixtures', 'salmon', 'mention.xml'))
       end
 
       it 'returns http client error' do
diff --git a/spec/controllers/api/subscriptions_controller_spec.rb b/spec/controllers/api/subscriptions_controller_spec.rb
index 48eb1fc64c951d04ae4f1a3e5be18d7054c70b01..7a4252fe6737ec9778099e0ad4c6a3c2c2bd07a5 100644
--- a/spec/controllers/api/subscriptions_controller_spec.rb
+++ b/spec/controllers/api/subscriptions_controller_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe Api::SubscriptionsController, type: :controller do
   end
 
   describe 'POST #update' do
-    let(:feed) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'push', 'feed.atom')) }
+    let(:feed) { File.read(Rails.root.join('spec', 'fixtures', 'push', 'feed.atom')) }
 
     before do
       stub_request(:post, "https://quitter.no/main/push/hub").to_return(:status => 200, :body => "", :headers => {})
@@ -53,9 +53,8 @@ RSpec.describe Api::SubscriptionsController, type: :controller do
       stub_request(:any, "https://mastodon.social/users/Gargron").to_return(status: 404)
 
       request.env['HTTP_X_HUB_SIGNATURE'] = "sha1=#{OpenSSL::HMAC.hexdigest('sha1', 'abc', feed)}"
-      request.env['RAW_POST_DATA'] = feed
 
-      post :update, params: { id: account.id }
+      post :update, params: { id: account.id }, body: feed
     end
 
     it 'returns http success' do
diff --git a/spec/controllers/api/v1/accounts/pins_controller_spec.rb b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c71935df21330a376ff85c7eb78b0fd37f553dd4
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+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(:token) { Fabricate(:accessible_access_token, resource_owner_id: john.id, scopes: 'write:accounts') }
+
+  before do
+    kevin.account.followers << john.account
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  describe 'POST #create' do
+    subject { post :create, params: { account_id: kevin.account.id } }
+
+    it 'returns 200' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'creates account_pin' do
+      expect do
+        subject
+      end.to change { AccountPin.where(account: john.account, target_account: kevin.account).count }.by(1)
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    subject { delete :destroy, params: { account_id: kevin.account.id } }
+
+    before do
+      Fabricate(:account_pin, account: john.account, target_account: kevin.account)
+    end
+
+    it 'returns 200' do
+      expect(response).to have_http_status(200)
+    end
+
+    it 'destroys account_pin' do
+      expect do
+        subject
+      end.to change { AccountPin.where(account: john.account, target_account: kevin.account).count }.by(-1)
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 3e54e88a5b79e8cf82347af596c57508d1e32eb1..f5f65c000e54a8b66b9b4ad232b7e9f52f7a920b 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -19,6 +19,40 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
     end
   end
 
+  describe 'POST #create' do
+    let(:app) { Fabricate(:application) }
+    let(:token) { Doorkeeper::AccessToken.find_or_create_for(app, nil, 'read write', nil, false) }
+    let(:agreement) { nil }
+
+    before do
+      post :create, params: { username: 'test', password: '12345678', email: 'hello@world.tld', agreement: agreement }
+    end
+
+    context 'given truthy agreement' do
+      let(:agreement) { 'true' }
+
+      it 'returns http success' do
+        expect(response).to have_http_status(200)
+      end
+
+      it 'returns a new access token as JSON' do
+        expect(body_as_json[:access_token]).to_not be_blank
+      end
+
+      it 'creates a user' do
+        user = User.find_by(email: 'hello@world.tld')
+        expect(user).to_not be_nil
+        expect(user.created_by_application_id).to eq app.id
+      end
+    end
+
+    context 'given no agreement' do
+      it 'returns http unprocessable entity' do
+        expect(response).to have_http_status(422)
+      end
+    end
+  end
+
   describe 'GET #show' do
     let(:scopes) { 'read:accounts' }
 
@@ -154,7 +188,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
     before do
       user.account.follow!(other_account)
-      post :mute, params: {id: other_account.id }
+      post :mute, params: { id: other_account.id }
     end
 
     it 'returns http success' do
@@ -182,7 +216,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
 
     before do
       user.account.follow!(other_account)
-      post :mute, params: {id: other_account.id, notifications: false }
+      post :mute, params: { id: other_account.id, notifications: false }
     end
 
     it 'returns http success' do
diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..070f65061b5239fd2a6d94837abcfa8a53d8a88e
--- /dev/null
+++ b/spec/controllers/api/v1/conversations_controller_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+RSpec.describe Api::V1::ConversationsController, 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: scopes) }
+  let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
+
+  before do
+    allow(controller).to receive(:doorkeeper_token) { token }
+  end
+
+  describe 'GET #index' do
+    let(:scopes) { 'read:statuses' }
+
+    before do
+      PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
+    end
+
+    it 'returns http success' do
+      get :index
+      expect(response).to have_http_status(200)
+    end
+
+    it 'returns pagination headers' do
+      get :index, params: { limit: 1 }
+      expect(response.headers['Link'].links.size).to eq(2)
+    end
+
+    it 'returns conversations' do
+      get :index
+      json = body_as_json
+      expect(json.size).to eq 1
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/endorsements_controller_spec.rb b/spec/controllers/api/v1/endorsements_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..ad5ff400f5e0c211db65ab98f724265489fa07cc
--- /dev/null
+++ b/spec/controllers/api/v1/endorsements_controller_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::V1::EndorsementsController, type: :controller do
+  let(:user)  { Fabricate(:user) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
+
+  describe 'GET #index' do
+    it 'returns 200' do
+      allow(controller).to receive(:doorkeeper_token) { token }
+      get :index
+
+      expect(response).to have_http_status(200)
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/favourites_controller_spec.rb b/spec/controllers/api/v1/favourites_controller_spec.rb
index 2bdf927f21f7db2b75451ae87da9339896fefae3..231f765008ed2792cc9d51342dea95b680a0c142 100644
--- a/spec/controllers/api/v1/favourites_controller_spec.rb
+++ b/spec/controllers/api/v1/favourites_controller_spec.rb
@@ -64,7 +64,7 @@ RSpec.describe Api::V1::FavouritesController, type: :controller do
           get :index, params: { limit: 1 }
 
           expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq "http://test.host/api/v1/favourites?limit=1&max_id=#{favourite.id}"
-          expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/favourites?limit=1&since_id=#{favourite.id}"
+          expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq "http://test.host/api/v1/favourites?limit=1&min_id=#{favourite.id}"
         end
 
         it 'does not add pagination headers if not necessary' do
diff --git a/spec/controllers/api/v1/instances/activity_controller_spec.rb b/spec/controllers/api/v1/instances/activity_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..159792ee0196becb941b560e458457367897fa63
--- /dev/null
+++ b/spec/controllers/api/v1/instances/activity_controller_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::V1::Instances::ActivityController, type: :controller do
+  describe 'GET #show' do
+    it 'returns 200' do
+      get :show
+      expect(response).to have_http_status(200)
+    end
+
+    context '!Setting.activity_api_enabled' do
+      it 'returns 404' do
+        Setting.activity_api_enabled = false
+
+        get :show
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/instances/peers_controller_spec.rb b/spec/controllers/api/v1/instances/peers_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..12a214a83ac890f4f6ce3618ab248cec5f9d5a22
--- /dev/null
+++ b/spec/controllers/api/v1/instances/peers_controller_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::V1::Instances::PeersController, type: :controller do
+  describe 'GET #index' do
+    it 'returns 200' do
+      get :index
+      expect(response).to have_http_status(200)
+    end
+
+    context '!Setting.peers_api_enabled' do
+      it 'returns 404' do
+        Setting.peers_api_enabled = false
+
+        get :index
+        expect(response).to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/controllers/api/v1/media_controller_spec.rb b/spec/controllers/api/v1/media_controller_spec.rb
index f01fcd9424c74e2efca6d386f959f860a4fd9b68..4e3037208431268324a19642297ccaa7172ca63f 100644
--- a/spec/controllers/api/v1/media_controller_spec.rb
+++ b/spec/controllers/api/v1/media_controller_spec.rb
@@ -84,19 +84,17 @@ RSpec.describe Api::V1::MediaController, type: :controller do
         post :create, params: { file: fixture_file_upload('files/attachment.webm', 'video/webm') }
       end
 
-      xit 'returns http success' do
+      it do
+        # returns http success
         expect(response).to have_http_status(200)
-      end
 
-      xit 'creates a media attachment' do
+        # creates a media attachment
         expect(MediaAttachment.first).to_not be_nil
-      end
 
-      xit 'uploads a file' do
+        # uploads a file
         expect(MediaAttachment.first).to have_attached_file(:file)
-      end
 
-      xit 'returns media ID in JSON' do
+        # returns media ID in JSON
         expect(body_as_json[:id]).to eq MediaAttachment.first.id.to_s
       end
     end
diff --git a/spec/controllers/api/v1/mutes_controller_spec.rb b/spec/controllers/api/v1/mutes_controller_spec.rb
index f9603b7ff1e645af72e9421c70f38ade1d32c454..a2b814a690d43b95d94194ad5a04a55a16d12faf 100644
--- a/spec/controllers/api/v1/mutes_controller_spec.rb
+++ b/spec/controllers/api/v1/mutes_controller_spec.rb
@@ -3,19 +3,61 @@ require 'rails_helper'
 RSpec.describe Api::V1::MutesController, 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:mutes') }
+  let(:user)   { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+  let(:scopes) { 'read:mutes' }
+  let(:token)  { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
 
-  before do
-    Fabricate(:mute, account: user.account, hide_notifications: false)
-    allow(controller).to receive(:doorkeeper_token) { token }
-  end
+  before { allow(controller).to receive(:doorkeeper_token) { token } }
 
   describe 'GET #index' do
-    it 'returns http success' do
+    it 'limits according to limit parameter' do
+      2.times.map { Fabricate(:mute, account: user.account) }
       get :index, params: { limit: 1 }
+      expect(body_as_json.size).to eq 1
+    end
+
+    it 'queries mutes in range according to max_id' do
+      mutes = 2.times.map { Fabricate(:mute, account: user.account) }
+
+      get :index, params: { max_id: mutes[1] }
 
+      expect(body_as_json.size).to eq 1
+      expect(body_as_json[0][:id]).to eq mutes[0].target_account_id.to_s
+    end
+
+    it 'queries mutes in range according to since_id' do
+      mutes = 2.times.map { Fabricate(:mute, account: user.account) }
+
+      get :index, params: { since_id: mutes[0] }
+
+      expect(body_as_json.size).to eq 1
+      expect(body_as_json[0][:id]).to eq mutes[1].target_account_id.to_s
+    end
+
+    it 'sets pagination header for next path' do
+      mutes = 2.times.map { Fabricate(:mute, account: user.account) }
+      get :index, params: { limit: 1, since_id: mutes[0] }
+      expect(response.headers['Link'].find_link(['rel', 'next']).href).to eq api_v1_mutes_url(limit: 1, max_id: mutes[1])
+    end
+
+    it 'sets pagination header for previous path' do
+      mute = Fabricate(:mute, account: user.account)
+      get :index
+      expect(response.headers['Link'].find_link(['rel', 'prev']).href).to eq api_v1_mutes_url(since_id: mute)
+    end
+
+    it 'returns http success' do
+      get :index
       expect(response).to have_http_status(200)
     end
+
+    context 'with wrong scopes' do
+      let(:scopes) { 'write:mutes' }
+
+      it 'returns http forbidden' do
+        get :index
+        expect(response).to have_http_status(403)
+      end
+    end
   end
 end
diff --git a/spec/controllers/api/v1/notifications_controller_spec.rb b/spec/controllers/api/v1/notifications_controller_spec.rb
index 9f679cb8a7594e8a247b74efe6c04dbfedbd1bca..d0f82e79febbc85cbf5b053cc8878b3b89628946 100644
--- a/spec/controllers/api/v1/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/notifications_controller_spec.rb
@@ -50,9 +50,9 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do
     let(:scopes) { 'read:notifications' }
 
     before do
-      first_status = PostStatusService.new.call(user.account, 'Test')
+      first_status = PostStatusService.new.call(user.account, text: 'Test')
       @reblog_of_first_status = ReblogService.new.call(other.account, first_status)
-      mentioning_status = PostStatusService.new.call(other.account, 'Hello @alice')
+      mentioning_status = PostStatusService.new.call(other.account, text: 'Hello @alice')
       @mention_from_status = mentioning_status.mentions.first
       @favourite = FavouriteService.new.call(other.account, first_status)
       @follow = FollowService.new.call(other.account, 'alice')
diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb
index ac93998c6901d0b2be8ad4b7df1593416ba57d65..a3596cf8a0387640c4deca777327d3ac3f6f2e21 100644
--- a/spec/controllers/api/v1/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/reports_controller_spec.rb
@@ -12,16 +12,6 @@ RSpec.describe Api::V1::ReportsController, type: :controller do
     allow(controller).to receive(:doorkeeper_token) { token }
   end
 
-  describe 'GET #index' do
-    let(:scopes) { 'read:reports' }
-
-    it 'returns http success' do
-      get :index
-
-      expect(response).to have_http_status(200)
-    end
-  end
-
   describe 'POST #create' do
     let(:scopes)  { 'write:reports' }
     let!(:status) { Fabricate(:status) }
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 23b5d7de92e39f7a63d89e3c2527b1edd1d3ebfe..40f75c700f592ccbe809398a90775fb32bcf4354 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
@@ -25,7 +25,6 @@ RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :control
         expect(response.headers['Link'].links.size).to eq(2)
       end
     end
-
   end
 
   context 'without an oauth token' do
diff --git a/spec/controllers/api/v1/streaming_controller_spec.rb b/spec/controllers/api/v1/streaming_controller_spec.rb
index daf2807e7f1953a553cae6cbf6d1e624e2b3cde7..4ab409a54103bcf20a95cb9070db04f4119d52a6 100644
--- a/spec/controllers/api/v1/streaming_controller_spec.rb
+++ b/spec/controllers/api/v1/streaming_controller_spec.rb
@@ -31,7 +31,7 @@ describe Api::V1::StreamingController do
 
     describe 'GET #index' do
       it 'redirects to streaming host' do
-        get :index, params: {access_token: 'deadbeef', stream: 'public'}
+        get :index, params: { access_token: 'deadbeef', stream: 'public' }
         expect(response).to have_http_status(301)
         request_uri = URI.parse(request.url)
         redirect_to_uri = URI.parse(response.location)
@@ -42,5 +42,4 @@ describe Api::V1::StreamingController do
       end
     end
   end
-
 end
diff --git a/spec/controllers/api/v1/timelines/direct_controller_spec.rb b/spec/controllers/api/v1/timelines/direct_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a22c2cbea598b386671e8037c2e46b595d012718
--- /dev/null
+++ b/spec/controllers/api/v1/timelines/direct_controller_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Api::V1::Timelines::DirectController, type: :controller do
+  let(:user)  { Fabricate(:user) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
+
+  describe 'GET #show' do
+    it 'returns 200' do
+      allow(controller).to receive(:doorkeeper_token) { token }
+      get :show
+
+      expect(response).to have_http_status(200)
+    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 a667c33fadb8126bf8212bf606cb43f1501c4793..e953e46495326b6651fb0c6a8f2282c11a8a3b89 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, account: Fabricate(:account, username: 'alice'), current_sign_in_at: 1.day.ago) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
@@ -17,7 +17,7 @@ describe Api::V1::Timelines::HomeController do
     describe 'GET #show' do
       before do
         follow = Fabricate(:follow, account: user.account)
-        PostStatusService.new.call(follow.target_account, 'New status for user home timeline.')
+        PostStatusService.new.call(follow.target_account, text: 'New status for user home timeline.')
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/v1/timelines/list_controller_spec.rb b/spec/controllers/api/v1/timelines/list_controller_spec.rb
index 93a2be6e6cd747aa38b4392c034efecc9d848fdb..45e4bf34c86e807db9d431eb5c9ddb8fec9f35fd 100644
--- a/spec/controllers/api/v1/timelines/list_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/list_controller_spec.rb
@@ -19,7 +19,7 @@ describe Api::V1::Timelines::ListController do
       before do
         follow = Fabricate(:follow, account: user.account)
         list.accounts << follow.target_account
-        PostStatusService.new.call(follow.target_account, 'New status for user home timeline.')
+        PostStatusService.new.call(follow.target_account, text: 'New status for user home timeline.')
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/v1/timelines/public_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb
index 68d87bbcbd1848024347faf22ee2ad4c527b2fad..737aedba6fd03afaf4622b3cfb21ee0ae4bd0e50 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, account: Fabricate(:account, username: 'alice')) }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
@@ -16,7 +16,7 @@ describe Api::V1::Timelines::PublicController do
 
     describe 'GET #show' do
       before do
-        PostStatusService.new.call(user.account, 'New status from user for federated public timeline.')
+        PostStatusService.new.call(user.account, text: 'New status from user for federated public timeline.')
       end
 
       it 'returns http success' do
@@ -29,7 +29,7 @@ describe Api::V1::Timelines::PublicController do
 
     describe 'GET #show with local only' do
       before do
-        PostStatusService.new.call(user.account, 'New status from user for local public timeline.')
+        PostStatusService.new.call(user.account, text: 'New status from user for local public timeline.')
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/v1/timelines/tag_controller_spec.rb b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
index 472779f5456d98c835576236d50841d83fcfc349..f71ca2a399d2310031a1d91ca433161fafa2e130 100644
--- a/spec/controllers/api/v1/timelines/tag_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
@@ -16,7 +16,7 @@ describe Api::V1::Timelines::TagController do
 
     describe 'GET #show' do
       before do
-        PostStatusService.new.call(user.account, 'It is a #test')
+        PostStatusService.new.call(user.account, text: 'It is a #test')
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/api/web/embeds_controller_spec.rb b/spec/controllers/api/web/embeds_controller_spec.rb
index 6b7297189aff1f619e62ed1c25315b252160e28b..a8fc1718f60686efc658c77dac6e7968be1a5d0f 100644
--- a/spec/controllers/api/web/embeds_controller_spec.rb
+++ b/spec/controllers/api/web/embeds_controller_spec.rb
@@ -14,7 +14,7 @@ describe Api::Web::EmbedsController do
 
     context 'when successfully finds status' do
       let(:status) { Fabricate(:status) }
-      let(:url) { "http://#{ Rails.configuration.x.web_domain }/@#{status.account.username}/#{status.id}" }
+      let(:url) { "http://#{Rails.configuration.x.web_domain}/@#{status.account.username}/#{status.id}" }
 
       it 'returns a right response' do
         expect(response).to have_http_status :ok
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index c6c78d3f7181161d2c5ec1890bd49b89cad940ab..33cc7108716d46f9adaf7ca1dfa7a291fadea746 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -92,6 +92,39 @@ describe ApplicationController, type: :controller do
     end
   end
 
+  describe 'helper_method :current_theme' do
+    it 'returns "default" when theme wasn\'t changed in admin settings' do
+      allow(Setting).to receive(:default_settings).and_return({ 'theme' => 'default' })
+
+      expect(controller.view_context.current_theme).to eq 'default'
+    end
+
+    it 'returns instances\'s theme when user is not signed in' do
+      allow(Setting).to receive(:[]).with('theme').and_return 'contrast'
+
+      expect(controller.view_context.current_theme).to eq 'contrast'
+    end
+
+    it 'returns instances\'s default theme when user didn\'t set theme' do
+      current_user = Fabricate(:user)
+      sign_in current_user
+
+      allow(Setting).to receive(:[]).with('theme').and_return 'contrast'
+
+      expect(controller.view_context.current_theme).to eq 'contrast'
+    end
+
+    it 'returns user\'s theme when it is set' do
+      current_user = Fabricate(:user)
+      current_user.settings['theme'] = 'mastodon-light'
+      sign_in current_user
+
+      allow(Setting).to receive(:[]).with('theme').and_return 'contrast'
+
+      expect(controller.view_context.current_theme).to eq 'mastodon-light'
+    end
+  end
+
   context 'ActionController::RoutingError' do
     subject do
       routes.draw { get 'routing_error' => 'anonymous#routing_error' }
@@ -164,7 +197,7 @@ describe ApplicationController, type: :controller do
   describe 'raise_not_found' do
     it 'raises error' do
       controller.params[:unmatched_route] = 'unmatched'
-      expect{ controller.raise_not_found }.to raise_error(ActionController::RoutingError, 'No route matches unmatched')
+      expect { controller.raise_not_found }.to raise_error(ActionController::RoutingError, 'No route matches unmatched')
     end
   end
 
diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb
index 35eed4f513ff8eab51faf6b9b8866c81831050cb..e9a471fc5a9e2700beb7f462526bac3b0adbbfb7 100644
--- a/spec/controllers/auth/confirmations_controller_spec.rb
+++ b/spec/controllers/auth/confirmations_controller_spec.rb
@@ -67,7 +67,7 @@ describe Auth::ConfirmationsController, type: :controller do
   end
 
   describe 'PATCH #finish_signup' do
-    subject { patch :finish_signup, params: { user: { email: email }} }
+    subject { patch :finish_signup, params: { user: { email: email } } }
 
     let(:user) { Fabricate(:user) }
     before do
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index 97719a606af26840959a225aadea660e676c728a..71fcc1a6e3d2a65b63a313455436446d876670fc 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -30,6 +30,13 @@ RSpec.describe Auth::SessionsController, type: :controller do
 
         expect(response).to redirect_to(new_user_session_path)
       end
+
+      it 'does not delete redirect location with continue=true' do
+        sign_in(user, scope: :user)
+        controller.store_location_for(:user, '/authorize')
+        delete :destroy, params: { continue: 'true' }
+        expect(controller.stored_location_for(:user)).to eq '/authorize'
+      end
     end
 
     context 'with a suspended user' do
@@ -48,7 +55,7 @@ RSpec.describe Auth::SessionsController, type: :controller do
       request.env['devise.mapping'] = Devise.mappings[:user]
     end
 
-    context 'using PAM authentication' do
+    context 'using PAM authentication', if: ENV['PAM_ENABLED'] == 'true' do
       context 'using a valid password' do
         before do
           post :create, params: { user: { email: "pam_user1", password: '123456' } }
diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_interactions_controller_spec.rb
similarity index 71%
rename from spec/controllers/authorize_follows_controller_spec.rb
rename to spec/controllers/authorize_interactions_controller_spec.rb
index 52971c72478a9ef62e83979ede8e8c36348f932e..ce4257b68dcda85e45156d0e57c99f186976a58c 100644
--- a/spec/controllers/authorize_follows_controller_spec.rb
+++ b/spec/controllers/authorize_interactions_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe AuthorizeFollowsController do
+describe AuthorizeInteractionsController do
   render_views
 
   describe 'GET #show' do
@@ -39,19 +39,19 @@ describe AuthorizeFollowsController do
         expect(service).to have_received(:call).with('missing@hostname')
       end
 
-      it 'sets account from url' do
+      it 'sets resource from url' do
         account = Account.new
         service = double
-        allow(FetchRemoteAccountService).to receive(:new).and_return(service)
+        allow(ResolveURLService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('http://example.com').and_return(account)
 
         get :show, params: { acct: 'http://example.com' }
 
         expect(response).to have_http_status(200)
-        expect(assigns(:account)).to eq account
+        expect(assigns(:resource)).to eq account
       end
 
-      it 'sets account from acct uri' do
+      it 'sets resource from acct uri' do
         account = Account.new
         service = double
         allow(ResolveAccountService).to receive(:new).and_return(service)
@@ -60,7 +60,7 @@ describe AuthorizeFollowsController do
         get :show, params: { acct: 'acct:found@hostname' }
 
         expect(response).to have_http_status(200)
-        expect(assigns(:account)).to eq account
+        expect(assigns(:resource)).to eq account
       end
     end
   end
@@ -75,8 +75,8 @@ describe AuthorizeFollowsController do
     end
 
     describe 'when signed in' do
-      let(:user) { Fabricate(:user) }
-      let(:account) { Fabricate(:account, user: user) }
+      let!(:user) { Fabricate(:user) }
+      let!(:account) { user.account }
 
       before do
         sign_in(user)
@@ -84,25 +84,28 @@ describe AuthorizeFollowsController do
 
       it 'shows error when account not found' do
         service = double
-        allow(FollowService).to receive(:new).and_return(service)
-        allow(service).to receive(:call).with(account, 'user@hostname').and_return(nil)
+
+        allow(ResolveAccountService).to receive(:new).and_return(service)
+        allow(service).to receive(:call).with('user@hostname').and_return(nil)
 
         post :create, params: { acct: 'acct:user@hostname' }
 
-        expect(service).to have_received(:call).with(account, 'user@hostname')
         expect(response).to render_template(:error)
       end
 
       it 'follows account when found' do
         target_account = Fabricate(:account)
-        result_account = double(target_account: target_account)
         service = double
-        allow(FollowService).to receive(:new).and_return(service)
-        allow(service).to receive(:call).with(account, 'user@hostname').and_return(result_account)
+
+        allow(ResolveAccountService).to receive(:new).and_return(service)
+        allow(service).to receive(:call).with('user@hostname').and_return(target_account)
+        allow(service).to receive(:call).with(target_account, skip_webfinger: true).and_return(target_account)
+
 
         post :create, params: { acct: 'acct:user@hostname' }
 
-        expect(service).to have_received(:call).with(account, 'user@hostname')
+        expect(service).to have_received(:call).with(target_account, skip_webfinger: true)
+        expect(account.following?(target_account)).to be true
         expect(response).to render_template(:success)
       end
     end
diff --git a/spec/controllers/concerns/accountable_concern_spec.rb b/spec/controllers/concerns/accountable_concern_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e3c06b4947953c1c8e5f5c484613f8149e06ecf0
--- /dev/null
+++ b/spec/controllers/concerns/accountable_concern_spec.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountableConcern do
+  class Hoge
+    include AccountableConcern
+    attr_reader :current_account
+
+    def initialize(current_account)
+      @current_account = current_account
+    end
+  end
+
+  let(:user)   { Fabricate(:user, account: Fabricate(:account)) }
+  let(:target) { Fabricate(:user, account: Fabricate(:account)) }
+  let(:hoge)   { Hoge.new(user.account) }
+
+  describe '#log_action' do
+    it 'creates Admin::ActionLog' do
+      expect do
+        hoge.log_action(:create, target.account)
+      end.to change { Admin::ActionLog.count }.by(1)
+    end
+  end
+end
diff --git a/spec/controllers/concerns/export_controller_concern_spec.rb b/spec/controllers/concerns/export_controller_concern_spec.rb
index 6a13db69d65f3860b0860373d8f0d7cda53cdf7c..e5861c801f54448442d09ffeebbec2c72f69de20 100644
--- a/spec/controllers/concerns/export_controller_concern_spec.rb
+++ b/spec/controllers/concerns/export_controller_concern_spec.rb
@@ -8,6 +8,7 @@ describe ApplicationController, type: :controller do
     def index
       send_export_file
     end
+
     def export_data
       @export.account.username
     end
diff --git a/spec/controllers/concerns/localized_spec.rb b/spec/controllers/concerns/localized_spec.rb
index 8c80b7d2a8df087cce9f623ecdb7759ae6f47ab5..76c3de1183d430093dc76038e9e728392c8c4fda 100644
--- a/spec/controllers/concerns/localized_spec.rb
+++ b/spec/controllers/concerns/localized_spec.rb
@@ -28,7 +28,7 @@ describe ApplicationController, type: :controller do
       expect(I18n.locale).to eq :fa
     end
 
-    it 'sets available and compatible langauge if none of available languages are preferred' do
+    it 'sets available and compatible language if none of available languages are preferred' do
       request.headers['Accept-Language'] = 'fa-IR'
       get 'success'
       expect(I18n.locale).to eq :fa
diff --git a/spec/controllers/concerns/signature_verification_spec.rb b/spec/controllers/concerns/signature_verification_spec.rb
index 64648621e04ae10390ae3f8e9fc3b8175774fb80..72069009716267e8b3b086f36c8c9b131705782a 100644
--- a/spec/controllers/concerns/signature_verification_spec.rb
+++ b/spec/controllers/concerns/signature_verification_spec.rb
@@ -73,6 +73,30 @@ describe ApplicationController, type: :controller do
       end
     end
 
+    context 'with request older than a day' do
+      before do
+        get :success
+
+        fake_request = Request.new(:get, request.url)
+        fake_request.add_headers({ 'Date' => 2.days.ago.utc.httpdate })
+        fake_request.on_behalf_of(author)
+
+        request.headers.merge!(fake_request.headers)
+      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
+    end
+
     context 'with body' do
       before do
         post :success, body: 'Hello world'
@@ -105,7 +129,7 @@ describe ApplicationController, type: :controller do
         end
 
         it 'returns nil when body has been tampered' do
-          request.headers['RAW_POST_DATA'] = 'doo doo doo'
+          post :success, body: 'doo doo doo'
           expect(controller.signed_request_account).to be_nil
         end
       end
diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb
index 68bae256d7b1c400af05cb2e0bca9586a9ec5716..fbbd11f64806d4927298b06003097fdbed63ba67 100644
--- a/spec/controllers/emojis_controller_spec.rb
+++ b/spec/controllers/emojis_controller_spec.rb
@@ -6,11 +6,11 @@ describe EmojisController do
   let(:emoji) { Fabricate(:custom_emoji) }
 
   describe 'GET #show' do
-    subject(:responce) { get :show, params: { id: emoji.id, format: :json } }
+    subject(:response) { get :show, params: { id: emoji.id, format: :json } }
     subject(:body) { JSON.parse(response.body, symbolize_names: true) }
 
     it 'returns the right response' do
-      expect(responce).to have_http_status 200
+      expect(response).to have_http_status 200
       expect(body[:name]).to eq ':coolcat:'
     end
   end
diff --git a/spec/controllers/intents_controller_spec.rb b/spec/controllers/intents_controller_spec.rb
index 3dde7f835bffc83e7f60cfa21443dac8003022e2..ddfd5ea365639e082ca614c531fc0aae4e324970 100644
--- a/spec/controllers/intents_controller_spec.rb
+++ b/spec/controllers/intents_controller_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe IntentsController, type: :controller do
       context 'when host is follow' do
         let(:uri) { 'web+mastodon://follow?uri=test' }
 
-        it { is_expected.to redirect_to authorize_follow_path(acct: 'test') }
+        it { is_expected.to redirect_to authorize_interaction_path(uri: 'test') }
       end
 
       context 'when host is share' do
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index 9f5ab67c303144cf99e38e4b3b10e78d8d055fa8..76e617e6b69139d5639e26dafe6b83208236d29e 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -43,7 +43,7 @@ describe InvitesController do
       let(:user) { Fabricate(:user, moderator: false, admin: true) }
 
       it 'succeeds to create a invite' do
-        expect{ subject }.to change { Invite.count }.by(1)
+        expect { subject }.to change { Invite.count }.by(1)
         expect(subject).to redirect_to invites_path
         expect(Invite.last).to have_attributes(user_id: user.id, max_uses: 10)
       end
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index 91c2d03ef05e4b9c7265b6b88129a6055aa42396..a84260a54d2abbff1a3a67804e9738a11d3a69a6 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -5,23 +5,25 @@ require 'rails_helper'
 RSpec.describe Oauth::AuthorizationsController, type: :controller do
   render_views
 
-  let(:app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/') }
+  let(:app) { Doorkeeper::Application.create!(name: 'test', redirect_uri: 'http://localhost/', scopes: 'read') }
 
   describe 'GET #new' do
     subject do
-      get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/' }
+      get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read' }
     end
 
     shared_examples 'stores location for user' do
       it 'stores location for user' do
         subject
-        expect(controller.stored_location_for(:user)).to eq "/oauth/authorize?client_id=#{app.uid}&redirect_uri=http%3A%2F%2Flocalhost%2F&response_type=code"
+        expect(controller.stored_location_for(:user)).to eq "/oauth/authorize?client_id=#{app.uid}&redirect_uri=http%3A%2F%2Flocalhost%2F&response_type=code&scope=read"
       end
     end
 
     context 'when signed in' do
+      let!(:user) { Fabricate(:user) }
+
       before do
-        sign_in Fabricate(:user), scope: :user
+        sign_in user, scope: :user
       end
 
       it 'returns http success' do
@@ -35,6 +37,28 @@ RSpec.describe Oauth::AuthorizationsController, type: :controller do
       end
 
       include_examples 'stores location for user'
+
+      context 'when app is already authorized' do
+        before do
+          Doorkeeper::AccessToken.find_or_create_for(
+            app,
+            user.id,
+            app.scopes,
+            Doorkeeper.configuration.access_token_expires_in,
+            Doorkeeper.configuration.refresh_token_enabled?
+          )
+        end
+
+        it 'redirects to callback' do
+          subject
+          expect(response).to redirect_to(/\A#{app.redirect_uri}/)
+        end
+
+        it 'does not redirect to callback with force_login=true' do
+          get :new, params: { client_id: app.uid, response_type: 'code', redirect_uri: 'http://localhost/', scope: 'read', force_login: 'true' }
+          expect(response.body).to match(/Authorize/)
+        end
+      end
     end
 
     context 'when not signed in' do
diff --git a/spec/controllers/remote_interaction_controller_spec.rb b/spec/controllers/remote_interaction_controller_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bb0074b11482185e85a79510212483555a90f222
--- /dev/null
+++ b/spec/controllers/remote_interaction_controller_spec.rb
@@ -0,0 +1,39 @@
+# 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/remote_unfollows_controller_spec.rb b/spec/controllers/remote_unfollows_controller_spec.rb
index 223ed64af62b9dea45ecc529c93d507fcb39b075..a1a55ede0b19906a74904fe5b5566409df7cd154 100644
--- a/spec/controllers/remote_unfollows_controller_spec.rb
+++ b/spec/controllers/remote_unfollows_controller_spec.rb
@@ -14,11 +14,11 @@ describe RemoteUnfollowsController do
     before do
       sign_in current_user
       current_account.follow!(remote_account)
-      stub_request(:post, 'http://example.com/inbox'){ { status: 200 } }
+      stub_request(:post, 'http://example.com/inbox') { { status: 200 } }
     end
 
     context 'when successfully unfollow remote account' do
-      let(:acct) {"acct:#{ remote_account.username }@#{ remote_account.domain }"}
+      let(:acct) { "acct:#{remote_account.username}@#{remote_account.domain}" }
 
       it do
         is_expected.to render_template :success
@@ -27,7 +27,7 @@ describe RemoteUnfollowsController do
     end
 
     context 'when fails to unfollow remote account' do
-      let(:acct) {"acct:#{ remote_account.username + '_test' }@#{ remote_account.domain }"}
+      let(:acct) { "acct:#{remote_account.username + '_test'}@#{remote_account.domain}" }
 
       it do
         is_expected.to render_template :error
diff --git a/spec/controllers/settings/applications_controller_spec.rb b/spec/controllers/settings/applications_controller_spec.rb
index f87107695fe7c8ecb4431973a7b509f4e99169da..29c278148463f887915b0be770ed44c9764ff7cc 100644
--- a/spec/controllers/settings/applications_controller_spec.rb
+++ b/spec/controllers/settings/applications_controller_spec.rb
@@ -21,7 +21,6 @@ describe Settings::ApplicationsController do
     end
   end
 
-
   describe 'GET #show' do
     it 'returns http success' do
       get :show, params: { id: app.id }
@@ -48,13 +47,13 @@ describe Settings::ApplicationsController do
     context 'success (passed scopes as a String)' do
       def call_create
         post :create, params: {
-               doorkeeper_application: {
-                 name: 'My New App',
-                 redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
-                 website: 'http://google.com',
-                 scopes: 'read write follow'
-               }
-             }
+          doorkeeper_application: {
+            name: 'My New App',
+            redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+            website: 'http://google.com',
+            scopes: 'read write follow'
+          }
+        }
         response
       end
 
@@ -70,13 +69,13 @@ describe Settings::ApplicationsController do
     context 'success (passed scopes as an Array)' do
       def call_create
         post :create, params: {
-               doorkeeper_application: {
-                 name: 'My New App',
-                 redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
-                 website: 'http://google.com',
-                 scopes: [ 'read', 'write', 'follow' ]
-               }
-             }
+          doorkeeper_application: {
+            name: 'My New App',
+            redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+            website: 'http://google.com',
+            scopes: [ 'read', 'write', 'follow' ]
+          }
+        }
         response
       end
 
@@ -92,13 +91,13 @@ describe Settings::ApplicationsController do
     context 'failure' do
       before do
         post :create, params: {
-               doorkeeper_application: {
-                 name: '',
-                 redirect_uri: '',
-                 website: '',
-                 scopes: []
-               }
-             }
+          doorkeeper_application: {
+            name: '',
+            redirect_uri: '',
+            website: '',
+            scopes: []
+          }
+        }
       end
 
       it 'returns http success' do
@@ -121,9 +120,9 @@ describe Settings::ApplicationsController do
 
       def call_update
         patch :update, params: {
-                id: app.id,
-                doorkeeper_application: opts
-              }
+          id: app.id,
+          doorkeeper_application: opts
+        }
         response
       end
 
@@ -140,14 +139,14 @@ describe Settings::ApplicationsController do
     context 'failure' do
       before do
         patch :update, params: {
-                id: app.id,
-                doorkeeper_application: {
-                  name: '',
-                  redirect_uri: '',
-                  website: '',
-                  scopes: []
-                }
-              }
+          id: app.id,
+          doorkeeper_application: {
+            name: '',
+            redirect_uri: '',
+            website: '',
+            scopes: []
+          }
+        }
       end
 
       it 'returns http success' do
diff --git a/spec/controllers/settings/exports_controller_spec.rb b/spec/controllers/settings/exports_controller_spec.rb
index b7cab4d8f2b902d66e8cacc52368c934ef74b2c2..a46fe095d840553c525d0d516a7c4b949981dcab 100644
--- a/spec/controllers/settings/exports_controller_spec.rb
+++ b/spec/controllers/settings/exports_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Settings::ExportsController do
@@ -28,4 +30,23 @@ describe Settings::ExportsController do
       end
     end
   end
+
+  describe 'POST #create' do
+    before do
+      sign_in Fabricate(:user), scope: :user
+    end
+
+    it 'redirects to settings_export_path' do
+      post :create
+      expect(response).to redirect_to(settings_export_path)
+    end
+
+    it 'queues BackupWorker job by 1' do
+      Sidekiq::Testing.fake! do
+        expect do
+          post :create
+        end.to change(BackupWorker.jobs, :size).by(1)
+      end
+    end
+  end
 end
diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index a621bcf1ce9999da803f391245ce8ae0acd3b20c..4d814a45e2977013e2042f25f5b8d8a48a24715c 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -10,7 +10,6 @@ describe Settings::MigrationsController do
   end
 
   describe 'GET #show' do
-
     context 'when user is not sign in' do
       subject { get :show }
 
@@ -45,7 +44,6 @@ describe Settings::MigrationsController do
   end
 
   describe 'PUT #update' do
-
     context 'when user is not sign in' do
       subject { put :update }
 
diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb
index a453200af6efff4c8bce4eb4562d9f89b097200c..5b1fe3acad697e4c8878dd73d82b723de97469cb 100644
--- a/spec/controllers/settings/profiles_controller_spec.rb
+++ b/spec/controllers/settings/profiles_controller_spec.rb
@@ -26,4 +26,26 @@ RSpec.describe Settings::ProfilesController, type: :controller do
       expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
     end
   end
+
+  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('files/avatar.gif', 'image/gif') } }
+      expect(response).to redirect_to(settings_profile_path)
+      expect(account.reload.avatar.instance.avatar_file_name).not_to be_nil
+      expect(ActivityPub::UpdateDistributionWorker).to have_received(:perform_async).with(account.id)
+    end
+  end
+
+  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('files/4096x4097.png', 'image/png') } }
+      expect(response.body).to include('images are not supported')
+    end
+  end
 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 7612bf90ece61d1644f61deb037bdc1ff7d2e86f..478f2458552a71f7d7e575ec3b7adcfa379ca77f 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -50,7 +50,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
 
       describe 'when form_two_factor_confirmation parameter is not provided' do
         it 'raises ActionController::ParameterMissing' do
-          expect { post :create, params: { } }.to raise_error(ActionController::ParameterMissing)
+          expect { post :create, params: {} }.to raise_error(ActionController::ParameterMissing)
         end
       end
 
diff --git a/spec/controllers/statuses_controller_spec.rb b/spec/controllers/statuses_controller_spec.rb
index b4f3c5a08192819b6f94122ac29aa3d17f3ec30d..1bb6636c603e8827e4f3e5594fdd01dbc30bd3a3 100644
--- a/spec/controllers/statuses_controller_spec.rb
+++ b/spec/controllers/statuses_controller_spec.rb
@@ -115,14 +115,18 @@ describe StatusesController do
       end
 
       it 'assigns @descendant_threads for threads with :next_status key if they are hitting the depth limit' do
-        stub_const 'StatusesController::DESCENDANTS_DEPTH_LIMIT', 1
+        stub_const 'StatusesController::DESCENDANTS_DEPTH_LIMIT', 2
         status = Fabricate(:status)
-        child = Fabricate(:status, in_reply_to_id: status.id)
+        child0 = Fabricate(:status, in_reply_to_id: status.id)
+        child1 = Fabricate(:status, in_reply_to_id: child0.id)
+        child2 = Fabricate(:status, in_reply_to_id: child0.id)
 
         get :show, params: { account_username: status.account.username, id: status.id }
 
-        expect(assigns(:descendant_threads)[0][:statuses].pluck(:id)).not_to include child.id
-        expect(assigns(:descendant_threads)[0][:next_status].id).to eq child.id
+        expect(assigns(:descendant_threads)[0][:statuses].pluck(:id)).not_to include child1.id
+        expect(assigns(:descendant_threads)[1][:statuses].pluck(:id)).not_to include child2.id
+        expect(assigns(:descendant_threads)[0][:next_status].id).to eq child1.id
+        expect(assigns(:descendant_threads)[1][:next_status].id).to eq child2.id
       end
 
       it 'returns a success' do
diff --git a/spec/controllers/stream_entries_controller_spec.rb b/spec/controllers/stream_entries_controller_spec.rb
index 534bc393dcdd80b20e1fcb72d74bb268ff7e3fe7..eb7fdf9d7823d284c21ccfde3b9ad4248ba280dc 100644
--- a/spec/controllers/stream_entries_controller_spec.rb
+++ b/spec/controllers/stream_entries_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe StreamEntriesController, type: :controller do
   render_views
 
   shared_examples 'before_action' do |route|
-    context 'when account is not suspended anbd stream_entry is available' do
+    context 'when account is not suspended and stream_entry is available' do
       it 'assigns instance variables' do
         status = Fabricate(:status)
 
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index 33ccaed61c427d182f6f0b5682d33508c8042ca2..69def90cf7d2672e48c01eba6385649e5836d5c0 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe TagsController, type: :controller do
 
       it 'renders application layout' do
         get :show, params: { id: 'test', max_id: late.id }
-        expect(response).to render_template layout: 'application'
+        expect(response).to render_template layout: 'public'
       end
     end
 
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index 7aa983f821f15cb4a85c9e171ef3002e40b7a1af..e092e6c0993d4a0e98f1b3d335e512e59dc92090 100644
--- a/spec/fabricators/account_fabricator.rb
+++ b/spec/fabricators/account_fabricator.rb
@@ -6,5 +6,5 @@ Fabricator(:account) do
   username            { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } }
   last_webfingered_at { Time.now.utc }
   public_key          { public_key }
-  private_key         { private_key}
+  private_key         { private_key }
 end
diff --git a/spec/fabricators/account_pin_fabricator.rb b/spec/fabricators/account_pin_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c0f8b8afbb6b3abea08a0a1a6ad8bfa512108c92
--- /dev/null
+++ b/spec/fabricators/account_pin_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:account_pin) do
+  account        nil
+  target_account nil
+end
diff --git a/spec/fabricators/account_stat_fabricator.rb b/spec/fabricators/account_stat_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2b06b4790920deeecec58dfd0add1109bac82259
--- /dev/null
+++ b/spec/fabricators/account_stat_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator(:account_stat) do
+  account         nil
+  statuses_count  ""
+  following_count ""
+  followers_count ""
+end
diff --git a/spec/fabricators/account_tag_stat_fabricator.rb b/spec/fabricators/account_tag_stat_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9edb550beca213fb04b16e8b539d2459fa74ee4d
--- /dev/null
+++ b/spec/fabricators/account_tag_stat_fabricator.rb
@@ -0,0 +1,3 @@
+Fabricator(:account_tag_stat) do
+  accounts_count ""
+end
diff --git a/spec/fabricators/account_warning_fabricator.rb b/spec/fabricators/account_warning_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..db161d4464d5ae058b198dc75fb14f233d5a97d3
--- /dev/null
+++ b/spec/fabricators/account_warning_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:account_warning) do
+  account        nil
+  target_account nil
+  text           "MyText"
+end
diff --git a/spec/fabricators/account_warning_preset_fabricator.rb b/spec/fabricators/account_warning_preset_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6c0b87e7cd4831e12fbd1d16aa30bc709cb48c41
--- /dev/null
+++ b/spec/fabricators/account_warning_preset_fabricator.rb
@@ -0,0 +1,3 @@
+Fabricator(:account_warning_preset) do
+  text "MyText"
+end
diff --git a/spec/fabricators/conversation_account_fabricator.rb b/spec/fabricators/conversation_account_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f57ffd53594f9ca6da3f072f93d8f92d1578ec42
--- /dev/null
+++ b/spec/fabricators/conversation_account_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator(:conversation_account) do
+  account                 nil
+  conversation            nil
+  participant_account_ids ""
+  last_status             nil
+end
diff --git a/spec/fabricators/list_fabricator.rb b/spec/fabricators/list_fabricator.rb
index 2a61b317b8c7b281e9aa6584cf52a62c08b503d2..c3db690fa4a3c7a926c046abcf0804f04ad0249f 100644
--- a/spec/fabricators/list_fabricator.rb
+++ b/spec/fabricators/list_fabricator.rb
@@ -1,4 +1,4 @@
 Fabricator(:list) do
   account
-  title   "MyString"
+  title "MyString"
 end
diff --git a/spec/fabricators/relay_fabricator.rb b/spec/fabricators/relay_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..488913f772ea1ed0d913682b8ec784f75f5b6574
--- /dev/null
+++ b/spec/fabricators/relay_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:relay) do
+  inbox_url "https://example.com/inbox"
+  state :idle
+end
diff --git a/spec/fabricators/scheduled_status_fabricator.rb b/spec/fabricators/scheduled_status_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..52384d13787c8d88257bfca8590e6e4fed7d48f3
--- /dev/null
+++ b/spec/fabricators/scheduled_status_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:scheduled_status) do
+  account
+  scheduled_at { 20.hours.from_now }
+end
diff --git a/spec/fabricators/site_upload_fabricator.rb b/spec/fabricators/site_upload_fabricator.rb
index 8f4e43ac9baad7f28b8cfeb8aa21e69b22e234e6..4a171486f67029d59e1503e63a3163118abfa713 100644
--- a/spec/fabricators/site_upload_fabricator.rb
+++ b/spec/fabricators/site_upload_fabricator.rb
@@ -1,3 +1,2 @@
 Fabricator(:site_upload) do
-
 end
diff --git a/spec/fabricators/status_stat_fabricator.rb b/spec/fabricators/status_stat_fabricator.rb
new file mode 100644
index 0000000000000000000000000000000000000000..9c67fd404aea5d55c8d7fb03cd5a257e2b5e8e49
--- /dev/null
+++ b/spec/fabricators/status_stat_fabricator.rb
@@ -0,0 +1,6 @@
+Fabricator(:status_stat) do
+  status_id        nil
+  replies_count    ""
+  reblogs_count    ""
+  favourites_count ""
+end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index cf51fe81d0e6da68cc972c2eadb788bdc957fc67..8f59565016dcdc5e8c42f04eb3d713a467c90b7d 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -2,5 +2,6 @@ Fabricator(:user) do
   account
   email        { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
   password     "123456789"
-  confirmed_at { Time.now }
+  confirmed_at { Time.zone.now }
+  agreement    true
 end
diff --git a/spec/features/log_in_spec.rb b/spec/features/log_in_spec.rb
index ed626d880ebf1a569cc5049a3ed336094e35a59e..53a1f9b126daa13f11bf7347890667163fc8e19d 100644
--- a/spec/features/log_in_spec.rb
+++ b/spec/features/log_in_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 feature "Log in" do
   given(:email)        { "test@examle.com" }
   given(:password)     { "password" }
-  given(:confirmed_at) { Time.now }
+  given(:confirmed_at) { Time.zone.now }
 
   background do
     Fabricate(:user, email: email, password: password, confirmed_at: confirmed_at)
diff --git a/spec/fixtures/files/4096x4097.png b/spec/fixtures/files/4096x4097.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1110cc2df0a299b47e9ad088ea61ccfd428cddb
Binary files /dev/null and b/spec/fixtures/files/4096x4097.png differ
diff --git a/spec/fixtures/requests/oembed_json_empty.html b/spec/fixtures/requests/oembed_json_empty.html
new file mode 100644
index 0000000000000000000000000000000000000000..4b02413aac333bf63e2ed4d33cf56ea54c01d184
--- /dev/null
+++ b/spec/fixtures/requests/oembed_json_empty.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link href='https://host.test/empty_provider.json' rel='alternate' type='application/json+oembed'>
+  </head>
+  <body></body>
+</html>
diff --git a/spec/fixtures/requests/windows-1251.txt b/spec/fixtures/requests/windows-1251.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f573e28b24904f43fb6198e4d4f854449298a9dc
--- /dev/null
+++ b/spec/fixtures/requests/windows-1251.txt
@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Wed, 12 Dec 2018 13:14:03 GMT
+content-type: text/html
+content-length: 190
+accept-ranges: bytes
+
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=windows-1251" />
+  <title>ñýìïë òåêñò</title>
+</head>
+<body>
+  <p>ñýìïë òåêñò</p>
+</body>
+</html>
diff --git a/spec/helpers/admin/account_moderation_notes_helper_spec.rb b/spec/helpers/admin/account_moderation_notes_helper_spec.rb
index 01b60c85162a44a3b0206318084a17c5ad0002b9..c07f6c4b886b37492c52b8ec0376ccc7ec380949 100644
--- a/spec/helpers/admin/account_moderation_notes_helper_spec.rb
+++ b/spec/helpers/admin/account_moderation_notes_helper_spec.rb
@@ -1,15 +1,55 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
-# Specs in this file have access to a helper object that includes
-# the Admin::AccountModerationNotesHelper. For example:
-#
-# describe Admin::AccountModerationNotesHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
 RSpec.describe Admin::AccountModerationNotesHelper, type: :helper do
-  pending "add some examples to (or delete) #{__FILE__}"
+  include StreamEntriesHelper
+
+  describe '#admin_account_link_to' do
+    context 'account is nil' do
+      let(:account) { nil }
+
+      it 'returns nil' do
+        expect(helper.admin_account_link_to(account)).to be_nil
+      end
+    end
+
+    context 'with account' do
+      let(:account) { Fabricate(:account) }
+
+      it 'calls #link_to' do
+        expect(helper).to receive(:link_to).with(
+          admin_account_path(account.id),
+          class: name_tag_classes(account),
+          title: account.acct
+        )
+
+        helper.admin_account_link_to(account)
+      end
+    end
+  end
+
+  describe '#admin_account_inline_link_to' do
+    context 'account is nil' do
+      let(:account) { nil }
+
+      it 'returns nil' do
+        expect(helper.admin_account_inline_link_to(account)).to be_nil
+      end
+    end
+
+    context 'with account' do
+      let(:account) { Fabricate(:account) }
+
+      it 'calls #link_to' do
+        expect(helper).to receive(:link_to).with(
+          admin_account_path(account.id),
+          class: name_tag_classes(account, true),
+          title: account.acct
+        )
+
+        helper.admin_account_inline_link_to(account)
+      end
+    end
+  end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index ac54f1f703036a296a198f598374fa0a22f765b7..61780b46b929ef26ad2cb1625e41b5b85104f9ef 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -9,6 +9,14 @@ describe ApplicationHelper do
       expect(result).to eq "active"
     end
 
+    it 'returns active when on a current page' do
+      allow(helper).to receive(:current_page?).with('/foo').and_return(false)
+      allow(helper).to receive(:current_page?).with('/test').and_return(true)
+
+      result = helper.active_nav_class('/foo', '/test')
+      expect(result).to eq "active"
+    end
+
     it 'returns empty string when not on current page' do
       allow(helper).to receive(:current_page?).and_return(false)
 
@@ -17,7 +25,7 @@ describe ApplicationHelper do
     end
   end
 
-  describe 'add_rtl_body_class' do
+  describe 'locale_direction' do
     around do |example|
       current_locale = I18n.locale
       example.run
@@ -26,22 +34,22 @@ describe ApplicationHelper do
 
     it 'adds rtl body class if locale is Arabic' do
       I18n.locale = :ar
-      expect(helper.add_rtl_body_class('other classes')).to eq 'other classes rtl'
+      expect(helper.locale_direction).to eq 'rtl'
     end
 
     it 'adds rtl body class if locale is Farsi' do
       I18n.locale = :fa
-      expect(helper.add_rtl_body_class('other classes')).to eq 'other classes rtl'
+      expect(helper.locale_direction).to eq 'rtl'
     end
 
     it 'adds rtl if locale is Hebrew' do
       I18n.locale = :he
-      expect(helper.add_rtl_body_class('other classes')).to eq 'other classes rtl'
+      expect(helper.locale_direction).to eq 'rtl'
     end
 
     it 'does not add rtl if locale is Thai' do
       I18n.locale = :th
-      expect(helper.add_rtl_body_class('other classes')).to eq 'other classes'
+      expect(helper.locale_direction).to_not eq 'rtl'
     end
   end
 
diff --git a/spec/helpers/jsonld_helper_spec.rb b/spec/helpers/jsonld_helper_spec.rb
index a5ab249c236dbb63521ff18f6111058e2a9ba048..883a88b14df1f3ba15c01b2f0bee86e25623bc1d 100644
--- a/spec/helpers/jsonld_helper_spec.rb
+++ b/spec/helpers/jsonld_helper_spec.rb
@@ -22,11 +22,35 @@ describe JsonLdHelper do
   end
 
   describe '#first_of_value' do
-    pending
+    context 'value.is_a?(Array)' do
+      it 'returns value.first' do
+        value = ['a']
+        expect(helper.first_of_value(value)).to be 'a'
+      end
+    end
+
+    context '!value.is_a?(Array)' do
+      it 'returns value' do
+        value = 'a'
+        expect(helper.first_of_value(value)).to be 'a'
+      end
+    end
   end
 
   describe '#supported_context?' do
-    pending
+    context "!json.nil? && equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)" do
+      it 'returns true' do
+        json = { '@context' => ActivityPub::TagManager::CONTEXT }.as_json
+        expect(helper.supported_context?(json)).to be true
+      end
+    end
+
+    context 'else' do
+      it 'returns false' do
+        json = nil
+        expect(helper.supported_context?(json)).to be false
+      end
+    end
   end
 
   describe '#fetch_resource' do
diff --git a/spec/helpers/stream_entries_helper_spec.rb b/spec/helpers/stream_entries_helper_spec.rb
index 1de6691ba1547f6731d7a8db82a187bb9b6c9d68..845b9974ea1b5ce7446f7869443fbb3343f96227 100644
--- a/spec/helpers/stream_entries_helper_spec.rb
+++ b/spec/helpers/stream_entries_helper_spec.rb
@@ -58,13 +58,14 @@ RSpec.describe StreamEntriesHelper, type: :helper do
       expect(acct).to eq '@user@foreign_server.com'
     end
 
-    it 'is the shortname for non embedded local accounts' do
+    it 'is fully qualified for non embedded local accounts' do
+      allow(Rails.configuration.x).to receive(:local_domain).and_return('local_domain')
       set_not_embedded_view
       account = Account.new(domain: nil, username: 'user')
 
       acct = helper.acct(account)
 
-      expect(acct).to eq '@user'
+      expect(acct).to eq '@user@local_domain'
     end
   end
 
diff --git a/spec/lib/activitypub/activity/accept_spec.rb b/spec/lib/activitypub/activity/accept_spec.rb
index 6503c83e37a33e97ab61f69850bad19e5d23d476..883bab6ac92c95306a949d6ee8010199cb535ea4 100644
--- a/spec/lib/activitypub/activity/accept_spec.rb
+++ b/spec/lib/activitypub/activity/accept_spec.rb
@@ -35,4 +35,30 @@ RSpec.describe ActivityPub::Activity::Accept do
       expect(recipient.requested?(sender)).to be false
     end
   end
+
+  context 'given a relay' do
+    let!(:relay) { Fabricate(:relay, state: :pending, follow_activity_id: 'https://abc-123/456') }
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Accept',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: {
+          id: 'https://abc-123/456',
+          type: 'Follow',
+          actor: ActivityPub::TagManager.instance.uri_for(recipient),
+          object: ActivityPub::TagManager.instance.uri_for(sender),
+        },
+      }.with_indifferent_access
+    end
+
+    subject { described_class.new(json, sender) }
+
+    it 'marks the relay as accepted' do
+      subject.perform
+      expect(relay.reload.accepted?).to be true
+    end
+  end
 end
diff --git a/spec/lib/activitypub/activity/block_spec.rb b/spec/lib/activitypub/activity/block_spec.rb
index 23c8cc31cf799e49d402009fa3e84a0694d9dc20..94d37356dd14c23a98436a65f00161689d8d6554 100644
--- a/spec/lib/activitypub/activity/block_spec.rb
+++ b/spec/lib/activitypub/activity/block_spec.rb
@@ -14,15 +14,72 @@ RSpec.describe ActivityPub::Activity::Block do
     }.with_indifferent_access
   end
 
-  describe '#perform' do
-    subject { described_class.new(json, sender) }
+  context 'when the recipient does not follow the sender' do
+    describe '#perform' do
+      subject { described_class.new(json, sender) }
+
+      before do
+        subject.perform
+      end
+
+      it 'creates a block from sender to recipient' do
+        expect(sender.blocking?(recipient)).to be true
+      end
+    end
+  end
+
+  context 'when the recipient follows the sender' do
+    before do
+      recipient.follow!(sender)
+    end
+
+    describe '#perform' do
+      subject { described_class.new(json, sender) }
+
+      before do
+        subject.perform
+      end
+
+      it 'creates a block from sender to recipient' do
+        expect(sender.blocking?(recipient)).to be true
+      end
+
+      it 'ensures recipient is not following sender' do
+        expect(recipient.following?(sender)).to be false
+      end
+    end
+  end
+
+  context 'when a matching undo has been received first' do
+    let(:undo_json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'bar',
+        type: 'Undo',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: json,
+      }.with_indifferent_access
+    end
 
     before do
-      subject.perform
+      recipient.follow!(sender)
+      ActivityPub::Activity::Undo.new(undo_json, sender).perform
     end
 
-    it 'creates a block from sender to recipient' do
-      expect(sender.blocking?(recipient)).to be true
+    describe '#perform' do
+      subject { described_class.new(json, sender) }
+
+      before do
+        subject.perform
+      end
+
+      it 'does not create a block from sender to recipient' do
+        expect(sender.blocking?(recipient)).to be false
+      end
+
+      it 'ensures recipient is not following sender' do
+        expect(recipient.following?(sender)).to be false
+      end
     end
   end
 end
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 62b9db8c24d251526902f1a9d7c948e52218c1f0..cd20b7c7cb006982ee1247dd099938c436a3c5eb 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -105,6 +105,31 @@ RSpec.describe ActivityPub::Activity::Create do
       end
     end
 
+    context 'limited' do
+      let(:recipient) { Fabricate(:account) }
+
+      let(:object_json) do
+        {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), '#bar'].join,
+          type: 'Note',
+          content: 'Lorem ipsum',
+          to: ActivityPub::TagManager.instance.uri_for(recipient),
+        }
+      end
+
+      it 'creates status' do
+        status = sender.statuses.first
+
+        expect(status).to_not be_nil
+        expect(status.visibility).to eq 'limited'
+      end
+
+      it 'creates silent mention' do
+        status = sender.statuses.first
+        expect(status.mentions.first).to be_silent
+      end
+    end
+
     context 'direct' do
       let(:recipient) { Fabricate(:account) }
 
@@ -114,6 +139,10 @@ RSpec.describe ActivityPub::Activity::Create do
           type: 'Note',
           content: 'Lorem ipsum',
           to: ActivityPub::TagManager.instance.uri_for(recipient),
+          tag: {
+            type: 'Mention',
+            href: ActivityPub::TagManager.instance.uri_for(recipient),
+          },
         }
       end
 
diff --git a/spec/lib/activitypub/activity/move_spec.rb b/spec/lib/activitypub/activity/move_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..3574f273a904ff4dcc2d5635ee16c7e90a243017
--- /dev/null
+++ b/spec/lib/activitypub/activity/move_spec.rb
@@ -0,0 +1,52 @@
+require 'rails_helper'
+
+RSpec.describe ActivityPub::Activity::Move do
+  let(:follower)    { Fabricate(:account) }
+  let(:old_account) { Fabricate(:account) }
+  let(:new_account) { Fabricate(:account) }
+
+  before do
+    follower.follow!(old_account)
+
+    old_account.update!(uri: 'https://example.org/alice', domain: 'example.org', protocol: :activitypub, inbox_url: 'https://example.org/inbox')
+    new_account.update!(uri: 'https://example.com/alice', domain: 'example.com', protocol: :activitypub, inbox_url: 'https://example.com/inbox', also_known_as: [old_account.uri])
+
+    stub_request(:post, 'https://example.org/inbox').to_return(status: 200)
+    stub_request(:post, 'https://example.com/inbox').to_return(status: 200)
+
+    service_stub = double
+    allow(ActivityPub::FetchRemoteAccountService).to receive(:new).and_return(service_stub)
+    allow(service_stub).to receive(:call).and_return(new_account)
+  end
+
+  let(:json) do
+    {
+      '@context': 'https://www.w3.org/ns/activitystreams',
+      id: 'foo',
+      type: 'Move',
+      actor: old_account.uri,
+      object: old_account.uri,
+      target: new_account.uri,
+    }.with_indifferent_access
+  end
+
+  describe '#perform' do
+    subject { described_class.new(json, old_account) }
+
+    before do
+      subject.perform
+    end
+
+    it 'sets moved account on old account' do
+      expect(old_account.reload.moved_to_account_id).to eq new_account.id
+    end
+
+    it 'makes followers unfollow old account' do
+      expect(follower.following?(old_account)).to be false
+    end
+
+    it 'makes followers follow-request the new account' do
+      expect(follower.requested?(new_account)).to be true
+    end
+  end
+end
diff --git a/spec/lib/activitypub/activity/reject_spec.rb b/spec/lib/activitypub/activity/reject_spec.rb
index 7fd95bcc64836e6d7e7d9daee09380c9bbbbd824..e7205df8dd6dcb30bfd18c304ef1fecdc4dd3917 100644
--- a/spec/lib/activitypub/activity/reject_spec.rb
+++ b/spec/lib/activitypub/activity/reject_spec.rb
@@ -35,4 +35,30 @@ RSpec.describe ActivityPub::Activity::Reject do
       expect(recipient.requested?(sender)).to be false
     end
   end
+
+  context 'given a relay' do
+    let!(:relay) { Fabricate(:relay, state: :pending, follow_activity_id: 'https://abc-123/456') }
+
+    let(:json) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Reject',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: {
+          id: 'https://abc-123/456',
+          type: 'Follow',
+          actor: ActivityPub::TagManager.instance.uri_for(recipient),
+          object: ActivityPub::TagManager.instance.uri_for(sender),
+        },
+      }.with_indifferent_access
+    end
+
+    subject { described_class.new(json, sender) }
+
+    it 'marks the relay as rejected' do
+      subject.perform
+      expect(relay.reload.rejected?).to be true
+    end
+  end
 end
diff --git a/spec/lib/activitypub/activity/undo_spec.rb b/spec/lib/activitypub/activity/undo_spec.rb
index e01c5e03e70554e5f2d6572d877168ebe63413f2..9545e1f46af6b98ba924ad53b5e84f2e2cc7ebdb 100644
--- a/spec/lib/activitypub/activity/undo_spec.rb
+++ b/spec/lib/activitypub/activity/undo_spec.rb
@@ -52,6 +52,32 @@ RSpec.describe ActivityPub::Activity::Undo do
       end
     end
 
+    context 'with Accept' do
+      let(:recipient) { Fabricate(:account) }
+      let(:object_json) do
+        {
+          id: 'bar',
+          type: 'Accept',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: 'follow-to-revoke',
+        }
+      end
+
+      before do
+        recipient.follow!(sender, uri: 'follow-to-revoke')
+      end
+
+      it 'deletes follow from recipient to sender' do
+        subject.perform
+        expect(recipient.following?(sender)).to be false
+      end
+
+      it 'creates a follow request from recipient to sender' do
+        subject.perform
+        expect(recipient.requested?(sender)).to be true
+      end
+    end
+
     context 'with Block' do
       let(:recipient) { Fabricate(:account) }
 
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 7535e144d7d935ed8a530e67724a8ec3352509a3..c506cd87f171db43229ea4e2dec1fee8e0d1b6d9 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -108,14 +108,14 @@ RSpec.describe FeedManager do
 
       it 'returns false for status by followee mentioning another account' do
         bob.follow!(alice)
-        status = PostStatusService.new.call(alice, 'Hey @jeff')
+        status = PostStatusService.new.call(alice, text: 'Hey @jeff')
         expect(FeedManager.instance.filter?(:home, status, bob.id)).to be false
       end
 
       it 'returns true for status by followee mentioning blocked account' do
         bob.block!(jeff)
         bob.follow!(alice)
-        status = PostStatusService.new.call(alice, 'Hey @jeff')
+        status = PostStatusService.new.call(alice, text: 'Hey @jeff')
         expect(FeedManager.instance.filter?(:home, status, bob.id)).to be true
       end
 
@@ -155,7 +155,7 @@ RSpec.describe FeedManager do
     context 'for mentions feed' do
       it 'returns true for status that mentions blocked account' do
         bob.block!(jeff)
-        status = PostStatusService.new.call(alice, 'Hey @jeff')
+        status = PostStatusService.new.call(alice, text: 'Hey @jeff')
         expect(FeedManager.instance.filter?(:mentions, status, bob.id)).to be true
       end
 
@@ -393,7 +393,7 @@ RSpec.describe FeedManager do
     end
 
     it 'sends push updates' do
-      status  = Fabricate(:status)
+      status = Fabricate(:status)
 
       FeedManager.instance.push_to_home(receiver, status)
 
diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb
index b8683e720bfe45acc83895221b2011ec4f9dbc14..0c1efe7c3cc763799e0e5c77ab1ef820f7d2d3b1 100644
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@@ -5,26 +5,26 @@ RSpec.describe Formatter do
   let(:remote_account) { Fabricate(:account, domain: 'remote.test', username: 'bob', url: 'https://remote.test/') }
 
   shared_examples 'encode and link URLs' do
-    context 'matches a stand-alone medium URL' 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 'has valid URL' do
+      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 'matches a stand-alone google URL' do
+    context 'given a stand-alone google URL' do
       let(:text) { 'http://google.com' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="http://google.com"'
       end
     end
 
-    context 'matches a stand-alone IDN URL' do
+    context 'given a stand-alone IDN URL' do
       let(:text) { 'https://nic.ã¿ã‚“ãª/' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="https://nic.ã¿ã‚“ãª/"'
       end
 
@@ -33,148 +33,170 @@ RSpec.describe Formatter do
       end
     end
 
-    context 'matches a URL without trailing period' do
+    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 'has valid URL' do
+      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 'matches a URL without closing paranthesis' do
+    context 'given a URL enclosed with parentheses' do
       let(:text) { '(http://google.com/)' }
 
-      it 'has valid URL' do
+      it 'matches the full URL but not the parentheses' do
         is_expected.to include 'href="http://google.com/"'
       end
     end
 
-    context 'matches a URL without exclamation point' do
+    context 'given a URL with a trailing exclamation point' do
       let(:text) { 'http://www.google.com!' }
 
-      it 'has valid URL' do
+      it 'matches the full URL but not the exclamation point' do
         is_expected.to include 'href="http://www.google.com"'
       end
     end
 
-    context 'matches a URL without single quote' do
+    context 'given a URL with a trailing single quote' do
       let(:text) { "http://www.google.com'" }
 
-      it 'has valid URL' do
+      it 'matches the full URL but not the single quote' do
         is_expected.to include 'href="http://www.google.com"'
       end
     end
 
-    context 'matches a URL without angle brackets' do
+    context 'given a URL with a trailing angle bracket' do
       let(:text) { 'http://www.google.com>' }
 
-      it 'has valid URL' do
+      it 'matches the full URL but not the angle bracket' do
         is_expected.to include 'href="http://www.google.com"'
       end
     end
 
-    context 'matches a URL with a query string' do
+    context 'given a URL with a query string' do
       let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink' }
 
-      it 'has valid URL' do
+      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 'matches a URL with parenthesis in it' do
+    context 'given a URL with parentheses in it' do
       let(:text) { 'https://en.wikipedia.org/wiki/Diaspora_(software)' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="https://en.wikipedia.org/wiki/Diaspora_(software)"'
       end
     end
 
-    context 'matches a URL with Japanese path string' do
+    context 'given a URL with Japanese path string' do
       let(:text) { 'https://ja.wikipedia.org/wiki/æ—¥æœ¬' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="https://ja.wikipedia.org/wiki/æ—¥æœ¬"'
       end
     end
 
-    context 'matches a URL with Korean path string' do
+    context 'given a URL with Korean path string' do
       let(:text) { 'https://ko.wikipedia.org/wiki/ëŒ€í•œë¯¼êµ' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="https://ko.wikipedia.org/wiki/ëŒ€í•œë¯¼êµ"'
       end
     end
 
-    context 'matches a URL with Simplified Chinese path string' do
+    context 'given a URL with Simplified Chinese path string' do
       let(:text) { 'https://baike.baidu.com/item/ä¸åŽäººæ°‘å…±å’Œå›½' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="https://baike.baidu.com/item/ä¸åŽäººæ°‘å…±å’Œå›½"'
       end
     end
 
-    context 'matches a URL with Traditional Chinese path string' do
+    context 'given a URL with Traditional Chinese path string' do
       let(:text) { 'https://zh.wikipedia.org/wiki/è‡ºç£' }
 
-      it 'has valid URL' do
+      it 'matches the full URL' do
         is_expected.to include 'href="https://zh.wikipedia.org/wiki/è‡ºç£"'
       end
     end
 
-    context 'contains unsafe URL (XSS attack, visible part)' do
+    context 'given a URL containing unsafe code (XSS attack, visible part)' do
       let(:text) { %q{http://example.com/b<del>b</del>} }
 
-      it 'has escaped HTML' do
+      it 'escapes the HTML in the URL' do
         is_expected.to include '&lt;del&gt;b&lt;/del&gt;'
       end
     end
 
-    context 'contains unsafe URL (XSS attack, invisible part)' do
+    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 'has escaped HTML' do
+      it 'escapes the HTML in the URL' do
         is_expected.to include '&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;'
       end
     end
 
-    context 'contains HTML (script tag)' do
+    context 'given text containing HTML code (script tag)' do
       let(:text) { '<script>alert("Hello")</script>' }
 
-      it 'has escaped HTML' do
+      it 'escapes the HTML' do
         is_expected.to include '<p>&lt;script&gt;alert(&quot;Hello&quot;)&lt;/script&gt;</p>'
       end
     end
 
-    context 'contains HTML (XSS attack)' do
+    context 'given text containing HTML (XSS attack)' do
       let(:text) { %q{<img src="javascript:alert('XSS');">} }
 
-      it 'has escaped HTML' do
+      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 'contains invalid URL' do
+    context 'given an invalid URL' do
       let(:text) { 'http://www\.google\.com' }
 
-      it 'has raw URL' do
+      it 'outputs the raw URL' do
         is_expected.to eq '<p>http://www\.google\.com</p>'
       end
     end
 
-    context 'contains a hashtag' do
+    context 'given text containing a hashtag' do
       let(:text)  { '#hashtag' }
 
-      it 'has a link' do
+      it 'creates a hashtag link' do
         is_expected.to include '/tags/hashtag" class="mention hashtag" rel="tag">#<span>hashtag</span></a>'
       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" alt=":coolcat:"/)
+      end
+    end
+  end
+
   describe '#format' do
     subject { Formatter.instance.format(status) }
 
-    context 'with local status' do
-      context 'with reblog' do
+    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) }
 
@@ -183,34 +205,34 @@ RSpec.describe Formatter do
         end
       end
 
-      context 'contains plain text' do
-        let(:status)  { Fabricate(:status, text: 'text', uri: nil) }
+      context 'given a post containing plain text' do
+        let(:status) { Fabricate(:status, text: 'text', uri: nil) }
 
-        it 'paragraphizes' do
+        it 'paragraphizes the text' do
           is_expected.to eq '<p>text</p>'
         end
       end
 
-      context 'contains line feeds' do
-        let(:status)  { Fabricate(:status, text: "line\nfeed", uri: nil) }
+      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 'contains linkable mentions' do
+      context 'given a post containing linkable mentions' do
         let(:status) { Fabricate(:status, mentions: [ Fabricate(:mention, account: local_account) ], text: '@alice') }
 
-        it 'links' do
+        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 'contains unlinkable mentions' do
+      context 'given a post containing unlinkable mentions' do
         let(:status) { Fabricate(:status, text: '@alice', uri: nil) }
 
-        it 'does not link' do
+        it 'does not create a mention link' do
           is_expected.to include '@alice'
         end
       end
@@ -224,29 +246,29 @@ RSpec.describe Formatter do
         include_examples 'encode and link URLs'
       end
 
-      context 'with custom_emojify option' do
+      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 'with emoji at the start' do
+        context 'given a post with an emoji shortcode at the start' do
           let(:text) { ':coolcat: Beep boop' }
 
-          it 'converts shortcode to image tag' do
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/<p><img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
 
-        context 'with emoji in the middle' do
+        context 'given a post with an emoji shortcode in the middle' do
           let(:text) { 'Beep :coolcat: boop' }
 
-          it 'converts shortcode to image tag' do
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/Beep <img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
 
-        context 'with concatenated emoji' do
+        context 'given a post with concatenated emoji shortcodes' do
           let(:text) { ':coolcat::coolcat:' }
 
           it 'does not touch the shortcodes' do
@@ -254,46 +276,46 @@ RSpec.describe Formatter do
           end
         end
 
-        context 'with emoji at the end' do
+        context 'given a post with an emoji shortcode at the end' do
           let(:text) { 'Beep boop :coolcat:' }
 
-          it 'converts shortcode to image tag' do
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/boop <img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
       end
     end
 
-    context 'with remote status' do
+    context 'given a post with remote status' do
       let(:status) { Fabricate(:status, account: remote_account, text: 'Beep boop') }
 
-      it 'reformats' do
+      it 'reformats the post' do
         is_expected.to eq 'Beep boop'
       end
 
-      context 'with custom_emojify option' do
+      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 'with emoji at the start' do
+        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
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/<p><img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
 
-        context 'with emoji in the middle' do
+        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
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/Beep <img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
 
-        context 'with concatenated emoji' do
+        context 'given a post with concatenated emoji' do
           let(:text) { '<p>:coolcat::coolcat:</p>' }
 
           it 'does not touch the shortcodes' do
@@ -301,10 +323,10 @@ RSpec.describe Formatter do
           end
         end
 
-        context 'with emoji at the end' do
+        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
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/<br><img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
@@ -315,26 +337,26 @@ RSpec.describe Formatter do
   describe '#reformat' do
     subject { Formatter.instance.reformat(text) }
 
-    context 'contains plain text' do
+    context 'given a post containing plain text' do
       let(:text) { 'Beep boop' }
 
-      it 'contains plain text' do
+      it 'keeps the plain text' do
         is_expected.to include 'Beep boop'
       end
     end
 
-    context 'contains scripts' do
+    context 'given a post containing script tags' do
       let(:text) { '<script>alert("Hello")</script>' }
 
-      it 'strips scripts' do
+      it 'strips the scripts' do
         is_expected.to_not include '<script>alert("Hello")</script>'
       end
     end
 
-    context 'contains malicious classes' do
+    context 'given a post containing malicious classes' do
       let(:text) { '<span class="mention	status__content__spoiler-link">Show more</span>' }
 
-      it 'strips malicious classes' do
+      it 'strips the malicious classes' do
         is_expected.to_not include 'status__content__spoiler-link'
       end
     end
@@ -343,16 +365,16 @@ RSpec.describe Formatter do
   describe '#plaintext' do
     subject { Formatter.instance.plaintext(status) }
 
-    context '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) }
+    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 raw text' do
+      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 'with remote status' do
-      let(:status)  { Fabricate(:status, account: remote_account, text: '<script>alert("Hello")</script>') }
+    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 ''
@@ -363,60 +385,60 @@ RSpec.describe Formatter do
   describe '#simplified_format' do
     subject { Formatter.instance.simplified_format(account) }
 
-    context 'with local status' do
+    context 'given a post with local status' do
       let(:account) { Fabricate(:account, domain: nil, note: text) }
 
-      context 'contains linkable mentions for local accounts' do
+      context 'given a post containing linkable mentions for local accounts' do
         let(:text) { '@alice' }
 
         before { local_account }
 
-        it 'links' do
+        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 'contains linkable mentions for remote accounts' do
+      context 'given a post containing linkable mentions for remote accounts' do
         let(:text) { '@bob@remote.test' }
 
         before { remote_account }
 
-        it 'links' do
+        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 'contains unlinkable mentions' do
+      context 'given a post containing unlinkable mentions' do
         let(:text) { '@alice' }
 
-        it 'returns raw mention texts' do
+        it 'does not create a mention link' do
           is_expected.to eq '<p>@alice</p>'
         end
       end
 
-      context 'with custom_emojify option' do
+      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 'with emoji at the start' do
+        context 'given a post with an emoji shortcode at the start' do
           let(:text) { ':coolcat: Beep boop' }
 
-          it 'converts shortcode to image tag' do
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/<p><img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
 
-        context 'with emoji in the middle' do
+        context 'given a post with an emoji shortcode in the middle' do
           let(:text) { 'Beep :coolcat: boop' }
 
-          it 'converts shortcode to image tag' do
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/Beep <img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
 
-        context 'with concatenated emoji' do
+        context 'given a post with concatenated emoji shortcodes' do
           let(:text) { ':coolcat::coolcat:' }
 
           it 'does not touch the shortcodes' do
@@ -424,10 +446,10 @@ RSpec.describe Formatter do
           end
         end
 
-        context 'with emoji at the end' do
+        context 'given a post with an emoji shortcode at the end' do
           let(:text) { 'Beep boop :coolcat:' }
 
-          it 'converts shortcode to image tag' do
+          it 'converts the shortcode to an image tag' do
             is_expected.to match(/boop <img draggable="false" class="emojione" alt=":coolcat:"/)
           end
         end
@@ -436,7 +458,7 @@ RSpec.describe Formatter do
       include_examples 'encode and link URLs'
     end
 
-    context 'with remote status' do
+    context 'given a post with remote status' do
       let(:text) { '<script>alert("Hello")</script>' }
       let(:account) { Fabricate(:account, domain: 'remote', note: text) }
 
@@ -451,7 +473,7 @@ RSpec.describe Formatter do
 
         subject { Formatter.instance.simplified_format(remote_account, custom_emojify: true) }
 
-        context 'with emoji at the start' do
+        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
@@ -459,7 +481,7 @@ RSpec.describe Formatter do
           end
         end
 
-        context 'with emoji in the middle' do
+        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
@@ -467,7 +489,7 @@ RSpec.describe Formatter do
           end
         end
 
-        context 'with concatenated emoji' do
+        context 'given a post with concatenated emoji shortcodes' do
           let(:text) { '<p>:coolcat::coolcat:</p>' }
 
           it 'does not touch the shortcodes' do
@@ -475,7 +497,7 @@ RSpec.describe Formatter do
           end
         end
 
-        context 'with emoji at the end' do
+        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
@@ -492,7 +514,7 @@ RSpec.describe Formatter do
     subject { Formatter.instance.sanitize(html, Sanitize::Config::MASTODON_STRICT) }
 
     it 'sanitizes' do
-      is_expected.to eq 'alert("Hello")'
+      is_expected.to eq ''
     end
   end
 end
diff --git a/spec/lib/language_detector_spec.rb b/spec/lib/language_detector_spec.rb
index d1702651156b1374d962b139512b91c53b02af09..0fa2a59eff9150830de9bfa4f61f6e722d2ccfd4 100644
--- a/spec/lib/language_detector_spec.rb
+++ b/spec/lib/language_detector_spec.rb
@@ -42,6 +42,7 @@ describe LanguageDetector do
 
   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 = [
@@ -57,7 +58,7 @@ describe LanguageDetector do
     end
 
     it 'detects spanish language' do
-      string = 'Obtener un Hola y bienvenidos a Mastodon'
+      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
@@ -86,11 +87,11 @@ describe LanguageDetector do
           account = double(user_locale: 'fr')
           result  = described_class.instance.detect('', account)
 
-          expect(result).to eq :fr
+          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)
+          result = described_class.instance.detect('', account_without_user_locale)
 
           expect(result).to eq nil
         end
@@ -104,6 +105,15 @@ describe LanguageDetector do
         end
       end
 
+      describe 'remote user' do
+        it 'nil for foreign user when language is not present' do
+          string = 'ì•ˆë…•í•˜ì„¸ìš”'
+          result = described_class.instance.detect(string, account_remote)
+
+          expect(result).to eq nil
+        end
+      end
+
       describe 'with a non-`en` default locale' do
         around(:each) do |example|
           before = I18n.default_locale
diff --git a/spec/lib/ostatus/atom_serializer_spec.rb b/spec/lib/ostatus/atom_serializer_spec.rb
index 0bd22880e0c346b363fd0669b3e46a010c71be31..891871c1c7fabbabd3ed938348951e87bdd55316 100644
--- a/spec/lib/ostatus/atom_serializer_spec.rb
+++ b/spec/lib/ostatus/atom_serializer_spec.rb
@@ -728,9 +728,9 @@ RSpec.describe OStatus::AtomSerializer do
     it 'appends id element with unique tag' do
       block = Fabricate(:block)
 
-      time_before = Time.now
+      time_before = Time.zone.now
       block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
-      time_after = Time.now
+      time_after = Time.zone.now
 
       expect(block_salmon.id.text).to(
         eq(OStatus::TagManager.instance.unique_tag(time_before.utc, block.id, 'Block'))
@@ -815,9 +815,9 @@ RSpec.describe OStatus::AtomSerializer do
     it 'appends id element with unique tag' do
       block = Fabricate(:block)
 
-      time_before = Time.now
+      time_before = Time.zone.now
       unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
-      time_after = Time.now
+      time_after = Time.zone.now
 
       expect(unblock_salmon.id.text).to(
         eq(OStatus::TagManager.instance.unique_tag(time_before.utc, block.id, 'Block'))
@@ -880,7 +880,7 @@ RSpec.describe OStatus::AtomSerializer do
 
       ProcessInteractionService.new.call(envelope, block.target_account)
 
-      expect{ block.reload }.to raise_error ActiveRecord::RecordNotFound
+      expect { block.reload }.to raise_error ActiveRecord::RecordNotFound
     end
   end
 
@@ -994,9 +994,9 @@ RSpec.describe OStatus::AtomSerializer do
     it 'appends id element with unique tag' do
       favourite = Fabricate(:favourite)
 
-      time_before = Time.now
+      time_before = Time.zone.now
       unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
-      time_after = Time.now
+      time_after = Time.zone.now
 
       expect(unfavourite_salmon.id.text).to(
         eq(OStatus::TagManager.instance.unique_tag(time_before.utc, favourite.id, 'Favourite'))
@@ -1179,9 +1179,9 @@ RSpec.describe OStatus::AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      time_before = Time.now
+      time_before = Time.zone.now
       unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
-      time_after = Time.now
+      time_after = Time.zone.now
 
       expect(unfollow_salmon.id.text).to(
         eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow.id, 'Follow'))
@@ -1327,9 +1327,9 @@ RSpec.describe OStatus::AtomSerializer do
     it 'appends id element with unique tag' do
       follow_request = Fabricate(:follow_request)
 
-      time_before = Time.now
+      time_before = Time.zone.now
       authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
-      time_after = Time.now
+      time_after = Time.zone.now
 
       expect(authorize_follow_request_salmon.id.text).to(
         eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest'))
@@ -1396,9 +1396,9 @@ RSpec.describe OStatus::AtomSerializer do
     it 'appends id element with unique tag' do
       follow_request = Fabricate(:follow_request)
 
-      time_before = Time.now
+      time_before = Time.zone.now
       reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
-      time_after = Time.now
+      time_after = Time.zone.now
 
       expect(reject_follow_request_salmon.id.text).to(
         eq(OStatus::TagManager.instance.unique_tag(time_before.utc, follow_request.id, 'FollowRequest'))
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index 939ac006ae1531870bcdfda47309cc4dd99e4d67..2d300f18d6c71494d97fe6b42a9ca811e83ee055 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -48,9 +48,11 @@ describe Request do
       end
 
       it 'executes a HTTP request when the first address is private' do
-        allow(Addrinfo).to receive(:foreach).with('example.com', nil, nil, :SOCK_STREAM)
-                                            .and_yield(Addrinfo.new(["AF_INET", 0, "example.com", "0.0.0.0"], :PF_INET, :SOCK_STREAM))
-                                            .and_yield(Addrinfo.new(["AF_INET6", 0, "example.com", "2001:4860:4860::8844"], :PF_INET6, :SOCK_STREAM))
+        resolver = double
+
+        allow(resolver).to receive(:getaddresses).with('example.com').and_return(%w(0.0.0.0 2001:4860:4860::8844))
+        allow(resolver).to receive(:timeouts=).and_return(nil)
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
 
         expect { |block| subject.perform &block }.to yield_control
         expect(a_request(:get, 'http://example.com')).to have_been_made.once
@@ -81,10 +83,13 @@ describe Request do
       end
 
       it 'raises Mastodon::ValidationError' do
-        allow(Addrinfo).to receive(:foreach).with('example.com', nil, nil, :SOCK_STREAM)
-                                            .and_yield(Addrinfo.new(["AF_INET", 0, "example.com", "0.0.0.0"], :PF_INET, :SOCK_STREAM))
-                                            .and_yield(Addrinfo.new(["AF_INET6", 0, "example.com", "2001:db8::face"], :PF_INET6, :SOCK_STREAM))
-        expect{ subject.perform }.to raise_error Mastodon::ValidationError
+        resolver = double
+
+        allow(resolver).to receive(:getaddresses).with('example.com').and_return(%w(0.0.0.0 2001:db8::face))
+        allow(resolver).to receive(:timeouts=).and_return(nil)
+        allow(Resolv::DNS).to receive(:open).and_yield(resolver)
+
+        expect { subject.perform }.to raise_error Mastodon::ValidationError
       end
     end
   end
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..4a8ef7b5eaee23ffa602ad4bf63517f36307fbbb
--- /dev/null
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+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(:report)    { Fabricate(:report, account: sender, target_account: recipient) }
+    let(:mail)      { described_class.new_report(recipient, report) }
+
+    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]
+      expect(mail.from).to eq ['notifications@localhost']
+    end
+
+    it 'renders the body' do
+      expect(mail.body.encoded).to eq("Mike,\r\n\r\nJohn has reported Mike\r\n\r\nView: https://cb6e6126.ngrok.io/admin/reports/#{report.id}\r\n")
+    end
+  end
+end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 1be01e8baa16f8b924fbb8d96700df3d5d9c93e5..38916b54f1d34d7be41d1eadf8ef2f2994b1b573 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -126,19 +126,7 @@ RSpec.describe NotificationMailer, type: :mailer do
       end
     end
 
-    it 'includes activities since the date specified by :since option' do
-      receiver.update!(last_emailed_at: '2000-02-01T00:00:00Z', current_sign_in_at: '2000-03-01T00:00:00Z')
-      mail = NotificationMailer.digest(receiver.account, since: Time.parse('2000-01-01T00:00:00Z'))
-      expect(mail.body.encoded).to include 'Jan 01, 2000, 00:00'
-    end
-
-    it 'includes activities since the receiver was last emailed if :since option is unavailable' do
-      receiver.update!(last_emailed_at: '2000-02-01T00:00:00Z', current_sign_in_at: '2000-03-01T00:00:00Z')
-      mail = NotificationMailer.digest(receiver.account)
-      expect(mail.body.encoded).to include 'Feb 01, 2000, 00:00'
-    end
-
-    it 'includes activities since the receiver last signed in if :since option and the last emailed date are unavailable' do
+    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'
diff --git a/spec/mailers/previews/user_mailer_preview.rb b/spec/mailers/previews/user_mailer_preview.rb
index d9cdb9264a6507815f7515ee02709cd1f5fa77c5..53c8364944579c9ef74eca4fa4ce9ddca9206597 100644
--- a/spec/mailers/previews/user_mailer_preview.rb
+++ b/spec/mailers/previews/user_mailer_preview.rb
@@ -39,4 +39,9 @@ class UserMailerPreview < ActionMailer::Preview
   def backup_ready
     UserMailer.backup_ready(User.first, Backup.first)
   end
+
+  # Preview this email at http://localhost:3000/rails/mailers/user_mailer/warning
+  def warning
+    UserMailer.warning(User.first, AccountWarning.new(text: '', action: :silence))
+  end
 end
diff --git a/spec/models/account_conversation_spec.rb b/spec/models/account_conversation_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..70a76281ef8185b8babe1fc5aa44a485849e3c15
--- /dev/null
+++ b/spec/models/account_conversation_spec.rb
@@ -0,0 +1,72 @@
+require 'rails_helper'
+
+RSpec.describe AccountConversation, type: :model do
+  let!(:alice) { Fabricate(:account, username: 'alice') }
+  let!(:bob)   { Fabricate(:account, username: 'bob') }
+  let!(:mark)  { Fabricate(:account, username: 'mark') }
+
+  describe '.add_status' do
+    it 'creates new record when no others exist' do
+      status = Fabricate(:status, account: alice, visibility: :direct)
+      status.mentions.create(account: bob)
+
+      conversation = AccountConversation.add_status(alice, status)
+
+      expect(conversation.participant_accounts).to include(bob)
+      expect(conversation.last_status).to eq status
+      expect(conversation.status_ids).to eq [status.id]
+    end
+
+    it 'appends to old record when there is a match' do
+      last_status  = Fabricate(:status, account: alice, visibility: :direct)
+      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+
+      status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status)
+      status.mentions.create(account: alice)
+
+      new_conversation = AccountConversation.add_status(alice, status)
+
+      expect(new_conversation.id).to eq conversation.id
+      expect(new_conversation.participant_accounts).to include(bob)
+      expect(new_conversation.last_status).to eq status
+      expect(new_conversation.status_ids).to eq [last_status.id, status.id]
+    end
+
+    it 'creates new record when new participants are added' do
+      last_status  = Fabricate(:status, account: alice, visibility: :direct)
+      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+
+      status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status)
+      status.mentions.create(account: alice)
+      status.mentions.create(account: mark)
+
+      new_conversation = AccountConversation.add_status(alice, status)
+
+      expect(new_conversation.id).to_not eq conversation.id
+      expect(new_conversation.participant_accounts).to include(bob, mark)
+      expect(new_conversation.last_status).to eq status
+      expect(new_conversation.status_ids).to eq [status.id]
+    end
+  end
+
+  describe '.remove_status' do
+    it 'updates last status to a previous value' do
+      last_status  = Fabricate(:status, account: alice, visibility: :direct)
+      status       = Fabricate(:status, account: alice, visibility: :direct)
+      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [status.id, last_status.id])
+      last_status.mentions.create(account: bob)
+      last_status.destroy!
+      conversation.reload
+      expect(conversation.last_status).to eq status
+      expect(conversation.status_ids).to eq [status.id]
+    end
+
+    it 'removes the record if no other statuses are referenced' do
+      last_status  = Fabricate(:status, account: alice, visibility: :direct)
+      conversation = AccountConversation.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      last_status.mentions.create(account: bob)
+      last_status.destroy!
+      expect(AccountConversation.where(id: conversation.id).count).to eq 0
+    end
+  end
+end
diff --git a/spec/models/account_filter_spec.rb b/spec/models/account_filter_spec.rb
index 8441939c5b7438039c2c3d454c2b9b5b7150e630..176a0eeacd0ce055c8f71f664a689b2553eec8a5 100644
--- a/spec/models/account_filter_spec.rb
+++ b/spec/models/account_filter_spec.rb
@@ -2,10 +2,10 @@ require 'rails_helper'
 
 describe AccountFilter do
   describe 'with empty params' do
-    it 'defaults to alphabetic account list' do
+    it 'defaults to recent local not-suspended account list' do
       filter = described_class.new({})
 
-      expect(filter.results).to eq Account.alphabetic
+      expect(filter.results).to eq Account.local.recent.without_suspended
     end
   end
 
@@ -17,23 +17,6 @@ describe AccountFilter do
     end
   end
 
-  describe 'when an IP address is provided' do
-    it 'filters with IP when valid' do
-      filter = described_class.new(ip: '127.0.0.1')
-      allow(User).to receive(:with_recent_ip_address).and_return(User.none)
-
-      filter.results
-      expect(User).to have_received(:with_recent_ip_address).with('127.0.0.1')
-    end
-
-    it 'skips IP when invalid' do
-      filter = described_class.new(ip: '345.678.901.234')
-      expect(User).not_to receive(:with_recent_ip_address)
-
-      filter.results
-    end
-  end
-
   describe 'with valid params' do
     it 'combines filters on Account' do
       filter = described_class.new(
@@ -60,13 +43,13 @@ describe AccountFilter do
     end
 
     describe 'that call account methods' do
-      %i(local remote silenced recent suspended).each do |option|
+      %i(local remote silenced suspended).each do |option|
         it "delegates the #{option} option" do
           allow(Account).to receive(option).and_return(Account.none)
           filter = described_class.new({ option => true })
           filter.results
 
-          expect(Account).to have_received(option)
+          expect(Account).to have_received(option).at_least(1)
         end
       end
     end
diff --git a/spec/models/account_moderation_note_spec.rb b/spec/models/account_moderation_note_spec.rb
index 16983b2e3601c7e14f9277295474fb3bb2692ced..69bd5500a5be689070c96eb892d888d586b06e39 100644
--- a/spec/models/account_moderation_note_spec.rb
+++ b/spec/models/account_moderation_note_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe AccountModerationNote, type: :model do
-
 end
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 4f71935d582003bd8c66a803ad9fd2cb85cf5a99..47b22719334c5de3229e4899c546a9f76ec0e93e 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -275,7 +275,7 @@ RSpec.describe Account, type: :model do
 
     subject { Fabricate(:account) }
 
-    context 'when the status is a reblog of another status'do
+    context 'when the status is a reblog of another status' do
       let(:original_reblog) do
         author = Fabricate(:account, username: 'original_reblogger')
         Fabricate(:status, reblog: original_status, account: author)
@@ -559,7 +559,7 @@ RSpec.describe Account, type: :model do
     end
 
     context 'when is local' do
-      it 'is invalid if the username is not unique in case-insensitive comparsion among local accounts' do
+      it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do
         account_1 = Fabricate(:account, username: 'the_doctor')
         account_2 = Fabricate.build(:account, username: 'the_Doctor')
         account_2.valid?
@@ -618,10 +618,16 @@ RSpec.describe Account, type: :model do
         expect(account).not_to model_have_error_on_field(:username)
       end
 
-      it 'is valid even if the username doesn\'t only contains letters, numbers and underscores' do
+      it 'is valid even if the username contains hyphens' do
         account = Fabricate.build(:account, domain: 'domain', username: 'the-doctor')
         account.valid?
-        expect(account).not_to model_have_error_on_field(:username)
+        expect(account).to_not model_have_error_on_field(:username)
+      end
+
+      it 'is invalid if the username doesn\'t only contains letters, numbers, underscores and hyphens' do
+        account = Fabricate.build(:account, domain: 'domain', username: 'the doctor')
+        account.valid?
+        expect(account).to model_have_error_on_field(:username)
       end
 
       it 'is valid even if the username is longer then 30 characters' do
@@ -754,24 +760,6 @@ RSpec.describe Account, type: :model do
         expect(Account.suspended).to match_array([account_1])
       end
     end
-
-    describe 'without_followers' do
-      it 'returns a relation of accounts without followers' do
-        account_1 = Fabricate(:account)
-        account_2 = Fabricate(:account)
-        Fabricate(:follow, account: account_1, target_account: account_2)
-        expect(Account.without_followers).to match_array([account_1])
-      end
-    end
-
-    describe 'with_followers' do
-      it 'returns a relation of accounts with followers' do
-        account_1 = Fabricate(:account)
-        account_2 = Fabricate(:account)
-        Fabricate(:follow, account: account_1, target_account: account_2)
-        expect(Account.with_followers).to match_array([account_2])
-      end
-    end
   end
 
   context 'when is local' do
diff --git a/spec/models/account_stat_spec.rb b/spec/models/account_stat_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a94185109c774d8701e914b1d2fe6d4b945f8447
--- /dev/null
+++ b/spec/models/account_stat_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe AccountStat, type: :model do
+end
diff --git a/spec/models/account_tag_stat_spec.rb b/spec/models/account_tag_stat_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6d3057f3555eb808993d763e4f26edafadc2451c
--- /dev/null
+++ b/spec/models/account_tag_stat_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AccountTagStat, type: :model do
+  key = 'accounts_count'
+  let(:account_tag_stat) { Fabricate(:tag).account_tag_stat }
+
+  describe '#increment_count!' do
+    it 'calls #update' do
+      args = { key => account_tag_stat.public_send(key) + 1 }
+      expect(account_tag_stat).to receive(:update).with(args)
+      account_tag_stat.increment_count!(key)
+    end
+
+    it 'increments value by 1' do
+      expect do
+        account_tag_stat.increment_count!(key)
+      end.to change { account_tag_stat.accounts_count }.by(1)
+    end
+  end
+
+  describe '#decrement_count!' do
+    it 'calls #update' do
+      args = { key => [account_tag_stat.public_send(key) - 1, 0].max }
+      expect(account_tag_stat).to receive(:update).with(args)
+      account_tag_stat.decrement_count!(key)
+    end
+
+    it 'decrements value by 1' do
+      account_tag_stat.update(key => 1)
+
+      expect do
+        account_tag_stat.decrement_count!(key)
+      end.to change { account_tag_stat.accounts_count }.by(-1)
+    end
+  end
+end
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a3db60cfc85c95585a9713b9fbe9d2c90f084477
--- /dev/null
+++ b/spec/models/admin/account_action_spec.rb
@@ -0,0 +1,131 @@
+require 'rails_helper'
+
+RSpec.describe Admin::AccountAction, type: :model do
+  let(:account_action) { described_class.new }
+
+  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(:type)           { 'disable' }
+
+    before do
+      account_action.assign_attributes(
+        type:            type,
+        current_account: account,
+        target_account:  target_account
+      )
+    end
+
+    context 'type is "disable"' do
+      let(:type) { 'disable' }
+
+      it 'disable user' do
+        subject
+        expect(target_account.user).to be_disabled
+      end
+    end
+
+    context 'type is "silence"' do
+      let(:type) { 'silence' }
+
+      it 'silences account' do
+        subject
+        expect(target_account).to be_silenced
+      end
+    end
+
+    context 'type is "suspend"' do
+      let(:type) { 'suspend' }
+
+      it 'suspends account' do
+        subject
+        expect(target_account).to be_suspended
+      end
+
+      it 'queues Admin::SuspensionWorker by 1' do
+        Sidekiq::Testing.fake! do
+          expect do
+            subject
+          end.to change { Admin::SuspensionWorker.jobs.size }.by 1
+        end
+      end
+    end
+
+    it 'creates Admin::ActionLog' do
+      expect do
+        subject
+      end.to change { Admin::ActionLog.count }.by 1
+    end
+
+    it 'calls queue_email!' do
+      expect(account_action).to receive(:queue_email!)
+      subject
+    end
+
+    it 'calls process_reports!' do
+      expect(account_action).to receive(:process_reports!)
+      subject
+    end
+  end
+
+  describe '#report' do
+    subject { account_action.report }
+
+    context 'report_id.present?' do
+      before do
+        account_action.report_id = Fabricate(:report).id
+      end
+
+      it 'returns Report' do
+        expect(subject).to be_instance_of Report
+      end
+    end
+
+    context '!report_id.present?' do
+      it 'returns nil' do
+        expect(subject).to be_nil
+      end
+    end
+  end
+
+  describe '#with_report?' do
+    subject { account_action.with_report? }
+
+    context '!report.nil?' do
+      before do
+        account_action.report_id = Fabricate(:report).id
+      end
+
+      it 'returns true' do
+        expect(subject).to be true
+      end
+    end
+
+    context '!(!report.nil?)' do
+      it 'returns false' do
+        expect(subject).to be false
+      end
+    end
+  end
+
+  describe '.types_for_account' do
+    subject { described_class.types_for_account(account) }
+
+    context 'account.local?' do
+      let(:account) { Fabricate(:account, domain: nil) }
+
+      it 'returns ["none", "disable", "silence", "suspend"]' do
+        expect(subject).to eq %w(none disable silence suspend)
+      end
+    end
+
+    context '!account.local?' do
+      let(:account) { Fabricate(:account, domain: 'hoge.com') }
+
+      it 'returns ["silence", "suspend"]' do
+        expect(subject).to eq %w(silence suspend)
+      end
+    end
+  end
+end
diff --git a/spec/models/admin/action_log_spec.rb b/spec/models/admin/action_log_spec.rb
index 59206a36b3f1a3f001688b341b9666ab32b11e87..3495cc51414cb30c08ae986325f55b2707f3289e 100644
--- a/spec/models/admin/action_log_spec.rb
+++ b/spec/models/admin/action_log_spec.rb
@@ -1,5 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Admin::ActionLog, type: :model do
-
+  describe '#action' do
+    it 'returns action' do
+      action_log = described_class.new(action: 'hoge')
+      expect(action_log.action).to be :hoge
+    end
+  end
 end
diff --git a/spec/models/backup_spec.rb b/spec/models/backup_spec.rb
index fabcdc845a83f228dd56ea236d3292a187c152e1..45230986d7a98f0e285b8137a6851a3358324e19 100644
--- a/spec/models/backup_spec.rb
+++ b/spec/models/backup_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe Backup, type: :model do
-
 end
diff --git a/spec/models/concerns/remotable_spec.rb b/spec/models/concerns/remotable_spec.rb
index b39233739c03ba13fe31e81f448348426c8642cf..a4289cc45e79aca0e8e251eb1b6113007a4eabeb 100644
--- a/spec/models/concerns/remotable_spec.rb
+++ b/spec/models/concerns/remotable_spec.rb
@@ -88,7 +88,18 @@ RSpec.describe Remotable do
 
       context 'parsed_url.host is empty' do
         it 'makes no request' do
-          parsed_url = double(scheme: 'https', host: double(empty?: true))
+          parsed_url = double(scheme: 'https', host: double(blank?: true))
+          allow(Addressable::URI).to receive_message_chain(:parse, :normalize)
+            .with(url).with(no_args).and_return(parsed_url)
+
+          foo.hoge_remote_url = url
+          expect(request).not_to have_been_requested
+        end
+      end
+
+      context 'parsed_url.host is nil' do
+        it 'makes no request' do
+          parsed_url = Addressable::URI.parse('https:https://example.com/path/file.png')
           allow(Addressable::URI).to receive_message_chain(:parse, :normalize)
             .with(url).with(no_args).and_return(parsed_url)
 
diff --git a/spec/models/concerns/status_threading_concern_spec.rb b/spec/models/concerns/status_threading_concern_spec.rb
index e5736a307909970a88918729b35e7a09c228fc9a..94c2d5fc2e84e95007f2e54acbabe76f2e316b92 100644
--- a/spec/models/concerns/status_threading_concern_spec.rb
+++ b/spec/models/concerns/status_threading_concern_spec.rb
@@ -118,5 +118,15 @@ describe StatusThreadingConcern do
       viewer.block_domain!('example.com')
       expect(status.descendants(4, viewer)).to_not include(reply2)
     end
+
+    it 'promotes self-replies to the top while leaving the rest in order' do
+      a = Fabricate(:status, account: alice)
+      d = Fabricate(:status, account: jeff, thread: a)
+      e = Fabricate(:status, account: bob, thread: d)
+      c = Fabricate(:status, account: alice, thread: a)
+      f = Fabricate(:status, account: bob, thread: c)
+
+      expect(a.descendants(20)).to eq [c, d, e, f]
+    end
   end
 end
diff --git a/spec/models/conversation_mute_spec.rb b/spec/models/conversation_mute_spec.rb
index b602e80c194a6de37c28a00a31251337981a092a..3fc2915d4f33fd6c0d8d1d8c7b129891fcf33dbe 100644
--- a/spec/models/conversation_mute_spec.rb
+++ b/spec/models/conversation_mute_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe ConversationMute, type: :model do
-
 end
diff --git a/spec/models/custom_emoji_filter_spec.rb b/spec/models/custom_emoji_filter_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d859f5c5f5067db3f6cdd32221dce22c51dfce3e
--- /dev/null
+++ b/spec/models/custom_emoji_filter_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CustomEmojiFilter do
+  describe '#results' do
+    let!(:custom_emoji_0) { Fabricate(:custom_emoji, domain: 'a') }
+    let!(:custom_emoji_1) { Fabricate(:custom_emoji, domain: 'b') }
+    let!(:custom_emoji_2) { Fabricate(:custom_emoji, domain: nil, shortcode: 'hoge') }
+
+    subject { described_class.new(params).results }
+
+    context 'params have values' do
+      context 'local' do
+        let(:params) { { local: true } }
+
+        it 'returns ActiveRecord::Relation' do
+          expect(subject).to be_kind_of(ActiveRecord::Relation)
+          expect(subject).to match_array([custom_emoji_2])
+        end
+      end
+
+      context 'remote' do
+        let(:params) { { remote: true } }
+
+        it 'returns ActiveRecord::Relation' do
+          expect(subject).to be_kind_of(ActiveRecord::Relation)
+          expect(subject).to match_array([custom_emoji_0, custom_emoji_1])
+        end
+      end
+
+      context 'by_domain' do
+        let(:params) { { by_domain: 'a' } }
+
+        it 'returns ActiveRecord::Relation' do
+          expect(subject).to be_kind_of(ActiveRecord::Relation)
+          expect(subject).to match_array([custom_emoji_0])
+        end
+      end
+
+      context 'shortcode' do
+        let(:params) { { shortcode: 'hoge' } }
+
+        it 'returns ActiveRecord::Relation' do
+          expect(subject).to be_kind_of(ActiveRecord::Relation)
+          expect(subject).to match_array([custom_emoji_2])
+        end
+      end
+
+      context 'else' do
+        let(:params) { { else: 'else' } }
+
+        it 'raises RuntimeError' do
+          expect do
+            subject
+          end.to raise_error(RuntimeError, /Unknown filter: else/)
+        end
+      end
+    end
+
+    context 'params without value' do
+      let(:params) { { hoge: nil } }
+
+      it 'returns ActiveRecord::Relation' do
+        expect(subject).to be_kind_of(ActiveRecord::Relation)
+        expect(subject).to match_array([custom_emoji_0, custom_emoji_1, custom_emoji_2])
+      end
+    end
+  end
+end
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index 87367df5003a47b20e4b090f8822bc66a29eb28d..9de218b4fed15ffa4518d93727f8ddd70ef15e14 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe CustomEmoji, type: :model do
   describe '#search' do
     let(:custom_emoji) { Fabricate(:custom_emoji, shortcode: shortcode) }
 
-    subject  { described_class.search(search_term) }
+    subject { described_class.search(search_term) }
 
     context 'shortcode is exact' do
       let(:shortcode) { 'blobpats' }
@@ -75,4 +75,13 @@ RSpec.describe CustomEmoji, type: :model do
       end
     end
   end
+
+  describe 'pre_validation' do
+    let(:custom_emoji) { Fabricate(:custom_emoji, domain: 'wWw.MaStOdOn.CoM') }
+
+    it 'should downcase' do
+      custom_emoji.valid?
+      expect(custom_emoji.domain).to eq('www.mastodon.com')
+    end
+  end
 end
diff --git a/spec/models/custom_filter_spec.rb b/spec/models/custom_filter_spec.rb
index 1024542e7be5007b05207652e8525a9644a5fd0d..3943dd5f1a219aff1f541bf598aeaf540647d30f 100644
--- a/spec/models/custom_filter_spec.rb
+++ b/spec/models/custom_filter_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe CustomFilter, type: :model do
-
 end
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index 6daa4614575bf570f46e7807d67dca47adc5bcd7..277dcc526498858f20a160bb391a5a27d541f6c2 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -48,17 +48,17 @@ describe Export do
   describe 'total_follows' do
     it 'returns the total number of the followed accounts' do
       target_accounts.each(&account.method(:follow!))
-      expect(Export.new(account).total_follows).to eq 2
+      expect(Export.new(account.reload).total_follows).to eq 2
     end
 
     it 'returns the total number of the blocked accounts' do
       target_accounts.each(&account.method(:block!))
-      expect(Export.new(account).total_blocks).to eq 2
+      expect(Export.new(account.reload).total_blocks).to eq 2
     end
 
     it 'returns the total number of the muted accounts' do
       target_accounts.each(&account.method(:mute!))
-      expect(Export.new(account).total_mutes).to eq 2
+      expect(Export.new(account.reload).total_mutes).to eq 2
     end
   end
 end
diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb
index 43175d8526aded12266038f046e9efe75bc82acf..0c84e5e7bfa2458455859733d850cb746e1c3bbd 100644
--- a/spec/models/follow_spec.rb
+++ b/spec/models/follow_spec.rb
@@ -23,6 +23,20 @@ RSpec.describe Follow, type: :model do
       follow.valid?
       expect(follow).to model_have_error_on_field(:target_account)
     end
+
+    it 'is invalid if account already follows too many people' do
+      alice.update(following_count: FollowLimitValidator::LIMIT)
+
+      expect(subject).to_not be_valid
+      expect(subject).to model_have_error_on_field(:base)
+    end
+
+    it 'is valid if account is only on the brink of following too many people' do
+      alice.update(following_count: FollowLimitValidator::LIMIT - 1)
+
+      expect(subject).to be_valid
+      expect(subject).to_not model_have_error_on_field(:base)
+    end
   end
 
   describe 'recent' do
@@ -37,4 +51,20 @@ RSpec.describe Follow, type: :model do
       expect(a[1]).to eq follow0
     end
   end
+
+  describe 'revoke_request!' do
+    let(:follow)         { Fabricate(:follow, account: account, target_account: target_account) }
+    let(:account)        { Fabricate(:account) }
+    let(:target_account) { Fabricate(:account) }
+
+    it 'revokes the follow relation' do
+      follow.revoke_request!
+      expect(account.following?(target_account)).to be false
+    end
+
+    it 'creates a follow request' do
+      follow.revoke_request!
+      expect(account.requested?(target_account)).to be true
+    end
+  end
 end
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 53f35541022a15daf97abf51d392089659289a56..689c9b797f4f6327695af58cd2de248d51088c50 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -1,5 +1,16 @@
 require 'rails_helper'
 
 RSpec.describe Identity, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  describe '.find_for_oauth' do
+    let(:auth) { Fabricate(:identity, user: Fabricate(:user)) }
+
+    it 'calls .find_or_create_by' do
+      expect(described_class).to receive(:find_or_create_by).with(uid: auth.uid, provider: auth.provider)
+      described_class.find_for_oauth(auth)
+    end
+
+    it 'returns an instance of Identity' do
+      expect(described_class.find_for_oauth(auth)).to be_instance_of Identity
+    end
+  end
 end
diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb
index a132e09b0eaae6027efbbeb9c33a9e1e1c1cc7db..a0cf02efe25f5ac5afc1570cc4a5833e638a61d4 100644
--- a/spec/models/list_account_spec.rb
+++ b/spec/models/list_account_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe ListAccount, type: :model do
-
 end
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index c302482b4388e50dd60263f0fc581afe0ae97bde..b780bb1de071706d81ad19295a5a80318d629e3e 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe List, type: :model do
-
 end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index d2230b6d0ff01f144394500685260b3c2758d0f1..266cd492039ec6a3ab1305fc7d7f463766584756 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -129,9 +129,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 400
-      expect(media.file.meta["small"]["height"]).to eq 267
-      expect(media.file.meta["small"]["aspect"]).to eq 400.0/267
+      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
     end
   end
 
diff --git a/spec/models/mute_spec.rb b/spec/models/mute_spec.rb
index 83ba793b2b1bd717d919f7c77aae838cf054c896..38a87bdf4a772c3ec4081785e9a3d9d39bd698a9 100644
--- a/spec/models/mute_spec.rb
+++ b/spec/models/mute_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe Mute, type: :model do
-
 end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index c781f2a294b5847330e7da5b4ba37723e55afd78..59c582cde0d26075f77cf20ac0fe29c0eb71cc4d 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -1,10 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe Notification, type: :model do
-  describe '#from_account' do
-    pending
-  end
-
   describe '#target_status' do
     let(:notification) { Fabricate(:notification, activity: activity) }
     let(:status)       { Fabricate(:status) }
@@ -101,7 +97,7 @@ RSpec.describe Notification, type: :model do
       before do
         allow(accounts_with_ids).to receive(:[]).with(stale_account1.id).and_return(account1)
         allow(accounts_with_ids).to receive(:[]).with(stale_account2.id).and_return(account2)
-        allow(Account).to receive_message_chain(:where, :map, :to_h).and_return(accounts_with_ids)
+        allow(Account).to receive_message_chain(:where, :includes, :each_with_object).and_return(accounts_with_ids)
       end
 
       let(:cached_items) do
diff --git a/spec/models/preview_card_spec.rb b/spec/models/preview_card_spec.rb
index 14ef23923cb7468ffaf9c1e3edcc5e89813ef1a7..45233d1d4f9f3ef9b22da2380e18978a270b4cdf 100644
--- a/spec/models/preview_card_spec.rb
+++ b/spec/models/preview_card_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe PreviewCard, type: :model do
-
 end
diff --git a/spec/models/relay_spec.rb b/spec/models/relay_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..12dc0f20f6e615fd49991ffe97f440ee423b45dc
--- /dev/null
+++ b/spec/models/relay_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe Relay, type: :model do
+end
diff --git a/spec/models/remote_follow_spec.rb b/spec/models/remote_follow_spec.rb
index 72c580f9f1cc35e777bb2568c73f469970dbded2..ed2667b28aad82eb4242543284033974ff57b1c5 100644
--- a/spec/models/remote_follow_spec.rb
+++ b/spec/models/remote_follow_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe RemoteFollow do
     subject { remote_follow.valid? }
 
     context 'attrs with acct' do
-      let(:attrs) { { acct: 'gargron@quitter.no' }}
+      let(:attrs) { { acct: 'gargron@quitter.no' } }
 
       it do
         is_expected.to be true
@@ -42,7 +42,7 @@ RSpec.describe RemoteFollow do
     end
 
     context 'attrs without acct' do
-      let(:attrs) { { } }
+      let(:attrs) { {} }
 
       it do
         is_expected.to be false
diff --git a/spec/models/scheduled_status_spec.rb b/spec/models/scheduled_status_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f8c9d8b81f6c4ad35c4b57ca177a01f48b75caa5
--- /dev/null
+++ b/spec/models/scheduled_status_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe ScheduledStatus, type: :model do
+end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index b3e475d99cfe9acdeb400e56caa958db28150dbd..e8cf18af905978176b6730d915d7f5317c40ad04 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -154,7 +154,7 @@ RSpec.describe Status, type: :model do
 
   describe '#target' do
     it 'returns nil if the status is self-contained' do
-     expect(subject.target).to be_nil
+      expect(subject.target).to be_nil
     end
 
     it 'returns nil if the status is a reply' do
@@ -182,6 +182,27 @@ RSpec.describe Status, type: :model do
       reblog.destroy
       expect(subject.reblogs_count).to eq 0
     end
+
+    it 'does not fail when original is deleted before reblog' do
+      reblog = Fabricate(:status, account: bob, reblog: subject)
+      expect(subject.reblogs_count).to eq 1
+      expect { subject.destroy }.to_not raise_error
+      expect(Status.find_by(id: reblog.id)).to be_nil
+    end
+  end
+
+  describe '#replies_count' do
+    it 'is the number of replies' do
+      reply = Fabricate(:status, account: bob, thread: subject)
+      expect(subject.replies_count).to eq 1
+    end
+
+    it 'is decremented when reply is removed' do
+      reply = Fabricate(:status, account: bob, thread: subject)
+      expect(subject.replies_count).to eq 1
+      reply.destroy
+      expect(subject.replies_count).to eq 0
+    end
   end
 
   describe '#favourites_count' do
@@ -552,17 +573,6 @@ RSpec.describe Status, type: :model do
           expect(results).to include(es_status)
         end
       end
-
-      context 'where that account is silenced' do
-        it 'includes statuses from other accounts that are silenced' do
-          @account.update(silenced: true)
-          other_silenced_account = Fabricate(:account, silenced: true)
-          other_status = Fabricate(:status, account: other_silenced_account)
-
-          results = Status.as_public_timeline(@account)
-          expect(results).to include(other_status)
-        end
-      end
     end
   end
 
diff --git a/spec/models/status_stat_spec.rb b/spec/models/status_stat_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..af1a6f288be8492f5ec07ca42b6263f23fe7ae07
--- /dev/null
+++ b/spec/models/status_stat_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe StatusStat, type: :model do
+end
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
index 84096e6ae80f7ecf68e00f56cf97fa49faf55cad..b83979d13799f4d3134d2a0dfd2f62658d6daada 100644
--- a/spec/models/subscription_spec.rb
+++ b/spec/models/subscription_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Subscription, type: :model do
   end
 
   describe 'lease_seconds' do
-    it 'returns the time remaing until expiration' do
+    it 'returns the time remaining until expiration' do
       datetime = 1.day.from_now
       subscription = Subscription.new(expires_at: datetime)
       travel_to(datetime - 12.hours) do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 93a6c26fb25abfbd7709125092984d4fc1aff401..856254ce4b6acd1908b5ace92e3e0681c0145b94 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -67,7 +67,7 @@ RSpec.describe User, type: :model do
     describe 'confirmed' do
       it 'returns an array of users who are confirmed' do
         user_1 = Fabricate(:user, confirmed_at: nil)
-        user_2 = Fabricate(:user, confirmed_at: Time.now)
+        user_2 = Fabricate(:user, confirmed_at: Time.zone.now)
         expect(User.confirmed).to match_array([user_2])
       end
     end
@@ -89,18 +89,6 @@ RSpec.describe User, type: :model do
         expect(User.matches_email('specified')).to match_array([specified])
       end
     end
-
-    describe 'with_recent_ip_address' do
-      it 'returns a relation of users who is, or was at last time, online with the given IP address' do
-        specifieds = [
-          Fabricate(:user, current_sign_in_ip: '0.0.0.42', last_sign_in_ip: '0.0.0.0'),
-          Fabricate(:user, current_sign_in_ip: nil, last_sign_in_ip: '0.0.0.42')
-        ]
-        Fabricate(:user, current_sign_in_ip: '0.0.0.0', last_sign_in_ip: '0.0.0.0')
-
-        expect(User.with_recent_ip_address('0.0.0.42')).to match_array(specifieds)
-      end
-    end
   end
 
   let(:account) { Fabricate(:account, username: 'alice') }
@@ -118,19 +106,19 @@ RSpec.describe User, type: :model do
     end
 
     it 'should allow a non-blacklisted user to be created' do
-      user = User.new(email: 'foo@example.com', account: account, password: password)
+      user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
 
       expect(user.valid?).to be_truthy
     end
 
     it 'should not allow a blacklisted user to be created' do
-      user = User.new(email: 'foo@mvrht.com', account: account, password: password)
+      user = User.new(email: 'foo@mvrht.com', account: account, password: password, agreement: true)
 
       expect(user.valid?).to be_falsey
     end
 
     it 'should not allow a subdomain blacklisted user to be created' do
-      user = User.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password)
+      user = User.new(email: 'foo@mvrht.com.topdomain.tld', account: account, password: password, agreement: true)
 
       expect(user.valid?).to be_falsey
     end
@@ -222,17 +210,17 @@ RSpec.describe User, type: :model do
     end
 
     it 'should not allow a user to be created unless they are whitelisted' do
-      user = User.new(email: 'foo@example.com', account: account, password: password)
+      user = User.new(email: 'foo@example.com', account: account, password: password, agreement: true)
       expect(user.valid?).to be_falsey
     end
 
     it 'should allow a user to be created if they are whitelisted' do
-      user = User.new(email: 'foo@mastodon.space', account: account, password: password)
+      user = User.new(email: 'foo@mastodon.space', account: account, password: password, agreement: true)
       expect(user.valid?).to be_truthy
     end
 
     it 'should not allow a user with a whitelisted top domain as subdomain in their email address to be created' do
-      user = User.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password)
+      user = User.new(email: 'foo@mastodon.space.userdomain.com', account: account, password: password, agreement: true)
       expect(user.valid?).to be_falsey
     end
 
@@ -254,7 +242,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' )
+      User.create!(account: Fabricate(:account), email: 'foo@mastodon.space', password: 'abcd1234', agreement: true)
     end
 
     def fabricate
@@ -512,7 +500,7 @@ RSpec.describe User, type: :model do
       context 'when user is confirmed' do
         let(:confirmed_at) { Time.zone.now }
 
-        it { is_expected.to be false }
+        it { is_expected.to be true }
       end
 
       context 'when user is not confirmed' do
diff --git a/spec/models/web/setting_spec.rb b/spec/models/web/setting_spec.rb
index 90e7695aa77d1f49a3200bd9061d445f85bcb30c..6657d4030f4dbeedb8b8e1f441c7b57660ff51ff 100644
--- a/spec/models/web/setting_spec.rb
+++ b/spec/models/web/setting_spec.rb
@@ -1,5 +1,4 @@
 require 'rails_helper'
 
 RSpec.describe Web::Setting, type: :model do
-
 end
diff --git a/spec/policies/account_moderation_note_policy_spec.rb b/spec/policies/account_moderation_note_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bb7af94e45564c1952c53e329c9a1032667cf92a
--- /dev/null
+++ b/spec/policies/account_moderation_note_policy_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe AccountModerationNotePolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :create? do
+    context 'staff' do
+      it 'grants to create' do
+        expect(subject).to permit(admin, AccountModerationNotePolicy)
+      end
+    end
+
+    context 'not staff' do
+      it 'denies to create' do
+        expect(subject).to_not permit(john, AccountModerationNotePolicy)
+      end
+    end
+  end
+
+  permissions :destroy? do
+    let(:account_moderation_note) do
+      Fabricate(:account_moderation_note,
+                account: john,
+                target_account: Fabricate(:account))
+    end
+
+    context 'admin' do
+      it 'grants to destroy' do
+        expect(subject).to permit(admin, AccountModerationNotePolicy)
+      end
+    end
+
+    context 'owner' do
+      it 'grants to destroy' do
+        expect(subject).to permit(john, account_moderation_note)
+      end
+    end
+
+    context 'neither admin nor owner' do
+      let(:kevin) { Fabricate(:user).account }
+
+      it 'denies to destroy' do
+        expect(subject).to_not permit(kevin, account_moderation_note)
+      end
+    end
+  end
+end
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..6648b0888bf6e830379875285f7699de23e4aeaf
--- /dev/null
+++ b/spec/policies/account_policy_spec.rb
@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe AccountPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index?, :show?, :unsuspend?, :unsilence?, :remove_avatar?, :remove_header? do
+    context 'staff' do
+      it 'permits' do
+        expect(subject).to permit(admin)
+      end
+    end
+
+    context 'not staff' do
+      it 'denies' do
+        expect(subject).to_not permit(john)
+      end
+    end
+  end
+
+  permissions :redownload?, :subscribe?, :unsubscribe? do
+    context 'admin' do
+      it 'permits' do
+        expect(subject).to permit(admin)
+      end
+    end
+
+    context 'not admin' do
+      it 'denies' do
+        expect(subject).to_not permit(john)
+      end
+    end
+  end
+
+  permissions :suspend?, :silence? do
+    let(:staff) { Fabricate(:user, admin: true).account }
+
+    context 'staff' do
+      context 'record is staff' do
+        it 'denies' do
+          expect(subject).to_not permit(admin, staff)
+        end
+      end
+
+      context 'record is not staff' do
+        it 'permits' do
+          expect(subject).to permit(admin, john)
+        end
+      end
+    end
+
+    context 'not staff' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Account)
+      end
+    end
+  end
+
+  permissions :memorialize? do
+    let(:other_admin) { Fabricate(:user, admin: true).account }
+
+    context 'admin' do
+      context 'record is admin' do
+        it 'denies' do
+          expect(subject).to_not permit(admin, other_admin)
+        end
+      end
+
+      context 'record is not admin' do
+        it 'permits' do
+          expect(subject).to permit(admin, john)
+        end
+      end
+    end
+
+    context 'not admin' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Account)
+      end
+    end
+  end
+end
diff --git a/spec/policies/backup_policy_spec.rb b/spec/policies/backup_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..80407e12f850de0ab7f99e9d28b8232daa80db9f
--- /dev/null
+++ b/spec/policies/backup_policy_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe BackupPolicy do
+  let(:subject) { described_class }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :create? do
+    context 'not user_signed_in?' do
+      it 'denies' do
+        expect(subject).to_not permit(nil, Backup)
+      end
+    end
+
+    context 'user_signed_in?' do
+      context 'no backups' do
+        it 'permits' do
+          expect(subject).to permit(john, Backup)
+        end
+      end
+
+      context 'backups are too old' do
+        it 'permits' do
+          travel(-8.days) do
+            Fabricate(:backup, user: john.user)
+          end
+
+          expect(subject).to permit(john, Backup)
+        end
+      end
+
+      context 'backups are newer' do
+        it 'denies' do
+          travel(-3.days) do
+            Fabricate(:backup, user: john.user)
+          end
+
+          expect(subject).to_not permit(john, Backup)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/policies/custom_emoji_policy_spec.rb b/spec/policies/custom_emoji_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8def88212fb41afbaf73bf083733f19521c8c463
--- /dev/null
+++ b/spec/policies/custom_emoji_policy_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe CustomEmojiPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index?, :enable?, :disable? do
+    context 'staff' do
+      it 'permits' do
+        expect(subject).to permit(admin, CustomEmoji)
+      end
+    end
+
+    context 'not staff' do
+      it 'denies' do
+        expect(subject).to_not permit(john, CustomEmoji)
+      end
+    end
+  end
+
+  permissions :create?, :update?, :copy?, :destroy? do
+    context 'admin' do
+      it 'permits' do
+        expect(subject).to permit(admin, CustomEmoji)
+      end
+    end
+
+    context 'not admin' do
+      it 'denies' do
+        expect(subject).to_not permit(john, CustomEmoji)
+      end
+    end
+  end
+end
diff --git a/spec/policies/domain_block_policy_spec.rb b/spec/policies/domain_block_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..aea50ec0fde33ebb2f6a2acd04c599105a981e64
--- /dev/null
+++ b/spec/policies/domain_block_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe DomainBlockPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index?, :show?, :create?, :destroy? do
+    context 'admin' do
+      it 'permits' do
+        expect(subject).to permit(admin, DomainBlock)
+      end
+    end
+
+    context 'not admin' do
+      it 'denies' do
+        expect(subject).to_not permit(john, DomainBlock)
+      end
+    end
+  end
+end
diff --git a/spec/policies/email_domain_block_policy_spec.rb b/spec/policies/email_domain_block_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..a3e825e078942d1d67d1ac89c42bb55efc5403cc
--- /dev/null
+++ b/spec/policies/email_domain_block_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe EmailDomainBlockPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index?, :create?, :destroy? do
+    context 'admin' do
+      it 'permits' do
+        expect(subject).to permit(admin, EmailDomainBlock)
+      end
+    end
+
+    context 'not admin' do
+      it 'denies' do
+        expect(subject).to_not permit(john, EmailDomainBlock)
+      end
+    end
+  end
+end
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..77a3bde3fb52c9a1e017fb825a9aa6be1c50ecd9
--- /dev/null
+++ b/spec/policies/instance_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe InstancePolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index? do
+    context 'admin' do
+      it 'permits' do
+        expect(subject).to permit(admin, Instance)
+      end
+    end
+
+    context 'not admin' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Instance)
+      end
+    end
+  end
+end
diff --git a/spec/policies/invite_policy_spec.rb b/spec/policies/invite_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e391455be3eb1f547f40ee6ddda8d8306084387d
--- /dev/null
+++ b/spec/policies/invite_policy_spec.rb
@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe InvitePolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index? do
+    context 'staff?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Invite)
+      end
+    end
+  end
+
+  permissions :create? do
+    context 'min_required_role?' do
+      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
+      it 'denies' do
+        allow_any_instance_of(described_class).to receive(:min_required_role?) { false }
+        expect(subject).to_not permit(john, Invite)
+      end
+    end
+  end
+
+  permissions :deactivate_all? do
+    context 'admin?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Invite)
+      end
+    end
+
+    context 'not admin?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Invite)
+      end
+    end
+  end
+
+  permissions :destroy? do
+    context 'owner?' do
+      it 'permits' do
+        expect(subject).to permit(john, Fabricate(:invite, user: john.user))
+      end
+    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
+        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
+        end
+      end
+    end
+  end
+end
diff --git a/spec/policies/relay_policy_spec.rb b/spec/policies/relay_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..640f27d5475eb9eb6ea50435f3f6f32e3fe35aca
--- /dev/null
+++ b/spec/policies/relay_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe RelayPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :update? do
+    context 'admin?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Relay)
+      end
+    end
+
+    context '!admin?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Relay)
+      end
+    end
+  end
+end
diff --git a/spec/policies/report_note_policy_spec.rb b/spec/policies/report_note_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..596d7d7a95fa07ca4fc35facdc1a5aa7c39ac4a1
--- /dev/null
+++ b/spec/policies/report_note_policy_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe ReportNotePolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :create? do
+    context 'staff?' do
+      it 'permits' do
+        expect(subject).to permit(admin, ReportNote)
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, ReportNote)
+      end
+    end
+  end
+
+  permissions :destroy? do
+    context 'admin?' do
+      it 'permit' do
+        expect(subject).to permit(admin, ReportNote)
+      end
+    end
+
+    context 'admin?' do
+      context 'owner?' do
+        it 'permit' do
+          report_note = Fabricate(:report_note, account: john)
+          expect(subject).to permit(john, report_note)
+        end
+      end
+
+      context '!owner?' do
+        it 'denies' do
+          report_note = Fabricate(:report_note)
+          expect(subject).to_not permit(john, report_note)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/policies/report_policy_spec.rb b/spec/policies/report_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c9ae1e87a909e71f94b8ef6763fd02a07ff187c8
--- /dev/null
+++ b/spec/policies/report_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe ReportPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :update?, :index?, :show? do
+    context 'staff?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Report)
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Report)
+      end
+    end
+  end
+end
diff --git a/spec/policies/settings_policy_spec.rb b/spec/policies/settings_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..92f1f4869a9e9da78de69f08baca284afaa1362e
--- /dev/null
+++ b/spec/policies/settings_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe SettingsPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :update?, :show? do
+    context 'admin?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Settings)
+      end
+    end
+
+    context '!admin?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Settings)
+      end
+    end
+  end
+end
diff --git a/spec/policies/status_policy_spec.rb b/spec/policies/status_policy_spec.rb
index bacb8fd9e3fe9e62d4c80367022cc8ce0ac833af..1cddf4abd57da9a0df420ae141f4e9d403c9f38a 100644
--- a/spec/policies/status_policy_spec.rb
+++ b/spec/policies/status_policy_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'pundit/rspec'
 
@@ -106,4 +108,30 @@ RSpec.describe StatusPolicy, type: :model do
       expect(subject).to_not permit(nil, status)
     end
   end
+
+  permissions :favourite? do
+    it 'grants access when viewer is not blocked' do
+      follow         = Fabricate(:follow)
+      status.account = follow.target_account
+
+      expect(subject).to permit(follow.account, status)
+    end
+
+    it 'denies when viewer is blocked' do
+      block          = Fabricate(:block)
+      status.account = block.target_account
+
+      expect(subject).to_not permit(block.account, status)
+    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)
+    end
+  end
 end
diff --git a/spec/policies/subscription_policy_spec.rb b/spec/policies/subscription_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..21d60c15fc0c95d55c15828ae23d98e65cd3a868
--- /dev/null
+++ b/spec/policies/subscription_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe SubscriptionPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index? do
+    context 'admin?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Subscription)
+      end
+    end
+
+    context '!admin?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Subscription)
+      end
+    end
+  end
+end
diff --git a/spec/policies/tag_policy_spec.rb b/spec/policies/tag_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c7afaa7c93d0f6eab29832da761cb4812a5861ee
--- /dev/null
+++ b/spec/policies/tag_policy_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe TagPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :index?, :hide?, :unhide? do
+    context 'staff?' do
+      it 'permits' do
+        expect(subject).to permit(admin, Tag)
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, Tag)
+      end
+    end
+  end
+end
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e37904f048e618c8f789f82a7e130a4ac2919e51
--- /dev/null
+++ b/spec/policies/user_policy_spec.rb
@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require 'pundit/rspec'
+
+RSpec.describe UserPolicy do
+  let(:subject) { described_class }
+  let(:admin)   { Fabricate(:user, admin: true).account }
+  let(:john)    { Fabricate(:user).account }
+
+  permissions :reset_password?, :change_email? do
+    context 'staff?' do
+      context '!record.staff?' do
+        it 'permits' do
+          expect(subject).to permit(admin, john.user)
+        end
+      end
+
+      context 'record.staff?' do
+        it 'denies' do
+          expect(subject).to_not permit(admin, admin.user)
+        end
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, User)
+      end
+    end
+  end
+
+  permissions :disable_2fa? do
+    context 'admin?' do
+      context '!record.staff?' do
+        it 'permits' do
+          expect(subject).to permit(admin, john.user)
+        end
+      end
+
+      context 'record.staff?' 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 :confirm? do
+    context 'staff?' do
+      context '!record.confirmed?' do
+        it 'permits' do
+          john.user.update(confirmed_at: nil)
+          expect(subject).to permit(admin, john.user)
+        end
+      end
+
+      context 'record.confirmed?' do
+        it 'denies' do
+          john.user.confirm!
+          expect(subject).to_not permit(admin, john.user)
+        end
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, User)
+      end
+    end
+  end
+
+  permissions :enable? do
+    context 'staff?' do
+      it 'permits' do
+        expect(subject).to permit(admin, User)
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, User)
+      end
+    end
+  end
+
+  permissions :disable? do
+    context 'staff?' do
+      context '!record.admin?' do
+        it 'permits' do
+          expect(subject).to permit(admin, john.user)
+        end
+      end
+
+      context 'record.admin?' do
+        it 'denies' do
+          expect(subject).to_not permit(admin, admin.user)
+        end
+      end
+    end
+
+    context '!staff?' do
+      it 'denies' do
+        expect(subject).to_not permit(john, User)
+      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/instance_presenter_spec.rb b/spec/presenters/instance_presenter_spec.rb
index 006403925fe52cd2e80d216d5fd006b712531ed7..0babc1b0c8a36e1e47e034acf05674a11bbf81e4 100644
--- a/spec/presenters/instance_presenter_spec.rb
+++ b/spec/presenters/instance_presenter_spec.rb
@@ -111,4 +111,37 @@ describe InstancePresenter do
       expect(instance_presenter.domain_count).to eq(345)
     end
   end
+
+  describe '#version_number' do
+    it 'returns Mastodon::Version' do
+      expect(instance_presenter.version_number).to be(Mastodon::Version)
+    end
+  end
+
+  describe '#source_url' do
+    it 'returns "https://github.com/tootsuite/mastodon"' do
+      expect(instance_presenter.source_url).to eq('https://github.com/tootsuite/mastodon')
+    end
+  end
+
+  describe '#thumbnail' do
+    it 'returns SiteUpload' do
+      thumbnail = Fabricate(:site_upload, var: 'thumbnail')
+      expect(instance_presenter.thumbnail).to eq(thumbnail)
+    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')
+      expect(instance_presenter.mascot).to eq(mascot)
+    end
+  end
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c575128e408bc22bde80194cf97a5a5cf67e358d..3a5e7491e515198888d2bc25733fab67fbec2a97 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -71,11 +71,11 @@ RSpec::Sidekiq.configure do |config|
 end
 
 def request_fixture(name)
-  File.read(File.join(Rails.root, 'spec', 'fixtures', 'requests', name))
+  File.read(Rails.root.join('spec', 'fixtures', 'requests', name))
 end
 
 def attachment_fixture(name)
-  File.open(File.join(Rails.root, 'spec', 'fixtures', 'files', name))
+  File.open(Rails.root.join('spec', 'fixtures', 'files', name))
 end
 
 def stub_jsonld_contexts!
diff --git a/spec/services/activitypub/fetch_remote_account_service_spec.rb b/spec/services/activitypub/fetch_remote_account_service_spec.rb
index dba55c034619660c72ebeaa31b0f31f5fc9ad15a..aa13f0a9b7936774212ffa16b2f7148206a1d4dd 100644
--- a/spec/services/activitypub/fetch_remote_account_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_account_service_spec.rb
@@ -59,7 +59,6 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
       it 'returns nil' do
         expect(account).to be_nil
       end
-
     end
 
     context 'when URI and WebFinger share the same host' do
@@ -119,5 +118,11 @@ RSpec.describe ActivityPub::FetchRemoteAccountService, type: :service do
 
       include_examples 'sets profile data'
     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_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 549eb80fa6454fbc790fefb879b151a6344bb4bf..9ae4099969405194c47006a7c3313a6afb5ab869 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -70,5 +70,27 @@ RSpec.describe ActivityPub::FetchRemoteStatusService, type: :service do
         expect(strip_tags(status.text)).to eq "Nyan Cat 10 hours remix https://#{valid_domain}/watch?v=12345"
       end
     end
+
+    context 'with wrong id' do
+      let(:note) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: "https://real.address/@foo/1234",
+          type: 'Note',
+          content: 'Lorem ipsum',
+          attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
+        }
+      end
+
+      let(:object) do
+        temp = note.dup
+        temp[:id] = 'https://fake.address/@foo/5678'
+        temp
+      end
+
+      it 'does not create status' do
+        expect(sender.statuses.first).to be_nil
+      end
+    end
   end
 end
diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb
index e46f0ae4501892ecf80d331cf53302c68fa5613b..b3baf6b6b545140891cfdf533ebf0967b5d22b14 100644
--- a/spec/services/activitypub/process_collection_service_spec.rb
+++ b/spec/services/activitypub/process_collection_service_spec.rb
@@ -26,15 +26,15 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
     context 'when actor differs from sender' do
       let(:forwarder) { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/other_account') }
 
-      it 'processes payload with sender if no signature exists' do
-        expect_any_instance_of(ActivityPub::LinkedDataSignature).not_to receive(:verify_account!)
-        expect(ActivityPub::Activity).to receive(:factory).with(instance_of(Hash), forwarder, instance_of(Hash))
+      it 'does not process payload if no signature exists' do
+        expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(nil)
+        expect(ActivityPub::Activity).not_to receive(:factory)
 
         subject.call(json, forwarder)
       end
 
       it 'processes payload with actor if valid signature exists' do
-        payload['signature'] = {'type' => 'RsaSignature2017'}
+        payload['signature'] = { 'type' => 'RsaSignature2017' }
 
         expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(actor)
         expect(ActivityPub::Activity).to receive(:factory).with(instance_of(Hash), actor, instance_of(Hash))
@@ -43,7 +43,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do
       end
 
       it 'does not process payload if invalid signature exists' do
-        payload['signature'] = {'type' => 'RsaSignature2017'}
+        payload['signature'] = { 'type' => 'RsaSignature2017' }
 
         expect_any_instance_of(ActivityPub::LinkedDataSignature).to receive(:verify_account!).and_return(nil)
         expect(ActivityPub::Activity).not_to receive(:factory)
diff --git a/spec/services/app_sign_up_service_spec.rb b/spec/services/app_sign_up_service_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d480df34808ce3c62a48d3109df3cca2e9e5bd18
--- /dev/null
+++ b/spec/services/app_sign_up_service_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+RSpec.describe AppSignUpService, type: :service do
+  let(:app) { Fabricate(:application, scopes: 'read write') }
+  let(:good_params) { { username: 'alice', password: '12345678', email: 'good@email.com', agreement: true } }
+
+  subject { described_class.new }
+
+  describe '#call' do
+    it 'returns nil when registrations are closed' do
+      Setting.open_registrations = false
+      expect(subject.call(app, good_params)).to be_nil
+    end
+
+    it 'raises an error when params are missing' do
+      expect { subject.call(app, {}) }.to raise_error ActiveRecord::RecordInvalid
+    end
+
+    it 'creates an unconfirmed user with access token' do
+      access_token = subject.call(app, good_params)
+      expect(access_token).to_not be_nil
+      user = User.find_by(id: access_token.resource_owner_id)
+      expect(user).to_not be_nil
+      expect(user.confirmed?).to be false
+    end
+
+    it 'creates access token with the app\'s scopes' do
+      access_token = subject.call(app, good_params)
+      expect(access_token).to_not be_nil
+      expect(access_token.scopes.to_s).to eq 'read write'
+    end
+
+    it 'creates an account' do
+      access_token = subject.call(app, good_params)
+      expect(access_token).to_not be_nil
+      user = User.find_by(id: access_token.resource_owner_id)
+      expect(user).to_not be_nil
+      expect(user.account).to_not be_nil
+    end
+  end
+end
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 23c122e59b8a72d15826272b1baff899eb2be9a8..e53623449f78d56abce08e5169cd53c72a2558a5 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -8,8 +8,8 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
   let!(:jeff)   { Fabricate(:user).account }
   let!(:hank)   { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
 
-  let(:status1) { PostStatusService.new.call(alice, 'Hello @bob@example.com') }
-  let(:status2) { PostStatusService.new.call(alice, 'Another status') }
+  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)
@@ -19,7 +19,7 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
     stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
 
     Fabricate(:subscription, account: alice, callback_url: 'http://example.com/push', confirmed: true, expires_at: 30.days.from_now)
-    jeff.user.update(current_sign_in_at: Time.now)
+    jeff.user.update(current_sign_in_at: Time.zone.now)
     jeff.follow!(alice)
     hank.follow!(alice)
 
diff --git a/spec/services/fetch_atom_service_spec.rb b/spec/services/fetch_atom_service_spec.rb
index bb233c12d1311adb2f02ea5bf24efd0cc1734bb9..495540004e9504d9d782283f7e91dd6379647991 100644
--- a/spec/services/fetch_atom_service_spec.rb
+++ b/spec/services/fetch_atom_service_spec.rb
@@ -57,11 +57,18 @@ RSpec.describe FetchAtomService, type: :service do
       context 'content type is application/atom+xml' do
         let(:content_type) { 'application/atom+xml' }
 
-        it { is_expected.to eq [url, {:prefetched_body=>""}, :ostatus] }
+        it { is_expected.to eq [url, { :prefetched_body => "" }, :ostatus] }
       end
 
-      context 'content_type is json' do
-        let(:content_type) { 'application/activity+json' }
+      context 'content_type is activity+json' do
+        let(:content_type) { 'application/activity+json; charset=utf-8' }
+        let(:body) { json }
+
+        it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
+      end
+
+      context 'content_type is ld+json with profile' do
+        let(:content_type) { 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' }
         let(:body) { json }
 
         it { is_expected.to eq [1, { prefetched_body: body, id: true }, :activitypub] }
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 88c5339db44929207a7e831408bcf65da6a3515a..50c60aafd1d6dec13d8b5cd06482da34ca14bd4a 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -17,6 +17,8 @@ RSpec.describe FetchLinkCardService, type: :service do
     stub_request(:head, 'https://github.com/qbi/WannaCry').to_return(status: 404)
     stub_request(:head, 'http://example.com/test-').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
     stub_request(:get, 'http://example.com/test-').to_return(request_fixture('idn.txt'))
+    stub_request(:head, 'http://example.com/windows-1251').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+    stub_request(:get, 'http://example.com/windows-1251').to_return(request_fixture('windows-1251.txt'))
 
     subject.call(status)
   end
@@ -57,6 +59,15 @@ RSpec.describe FetchLinkCardService, type: :service do
       end
     end
 
+    context do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/windows-1251') }
+
+      it 'works with windows-1251' do
+        expect(a_request(:get, 'http://example.com/windows-1251')).to have_been_made.at_least_once
+        expect(status.preview_cards.first.title).to eq('ÑÑÐ¼Ð¿Ð» Ñ‚ÐµÐºÑÑ‚')
+      end
+    end
+
     context do
       let(:status) { Fabricate(:status, text: 'ãƒ†ã‚¹ãƒˆhttp://example.com/æ—¥æœ¬èªž') }
 
diff --git a/spec/services/fetch_oembed_service_spec.rb b/spec/services/fetch_oembed_service_spec.rb
index 706eb3f2ae0c5733792aca3622eae3122e103684..5789fb53bebbd168bb5007f72207b0362304123c 100644
--- a/spec/services/fetch_oembed_service_spec.rb
+++ b/spec/services/fetch_oembed_service_spec.rb
@@ -8,6 +8,7 @@ describe FetchOEmbedService, type: :service do
   before do
     stub_request(:get, "https://host.test/provider.json").to_return(status: 404)
     stub_request(:get, "https://host.test/provider.xml").to_return(status: 404)
+    stub_request(:get, "https://host.test/empty_provider.json").to_return(status: 200)
   end
 
   describe 'discover_provider' do
@@ -93,6 +94,23 @@ describe FetchOEmbedService, type: :service do
           expect(subject.call('https://host.test/oembed.html')).to be_nil
         end
       end
+
+      context 'Empty JSON provider is discoverable' do
+        before do
+          stub_request(:get, 'https://host.test/oembed.html').to_return(
+            status: 200,
+            headers: { 'Content-Type': 'text/html' },
+            body: request_fixture('oembed_json_empty.html')
+          )
+        end
+
+        it 'returns new OEmbed::Provider for JSON provider' do
+          subject.call('https://host.test/oembed.html')
+          expect(subject.endpoint_url).to eq 'https://host.test/empty_provider.json'
+          expect(subject.format).to eq :json
+        end
+      end
+
     end
 
     context 'when status code is not 200' do
diff --git a/spec/services/fetch_remote_account_service_spec.rb b/spec/services/fetch_remote_account_service_spec.rb
index 1c3abe8f3c7b0e2359609ad83a723ae1d2f6b0f3..3cd86708be4339746ce8f8ca9a63783e1bd2bc90 100644
--- a/spec/services/fetch_remote_account_service_spec.rb
+++ b/spec/services/fetch_remote_account_service_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe FetchRemoteAccountService, type: :service do
-  let(:url) { 'https://example.com' }
+  let(:url) { 'https://example.com/alice' }
   let(:prefetched_body) { nil }
   let(:protocol) { :ostatus }
   subject { FetchRemoteAccountService.new.call(url, prefetched_body, protocol) }
@@ -19,7 +19,7 @@ RSpec.describe FetchRemoteAccountService, type: :service do
   end
 
   let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice' }] } }
-  let(:xml) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'xml', 'mastodon.atom')) }
+  let(:xml) { File.read(Rails.root.join('spec', 'fixtures', 'xml', 'mastodon.atom')) }
 
   shared_examples 'return Account' do
     it { is_expected.to be_an Account }
@@ -46,6 +46,24 @@ RSpec.describe FetchRemoteAccountService, type: :service do
     end
 
     include_examples 'return Account'
+
+    it 'does not update account information if XML comes from an unverified domain' do
+      feed_xml = <<-XML.squish
+        <?xml version="1.0" encoding="UTF-8"?>
+        <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+          <author>
+            <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+            <uri>http://kickass.zone/users/localhost</uri>
+            <name>localhost</name>
+            <poco:preferredUsername>localhost</poco:preferredUsername>
+            <poco:displayName>Villain!!!</poco:displayName>
+          </author>
+        </feed>
+      XML
+
+      returned_account = described_class.new.call('https://real-fake-domains.com/alice', feed_xml, :ostatus)
+      expect(returned_account.display_name).to_not eq 'Villain!!!'
+    end
   end
 
   context 'when prefetched_body is nil' do
diff --git a/spec/services/fetch_remote_status_service_spec.rb b/spec/services/fetch_remote_status_service_spec.rb
index 0df9c329ab28e96ae1f692eec6481504780b6ba9..f9db024b93ab17dcb17988144c9f212bf391ad92 100644
--- a/spec/services/fetch_remote_status_service_spec.rb
+++ b/spec/services/fetch_remote_status_service_spec.rb
@@ -32,4 +32,56 @@ RSpec.describe FetchRemoteStatusService, type: :service do
       expect(status.text).to eq 'Lorem ipsum'
     end
   end
+
+  context 'protocol is :ostatus' do
+    subject { described_class.new }
+
+    before do
+      Fabricate(:account, username: 'tracer', domain: 'real.domain', remote_url: 'https://real.domain/users/tracer')
+    end
+
+    it 'does not create status with author at different domain' do
+      status_body = <<-XML.squish
+        <?xml version="1.0"?>
+        <entry xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
+          <id>tag:real.domain,2017-04-27:objectId=4487555:objectType=Status</id>
+          <published>2017-04-27T13:49:25Z</published>
+          <updated>2017-04-27T13:49:25Z</updated>
+          <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+          <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+          <author>
+            <id>https://real.domain/users/tracer</id>
+            <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+            <uri>https://real.domain/users/tracer</uri>
+            <name>tracer</name>
+          </author>
+          <content type="html">Overwatch rocks</content>
+        </entry>
+      XML
+
+      expect(subject.call('https://fake.domain/foo', status_body, :ostatus)).to be_nil
+    end
+
+    it 'does not create status with wrong id when id uses http format' do
+      status_body = <<-XML.squish
+        <?xml version="1.0"?>
+        <entry xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
+          <id>https://other-real.domain/statuses/123</id>
+          <published>2017-04-27T13:49:25Z</published>
+          <updated>2017-04-27T13:49:25Z</updated>
+          <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+          <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+          <author>
+            <id>https://real.domain/users/tracer</id>
+            <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+            <uri>https://real.domain/users/tracer</uri>
+            <name>tracer</name>
+          </author>
+          <content type="html">Overwatch rocks</content>
+        </entry>
+      XML
+
+      expect(subject.call('https://real.domain/statuses/456', status_body, :ostatus)).to be_nil
+    end
+  end
 end
diff --git a/spec/services/hashtag_query_service_spec.rb b/spec/services/hashtag_query_service_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..24282d2f0672e1defd94bd4bcc100bfe736c04f0
--- /dev/null
+++ b/spec/services/hashtag_query_service_spec.rb
@@ -0,0 +1,60 @@
+require 'rails_helper'
+
+describe HashtagQueryService, type: :service do
+  describe '.call' do
+    let(:account) { Fabricate(:account) }
+    let(:tag1) { Fabricate(:tag) }
+    let(:tag2) { Fabricate(:tag) }
+    let!(:status1) { Fabricate(:status, tags: [tag1]) }
+    let!(:status2) { Fabricate(:status, tags: [tag2]) }
+    let!(:both) { Fabricate(:status, tags: [tag1, tag2]) }
+
+    it 'can add tags in "any" mode' do
+      results = subject.call(tag1, { any: [tag2.name] })
+      expect(results).to include status1
+      expect(results).to include status2
+      expect(results).to include both
+    end
+
+    it 'can remove tags in "all" mode' do
+      results = subject.call(tag1, { all: [tag2.name] })
+      expect(results).to_not include status1
+      expect(results).to_not include status2
+      expect(results).to     include both
+    end
+
+    it 'can remove tags in "none" mode' do
+      results = subject.call(tag1, { none: [tag2.name] })
+      expect(results).to     include status1
+      expect(results).to_not include status2
+      expect(results).to_not include both
+    end
+
+    it 'ignores an invalid mode' do
+      results = subject.call(tag1, { wark: [tag2.name] })
+      expect(results).to     include status1
+      expect(results).to_not include status2
+      expect(results).to     include both
+    end
+
+    it 'handles being passed non existant tag names' do
+      results = subject.call(tag1, { any: ['wark'] })
+      expect(results).to     include status1
+      expect(results).to_not include status2
+      expect(results).to     include both
+    end
+
+    it 'can restrict to an account' do
+      BlockService.new.call(account, status1.account)
+      results = subject.call(tag1, { none: [tag2.name] }, account)
+      expect(results).to_not include status1
+    end
+
+    it 'can restrict to local' do
+      status1.account.update(domain: 'example.com')
+      status1.update(local: false, uri: 'example.com/toot')
+      results = subject.call(tag1, { any: [tag2.name] }, nil, true)
+      expect(results).to_not include status1
+    end
+  end
+end
diff --git a/spec/services/notify_service_spec.rb b/spec/services/notify_service_spec.rb
index d3466794314bc653f9e00ad5e89ce7cc00fa3855..39a681abbf70381aaf2cbc69cf05b195ee7a9dd1 100644
--- a/spec/services/notify_service_spec.rb
+++ b/spec/services/notify_service_spec.rb
@@ -104,9 +104,9 @@ RSpec.describe NotifyService, type: :service do
       is_expected.to change(Notification, :count)
     end
 
-    it 'hides reblogs when disabled' do
-      recipient.follow!(sender, reblogs: false)
-      is_expected.to_not change(Notification, :count)
+    it 'shows reblogs when disabled' do
+      recipient.follow!(sender, reblogs: true)
+      is_expected.to change(Notification, :count)
     end
   end
 
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 40fa8fbefaab55ef94e950d8e253455af3f602d3..3774fed6f3e8a641e5bac4b515060ff9c2e5b5d8 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe PostStatusService, type: :service do
     account = Fabricate(:account)
     text = "test status update"
 
-    status = subject.call(account, text)
+    status = subject.call(account, text: text)
 
     expect(status).to be_persisted
     expect(status.text).to eq text
@@ -18,13 +18,37 @@ RSpec.describe PostStatusService, type: :service do
     account = Fabricate(:account)
     text = "test status update"
 
-    status = subject.call(account, text, in_reply_to_status)
+    status = subject.call(account, text: text, thread: in_reply_to_status)
 
     expect(status).to be_persisted
     expect(status.text).to eq text
     expect(status.thread).to eq in_reply_to_status
   end
 
+  it 'schedules a status' do
+    account = Fabricate(:account)
+    future  = Time.now.utc + 2.hours
+
+    status = subject.call(account, text: 'Hi future!', scheduled_at: future)
+
+    expect(status).to be_a ScheduledStatus
+    expect(status.scheduled_at).to eq future
+    expect(status.params['text']).to eq 'Hi future!'
+  end
+
+  it 'creates response to the original status of boost' do
+    boosted_status = Fabricate(:status)
+    in_reply_to_status = Fabricate(:status, reblog: boosted_status)
+    account = Fabricate(:account)
+    text = "test status update"
+
+    status = subject.call(account, text: text, thread: in_reply_to_status)
+
+    expect(status).to be_persisted
+    expect(status.text).to eq text
+    expect(status.thread).to eq boosted_status
+  end
+
   it 'creates a sensitive status' do
     status = create_status_with_options(sensitive: true)
 
@@ -55,6 +79,13 @@ RSpec.describe PostStatusService, type: :service do
     expect(status.visibility).to eq "private"
   end
 
+  it 'creates a status with limited visibility for silenced users' do
+    status = subject.call(Fabricate(:account, silenced: true), text: 'test', visibility: :public)
+
+    expect(status).to be_persisted
+    expect(status.visibility).to eq "unlisted"
+  end
+
   it 'creates a status for the given application' do
     application = Fabricate(:application)
 
@@ -68,7 +99,7 @@ RSpec.describe PostStatusService, type: :service do
     account = Fabricate(:account)
     text = 'This is an English text.'
 
-    status = subject.call(account, text)
+    status = subject.call(account, text: text)
 
     expect(status.language).to eq 'en'
   end
@@ -79,7 +110,7 @@ RSpec.describe PostStatusService, type: :service do
     allow(ProcessMentionsService).to receive(:new).and_return(mention_service)
     account = Fabricate(:account)
 
-    status = subject.call(account, "test status update")
+    status = subject.call(account, text: "test status update")
 
     expect(ProcessMentionsService).to have_received(:new)
     expect(mention_service).to have_received(:call).with(status)
@@ -91,7 +122,7 @@ RSpec.describe PostStatusService, type: :service do
     allow(ProcessHashtagsService).to receive(:new).and_return(hashtags_service)
     account = Fabricate(:account)
 
-    status = subject.call(account, "test status update")
+    status = subject.call(account, text: "test status update")
 
     expect(ProcessHashtagsService).to have_received(:new)
     expect(hashtags_service).to have_received(:call).with(status)
@@ -104,7 +135,7 @@ RSpec.describe PostStatusService, type: :service do
 
     account = Fabricate(:account)
 
-    status = subject.call(account, "test status update")
+    status = subject.call(account, text: "test status update")
 
     expect(DistributionWorker).to have_received(:perform_async).with(status.id)
     expect(Pubsubhubbub::DistributionWorker).to have_received(:perform_async).with(status.stream_entry.id)
@@ -115,7 +146,7 @@ RSpec.describe PostStatusService, type: :service do
     allow(LinkCrawlWorker).to receive(:perform_async)
     account = Fabricate(:account)
 
-    status = subject.call(account, "test status update")
+    status = subject.call(account, text: "test status update")
 
     expect(LinkCrawlWorker).to have_received(:perform_async).with(status.id)
   end
@@ -126,8 +157,7 @@ RSpec.describe PostStatusService, type: :service do
 
     status = subject.call(
       account,
-      "test status update",
-      nil,
+      text: "test status update",
       media_ids: [media.id],
     )
 
@@ -140,8 +170,7 @@ RSpec.describe PostStatusService, type: :service do
     expect do
       subject.call(
         account,
-        "test status update",
-        nil,
+        text: "test status update",
         media_ids: [
           Fabricate(:media_attachment, account: account),
           Fabricate(:media_attachment, account: account),
@@ -162,8 +191,7 @@ RSpec.describe PostStatusService, type: :service do
     expect do
       subject.call(
         account,
-        "test status update",
-        nil,
+        text: "test status update",
         media_ids: [
           Fabricate(:media_attachment, type: :video, account: account),
           Fabricate(:media_attachment, type: :image, account: account),
@@ -177,12 +205,12 @@ RSpec.describe PostStatusService, type: :service do
 
   it 'returns existing status when used twice with idempotency key' do
     account = Fabricate(:account)
-    status1 = subject.call(account, 'test', nil, idempotency: 'meepmeep')
-    status2 = subject.call(account, 'test', nil, idempotency: 'meepmeep')
+    status1 = subject.call(account, text: 'test', idempotency: 'meepmeep')
+    status2 = subject.call(account, text: 'test', idempotency: 'meepmeep')
     expect(status2.id).to eq status1.id
   end
 
   def create_status_with_options(**options)
-    subject.call(Fabricate(:account), 'test', nil, options)
+    subject.call(Fabricate(:account), options.merge(text: 'test'))
   end
 end
diff --git a/spec/services/process_feed_service_spec.rb b/spec/services/process_feed_service_spec.rb
index d8b06506361228382dc432fdefe04b3899fde3f2..9d3465f3f8ddac3eb9ce125d41b92fc0681a7507 100644
--- a/spec/services/process_feed_service_spec.rb
+++ b/spec/services/process_feed_service_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe ProcessFeedService, type: :service do
   subject { ProcessFeedService.new }
 
   describe 'processing a feed' do
-    let(:body) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'xml', 'mastodon.atom')) }
+    let(:body) { File.read(Rails.root.join('spec', 'fixtures', 'xml', 'mastodon.atom')) }
     let(:account) { Fabricate(:account, username: 'localhost', domain: 'kickass.zone') }
 
     before do
@@ -166,7 +166,7 @@ XML
     expect(created_statuses.first.reblog.text).to eq 'Overwatch rocks'
   end
 
-  it 'ignores reblogs if it failed to retreive reblogged statuses' do
+  it 'ignores reblogs if it failed to retrieve reblogged statuses' do
     stub_request(:get, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404)
 
     actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com')
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 2134f51fda7a9482c40f48c3634d3fc4a7956b0f..7bba83a60213f7edd345580834bb9f5b2534837c 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe RemoveStatusService, type: :service do
     jeff.follow!(alice)
     hank.follow!(alice)
 
-    @status = PostStatusService.new.call(alice, 'Hello @bob@example.com')
+    @status = PostStatusService.new.call(alice, text: 'Hello @bob@example.com')
     Fabricate(:status, account: bill, reblog: @status, uri: 'hoge')
     subject.call(@status)
   end
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 2c392d37684f57b8c96ef1e96f6297b792db5d68..e8b094c89b2b686ca291e00537b8f11f737184c5 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(:account) }
+  let(:source_account) { Fabricate(:user).account }
 
   context 'for a remote account' do
     let(:remote_account) { Fabricate(:account, domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
@@ -22,4 +22,22 @@ RSpec.describe ReportService, type: :service do
       expect(a_request(:post, 'http://example.com/inbox')).to_not have_been_made
     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) }
+
+    subject do
+      -> {  described_class.new.call(source_account, target_account) }
+    end
+
+    before do
+      ActionMailer::Base.deliveries.clear
+      source_account.user.settings.notification_emails['report'] = true
+    end
+
+    it 'does not send an e-mail' do
+      is_expected.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 dd7561587d65d26b2e55b1ca64238884e5e68306..27a85af7c9778bd1469fc585af837396d8d41609 100644
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@@ -119,8 +119,6 @@ RSpec.describe ResolveAccountService, type: :service do
         expect(account.actor_type).to eq 'Person'
       end
     end
-
-    pending
   end
 
   it 'processes one remote account at a time using locks' do
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 673de523385c27ca8bc00cb6887dfa5d0b7fd0a4..671080f1d980e68936c3ddb9b613bf63dc8ac98f 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -29,7 +29,7 @@ describe SearchService, type: :service do
           allow(ResolveURLService).to receive(:new).and_return(service)
           results = subject.call(@query, 10)
 
-          expect(service).to have_received(:call).with(@query)
+          expect(service).to have_received(:call).with(@query, on_behalf_of: nil)
           expect(results).to eq empty_results
         end
       end
@@ -41,7 +41,7 @@ describe SearchService, type: :service do
           allow(ResolveURLService).to receive(:new).and_return(service)
 
           results = subject.call(@query, 10)
-          expect(service).to have_received(:call).with(@query)
+          expect(service).to have_received(:call).with(@query, on_behalf_of: nil)
           expect(results).to eq empty_results.merge(accounts: [account])
         end
       end
@@ -53,7 +53,7 @@ describe SearchService, type: :service do
           allow(ResolveURLService).to receive(:new).and_return(service)
 
           results = subject.call(@query, 10)
-          expect(service).to have_received(:call).with(@query)
+          expect(service).to have_received(:call).with(@query, on_behalf_of: nil)
           expect(results).to eq empty_results.merge(statuses: [status])
         end
       end
diff --git a/spec/services/suspend_account_service_spec.rb b/spec/services/suspend_account_service_spec.rb
index fd303a9d5bb920278c11593ae859e764734c848b..8a5bd33010c2cfd90f464f542368ea236e75c10a 100644
--- a/spec/services/suspend_account_service_spec.rb
+++ b/spec/services/suspend_account_service_spec.rb
@@ -2,6 +2,11 @@ require 'rails_helper'
 
 RSpec.describe SuspendAccountService, type: :service do
   describe '#call' do
+    before do
+      stub_request(:post, "https://alice.com/inbox").to_return(status: 201)
+      stub_request(:post, "https://bob.com/inbox").to_return(status: 201)
+    end
+
     subject do
       -> { described_class.new.call(account) }
     end
@@ -14,6 +19,8 @@ RSpec.describe SuspendAccountService, type: :service do
     let!(:active_relationship) { Fabricate(:follow, account: account) }
     let!(:passive_relationship) { Fabricate(:follow, target_account: account) }
     let!(:subscription) { Fabricate(:subscription, account: account) }
+    let!(:remote_alice) { Fabricate(:account, inbox_url: 'https://alice.com/inbox', protocol: :activitypub) }
+    let!(:remote_bob) { Fabricate(:account, inbox_url: 'https://bob.com/inbox', protocol: :activitypub) }
 
     it 'deletes associated records' do
       is_expected.to change {
@@ -29,5 +36,11 @@ RSpec.describe SuspendAccountService, type: :service do
         ].map(&:count)
       }.from([1, 1, 1, 1, 1, 1, 1, 1]).to([0, 0, 0, 0, 0, 0, 0, 0])
     end
+
+    it 'sends a delete actor activity to all known inboxes' do
+      subject.call
+      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
   end
 end
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index c5914c81820b88d9c9d68f36401d8c9e005ff14e..8a2881ab17f29e26811411d397fadce0fb4d6265 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -56,4 +56,22 @@ RSpec.describe UnfollowService, type: :service do
       expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
     end
   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 }
+
+    before do
+      bob.follow!(sender)
+      stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
+      subject.call(bob, sender)
+    end
+
+    it 'destroys the following relation' do
+      expect(bob.following?(sender)).to be false
+    end
+
+    it 'sends a reject activity' do
+      expect(a_request(:post, 'http://example.com/inbox')).to have_been_made.once
+    end
+  end
 end
diff --git a/spec/services/update_remote_profile_service_spec.rb b/spec/services/update_remote_profile_service_spec.rb
index 7ac3a809a7c82768c141c16cbd40e76d5faed24e..f3ea70b801b7ff943d08c95241e1b0a1435351dc 100644
--- a/spec/services/update_remote_profile_service_spec.rb
+++ b/spec/services/update_remote_profile_service_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe UpdateRemoteProfileService, type: :service do
-  let(:xml) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'push', 'feed.atom')) }
+  let(:xml) { File.read(Rails.root.join('spec', 'fixtures', 'push', 'feed.atom')) }
 
   subject { UpdateRemoteProfileService.new }
 
diff --git a/spec/services/verify_link_service_spec.rb b/spec/services/verify_link_service_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..2edcdb75f12494e499a0b1f31a67b75ae9a3e50e
--- /dev/null
+++ b/spec/services/verify_link_service_spec.rb
@@ -0,0 +1,109 @@
+require 'rails_helper'
+
+RSpec.describe VerifyLinkService, type: :service do
+  subject { described_class.new }
+
+  context 'given a local account' do
+    let(:account) { Fabricate(:account, username: 'alice') }
+    let(:field)   { Account::Field.new(account, 'name' => 'Website', 'value' => 'http://example.com') }
+
+    before do
+      stub_request(:head, 'https://redirect.me/abc').to_return(status: 301, headers: { 'Location' => ActivityPub::TagManager.instance.url_for(account) })
+      stub_request(:get, 'http://example.com').to_return(status: 200, body: html)
+      subject.call(field)
+    end
+
+    context 'when a link contains an <a> back' do
+      let(:html) do
+        <<-HTML
+          <!doctype html>
+          <body>
+            <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me">Follow me on Mastodon</a>
+          </body>
+        HTML
+      end
+
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
+      end
+    end
+
+    context 'when a link contains an <a rel="noopener"> back' do
+      let(:html) do
+        <<-HTML
+          <!doctype html>
+          <body>
+            <a href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="noopener me" target="_blank">Follow me on Mastodon</a>
+          </body>
+        HTML
+      end
+
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
+      end
+    end
+
+    context 'when a link contains a <link> back' do
+      let(:html) do
+        <<-HTML
+          <!doctype html>
+          <head>
+            <link type="text/html" href="#{ActivityPub::TagManager.instance.url_for(account)}" rel="me" />
+          </head>
+        HTML
+      end
+
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
+      end
+    end
+
+    context 'when a link goes through a redirect back' do
+      let(:html) do
+        <<-HTML
+          <!doctype html>
+          <head>
+            <link type="text/html" href="https://redirect.me/abc" rel="me" />
+          </head>
+        HTML
+      end
+
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
+      end
+    end
+
+    context 'when a link does not contain a link back' do
+      let(:html) { '' }
+
+      it 'marks the field as verified' do
+        expect(field.verified?).to be false
+      end
+    end
+  end
+
+  context 'given a remote account' do
+    let(:account) { Fabricate(:account, username: 'alice', domain: 'example.com', url: 'https://profile.example.com/alice') }
+    let(:field)   { Account::Field.new(account, 'name' => 'Website', 'value' => '<a href="http://example.com" rel="me"><span class="invisible">http://</span><span class="">example.com</span><span class="invisible"></span></a>') }
+
+    before do
+      stub_request(:get, 'http://example.com').to_return(status: 200, body: html)
+      subject.call(field)
+    end
+
+    context 'when a link contains an <a> back' do
+      let(:html) do
+        <<-HTML
+          <!doctype html>
+          <body>
+            <a href="https://profile.example.com/alice" rel="me">Follow me on Mastodon</a>
+          </body>
+        HTML
+      end
+
+      it 'marks the field as verified' do
+        expect(field.verified?).to be true
+      end
+    end
+  end
+end
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..d2e442f4ab40bc71d219660053693bc9470c5f20
--- /dev/null
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe BlacklistedEmailValidator, type: :validator do
+  describe '#validate' do
+    let(:user)   { double(email: 'info@mail.com', errors: errors) }
+    let(:errors) { double(add: nil) }
+
+    before do
+      allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email }
+      described_class.new.validate(user)
+    end
+
+    context 'blocked_email?' do
+      let(:blocked_email) { true }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(:email, I18n.t('users.invalid_email'))
+      end
+    end
+
+    context '!blocked_email?' do
+      let(:blocked_email) { false }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(:email, I18n.t('users.invalid_email'))
+      end
+    end
+  end
+end
diff --git a/spec/validators/disallowed_hashtags_validator_spec.rb b/spec/validators/disallowed_hashtags_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..8ec1302ab9f6b6bd13613eaeb38cbf7a5da15e93
--- /dev/null
+++ b/spec/validators/disallowed_hashtags_validator_spec.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe DisallowedHashtagsValidator, type: :validator do
+  describe '#validate' do
+    before do
+      allow_any_instance_of(described_class).to receive(:select_tags) { tags }
+      described_class.new.validate(status)
+    end
+
+    let(:status) { double(errors: errors, local?: local, reblog?: reblog, text: '') }
+    let(:errors) { double(add: nil) }
+
+    context 'unless status.local? && !status.reblog?' do
+      let(:local)  { false }
+      let(:reblog) { true }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(:text, any_args)
+      end
+    end
+
+    context 'status.local? && !status.reblog?' do
+      let(:local)  { true }
+      let(:reblog) { false }
+
+      context 'tags.empty?' do
+        let(:tags) { [] }
+
+        it 'not calls errors.add' do
+          expect(errors).not_to have_received(:add).with(:text, any_args)
+        end
+      end
+
+      context '!tags.empty?' do
+        let(:tags) { %w(a b c) }
+
+        it 'calls errors.add' do
+          expect(errors).to have_received(:add)
+            .with(:text, I18n.t('statuses.disallowed_hashtags', tags: tags.join(', '), count: tags.size))
+        end
+      end
+    end
+  end
+end
diff --git a/spec/validators/email_mx_validator_spec.rb b/spec/validators/email_mx_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..bc68f63cfbc16fa3b22eb87e5d4e0e699f177b62
--- /dev/null
+++ b/spec/validators/email_mx_validator_spec.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe EmailMxValidator do
+  describe '#validate' do
+    let(:user) { double(email: 'foo@example.com', errors: double(add: nil)) }
+
+    it 'adds an error if there are no DNS records for the e-mail domain' 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(: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 a MX record exists but 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')])
+      allow(resolver).to receive(:getresources).with('example.com', Resolv::DNS::Resource::IN::A).and_return([])
+      allow(resolver).to receive(:getresources).with('mail.example.com', Resolv::DNS::Resource::IN::A).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 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(: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('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([double(address: '2.3.4.5')])
+      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
+
+      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('mail.example.com', Resolv::DNS::Resource::IN::A).and_return([double(address: '2.3.4.5')])
+      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
+  end
+end
diff --git a/spec/validators/follow_limit_validator_spec.rb b/spec/validators/follow_limit_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cc8fbb6313233f920b7193bb395c633752455273
--- /dev/null
+++ b/spec/validators/follow_limit_validator_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe FollowLimitValidator, type: :validator do
+  describe '#validate' do
+    before do
+      allow_any_instance_of(described_class).to receive(:limit_reached?).with(account) do
+        limit_reached
+      end
+
+      described_class.new.validate(follow)
+    end
+
+    let(:follow)  { double(account: account, errors: errors) }
+    let(:errors)  { double(add: nil) }
+    let(:account) { double(nil?: _nil, local?: local, following_count: 0, followers_count: 0) }
+    let(:_nil)    { true }
+    let(:local)   { false }
+
+    context 'follow.account.nil? || !follow.account.local?' do
+      let(:_nil)    { true }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(:base, any_args)
+      end
+    end
+
+    context '!(follow.account.nil? || !follow.account.local?)' do
+      let(:_nil)    { false }
+      let(:local)   { true }
+
+      context 'limit_reached?' do
+        let(:limit_reached) { true }
+
+        it 'calls errors.add' do
+          expect(errors).to have_received(:add)
+            .with(:base, I18n.t('users.follow_limit_reached', limit: FollowLimitValidator::LIMIT))
+        end
+      end
+
+      context '!limit_reached?' do
+        let(:limit_reached) { false }
+
+        it 'not calls errors.add' do
+          expect(errors).not_to have_received(:add).with(:base, any_args)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb
index e2d1a15ec96387954e66fdb07993144d1b66e649..11e55f9335f184e73a6d4a81c30de8974107db2e 100644
--- a/spec/validators/status_length_validator_spec.rb
+++ b/spec/validators/status_length_validator_spec.rb
@@ -4,8 +4,17 @@ require 'rails_helper'
 
 describe StatusLengthValidator do
   describe '#validate' do
-    it 'does not add errors onto remote statuses'
-    it 'does not add errors onto local reblogs'
+    it 'does not add errors onto remote statuses' do
+      status = double(local?: false)
+      subject.validate(status)
+      expect(status).not_to receive(:errors)
+    end
+
+    it 'does not add errors onto local reblogs' do
+      status = double(local?: false, reblog?: true)
+      subject.validate(status)
+      expect(status).not_to receive(:errors)
+    end
 
     it 'adds an error when content warning is over 500 characters' do
       status = double(spoiler_text: 'a' * 520, text: '', errors: double(add: nil), local?: true, reblog?: false)
diff --git a/spec/validators/status_pin_validator_spec.rb b/spec/validators/status_pin_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..06532e5b3f5a701f3203fed142c2d05b8b678361
--- /dev/null
+++ b/spec/validators/status_pin_validator_spec.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe StatusPinValidator, type: :validator do
+  describe '#validate' do
+    before do
+      subject.validate(pin)
+    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(:account)     { double(status_pins: status_pins, local?: local) }
+    let(:status_pins) { double(count: count) }
+    let(:errors)      { double(add: nil) }
+    let(:pin_account_id)    { 1 }
+    let(:status_account_id) { 1 }
+    let(:visibility)  { 'public' }
+    let(:local)       { false }
+    let(:reblog)      { false }
+    let(:count)       { 0 }
+
+    context 'pin.status.reblog?' do
+      let(:reblog) { true }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.reblog'))
+      end
+    end
+
+    context 'pin.account_id != pin.status.account_id' do
+      let(:pin_account_id)    { 1 }
+      let(:status_account_id) { 2 }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.ownership'))
+      end
+    end
+
+    context 'unless %w(public unlisted).include?(pin.status.visibility)' do
+      let(:visibility) { '' }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.private'))
+      end
+    end
+
+    context 'pin.account.status_pins.count > 4 && pin.account.local?' do
+      let(:count) { 5 }
+      let(:local) { true }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(:base, I18n.t('statuses.pin_errors.limit'))
+      end
+    end
+  end
+end
diff --git a/spec/validators/unique_username_validator_spec.rb b/spec/validators/unique_username_validator_spec.rb
index b9d773bed3bc1da46b9cc7a20f8ede99c7780eb1..c2e2eedf41f26c5b53dc623eca69eb3d1b23aafa 100644
--- a/spec/validators/unique_username_validator_spec.rb
+++ b/spec/validators/unique_username_validator_spec.rb
@@ -15,14 +15,6 @@ describe UniqueUsernameValidator do
       expect(account).to be_valid
     end
 
-    it 'adds an error when the username is already used with ignoring dots' do
-      pending 'allowing dots in username is still in development'
-      Fabricate(:account, username: 'abcd.ef')
-      account = double(username: 'ab.cdef', persisted?: false, errors: double(add: nil))
-      subject.validate(account)
-      expect(account.errors).to have_received(:add)
-    end
-
     it 'adds an error when the username is already used with ignoring cases' do
       Fabricate(:account, username: 'ABCdef')
       account = double(username: 'abcDEF', persisted?: false, errors: double(add: nil))
diff --git a/spec/validators/unreserved_username_validator_spec.rb b/spec/validators/unreserved_username_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..0187941b0378ce0b219741a1caf5f8d9b72a79c8
--- /dev/null
+++ b/spec/validators/unreserved_username_validator_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnreservedUsernameValidator, type: :validator do
+  describe '#validate' do
+    before do
+      allow(validator).to receive(:reserved_username?) { reserved_username }
+      validator.validate(account)
+    end
+
+    let(:validator) { described_class.new }
+    let(:account)   { double(username: username, errors: errors) }
+    let(:errors )   { double(add: nil) }
+
+    context '@username.nil?' do
+      let(:username)  { nil }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(:username, any_args)
+      end
+    end
+
+    context '!@username.nil?' do
+      let(:username)  { '' }
+
+      context 'reserved_username?' do
+        let(:reserved_username) { true }
+
+        it 'calls erros.add' do
+          expect(errors).to have_received(:add).with(:username, I18n.t('accounts.reserved_username'))
+        end
+      end
+
+      context '!reserved_username?' do
+        let(:reserved_username) { false }
+
+        it 'not calls erros.add' do
+          expect(errors).not_to have_received(:add).with(:username, any_args)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/validators/url_validator_spec.rb b/spec/validators/url_validator_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e8d0e6494690aceebc1c7c9bc6e297c6137f3af9
--- /dev/null
+++ b/spec/validators/url_validator_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UrlValidator, type: :validator do
+  describe '#validate_each' do
+    before do
+      allow(validator).to receive(:compliant?).with(value) { compliant }
+      validator.validate_each(record, attribute, value)
+    end
+
+    let(:validator) { described_class.new(attributes: [attribute]) }
+    let(:record)    { double(errors: errors) }
+    let(:errors)    { double(add: nil) }
+    let(:value)     { '' }
+    let(:attribute) { :foo }
+
+    context 'unless compliant?' do
+      let(:compliant) { false }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(attribute, I18n.t('applications.invalid_url'))
+      end
+    end
+
+    context 'if compliant?' do
+      let(:compliant) { true }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(attribute, any_args)
+      end
+    end
+  end
+end
diff --git a/spec/views/about/_contact.html.haml_spec.rb b/spec/views/about/_contact.html.haml_spec.rb
deleted file mode 100644
index 25ba1579464a3b74f4061b26ed0c6a9271c1539e..0000000000000000000000000000000000000000
--- a/spec/views/about/_contact.html.haml_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'about/_contact.html.haml' do
-  describe 'the contact account', without_verify_partial_doubles: true do
-    before do
-      allow(view).to receive(:display_name).and_return('Display Name!')
-    end
-
-    it 'shows info when account is present' do
-      account = Account.new(username: 'admin')
-      contact = double(contact_account: account, site_contact_email: '')
-      render 'about/contact', contact: contact
-
-      expect(rendered).to have_content('@admin')
-    end
-
-    it 'does not show info when account is missing' do
-      contact = double(contact_account: nil, site_contact_email: '')
-      render 'about/contact', contact: contact
-
-      expect(rendered).not_to have_content('@')
-    end
-  end
-
-  describe 'the contact email' do
-    it 'show info when email is present' do
-      contact = double(site_contact_email: 'admin@example.com', contact_account: nil)
-      render 'about/contact', contact: contact
-
-      expect(rendered).to have_content('admin@example.com')
-    end
-  end
-end
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index cbe5aa93b68923b0af6a4cc2958dcb147dd05ad5..eb81090b5173b2452f89bfcafa1db9d9918eea95 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -11,12 +11,14 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
   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/tootsuite/mastodon',
                                 open_registrations: false,
                                 thumbnail: nil,
                                 hero: nil,
+                                mascot: nil,
                                 user_count: 0,
                                 status_count: 0,
                                 contact_account: nil,
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
index e0681b125779a4d8ed35c0ac0392f00cc9873e7c..93f0adb991c399082f7f34f8182117347352b8a0 100644
--- a/spec/views/stream_entries/show.html.haml_spec.rb
+++ b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -12,6 +12,8 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
     allow(view).to receive(:full_asset_url).and_return('//asset.host/image.svg')
     allow(view).to receive(:local_time)
     allow(view).to receive(:local_time_ago)
+    allow(view).to receive(:current_account).and_return(nil)
+    assign(:instance_presenter, InstancePresenter.new)
   end
 
   it 'has valid author h-card and basic data for a detailed_status' do
@@ -47,8 +49,8 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
     assign(:stream_entry, reply.stream_entry)
     assign(:account, alice)
     assign(:type, reply.stream_entry.activity_type.downcase)
-    assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob) )
-    assign(:descendant_threads, [{ statuses: reply.stream_entry.activity.descendants(1)}])
+    assign(:ancestors, reply.stream_entry.activity.ancestors(1, bob))
+    assign(:descendant_threads, [{ statuses: reply.stream_entry.activity.descendants(1) }])
 
     render
 
diff --git a/spec/workers/publish_scheduled_status_worker_spec.rb b/spec/workers/publish_scheduled_status_worker_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..f8547e6fe2a6853b7ff458f998482225f3e3bbd0
--- /dev/null
+++ b/spec/workers/publish_scheduled_status_worker_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe PublishScheduledStatusWorker do
+  subject { described_class.new }
+
+  let(:scheduled_status) { Fabricate(:scheduled_status, params: { text: 'Hello world, future!' }) }
+
+  describe 'perform' do
+    before do
+      subject.perform(scheduled_status.id)
+    end
+
+    it 'creates a status' do
+      expect(scheduled_status.account.statuses.first.text).to eq 'Hello world, future!'
+    end
+
+    it 'removes the scheduled status' do
+      expect(ScheduledStatus.find_by(id: scheduled_status.id)).to be_nil
+    end
+  end
+end
diff --git a/streaming/index.js b/streaming/index.js
index 4eaf66865839a9f87ceca6de4849413fcd027349..b4d09d0ad2c7d60b0a0c7b1d74a7404a133d9a12 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -9,6 +9,7 @@ const log = require('npmlog');
 const url = require('url');
 const WebSocket = require('uws');
 const uuid = require('uuid');
+const fs = require('fs');
 
 const env = process.env.NODE_ENV || 'development';
 
@@ -70,6 +71,10 @@ const redisUrlToClient = (defaultConfig, redisUrl) => {
 const numWorkers = +process.env.STREAMING_CLUSTER_NUM || (env === 'development' ? 1 : Math.max(os.cpus().length - 1, 1));
 
 const startMaster = () => {
+  if (!process.env.SOCKET && process.env.PORT && isNaN(+process.env.PORT)) {
+    log.warn('UNIX domain socket is now supported by using SOCKET. Please migrate from PORT hack.');
+  }
+
   log.info(`Starting streaming API server master with ${numWorkers} workers`);
 };
 
@@ -192,7 +197,7 @@ const startWorker = (workerId) => {
         return;
       }
 
-      client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.filtered_languages FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
+      client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
         done();
 
         if (err) {
@@ -209,7 +214,7 @@ const startWorker = (workerId) => {
         }
 
         req.accountId = result.rows[0].account_id;
-        req.filteredLanguages = result.rows[0].filtered_languages;
+        req.chosenLanguages = result.rows[0].chosen_languages;
 
         next();
       });
@@ -340,7 +345,7 @@ const startWorker = (workerId) => {
       const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id));
       const accountDomain    = unpackedPayload.account.acct.split('@')[1];
 
-      if (Array.isArray(req.filteredLanguages) && req.filteredLanguages.indexOf(unpackedPayload.language) !== -1) {
+      if (Array.isArray(req.chosenLanguages) && unpackedPayload.language !== null && req.chosenLanguages.indexOf(unpackedPayload.language) === -1) {
         log.silly(req.requestId, `Message ${unpackedPayload.id} filtered by language (${unpackedPayload.language})`);
         return;
       }
@@ -445,9 +450,20 @@ const startWorker = (workerId) => {
     });
   };
 
+  const httpNotFound = res => {
+    res.writeHead(404, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Not found' }));
+  };
+
   app.use(setRequestId);
   app.use(setRemoteAddress);
   app.use(allowCrossDomain);
+
+  app.get('/api/v1/streaming/health', (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'text/plain' });
+    res.end('OK');
+  });
+
   app.use(authenticationMiddleware);
   app.use(errorMiddleware);
 
@@ -475,15 +491,30 @@ const startWorker = (workerId) => {
   });
 
   app.get('/api/v1/streaming/direct', (req, res) => {
-    streamFrom(`timeline:direct:${req.accountId}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
+    const channel = `timeline:direct:${req.accountId}`;
+    streamFrom(channel, req, streamToHttp(req, res), streamHttpEnd(req, subscriptionHeartbeat(channel)), true);
   });
 
   app.get('/api/v1/streaming/hashtag', (req, res) => {
-    streamFrom(`timeline:hashtag:${req.query.tag.toLowerCase()}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
+    const { tag } = req.query;
+
+    if (!tag || tag.length === 0) {
+      httpNotFound(res);
+      return;
+    }
+
+    streamFrom(`timeline:hashtag:${tag.toLowerCase()}`, req, streamToHttp(req, res), streamHttpEnd(req), true);
   });
 
   app.get('/api/v1/streaming/hashtag/local', (req, res) => {
-    streamFrom(`timeline:hashtag:${req.query.tag.toLowerCase()}:local`, req, streamToHttp(req, res), streamHttpEnd(req), true);
+    const { tag } = req.query;
+
+    if (!tag || tag.length === 0) {
+      httpNotFound(res);
+      return;
+    }
+
+    streamFrom(`timeline:hashtag:${tag.toLowerCase()}:local`, req, streamToHttp(req, res), streamHttpEnd(req), true);
   });
 
   app.get('/api/v1/streaming/list', (req, res) => {
@@ -491,8 +522,7 @@ const startWorker = (workerId) => {
 
     authorizeListAccess(listId, req, authorized => {
       if (!authorized) {
-        res.writeHead(404, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Not found' }));
+        httpNotFound(res);
         return;
       }
 
@@ -515,9 +545,11 @@ const startWorker = (workerId) => {
       ws.isAlive = true;
     });
 
+    let channel;
+
     switch(location.query.stream) {
     case 'user':
-      const channel = `timeline:${req.accountId}`;
+      channel = `timeline:${req.accountId}`;
       streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)));
       break;
     case 'user:notification':
@@ -536,12 +568,23 @@ const startWorker = (workerId) => {
       streamFrom('timeline:public:local:media', req, streamToWs(req, ws), streamWsEnd(req, ws), true);
       break;
     case 'direct':
-      streamFrom(`timeline:direct:${req.accountId}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
+      channel = `timeline:direct:${req.accountId}`;
+      streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)), true);
       break;
     case 'hashtag':
+      if (!location.query.tag || location.query.tag.length === 0) {
+        ws.close();
+        return;
+      }
+
       streamFrom(`timeline:hashtag:${location.query.tag.toLowerCase()}`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
       break;
     case 'hashtag:local':
+      if (!location.query.tag || location.query.tag.length === 0) {
+        ws.close();
+        return;
+      }
+
       streamFrom(`timeline:hashtag:${location.query.tag.toLowerCase()}:local`, req, streamToWs(req, ws), streamWsEnd(req, ws), true);
       break;
     case 'list':
@@ -553,7 +596,7 @@ const startWorker = (workerId) => {
           return;
         }
 
-        const channel = `timeline:list:${listId}`;
+        channel = `timeline:list:${listId}`;
         streamFrom(channel, req, streamToWs(req, ws), streamWsEnd(req, ws, subscriptionHeartbeat(channel)));
       });
       break;
@@ -574,8 +617,8 @@ const startWorker = (workerId) => {
     });
   }, 30000);
 
-  server.listen(process.env.PORT || 4000, process.env.BIND || '0.0.0.0', () => {
-    log.info(`Worker ${workerId} now listening on ${server.address().address}:${server.address().port}`);
+  attachServerWithConfig(server, address => {
+    log.info(`Worker ${workerId} now listening on ${address}`);
   });
 
   const onExit = () => {
@@ -596,9 +639,48 @@ const startWorker = (workerId) => {
   process.on('uncaughtException', onError);
 };
 
-throng({
-  workers: numWorkers,
-  lifetime: Infinity,
-  start: startWorker,
-  master: startMaster,
+const attachServerWithConfig = (server, onSuccess) => {
+  if (process.env.SOCKET || process.env.PORT && isNaN(+process.env.PORT)) {
+    server.listen(process.env.SOCKET || process.env.PORT, () => {
+      if (onSuccess) {
+        fs.chmodSync(server.address(), 0o666);
+        onSuccess(server.address());
+      }
+    });
+  } else {
+    server.listen(+process.env.PORT || 4000, process.env.BIND || '0.0.0.0', () => {
+      if (onSuccess) {
+        onSuccess(`${server.address().address}:${server.address().port}`);
+      }
+    });
+  }
+};
+
+const onPortAvailable = onSuccess => {
+  const testServer = http.createServer();
+
+  testServer.once('error', err => {
+    onSuccess(err);
+  });
+
+  testServer.once('listening', () => {
+    testServer.once('close', () => onSuccess());
+    testServer.close();
+  });
+
+  attachServerWithConfig(testServer);
+};
+
+onPortAvailable(err => {
+  if (err) {
+    log.error('Could not start server, the port or socket is in use');
+    return;
+  }
+
+  throng({
+    workers: numWorkers,
+    lifetime: Infinity,
+    start: startWorker,
+    master: startMaster,
+  });
 });
diff --git a/vendor/assets/javascripts/.keep b/vendor/.keep
similarity index 100%
rename from vendor/assets/javascripts/.keep
rename to vendor/.keep
diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/yarn.lock b/yarn.lock
index 64183514976768ac1f674f6996bbaa752dfe495c..9ff12a712bfa077c87d21109b719d9a09f78ccc7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,1119 +2,1484 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.36.tgz#2349d7ec04b3a06945ae173280ef8579b63728e4"
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-"@babel/code-frame@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
-  dependencies:
-    "@babel/highlight" "7.0.0-beta.44"
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.0.0-beta.35":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/core@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
+  integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.2.2"
+    "@babel/helpers" "^7.2.0"
+    "@babel/parser" "^7.2.2"
+    "@babel/template" "^7.2.2"
+    "@babel/traverse" "^7.2.2"
+    "@babel/types" "^7.2.2"
+    convert-source-map "^1.1.0"
+    debug "^4.1.0"
+    json5 "^2.1.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
 
-"@babel/generator@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
+"@babel/generator@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz#18c816c70962640eab42fe8cae5f3947a5c65ccc"
+  integrity sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==
   dependencies:
-    "@babel/types" "7.0.0-beta.44"
+    "@babel/types" "^7.2.2"
     jsesc "^2.5.1"
-    lodash "^4.2.0"
+    lodash "^4.17.10"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/helper-function-name@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.36.tgz#366e3bc35147721b69009f803907c4d53212e88d"
+"@babel/helper-annotate-as-pure@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+  integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.36"
-    "@babel/template" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
+    "@babel/types" "^7.0.0"
 
-"@babel/helper-function-name@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+  integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.44"
-    "@babel/template" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
+    "@babel/helper-explode-assignable-expression" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/helper-get-function-arity@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.36.tgz#f5383bac9a96b274828b10d98900e84ee43e32b8"
+"@babel/helper-builder-react-jsx@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz#fa154cb53eb918cf2a9a7ce928e29eb649c5acdb"
+  integrity sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==
   dependencies:
-    "@babel/types" "7.0.0-beta.36"
+    "@babel/types" "^7.0.0"
+    esutils "^2.0.0"
 
-"@babel/helper-get-function-arity@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
+"@babel/helper-call-delegate@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz#6a957f105f37755e8645343d3038a22e1449cc4a"
+  integrity sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==
   dependencies:
-    "@babel/types" "7.0.0-beta.44"
+    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/helper-split-export-declaration@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
+"@babel/helper-create-class-features-plugin@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.2.3.tgz#f6e719abb90cb7f4a69591e35fd5eb89047c4a7c"
+  integrity sha512-xO/3Gn+2C7/eOUeb0VRnSP1+yvWHNxlpAot1eMhtoKDCN7POsyQP5excuT5UsV5daHxMWBeIIOeI5cmB8vMRgQ==
   dependencies:
-    "@babel/types" "7.0.0-beta.44"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.2.3"
 
-"@babel/highlight@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
+"@babel/helper-define-map@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz#3b74caec329b3c80c116290887c0dd9ae468c20c"
+  integrity sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==
   dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^3.0.0"
-
-"@babel/template@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.36.tgz#02e903de5d68bd7899bce3c5b5447e59529abb00"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
-    lodash "^4.2.0"
-
-"@babel/template@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-    babylon "7.0.0-beta.44"
-    lodash "^4.2.0"
-
-"@babel/traverse@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.36.tgz#1dc6f8750e89b6b979de5fe44aa993b1a2192261"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/helper-function-name" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
-    debug "^3.0.1"
-    globals "^11.1.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-"@babel/traverse@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.44"
-    "@babel/generator" "7.0.0-beta.44"
-    "@babel/helper-function-name" "7.0.0-beta.44"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-    babylon "7.0.0-beta.44"
-    debug "^3.1.0"
-    globals "^11.1.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    lodash "^4.17.10"
 
-"@babel/types@7.0.0-beta.36":
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.36.tgz#64f2004353de42adb72f9ebb4665fc35b5499d23"
+"@babel/helper-explode-assignable-expression@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+  integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@babel/types@7.0.0-beta.44":
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
+"@babel/helper-function-name@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+  integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
   dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-"@types/node@*":
-  version "8.0.53"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
-
-abab@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+"@babel/helper-get-function-arity@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+  integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
+  dependencies:
+    "@babel/types" "^7.0.0"
 
-accepts@~1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
+"@babel/helper-hoist-variables@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz#46adc4c5e758645ae7a45deb92bab0918c23bb88"
+  integrity sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==
   dependencies:
-    mime-types "~2.1.16"
-    negotiator "0.6.1"
+    "@babel/types" "^7.0.0"
 
-acorn-dynamic-import@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+"@babel/helper-member-expression-to-functions@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+  integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
   dependencies:
-    acorn "^4.0.3"
+    "@babel/types" "^7.0.0"
 
-acorn-globals@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
   dependencies:
-    acorn "^4.0.4"
+    "@babel/types" "^7.0.0"
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+"@babel/helper-module-transforms@^7.1.0":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz#ab2f8e8d231409f8370c883d20c335190284b963"
+  integrity sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==
   dependencies:
-    acorn "^3.0.4"
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/template" "^7.2.2"
+    "@babel/types" "^7.2.2"
+    lodash "^4.17.10"
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+"@babel/helper-optimise-call-expression@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+  integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
+  dependencies:
+    "@babel/types" "^7.0.0"
 
-acorn@^4.0.3, acorn@^4.0.4:
-  version "4.0.13"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+"@babel/helper-plugin-utils@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+  integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
 
-acorn@^5.0.0, acorn@^5.1.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
+"@babel/helper-regex@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0.tgz#2c1718923b57f9bbe64705ffe5640ac64d9bdb27"
+  integrity sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==
+  dependencies:
+    lodash "^4.17.10"
 
-acorn@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.0.tgz#572bedb377a1c61b7a289e72b8c5cfeb7baaf0bf"
+"@babel/helper-remap-async-to-generator@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+  integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-wrap-function" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-adjust-sourcemap-loader@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.1.0.tgz#412d92404eb61e4113635012cba53a33d008e0e2"
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz#19970020cf22677d62b3a689561dbd9644d8c5e5"
+  integrity sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==
   dependencies:
-    assert "^1.3.0"
-    camelcase "^1.2.1"
-    loader-utils "^1.0.2"
-    lodash.assign "^4.0.1"
-    lodash.defaults "^3.1.2"
-    object-path "^0.9.2"
-    regex-parser "^2.2.1"
+    "@babel/helper-member-expression-to-functions" "^7.0.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/traverse" "^7.2.3"
+    "@babel/types" "^7.0.0"
 
-ajv-keywords@^2.0.0, ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+"@babel/helper-simple-access@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+  integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
+  dependencies:
+    "@babel/template" "^7.1.0"
+    "@babel/types" "^7.0.0"
 
-ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+"@babel/helper-split-export-declaration@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz#3aae285c0311c2ab095d997b8c9a94cad547d813"
+  integrity sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==
   dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
+    "@babel/types" "^7.0.0"
 
-ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.1.tgz#b38bb8876d9e86bee994956a04e721e88b248eb2"
+"@babel/helper-wrap-function@^7.1.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
+  integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
   dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/template" "^7.1.0"
+    "@babel/traverse" "^7.1.0"
+    "@babel/types" "^7.2.0"
 
-ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+"@babel/helpers@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.2.0.tgz#8335f3140f3144270dc63c4732a4f8b0a50b7a21"
+  integrity sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A==
   dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
+    "@babel/template" "^7.1.2"
+    "@babel/traverse" "^7.1.5"
+    "@babel/types" "^7.2.0"
 
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
   dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
 
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489"
+  integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA==
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+"@babel/plugin-proposal-async-generator-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
+  integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
 
-ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+"@babel/plugin-proposal-class-properties@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.2.3.tgz#c9e1294363b346cff333007a92080f3203698461"
+  integrity sha512-FVuQngLoN2iDrpW7LmhPZ2sO4DJxf35FOcwidwB9Ru9tMvI5URthnkVHuG14IStV+TzkMTyLMoOUlSTtrdVwqw==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.2.3"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+"@babel/plugin-proposal-decorators@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.2.3.tgz#1fe5b0d22ce0c4418f225474ebd40267430364c0"
+  integrity sha512-jhCFm7ftmue02EWIYqbhzP0iConEPsgVQeDriOs/Qc2lgr6MDtHTTrv3hE2GOOQDFjQ9tjP7nWQq0ad0JhIsQg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.2.3"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-decorators" "^7.2.0"
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+"@babel/plugin-proposal-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+  integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-json-strings" "^7.2.0"
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+"@babel/plugin-proposal-object-rest-spread@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.2.0.tgz#88f5fec3e7ad019014c97f7ee3c992f0adbf7fb8"
+  integrity sha512-1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+  integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
-ansi-styles@^3.1.0, ansi-styles@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+"@babel/plugin-proposal-unicode-property-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz#abe7281fe46c95ddc143a65e5358647792039520"
+  integrity sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==
   dependencies:
-    color-convert "^1.9.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.2.0"
 
-any-promise@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
+"@babel/plugin-syntax-async-generators@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+  integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+"@babel/plugin-syntax-decorators@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz#c50b1b957dcc69e4b1127b65e1c33eef61570c1b"
+  integrity sha512-38QdqVoXdHUQfTpZo3rQwqQdWtCn5tMv4uV6r2RMfTqNBuv4ZBhz79SfaQWKTVmxHjeFv/DnXVC/+agHCklYWA==
   dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-append-transform@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
+  integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
   dependencies:
-    default-require-extensions "^1.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+"@babel/plugin-syntax-json-strings@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+  integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+"@babel/plugin-syntax-jsx@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
+  integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
   dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+"@babel/plugin-syntax-object-rest-spread@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+  integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
   dependencies:
-    sprintf-js "~1.0.2"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-aria-query@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.7.0.tgz#4af10a1e61573ddea0cf3b99b51c52c05b424d24"
+"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+  integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
   dependencies:
-    ast-types-flow "0.0.7"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+"@babel/plugin-transform-arrow-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+  integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
   dependencies:
-    arr-flatten "^1.0.1"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+"@babel/plugin-transform-async-to-generator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz#68b8a438663e88519e65b776f8938f3445b1a2ff"
+  integrity sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-remap-async-to-generator" "^7.1.0"
 
-array-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+"@babel/plugin-transform-block-scoped-functions@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+  integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+"@babel/plugin-transform-block-scoping@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4"
+  integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    lodash "^4.17.10"
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+"@babel/plugin-transform-classes@^7.2.0":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz#6c90542f210ee975aa2aa8c8b5af7fa73a126953"
+  integrity sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-define-map" "^7.1.0"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-optimise-call-expression" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    globals "^11.1.0"
 
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+"@babel/plugin-transform-computed-properties@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+  integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-flatten@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+"@babel/plugin-transform-destructuring@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz#e75269b4b7889ec3a332cd0d0c8cff8fed0dc6f3"
+  integrity sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+"@babel/plugin-transform-dotall-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz#f0aabb93d120a8ac61e925ea0ba440812dbe0e49"
+  integrity sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+"@babel/plugin-transform-duplicate-keys@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz#d952c4930f312a4dbfff18f0b2914e60c35530b3"
+  integrity sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+"@babel/plugin-transform-exponentiation-operator@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
+  integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+"@babel/plugin-transform-for-of@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz#ab7468befa80f764bb03d3cb5eef8cc998e1cad9"
+  integrity sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==
   dependencies:
-    array-uniq "^1.0.1"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+"@babel/plugin-transform-function-name@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz#f7930362829ff99a3174c39f0afcc024ef59731a"
+  integrity sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+"@babel/plugin-transform-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+  integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-arrify@^1.0.0, arrify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+"@babel/plugin-transform-modules-amd@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz#82a9bce45b95441f617a24011dc89d12da7f4ee6"
+  integrity sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+"@babel/plugin-transform-modules-commonjs@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz#c4f1933f5991d5145e9cfad1dfd848ea1727f404"
+  integrity sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-simple-access" "^7.1.0"
 
-asn1.js@^4.0.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.2.tgz#8117ef4f7ed87cd8f89044b5bff97ac243a16c9a"
+"@babel/plugin-transform-modules-systemjs@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz#912bfe9e5ff982924c81d0937c92d24994bb9068"
+  integrity sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==
   dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
+    "@babel/helper-hoist-variables" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+"@babel/plugin-transform-modules-umd@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
+  integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.1.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+"@babel/plugin-transform-new-target@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz#ae8fbd89517fa7892d20e6564e641e8770c3aa4a"
+  integrity sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+"@babel/plugin-transform-object-super@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598"
+  integrity sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-replace-supers" "^7.1.0"
 
-assert@^1.1.1, assert@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+"@babel/plugin-transform-parameters@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.2.0.tgz#0d5ad15dc805e2ea866df4dd6682bfe76d1408c2"
+  integrity sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA==
   dependencies:
-    util "0.10.3"
+    "@babel/helper-call-delegate" "^7.1.0"
+    "@babel/helper-get-function-arity" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-ast-types-flow@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+"@babel/plugin-transform-react-display-name@^7.0.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
+  integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+"@babel/plugin-transform-react-inline-elements@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.2.0.tgz#3e36e7c47f1c21f52b2b0090d5cd83ceb19a4770"
+  integrity sha512-OAflI+josEl8xoAzZYpFnN+C4e9wvxDecExTtvDsteAcChIZtsH/D2kMNcJnrrzbFzCroGajCTr9tAB7K0KsiQ==
+  dependencies:
+    "@babel/helper-builder-react-jsx" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+"@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba"
+  integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
 
-async-foreach@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+"@babel/plugin-transform-react-jsx-source@^7.0.0", "@babel/plugin-transform-react-jsx-source@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.2.0.tgz#20c8c60f0140f5dd3cd63418d452801cf3f7180f"
+  integrity sha512-A32OkKTp4i5U6aE88GwwcuV4HAprUgHcTq0sSafLxjr6AW0QahrCRCjxogkbbcdtpbXkuTOlgpjophCxb6sh5g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
 
-async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+"@babel/plugin-transform-react-jsx@^7.0.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.2.0.tgz#ca36b6561c4d3b45524f8efb6f0fbc9a0d1d622f"
+  integrity sha512-h/fZRel5wAfCqcKgq3OhbmYaReo7KkoJBpt8XnvpS7wqaNMqtw5xhxutzcm35iMUWucfAdT/nvGTsWln0JTg2Q==
+  dependencies:
+    "@babel/helper-builder-react-jsx" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-jsx" "^7.2.0"
 
-async@2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
+"@babel/plugin-transform-regenerator@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz#5b41686b4ed40bef874d7ed6a84bdd849c13e0c1"
+  integrity sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==
   dependencies:
-    lodash "^4.14.0"
+    regenerator-transform "^0.13.3"
 
-async@^1.4.0, async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+"@babel/plugin-transform-runtime@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz#566bc43f7d0aedc880eaddbd29168d0f248966ea"
+  integrity sha512-jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    resolve "^1.8.1"
+    semver "^5.5.1"
 
-async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
+"@babel/plugin-transform-shorthand-properties@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+  integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
   dependencies:
-    lodash "^4.14.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+"@babel/plugin-transform-spread@^7.2.0":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
+  integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-atob@~1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
+"@babel/plugin-transform-sticky-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+  integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
 
-autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+"@babel/plugin-transform-template-literals@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz#d87ed01b8eaac7a92473f608c97c089de2ba1e5b"
+  integrity sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==
   dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
+    "@babel/helper-annotate-as-pure" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-autoprefixer@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.6.tgz#fb933039f74af74a83e71225ce78d9fd58ba84d7"
+"@babel/plugin-transform-typeof-symbol@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
+  integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
   dependencies:
-    browserslist "^2.5.1"
-    caniuse-lite "^1.0.30000748"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^6.0.13"
-    postcss-value-parser "^3.2.3"
+    "@babel/helper-plugin-utils" "^7.0.0"
 
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+"@babel/plugin-transform-unicode-regex@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz#4eb8db16f972f8abb5062c161b8b115546ade08b"
+  integrity sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/helper-regex" "^7.0.0"
+    regexpu-core "^4.1.3"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+"@babel/preset-env@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.2.3.tgz#948c8df4d4609c99c7e0130169f052ea6a7a8933"
+  integrity sha512-AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.0.0"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+    "@babel/plugin-proposal-json-strings" "^7.2.0"
+    "@babel/plugin-proposal-object-rest-spread" "^7.2.0"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.2.0"
+    "@babel/plugin-syntax-async-generators" "^7.2.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+    "@babel/plugin-transform-arrow-functions" "^7.2.0"
+    "@babel/plugin-transform-async-to-generator" "^7.2.0"
+    "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
+    "@babel/plugin-transform-block-scoping" "^7.2.0"
+    "@babel/plugin-transform-classes" "^7.2.0"
+    "@babel/plugin-transform-computed-properties" "^7.2.0"
+    "@babel/plugin-transform-destructuring" "^7.2.0"
+    "@babel/plugin-transform-dotall-regex" "^7.2.0"
+    "@babel/plugin-transform-duplicate-keys" "^7.2.0"
+    "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
+    "@babel/plugin-transform-for-of" "^7.2.0"
+    "@babel/plugin-transform-function-name" "^7.2.0"
+    "@babel/plugin-transform-literals" "^7.2.0"
+    "@babel/plugin-transform-modules-amd" "^7.2.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
+    "@babel/plugin-transform-modules-systemjs" "^7.2.0"
+    "@babel/plugin-transform-modules-umd" "^7.2.0"
+    "@babel/plugin-transform-new-target" "^7.0.0"
+    "@babel/plugin-transform-object-super" "^7.2.0"
+    "@babel/plugin-transform-parameters" "^7.2.0"
+    "@babel/plugin-transform-regenerator" "^7.0.0"
+    "@babel/plugin-transform-shorthand-properties" "^7.2.0"
+    "@babel/plugin-transform-spread" "^7.2.0"
+    "@babel/plugin-transform-sticky-regex" "^7.2.0"
+    "@babel/plugin-transform-template-literals" "^7.2.0"
+    "@babel/plugin-transform-typeof-symbol" "^7.2.0"
+    "@babel/plugin-transform-unicode-regex" "^7.2.0"
+    browserslist "^4.3.4"
+    invariant "^2.2.2"
+    js-levenshtein "^1.1.3"
+    semver "^5.3.0"
 
-aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+"@babel/preset-react@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
+  integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-transform-react-display-name" "^7.0.0"
+    "@babel/plugin-transform-react-jsx" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-self" "^7.0.0"
+    "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
-axios@~0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+"@babel/runtime@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
+  integrity sha512-7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA==
   dependencies:
-    follow-redirects "^1.2.3"
-    is-buffer "^1.1.5"
+    regenerator-runtime "^0.12.0"
 
-axobject-query@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-0.1.0.tgz#62f59dbc59c9f9242759ca349960e7a2fe3c36c0"
+"@babel/runtime@7.2.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
+  integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==
   dependencies:
-    ast-types-flow "0.0.7"
+    regenerator-runtime "^0.12.0"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+"@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907"
+  integrity sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.2.2"
+    "@babel/types" "^7.2.2"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.1.5", "@babel/traverse@^7.2.2", "@babel/traverse@^7.2.3":
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8"
+  integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/generator" "^7.2.2"
+    "@babel/helper-function-name" "^7.1.0"
+    "@babel/helper-split-export-declaration" "^7.0.0"
+    "@babel/parser" "^7.2.3"
+    "@babel/types" "^7.2.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.2.0", "@babel/types@^7.2.2":
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e"
+  integrity sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==
   dependencies:
-    chalk "^1.1.3"
     esutils "^2.0.2"
-    js-tokens "^3.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
 
-babel-core@^6.0.0, babel-core@^6.25.0, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+"@emotion/cache@10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.0.tgz#e22eadcb770de4131ec707c84207e9e1ce210413"
+  integrity sha512-1/sT6GNyvWmxCtJek8ZDV+b+a+NMDx8/61UTnnF3rqrTY7bLTjw+fmXO7WgUIH0owuWKxza/J/FfAWC/RU4G7A==
   dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.7"
-    slash "^1.0.0"
-    source-map "^0.5.6"
+    "@emotion/sheet" "0.9.2"
+    "@emotion/stylis" "0.8.3"
+    "@emotion/utils" "0.11.1"
+    "@emotion/weak-memoize" "0.2.2"
 
-babel-eslint@^8.0.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.1.tgz#136888f3c109edc65376c23ebf494f36a3e03951"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.36"
-    "@babel/traverse" "7.0.0-beta.36"
-    "@babel/types" "7.0.0-beta.36"
-    babylon "7.0.0-beta.36"
-    eslint-scope "~3.7.1"
-    eslint-visitor-keys "^1.0.0"
+"@emotion/hash@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.1.tgz#9833722341379fb7d67f06a4b00ab3c37913da53"
+  integrity sha512-OYpa/Sg+2GDX+jibUfpZVn1YqSVRpYmTLF2eyAfrFTIJSbwyIrc+YscayoykvaOME/wV4BV0Sa0yqdMrgse6mA==
 
-babel-eslint@^8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf"
-  dependencies:
-    "@babel/code-frame" "7.0.0-beta.44"
-    "@babel/traverse" "7.0.0-beta.44"
-    "@babel/types" "7.0.0-beta.44"
-    babylon "7.0.0-beta.44"
-    eslint-scope "~3.7.1"
-    eslint-visitor-keys "^1.0.0"
+"@emotion/memoize@0.7.1":
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.1.tgz#e93c13942592cf5ef01aa8297444dc192beee52f"
+  integrity sha512-Qv4LTqO11jepd5Qmlp3M1YEjBumoTHcHFdgPTQ+sFlIL5myi/7xu/POwP7IRu6odBdmLXdtIs1D6TuW6kbwbbg==
 
-babel-generator@^6.18.0, babel-generator@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
+"@emotion/serialize@^0.11.3":
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.3.tgz#c4af2d96e3ddb9a749b7b567daa7556bcae45af2"
+  integrity sha512-6Q+XH/7kMdHwtylwZvdkOVMydaGZ989axQ56NF7urTR7eiDMLGun//pFUy31ha6QR4C6JB+KJVhZ3AEAJm9Z1g==
   dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.6"
-    trim-right "^1.0.1"
+    "@emotion/hash" "0.7.1"
+    "@emotion/memoize" "0.7.1"
+    "@emotion/unitless" "0.7.3"
+    "@emotion/utils" "0.11.1"
+    csstype "^2.5.7"
 
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+"@emotion/sheet@0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.2.tgz#74e5c6b5e489a1ba30ab246ab5eedd96916487c4"
+  integrity sha512-pVBLzIbC/QCHDKJF2E82V2H/W/B004mDFQZiyo/MSR+VC4pV5JLG0TF/zgQDFvP3fZL/5RTPGEmXlYJBMUuJ+A==
 
-babel-helper-builder-react-jsx@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    esutils "^2.0.2"
+"@emotion/stylis@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.3.tgz#3ca7e9bcb31b3cb4afbaeb66156d86ee85e23246"
+  integrity sha512-M3nMfJ6ndJMYloSIbYEBq6G3eqoYD41BpDOxreE8j0cb4fzz/5qvmqU9Mb2hzsXcCnIlGlWhS03PCzVGvTAe0Q==
 
-babel-helper-call-delegate@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+"@emotion/unitless@0.7.3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.3.tgz#6310a047f12d21a1036fb031317219892440416f"
+  integrity sha512-4zAPlpDEh2VwXswwr/t8xGNDGg8RQiPxtxZ3qQEXyQsBV39ptTdESCjuBvGze1nLMVrxmTIKmnO/nAV8Tqjjzg==
 
-babel-helper-define-map@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
+"@emotion/utils@0.11.1":
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628"
+  integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg==
 
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+"@emotion/weak-memoize@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.2.tgz#63985d3d8b02530e0869962f4da09142ee8e200e"
+  integrity sha512-n/VQ4mbfr81aqkx/XmVicOLjviMuy02eenSdJY33SVA7S2J42EU0P1H0mOogfYedb3wXA0d/LVtBrgTSm04WEA==
 
-babel-helper-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+"@gfx/zopfli@^1.0.10":
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/@gfx/zopfli/-/zopfli-1.0.10.tgz#8cccfcbd670f676cb240812bcf8380c9a66da367"
+  integrity sha512-PAR3ICucog1HV+hDVF+VYNfnvB/JmE4C8YqxhMMEuxyycFthrv6hIEeCoNsRVF3J+SEtNLWRPTOXgcvQkZIM5A==
   dependencies:
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    base64-js "^1.3.0"
 
-babel-helper-get-function-arity@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+"@types/node@*":
+  version "10.12.18"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
+  integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
 
-babel-helper-hoist-variables@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+"@types/q@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
+  integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==
+
+"@types/react@16.4.6":
+  version "16.4.6"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.6.tgz#5024957c6bcef4f02823accf5974faba2e54fada"
+  integrity sha512-9LDZdhsuKSc+DjY65SjBkA958oBWcTWSVWAd2cD9XqKBjhGw1KzAkRhWRw2eIsXvaIE/TOTjjKMFVC+JA1iU4g==
+  dependencies:
+    csstype "^2.2.0"
+
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
+
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
+
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
+
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
+
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
+
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
+
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
+  dependencies:
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
+
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
-babel-helper-module-imports@^7.0.0-beta.3:
-  version "7.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/babel-helper-module-imports/-/babel-helper-module-imports-7.0.0-beta.3.tgz#e15764e3af9c8e11810c09f78f498a2bdc71585a"
-  dependencies:
-    babel-types "7.0.0-beta.3"
-    lodash "^4.2.0"
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
 
-babel-helper-optimise-call-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+abab@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+  integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
 
-babel-helper-regex@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+accepts@~1.3.4, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
   dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
 
-babel-helper-replace-supers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+acorn-dynamic-import@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
+  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
   dependencies:
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    acorn "^5.0.0"
 
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+acorn-globals@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz#e3b6f8da3c1552a95ae627571f7dd6923bb54103"
+  integrity sha512-hMtHj3s5RnuhvHPowpBYvJVj3rAar82JiDQHvGs1zO0l10ocX/xEdBShNHTJaboucJUsScghp74pH3s7EnHHQw==
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
 
-babel-jest@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-21.2.0.tgz#2ce059519a9374a2c46f2455b6fbef5ad75d863e"
-  dependencies:
-    babel-plugin-istanbul "^4.0.0"
-    babel-preset-jest "^21.2.0"
+acorn-jsx@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
+  integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
 
-babel-loader@^7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
-  dependencies:
-    find-cache-dir "^1.0.0"
-    loader-utils "^1.0.2"
-    mkdirp "^0.5.1"
+acorn-walk@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
+  integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
-babel-macros@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/babel-macros/-/babel-macros-1.2.0.tgz#39e47ed6d286d4a98f1948d8bab45dac17e4e2d4"
+acorn@^5.0.0, acorn@^5.5.3, acorn@^5.6.2, acorn@^5.7.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+  integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
+
+acorn@^6.0.1, acorn@^6.0.2:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754"
+  integrity sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+  integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
+
+ajv@^6.1.0, ajv@^6.5.3, ajv@^6.5.5, ajv@^6.6.1:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d"
+  integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==
   dependencies:
-    cosmiconfig "3.1.0"
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
 
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+alphanum-sort@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+  integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
+
+ansi-colors@^3.0.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
+ansi-escapes@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+  integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  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.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
+  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
-    babel-runtime "^6.22.0"
+    color-convert "^1.9.0"
 
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
-    babel-runtime "^6.22.0"
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
 
-babel-plugin-istanbul@^4.0.0:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  integrity sha1-126/jKlNJ24keja61EpLdKthGZE=
   dependencies:
-    find-up "^2.1.0"
-    istanbul-lib-instrument "^1.7.5"
-    test-exclude "^4.1.1"
+    default-require-extensions "^1.0.0"
 
-babel-plugin-jest-hoist@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-21.2.0.tgz#2cef637259bd4b628a6cace039de5fcd14dbb006"
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-babel-plugin-lodash@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.2.tgz#da3a5b49ba27447f54463f6c4fa81396ccdd463f"
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
   dependencies:
-    babel-helper-module-imports "^7.0.0-beta.3"
-    babel-types "^6.26.0"
-    glob "^7.1.1"
-    lodash "^4.17.4"
-    require-package-name "^2.0.1"
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
 
-babel-plugin-preval@^1.6.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.2.tgz#8f580a1d4579d5fc79f1cfaee6f9fe0996fdeb1f"
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
-    babel-macros "^1.1.1"
-    babel-register "^6.26.0"
-    babylon "^6.18.0"
-    require-from-string "^2.0.1"
+    sprintf-js "~1.0.2"
 
-babel-plugin-react-intl@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz#3d43912e824da005e08e8e8239d5ba784374bb00"
+aria-query@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
   dependencies:
-    babel-runtime "^6.2.0"
-    intl-messageformat-parser "^1.2.0"
-    mkdirp "^0.5.1"
-
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-
-babel-plugin-syntax-class-properties@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
 
-babel-plugin-syntax-decorators@^6.1.18:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
+  dependencies:
+    arr-flatten "^1.0.1"
 
-babel-plugin-syntax-dynamic-import@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
-babel-plugin-syntax-flow@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+array-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+  integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+array-flatten@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
   dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
 
-babel-plugin-transform-class-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
   dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+    array-uniq "^1.0.1"
 
-babel-plugin-transform-decorators-legacy@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz#741b58f6c5bce9e6027e0882d9c994f04f366925"
-  dependencies:
-    babel-plugin-syntax-decorators "^6.1.18"
-    babel-runtime "^6.2.0"
-    babel-template "^6.3.0"
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
 
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+array.prototype.flat@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4"
+  integrity sha512-rVqIs330nLJvfC7JqYvEWwqVr5QjYF1ib02i3YJtR/fICO6527Tjpc/e4Mvmxh3GIePPreRXMdaGyC99YphWEw==
   dependencies:
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
+    define-properties "^1.1.2"
+    es-abstract "^1.10.0"
+    function-bind "^1.1.1"
 
-babel-plugin-transform-es2015-classes@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  dependencies:
-    babel-helper-define-map "^6.24.1"
-    babel-helper-function-name "^6.24.1"
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-helper-replace-supers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-babel-plugin-transform-es2015-destructuring@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
   dependencies:
-    babel-runtime "^6.22.0"
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+asn1@~0.2.3:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+  integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    safer-buffer "~2.1.0"
 
-babel-plugin-transform-es2015-for-of@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-babel-plugin-transform-es2015-function-name@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
   dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    util "0.10.3"
 
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-types "^6.26.0"
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
 
-babel-plugin-transform-es2015-modules-umd@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
+async-limiter@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
 
-babel-plugin-transform-es2015-object-super@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
+async@^2.1.4, async@^2.5.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
   dependencies:
-    babel-helper-replace-supers "^6.24.1"
-    babel-runtime "^6.22.0"
+    lodash "^4.17.10"
 
-babel-plugin-transform-es2015-parameters@^6.23.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+autoprefixer@^9.4.3:
+  version "9.4.3"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9"
+  integrity sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==
   dependencies:
-    babel-helper-call-delegate "^6.24.1"
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
+    browserslist "^4.3.6"
+    caniuse-lite "^1.0.30000921"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.6"
+    postcss-value-parser "^3.3.1"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+aws4@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+  integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+axios@^0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
+  integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
   dependencies:
-    babel-runtime "^6.22.0"
+    follow-redirects "^1.3.0"
+    is-buffer "^1.1.5"
 
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+axobject-query@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9"
+  integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==
   dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    ast-types-flow "0.0.7"
 
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
   dependencies:
-    babel-runtime "^6.22.0"
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+babel-core@^6.0.0, babel-core@^6.26.0:
+  version "6.26.3"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+  integrity sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==
   dependencies:
-    babel-runtime "^6.22.0"
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.1"
+    debug "^2.6.9"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.8"
+    slash "^1.0.0"
+    source-map "^0.5.7"
+
+babel-core@^7.0.0-bridge.0:
+  version "7.0.0-bridge.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
+  integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
+
+babel-eslint@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz#919681dc099614cd7d31d45c8908695092a1faed"
+  integrity sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    eslint-scope "3.7.1"
+    eslint-visitor-keys "^1.0.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.22.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+babel-generator@^6.18.0, babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  integrity sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==
   dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
 
-babel-plugin-transform-exponentiation-operator@^6.22.0:
+babel-helpers@^6.24.1:
   version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-flow-strip-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  integrity sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
   dependencies:
-    babel-plugin-syntax-flow "^6.18.0"
     babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-object-rest-spread@^6.23.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+babel-jest@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.6.0.tgz#a644232366557a2240a0c083da6b25786185a2f1"
+  integrity sha512-lqKGG6LYXYu+DQh/slrQ8nxXQkEkhugdXsU6St7GmhVS7Ilc/22ArwqXNJrf0QaOBjZB0360qZMwXqDYQHXaew==
   dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
+    babel-plugin-istanbul "^4.1.6"
+    babel-preset-jest "^23.2.0"
 
-babel-plugin-transform-react-display-name@^6.23.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
+babel-loader@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.4.tgz#7bbf20cbe4560629e2e41534147692d3fecbdce6"
+  integrity sha512-fhBhNkUToJcW9nV46v8w87AJOwAJDz84c1CL57n3Stj73FANM/b9TbCUK4YhdOwEyZ+OxhYpdeZDNzSI29Firw==
   dependencies:
-    babel-runtime "^6.22.0"
+    find-cache-dir "^1.0.0"
+    loader-utils "^1.0.2"
+    mkdirp "^0.5.1"
+    util.promisify "^1.0.0"
 
-babel-plugin-transform-react-inline-elements@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-inline-elements/-/babel-plugin-transform-react-inline-elements-6.22.0.tgz#6687211a32b49a52f22c573a2b5504a25ef17c53"
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx-self@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
+babel-plugin-istanbul@^4.1.6:
+  version "4.1.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
+  integrity sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==
   dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
+    babel-plugin-syntax-object-rest-spread "^6.13.0"
+    find-up "^2.1.0"
+    istanbul-lib-instrument "^1.10.1"
+    test-exclude "^4.2.1"
 
-babel-plugin-transform-react-jsx-source@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
+babel-plugin-jest-hoist@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167"
+  integrity sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=
 
-babel-plugin-transform-react-jsx@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
+babel-plugin-lodash@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz#4f6844358a1340baed182adbeffa8df9967bc196"
+  integrity sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==
   dependencies:
-    babel-helper-builder-react-jsx "^6.24.1"
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-remove-prop-types@^0.4.10:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.10.tgz#3c7f3a03ad8aa6bb8c00e93fd13a433910444545"
+    "@babel/helper-module-imports" "^7.0.0-beta.49"
+    "@babel/types" "^7.0.0-beta.49"
+    glob "^7.1.1"
+    lodash "^4.17.10"
+    require-package-name "^2.0.1"
 
-babel-plugin-transform-regenerator@^6.22.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+babel-plugin-macros@^2.2.2:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.4.3.tgz#870345aa538d85f04b4614fea5922b55c45dd551"
+  integrity sha512-M8cE1Rx0zgfKYBWAS+T6ZVCLGuTKdBI5Rn3fu9q6iVdH0UjaXdmF501/VEYn7kLHCgguhGNk5JBzOn64e2xDEA==
   dependencies:
-    regenerator-transform "^0.10.0"
+    cosmiconfig "^5.0.5"
+    resolve "^1.8.1"
 
-babel-plugin-transform-runtime@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+babel-plugin-preval@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-3.0.1.tgz#a26f9690114a864a54a5cbdf865496ebf541a9c3"
+  integrity sha512-s8hmTlRSmzcL7cHSIi0s6WxmpOAxfIlWqSVQwBIt7V5bNBaac+8JMZ6kJXLOazMJ8gCIcb5AJgQUgPHvbSYUzw==
   dependencies:
-    babel-runtime "^6.22.0"
+    babel-plugin-macros "^2.2.2"
+    require-from-string "^2.0.2"
 
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+babel-plugin-react-intl@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-react-intl/-/babel-plugin-react-intl-3.0.1.tgz#4abc7fff04a7bbbb7034aec0a675713f2e52181c"
+  integrity sha512-FqnEO+Tq7kJVUPKsSG3s5jaHi3pAC4RUR11IrscvjsfkOApLP2DtzNo6dtQ+tX+OzEzJx7cUms8aCw5BFyW5xg==
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
+    "@babel/runtime" "^7.0.0"
+    intl-messageformat-parser "^1.2.0"
+    mkdirp "^0.5.1"
 
-babel-preset-env@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.23.0"
-    babel-plugin-transform-es2015-classes "^6.23.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-    babel-plugin-transform-es2015-destructuring "^6.23.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-    babel-plugin-transform-es2015-for-of "^6.23.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
-    babel-plugin-transform-es2015-modules-umd "^6.23.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.23.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
-    browserslist "^2.1.2"
-    invariant "^2.2.2"
-    semver "^5.3.0"
+babel-plugin-syntax-object-rest-spread@^6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+  integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
-babel-preset-flow@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
-  dependencies:
-    babel-plugin-transform-flow-strip-types "^6.22.0"
+babel-plugin-transform-react-remove-prop-types@^0.4.21:
+  version "0.4.21"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.21.tgz#0087938f4348cb751b3e5055a6b38f3c61b5231b"
+  integrity sha512-+gQBtcnEhYFbMPFGr8YL7SHD4BpHifFDGEc+ES0+1iDwC9psist2+eumcLoHjBMumL7N/HI/G64XR5aQC8Nr5Q==
 
-babel-preset-jest@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-21.2.0.tgz#ff9d2bce08abd98e8a36d9a8a5189b9173b85638"
+babel-preset-jest@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
+  integrity sha1-jsegOhOPABoaj7HoETZSvxpV2kY=
   dependencies:
-    babel-plugin-jest-hoist "^21.2.0"
+    babel-plugin-jest-hoist "^23.2.0"
     babel-plugin-syntax-object-rest-spread "^6.13.0"
 
-babel-preset-react@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.23.0"
-    babel-plugin-transform-react-jsx "^6.24.1"
-    babel-plugin-transform-react-jsx-self "^6.22.0"
-    babel-plugin-transform-react-jsx-source "^6.22.0"
-    babel-preset-flow "^6.23.0"
-
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  integrity sha1-btAhFz4vy0htestFxgCahW9kcHE=
   dependencies:
     babel-core "^6.26.0"
     babel-runtime "^6.26.0"
@@ -1124,16 +1489,18 @@ babel-register@^6.26.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.15"
 
-babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0:
+babel-runtime@^6.22.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"
 
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
+babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -1141,9 +1508,10 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0, babel-te
     babylon "^6.18.0"
     lodash "^4.17.4"
 
-babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -1155,103 +1523,118 @@ babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
     invariant "^2.2.2"
     lodash "^4.17.4"
 
-babel-types@7.0.0-beta.3:
-  version "7.0.0-beta.3"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-7.0.0-beta.3.tgz#cd927ca70e0ae8ab05f4aab83778cfb3e6eb20b4"
-  dependencies:
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^2.0.0"
-
-babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+babel-types@^6.0.0, babel-types@^6.18.0, babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.36:
-  version "7.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.36.tgz#3a3683ba6a9a1e02b0aa507c8e63435e39305b9e"
-
-babylon@7.0.0-beta.44:
-  version "7.0.0-beta.44"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
-
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
 backoff@^2.4.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f"
+  integrity sha1-9hbtqdPktmuMp/ynn2lXIsX44m8=
   dependencies:
     precond "0.2"
 
-balanced-match@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
-
-balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
 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.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
+base64-js@^1.0.2, base64-js@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
 
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
 bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
   dependencies:
     tweetnacl "^0.14.3"
 
+bfj@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz#05a3b7784fbd72cfa3c22e56002ef99336516c48"
+  integrity sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==
+  dependencies:
+    bluebird "^3.5.1"
+    check-types "^7.3.0"
+    hoopy "^0.1.2"
+    tryer "^1.0.0"
+
 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"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
+  integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
 
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
+bluebird@^3.5.1, bluebird@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
+body-parser@1.18.3:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
   dependencies:
     bytes "3.0.0"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
+    depd "~1.1.2"
+    http-errors "~1.6.3"
+    iconv-lite "0.4.23"
     on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
+    qs "6.5.2"
+    raw-body "2.3.3"
+    type-is "~1.6.16"
 
 bonjour@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
   dependencies:
     array-flatten "^2.1.0"
     deep-equal "^1.0.1"
@@ -1260,31 +1643,15 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-boolbase@~1.0.0:
+boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1292,24 +1659,56 @@ brace-expansion@^1.1.7:
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
   dependencies:
     expand-range "^1.8.1"
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+braces@^2.3.0, braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.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:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
 
-browser-resolve@^1.11.2:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+browser-resolve@^1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+  integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
   dependencies:
     resolve "1.1.7"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1319,24 +1718,28 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
     evp_bytestokey "^1.0.0"
 
 browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
@@ -1344,6 +1747,7 @@ browserify-rsa@^4.0.0:
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1356,141 +1760,177 @@ browserify-sign@^4.0.0:
 browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
   dependencies:
     pako "~1.0.5"
 
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
-
-browserslist@^2.1.2, browserslist@^2.5.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.9.1.tgz#b72d3982ab01b5cd24da62ff6d45573886aff275"
+browserslist@^4.0.0, browserslist@^4.3.4, browserslist@^4.3.6:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.7.tgz#f1de479a6466ea47a0a26dcc725e7504817e624a"
+  integrity sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ==
   dependencies:
-    caniuse-lite "^1.0.30000770"
-    electron-to-chromium "^1.3.27"
+    caniuse-lite "^1.0.30000925"
+    electron-to-chromium "^1.3.96"
+    node-releases "^1.1.3"
 
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
   dependencies:
     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==
+
 buffer-indexof@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
 
 buffer-writer@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08"
+  integrity sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=
 
 buffer-xor@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
 
 buffer@^4.3.0:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
 
 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"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+cacache@^11.0.2, cacache@^11.2.0:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+  dependencies:
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  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"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  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"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
-camelcase-css@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-1.0.1.tgz#157c4238265f5cf94a1dffde86446552cbf3f705"
-
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
-camelcase@^1.0.2, camelcase@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
-camelcase@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-
-camelcase@^4.0.0, camelcase@^4.1.0:
+camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-caniuse-api@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+camelcase@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+
+caniuse-api@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
-    browserslist "^1.3.6"
-    caniuse-db "^1.0.30000529"
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000777"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000777.tgz#2e19adba63bdd7c501df637a862adead7f4bc054"
-
-caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000770:
-  version "1.0.30000777"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000777.tgz#31c18a4a8cd49782ebb305c8e8a93e6b3b3e4f13"
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000921, caniuse-lite@^1.0.30000925:
+  version "1.0.30000926"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000926.tgz#4361a99d818ca6e521dbe89a732de62a194a789c"
+  integrity sha512-diMkEvxfFw09SkbErCLmw/1Fx1ZZe9xfWm4aeA2PUffB48x1tfZeMsK5j4BW7zN7Y4PdqmPVVdG2eYjE5IRTag==
 
-caseless@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+capture-exit@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+  integrity sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=
+  dependencies:
+    rsvp "^3.3.3"
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
-chain-function@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.0.tgz#0d4ab37e7e18ead0bdc47b920764118ce58733dc"
-
-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=
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -1498,21 +1938,29 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+chalk@^2.0, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
+  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
   dependencies:
-    ansi-styles "^3.1.0"
+    ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
+    supports-color "^5.3.0"
 
-chardet@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
+check-types@^7.3.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
+  integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
 cheerio@^1.0.0-rc.2:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
+  integrity sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=
   dependencies:
     css-select "~1.2.0"
     dom-serializer "~0.1.0"
@@ -1521,28 +1969,47 @@ cheerio@^1.0.0-rc.2:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
-chokidar@^1.6.0, chokidar@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+chokidar@^2.0.0, chokidar@^2.0.2:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
+  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
   dependencies:
-    anymatch "^1.3.0"
+    anymatch "^2.0.0"
     async-each "^1.0.0"
-    glob-parent "^2.0.0"
+    braces "^2.3.0"
+    glob-parent "^3.1.0"
     inherits "^2.0.1"
     is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
+    is-glob "^4.0.0"
+    lodash.debounce "^4.0.8"
+    normalize-path "^2.1.1"
     path-is-absolute "^1.0.0"
     readdirp "^2.0.0"
+    upath "^1.0.5"
   optionalDependencies:
-    fsevents "^1.0.0"
+    fsevents "^1.2.2"
 
-ci-info@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.2.tgz#03561259db48d0474c8bdc90f5b47b068b6bbfb4"
+chownr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+
+chrome-trace-event@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
+  dependencies:
+    tslib "^1.9.0"
+
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+  integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
@@ -1550,161 +2017,198 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
 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==
 
-clap@^1.0.9:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
-    chalk "^1.1.3"
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
 
 classnames@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
 
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
 cliui@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-clone-deep@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
   dependencies:
-    for-own "^1.0.0"
-    is-plain-object "^2.0.1"
-    kind-of "^3.2.2"
-    shallow-clone "^0.1.2"
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
 
-clone@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+clone-deep@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+  integrity sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==
+  dependencies:
+    for-own "^1.0.0"
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.0"
+    shallow-clone "^1.0.0"
 
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-coa@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
+coa@~2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
+  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
   dependencies:
+    "@types/q" "^1.5.1"
+    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=
 
-color-convert@^1.3.0, color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0, color-convert@^1.9.1:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
-    color-name "^1.1.1"
+    color-name "1.1.3"
 
-color-name@^1.0.0, color-name@^1.1.1:
+color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  dependencies:
-    color-name "^1.0.0"
+color-name@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+color-string@^1.5.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
+  integrity sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==
   dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
 
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+color@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc"
+  integrity sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==
   dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
-
-colors@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+    color-convert "^1.9.1"
+    color-string "^1.5.2"
 
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+  integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
+  integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.8.1, commander@^2.9.0:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
+commander@^2.11.0, commander@^2.18.0, commander@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-complex.js@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.0.4.tgz#d8e7cfb9652d1e853e723386421c1a0ca7a48373"
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
-compressible@~2.0.11:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
+compressible@~2.0.14:
+  version "2.0.15"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz#857a9ab0a7e5a07d8d837ed43fe2defff64fe212"
+  integrity sha512-4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw==
   dependencies:
-    mime-db ">= 1.30.0 < 2"
+    mime-db ">= 1.36.0 < 2"
 
-compression-webpack-plugin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.0.1.tgz#7f0a2af9f642b4f87b5989516a3b9e9b41bb4b3f"
-  dependencies:
-    async "2.4.1"
+compression-webpack-plugin@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz#46476350c1eb27f783dccc79ac2f709baa2cffbc"
+  integrity sha512-bDgd7oTUZC8EkRx8j0sjyCfeiO+e5sFcfgaFcjVhfQf5lLya7oY2BczxcJ7IUuVjz5m6fy8IECFmVFew3xLk8Q==
+  dependencies:
+    cacache "^11.2.0"
+    find-cache-dir "^2.0.0"
+    neo-async "^2.5.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
     webpack-sources "^1.0.1"
 
 compression@^1.5.2:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz#27e0e176aaf260f7f2c2813c3e440adb9f1993db"
+  integrity sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==
   dependencies:
-    accepts "~1.3.4"
+    accepts "~1.3.5"
     bytes "3.0.0"
-    compressible "~2.0.11"
+    compressible "~2.0.14"
     debug "2.6.9"
     on-headers "~1.0.1"
-    safe-buffer "5.1.1"
+    safe-buffer "5.1.2"
     vary "~1.1.2"
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+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==
   dependencies:
+    buffer-from "^1.0.0"
     inherits "^2.0.3"
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
@@ -1712,105 +2216,142 @@ concat-stream@^1.6.0:
 connect-history-api-fallback@^1.3.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+  integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
   dependencies:
     date-now "^0.1.4"
 
 console-control-strings@^1.0.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=
 
 constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
 
 content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-
-content-type-parser@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
 
 content-type@~1.0.4:
   version "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@^0.3.3:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
-
-convert-source-map@^1.1.1, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+  dependencies:
+    safe-buffer "~5.1.1"
 
 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.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
 
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042"
+  integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-3.1.0.tgz#640a94bf9847f321800403cd273af60665c73397"
+cosmiconfig@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
+  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
   dependencies:
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
-    parse-json "^3.0.0"
+    parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
-cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
+cosmiconfig@^5.0.0, cosmiconfig@^5.0.5:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
   dependencies:
+    import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.4.3"
-    minimist "^1.2.0"
-    object-assign "^4.1.0"
-    os-homedir "^1.0.1"
-    parse-json "^2.2.0"
-    require-from-string "^1.1.0"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
 
 create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
 
+create-emotion@^10.0.4:
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-10.0.5.tgz#22487f19b59a7ed10144f808289eadffebcfab06"
+  integrity sha512-MIOSeFiMtPrAULEtd2GFYGZEzeN2xnCFoiHrjvUYjxruYCJfGqUOBmh4YEN1yU+Ww5yXr+DIZibFl7FEOP57iA==
+  dependencies:
+    "@emotion/cache" "10.0.0"
+    "@emotion/serialize" "^0.11.3"
+    "@emotion/sheet" "0.9.2"
+    "@emotion/utils" "0.11.1"
+
 create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^2.0.0"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -1819,51 +2360,38 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.5.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-cross-env@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.1.tgz#b6d8ab97f304c0f71dae7277b75fe424c08dfa74"
+cross-env@^5.1.4:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2"
+  integrity sha512-jtdNFfFW1hB7sMhr/H6rW1Z45LFqyI431m3qU6bFXcQ3Eh7LtBuG3h74o7ohHZ3crrRkkqHlo4jYHFPcjroANg==
   dependencies:
-    cross-spawn "^5.1.0"
+    cross-spawn "^6.0.5"
     is-windows "^1.0.0"
 
-cross-spawn@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
-  dependencies:
-    lru-cache "^4.0.1"
-    which "^1.2.9"
-
-cross-spawn@^5.0.1, cross-spawn@^5.1.0:
+cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
   dependencies:
     lru-cache "^4.0.1"
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
-    boom "5.x.x"
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
 
 crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -1877,67 +2405,86 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-css-color-function@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.3.tgz#8ed24c2c0205073339fafa004bc8c141fccb282e"
-  dependencies:
-    balanced-match "0.1.0"
-    color "^0.11.0"
-    debug "^3.1.0"
-    rgb "~0.1.0"
-
-css-color-names@0.0.4:
+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"
+  integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
+
+css-declaration-sorter@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
+  integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==
+  dependencies:
+    postcss "^7.0.1"
+    timsort "^0.3.0"
 
 css-font-size-keywords@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz#854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"
+  integrity sha1-hUh1rOmspqjS7g00WkSq6btttss=
 
 css-font-stretch-keywords@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz#50cee9b9ba031fb5c952d4723139f1e107b54b10"
+  integrity sha1-UM7puboDH7XJUtRyMTnx4Qe1SxA=
 
 css-font-style-keywords@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz#5c3532813f63b4a1de954d13cea86ab4333409e4"
+  integrity sha1-XDUygT9jtKHelU0TzqhqtDM0CeQ=
 
 css-font-weight-keywords@^1.0.0:
   version "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-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"
+  integrity sha1-cqmupyeW0Bmx0qMlLeTlqqN+Smk=
 
 css-list-helpers@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz#fff57192202db83240c41686f919e449a7024f7d"
+  integrity sha1-//VxkiAtuDJAxBaG+RnkSacCT30=
   dependencies:
     tcomb "^2.5.0"
 
-css-loader@^0.28.4:
-  version "0.28.7"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b"
-  dependencies:
-    babel-code-frame "^6.11.0"
-    css-selector-tokenizer "^0.7.0"
-    cssnano ">=2.6.1 <4"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    object-assign "^4.0.1"
-    postcss "^5.0.6"
-    postcss-modules-extract-imports "^1.0.0"
-    postcss-modules-local-by-default "^1.0.1"
-    postcss-modules-scope "^1.0.0"
-    postcss-modules-values "^1.1.0"
+css-loader@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.0.tgz#42952ac22bca5d076978638e9813abce49b8f0cc"
+  integrity sha512-MoOu+CStsGrSt5K2OeZ89q3Snf+IkxRfAIt9aAKg4piioTrhtP1iEFPu+OVn3Ohz24FO6L+rw9UJxBILiSBw5Q==
+  dependencies:
+    icss-utils "^4.0.0"
+    loader-utils "^1.2.1"
+    lodash "^4.17.11"
+    postcss "^7.0.6"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^2.0.3"
+    postcss-modules-scope "^2.0.0"
+    postcss-modules-values "^2.0.0"
     postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    schema-utils "^1.0.0"
+
+css-select-base-adapter@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
+  integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
+
+css-select@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
+  integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^2.1.2"
+    domutils "^1.7.0"
+    nth-check "^1.0.2"
 
 css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
   dependencies:
     boolbase "~1.0.0"
     css-what "2.1"
@@ -1945,8 +2492,9 @@ css-select@~1.2.0:
     nth-check "~1.0.1"
 
 css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -1955,174 +2503,292 @@ css-selector-tokenizer@^0.7.0:
 css-system-font-keywords@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz#85c6f086aba4eb32c571a3086affc434b84823ed"
+  integrity sha1-hcbwhquk6zLFcaMIav/ENLhII+0=
 
-css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
+css-tree@1.0.0-alpha.28:
+  version "1.0.0-alpha.28"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"
+  integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==
+  dependencies:
+    mdn-data "~1.1.0"
+    source-map "^0.5.3"
 
-css@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.1.tgz#73a4c81de85db664d4ee674f7d47085e3b2d55dc"
+css-tree@1.0.0-alpha.29:
+  version "1.0.0-alpha.29"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
+  integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
   dependencies:
-    inherits "^2.0.1"
-    source-map "^0.1.38"
-    source-map-resolve "^0.3.0"
-    urix "^0.1.0"
+    mdn-data "~1.1.0"
+    source-map "^0.5.3"
+
+css-unit-converter@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
+  integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
+
+css-url-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
+  integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
+
+css-what@2.1, css-what@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
+  integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+  integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
-"cssnano@>=2.6.1 <4":
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+cssesc@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
+  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+
+cssnano-preset-default@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.6.tgz#92379e2a6db4a91c0ea727f5f556eeac693eab6a"
+  integrity sha512-UPboYbFaJFtDUhJ4fqctThWbbyF4q01/7UhsZbLzp35l+nUxtzh1SifoVlEfyLM3n3Z0htd8B1YlCxy9i+bQvg==
+  dependencies:
+    css-declaration-sorter "^4.0.1"
+    cssnano-util-raw-cache "^4.0.1"
+    postcss "^7.0.0"
+    postcss-calc "^7.0.0"
+    postcss-colormin "^4.0.2"
+    postcss-convert-values "^4.0.1"
+    postcss-discard-comments "^4.0.1"
+    postcss-discard-duplicates "^4.0.2"
+    postcss-discard-empty "^4.0.1"
+    postcss-discard-overridden "^4.0.1"
+    postcss-merge-longhand "^4.0.10"
+    postcss-merge-rules "^4.0.2"
+    postcss-minify-font-values "^4.0.2"
+    postcss-minify-gradients "^4.0.1"
+    postcss-minify-params "^4.0.1"
+    postcss-minify-selectors "^4.0.1"
+    postcss-normalize-charset "^4.0.1"
+    postcss-normalize-display-values "^4.0.1"
+    postcss-normalize-positions "^4.0.1"
+    postcss-normalize-repeat-style "^4.0.1"
+    postcss-normalize-string "^4.0.1"
+    postcss-normalize-timing-functions "^4.0.1"
+    postcss-normalize-unicode "^4.0.1"
+    postcss-normalize-url "^4.0.1"
+    postcss-normalize-whitespace "^4.0.1"
+    postcss-ordered-values "^4.1.1"
+    postcss-reduce-initial "^4.0.2"
+    postcss-reduce-transforms "^4.0.1"
+    postcss-svgo "^4.0.1"
+    postcss-unique-selectors "^4.0.1"
+
+cssnano-util-get-arguments@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
+  integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
+
+cssnano-util-get-match@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
+  integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
+
+cssnano-util-raw-cache@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
+  integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==
   dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
-
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+    postcss "^7.0.0"
+
+cssnano-util-same-parent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
+  integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
+
+cssnano@^4.1.8:
+  version "4.1.8"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.8.tgz#8014989679d5fd42491e4499a521dbfb85c95fd1"
+  integrity sha512-5GIY0VzAHORpbKiL3rMXp4w4M1Ki+XlXgEXyuWXVd3h6hlASb+9Vo76dNP56/elLMVBBsUfusCo1q56uW0UWig==
   dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
+    cosmiconfig "^5.0.0"
+    cssnano-preset-default "^4.0.6"
+    is-resolvable "^1.0.0"
+    postcss "^7.0.0"
+
+csso@^3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
+  integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
+  dependencies:
+    css-tree "1.0.0-alpha.29"
 
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz#8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"
+  integrity sha512-+7prCSORpXNeR4/fUP3rL+TzqtiFfhMvTd7uEqMdgPvLPt4+uzFUeufx5RHjGTACCargg/DiEt/moMQmvnfkog==
 
-"cssstyle@>= 0.2.37 < 0.3.0":
-  version "0.2.37"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
+cssstyle@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz#18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"
+  integrity sha512-364AI1l/M5TYcFH83JnOH/pSqgaNnKmYgKrm0didZMGKWjQB60dymwWy1rKUgL3J1ffdq9xVi2yGLHdSjjSNog==
   dependencies:
     cssom "0.3.x"
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  dependencies:
-    array-find-index "^1.0.1"
+csstype@^2.2.0, csstype@^2.5.7:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.0.tgz#6cf7b2fa7fc32aab3d746802c244d4eda71371a2"
+  integrity sha512-by8hi8BlLbowQq0qtkx54d9aN73R9oUW20HISpka5kmgsR9F7nnxgfsemuR2sdCKZh+CDNf5egW9UZMm4mgJRg==
+
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
   dependencies:
     es5-ext "^0.10.9"
 
-damerau-levenshtein@^1.0.0:
+damerau-levenshtein@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
+  integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=
 
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+  integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
+  dependencies:
+    abab "^2.0.0"
+    whatwg-mimetype "^2.2.0"
+    whatwg-url "^7.0.0"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
-debug@2.6.9, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, 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@^3.0.1, debug@^3.1.0:
+debug@=3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
   dependencies:
     ms "2.0.0"
 
-decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
+debug@^3.1.0, debug@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.0.1, debug@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+decamelize@^1.1.1, 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@7.2.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-7.2.3.tgz#6434c3b8a8c375780062fc633d0d2bbdb264cc78"
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
+  dependencies:
+    xregexp "4.0.0"
+
+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=
 
 deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+
+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-extend@^0.4.0, deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
+default-gateway@^2.6.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+  dependencies:
+    execa "^0.10.0"
+    ip-regex "^2.1.0"
 
 default-require-extensions@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  integrity sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=
   dependencies:
     strip-bom "^2.0.0"
 
-defaults@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
+define-properties@^1.1.1, define-properties@^1.1.2, 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==
   dependencies:
-    clone "^1.0.2"
+    object-keys "^1.0.12"
 
-define-properties@^1.1.1, define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
+    is-descriptor "^0.1.0"
 
-defined@^1.0.0:
+define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
 
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
 
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -2134,18 +2800,22 @@ del@^3.0.0:
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@1.1.1, depd@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
 
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -2153,32 +2823,44 @@ des.js@^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=
 
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  integrity sha1-920GQ1LN9Docts5hnE7jqUdd4gg=
   dependencies:
     repeating "^2.0.0"
 
-detect-libc@^1.0.2:
+detect-libc@^1.0.2, detect-libc@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
 
-detect-node@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
+detect-newline@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
+
+detect-node@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
 detect-passive-events@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-1.0.4.tgz#6ed477e6e5bceb79079735dcd357789d37f9a91a"
+  integrity sha1-btR35uW863kHlzXc01d4nTf5qRo=
 
 diff@^3.2.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
 
 diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2187,14 +2869,17 @@ diffie-hellman@^5.0.0:
 discontinuous-range@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+  integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
-dns-packet@^1.0.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz#a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -2202,98 +2887,144 @@ dns-packet@^1.0.1:
 dns-txt@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
   dependencies:
     buffer-indexof "^1.0.0"
 
 doctrine@1.5.0:
   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.0.2, doctrine@^2.1.0:
+doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
 
-dom-helpers@^3.2.0, dom-helpers@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
+dom-helpers@^3.2.1, dom-helpers@^3.3.1:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
+  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
+  dependencies:
+    "@babel/runtime" "^7.1.2"
 
 dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  integrity sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=
   dependencies:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
 domain-browser@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@~1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+  integrity sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=
+
+domexception@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
+  dependencies:
+    webidl-conversions "^4.0.2"
 
 domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
   dependencies:
     domelementtype "1"
 
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^1.5.1:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+domutils@^1.5.1, domutils@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
-dotenv@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-4.0.0.tgz#864ef1379aced55ce6f95debecdce179f7a0cd1d"
+dot-prop@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+  dependencies:
+    is-obj "^1.0.0"
+
+dotenv@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
+  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
 
 double-ended-queue@^2.1.0-0:
   version "2.1.0-0"
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
+  integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
 
-duplexer@^0.1.1, duplexer@~0.1.1:
+duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
 
 ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
   dependencies:
     jsbn "~0.1.0"
+    safer-buffer "^2.1.0"
 
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^2.3.4, ejs@^2.5.6:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
+ejs@^2.3.4, ejs@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
+  integrity sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.27:
-  version "1.3.27"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
+electron-to-chromium@^1.3.96:
+  version "1.3.96"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a"
+  integrity sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==
 
 elliptic@^6.0.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
@@ -2307,87 +3038,115 @@ emoji-mart@Gargron/emoji-mart#build:
   version "2.6.2"
   resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9"
 
-emoji-regex@^6.1.0:
+emoji-regex@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.5.1.tgz#9baea929b155565c11ea41c6626eaa65cef992c2"
+  integrity sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==
 
 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=
 
-encodeurl@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
 encoding@^0.1.11:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
   dependencies:
     iconv-lite "~0.4.13"
 
-enhanced-resolve@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  dependencies:
+    once "^1.4.0"
+
+enhanced-resolve@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
-    object-assign "^4.0.1"
-    tapable "^0.2.7"
+    tapable "^1.0.0"
 
 entities@^1.1.1, entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-enzyme-adapter-react-16@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.0.tgz#86c5db7c10f0be6ec25d54ca41b59f2abb397cf4"
+enzyme-adapter-react-16@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.7.1.tgz#c37c4cb0fd75e88a063154a7a88096474914496a"
+  integrity sha512-OQXKgfHWyHN3sFu2nKj3mhgRcqIPIJX6aOzq5AHVFES4R9Dw/vCBZFMPyaG81g2AZ5DogVh39P3MMNUbqNLTcw==
   dependencies:
-    enzyme-adapter-utils "^1.1.0"
-    lodash "^4.17.4"
-    object.assign "^4.0.4"
+    enzyme-adapter-utils "^1.9.0"
+    function.prototype.name "^1.1.0"
+    object.assign "^4.1.0"
     object.values "^1.0.4"
-    prop-types "^15.5.10"
+    prop-types "^15.6.2"
+    react-is "^16.6.1"
     react-test-renderer "^16.0.0-0"
 
-enzyme-adapter-utils@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.2.0.tgz#7f4471ee0a70b91169ec8860d2bf0a6b551664b2"
+enzyme-adapter-utils@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.9.0.tgz#3997c20f3387fdcd932b155b3740829ea10aa86c"
+  integrity sha512-uMe4xw4l/Iloh2Fz+EO23XUYMEQXj5k/5ioLUXCNOUCI8Dml5XQMO9+QwUq962hBsY5qftfHHns+d990byWHvg==
   dependencies:
-    lodash "^4.17.4"
-    object.assign "^4.0.4"
-    prop-types "^15.5.10"
+    function.prototype.name "^1.1.0"
+    object.assign "^4.1.0"
+    prop-types "^15.6.2"
+    semver "^5.6.0"
 
-enzyme@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.2.0.tgz#998bdcda0fc71b8764a0017f7cc692c943f54a7a"
+enzyme@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.8.0.tgz#646d2d5d0798cb98fdec39afcee8a53237b47ad5"
+  integrity sha512-bfsWo5nHyZm1O1vnIsbwdfhU989jk+squU9NKvB+Puwo5j6/Wg9pN5CO0YJelm98Dao3NPjkDZk+vvgwpMwYxw==
   dependencies:
+    array.prototype.flat "^1.2.1"
     cheerio "^1.0.0-rc.2"
-    function.prototype.name "^1.0.3"
-    has "^1.0.1"
+    function.prototype.name "^1.1.0"
+    has "^1.0.3"
+    is-boolean-object "^1.0.0"
+    is-callable "^1.1.4"
+    is-number-object "^1.0.3"
+    is-string "^1.0.4"
     is-subset "^0.1.1"
-    lodash "^4.17.4"
+    lodash.escape "^4.0.1"
+    lodash.isequal "^4.5.0"
+    object-inspect "^1.6.0"
     object-is "^1.0.1"
-    object.assign "^4.0.4"
+    object.assign "^4.1.0"
     object.entries "^1.0.4"
     object.values "^1.0.4"
     raf "^3.4.0"
     rst-selector-parser "^2.2.3"
+    string.prototype.trim "^1.1.2"
 
-errno@^0.1.3, errno@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
   dependencies:
-    prr "~0.0.0"
+    prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.4.3, es-abstract@^1.6.1, es-abstract@^1.7.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+es-abstract@^1.10.0, es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
+  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -2396,294 +3155,292 @@ es-abstract@^1.4.3, es-abstract@^1.6.1, es-abstract@^1.7.0:
     is-regex "^1.0.4"
 
 es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
   dependencies:
-    is-callable "^1.1.1"
+    is-callable "^1.1.4"
     is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
+    is-symbol "^1.0.2"
 
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.37"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
+es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.46"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
+  integrity sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==
   dependencies:
-    es6-iterator "~2.0.1"
+    es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
+    next-tick "1"
 
-es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+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=
   dependencies:
     d "1"
     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"
-  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"
-  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, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+es6-symbol@^3.1.1, 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-weak-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
 escape-html@^1.0.3, escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escodegen@^1.6.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.0.tgz#9811a2f265dc1cd3894420ee3717064b632b8852"
+escodegen@^1.9.1:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+  integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
   dependencies:
     esprima "^3.1.3"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     optionator "^0.8.1"
   optionalDependencies:
-    source-map "~0.5.6"
-
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
+    source-map "~0.6.1"
 
 eslint-import-resolver-node@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+  integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
   dependencies:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-module-utils@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
+eslint-module-utils@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746"
+  integrity sha1-snA2LNiLGkitMIl2zn+lTphBF0Y=
   dependencies:
     debug "^2.6.8"
     pkg-dir "^1.0.0"
 
-eslint-plugin-import@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
+eslint-plugin-import@~2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8"
+  integrity sha512-FpuRtniD/AY6sXByma2Wr0TXvXJ4nA/2/04VPlfpmUDPOpOY264x+ILiwnrk/k4RINgDAyFZByxqPUbSQ5YE7g==
   dependencies:
-    builtin-modules "^1.1.1"
     contains-path "^0.1.0"
     debug "^2.6.8"
     doctrine "1.5.0"
     eslint-import-resolver-node "^0.3.1"
-    eslint-module-utils "^2.1.1"
+    eslint-module-utils "^2.2.0"
     has "^1.0.1"
-    lodash.cond "^4.3.0"
+    lodash "^4.17.4"
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
+    resolve "^1.6.0"
 
-eslint-plugin-jsx-a11y@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.0.3.tgz#54583d1ae442483162e040e13cc31865465100e5"
+eslint-plugin-jsx-a11y@~6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz#69bca4890b36dcf0fe16dd2129d2d88b98f33f88"
+  integrity sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw==
   dependencies:
-    aria-query "^0.7.0"
+    aria-query "^3.0.0"
     array-includes "^3.0.3"
-    ast-types-flow "0.0.7"
-    axobject-query "^0.1.0"
-    damerau-levenshtein "^1.0.0"
-    emoji-regex "^6.1.0"
-    jsx-ast-utils "^2.0.0"
+    ast-types-flow "^0.0.7"
+    axobject-query "^2.0.1"
+    damerau-levenshtein "^1.0.4"
+    emoji-regex "^6.5.1"
+    has "^1.0.3"
+    jsx-ast-utils "^2.0.1"
 
-eslint-plugin-promise@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-3.8.0.tgz#65ebf27a845e3c1e9d6f6a5622ddd3801694b621"
+eslint-plugin-promise@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2"
+  integrity sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg==
 
-eslint-plugin-react@^7.8.2:
-  version "7.8.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.8.2.tgz#e95c9c47fece55d2303d1a67c9d01b930b88a51d"
+eslint-plugin-react@~7.12.1:
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.12.1.tgz#b9c4639f72469ff317ac31e3bd630d22d0dbf8f4"
+  integrity sha512-1YyXVhp6KSB+xRC1BWzmlA4BH9Wp9jMMBE6AJizxuk+bg/KUJpQGRwsU1/q1pV8rM6oEdLCxunXn7Nfh2BOWBg==
   dependencies:
-    doctrine "^2.0.2"
-    has "^1.0.1"
+    array-includes "^3.0.3"
+    doctrine "^2.1.0"
+    has "^1.0.3"
     jsx-ast-utils "^2.0.1"
-    prop-types "^15.6.0"
+    object.fromentries "^2.0.0"
+    prop-types "^15.6.2"
+    resolve "^1.9.0"
 
-eslint-scope@^3.7.1, eslint-scope@~3.7.1:
+eslint-scope@3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"
+  integrity sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
+  integrity sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==
   dependencies:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-utils@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+  integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
+
 eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
 
-eslint@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+eslint@^5.11.1:
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.11.1.tgz#8deda83db9f354bf9d3f53f9677af7e0e13eadda"
+  integrity sha512-gOKhM8JwlFOc2acbOrkYR05NW8M6DCMSvfcJiBB5NDxRE1gv8kbvxKaC9u69e6ZGEMWXcswA/7eKR229cEIpvg==
   dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.5.3"
     chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
     doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
+    eslint-scope "^4.0.0"
+    eslint-utils "^1.3.1"
     eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
+    espree "^5.0.0"
+    esquery "^1.0.1"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     functional-red-black-tree "^1.0.1"
     glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
+    globals "^11.7.0"
+    ignore "^4.0.6"
     imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
+    inquirer "^6.1.0"
+    js-yaml "^3.12.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
+    lodash "^4.17.5"
+    minimatch "^3.0.4"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
     optionator "^0.8.2"
     path-is-inside "^1.0.2"
     pluralize "^7.0.0"
     progress "^2.0.0"
-    regexpp "^1.0.1"
+    regexpp "^2.0.1"
     require-uncached "^1.0.3"
-    semver "^5.3.0"
+    semver "^5.5.1"
     strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
+    strip-json-comments "^2.0.1"
+    table "^5.0.2"
+    text-table "^0.2.0"
 
-espree@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+espree@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.0.tgz#fc7f984b62b36a0f543b13fb9cd7b9f4a7f5b65c"
+  integrity sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==
   dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
-esprima@^2.6.0:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+    acorn "^6.0.2"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
 
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+  integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
 
 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+esquery@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
   dependencies:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
   dependencies:
     estraverse "^4.1.0"
-    object-assign "^4.0.1"
 
 estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
-esutils@^2.0.2:
+esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
 
 etag@~1.8.1:
   version "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"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-event-stream@~3.3.0:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  dependencies:
-    duplexer "~0.1.1"
-    from "~0"
-    map-stream "~0.1.0"
-    pause-stream "0.0.11"
-    split "0.3"
-    stream-combiner "~0.0.4"
-    through "~2.3.1"
-
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
-eventsource@0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+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==
   dependencies:
-    original ">=0.0.5"
+    original "^1.0.0"
 
 evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
   dependencies:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
 exec-sh@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+  dependencies:
+    merge "^1.2.0"
+
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  integrity sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==
   dependencies:
-    merge "^1.1.3"
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
+  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
   dependencies:
     cross-spawn "^5.0.1"
     get-stream "^3.0.0"
@@ -2693,140 +3450,209 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exif-js@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz#9d10819bf571f873813e7640241255ab9ce1a814"
+  integrity sha1-nRCBm/Vx+HOBPnZAJBJVq5zhqBQ=
+
+exit@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
   dependencies:
     is-posix-bracket "^0.1.0"
 
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
   dependencies:
     fill-range "^2.1.0"
 
-expect@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-21.2.1.tgz#003ac2ac7005c3c29e73b38a272d4afadd6d1d7b"
+expect@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98"
+  integrity sha512-dgSoOHgmtn/aDGRVFWclQyPDKl2CQRq0hmIEoUAuQs/2rn2NcvCWcSCovm6BLeuB/7EZuLGu2QfnR+qRt5OM4w==
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^21.2.1"
-    jest-get-type "^21.2.0"
-    jest-matcher-utils "^21.2.1"
-    jest-message-util "^21.2.1"
-    jest-regex-util "^21.2.0"
-
-express@^4.15.2, express@^4.16.2:
-  version "4.16.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c"
-  dependencies:
-    accepts "~1.3.4"
+    jest-diff "^23.6.0"
+    jest-get-type "^22.1.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+
+express@^4.16.2, express@^4.16.3, express@^4.16.4:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
+  dependencies:
+    accepts "~1.3.5"
     array-flatten "1.1.1"
-    body-parser "1.18.2"
+    body-parser "1.18.3"
     content-disposition "0.5.2"
     content-type "~1.0.4"
     cookie "0.3.1"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.1"
-    encodeurl "~1.0.1"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.1.0"
+    finalhandler "1.1.1"
     fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
     parseurl "~1.3.2"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.2"
-    qs "6.5.1"
+    proxy-addr "~2.0.4"
+    qs "6.5.2"
     range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.1"
-    serve-static "1.13.1"
+    safe-buffer "5.1.2"
+    send "0.16.2"
+    serve-static "1.13.2"
     setprototypeof "1.1.0"
-    statuses "~1.3.1"
-    type-is "~1.6.15"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
 
-external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+external-editor@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
   dependencies:
-    chardet "^0.4.0"
-    iconv-lite "^0.4.17"
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
-  dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
-    schema-utils "^0.3.0"
-    webpack-sources "^1.0.1"
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
 extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+  integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
   dependencies:
     websocket-driver ">=0.5.1"
 
-faye-websocket@~0.11.0:
+faye-websocket@~0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
   dependencies:
     websocket-driver ">=0.5.1"
 
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
   dependencies:
     bser "^2.0.0"
 
-fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
-  version "0.8.16"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+fbjs@^0.8.4:
+  version "0.8.17"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -2834,75 +3660,117 @@ fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
     object-assign "^4.1.0"
     promise "^7.1.1"
     setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
+    ua-parser-js "^0.7.18"
+
+fibers@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fibers/-/fibers-3.1.1.tgz#0238902ca938347bd779523692fbeefdf4f688ab"
+  integrity sha512-dl3Ukt08rHVQfY8xGD0ODwyjwrRALtaghuqGH2jByYX1wpY+nAnRQjJ6Dbqq0DnVgNVQ9yibObzbF4IlPyiwPw==
+  dependencies:
+    detect-libc "^1.0.3"
+
+figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
 
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
   dependencies:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^0.11.2:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
+file-loader@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
   dependencies:
     loader-utils "^1.0.2"
+    schema-utils "^1.0.0"
 
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
 
 fileset@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+  integrity sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=
   dependencies:
     glob "^7.0.3"
     minimatch "^3.0.3"
 
-filesize@^3.5.9:
-  version "3.5.11"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
+filesize@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
+  integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
 fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
   dependencies:
     is-number "^2.1.0"
     isobject "^2.0.0"
-    randomatic "^1.1.3"
+    randomatic "^3.0.0"
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
   dependencies:
     debug "2.6.9"
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
     parseurl "~1.3.2"
-    statuses "~1.3.1"
+    statuses "~1.4.0"
     unpipe "~1.0.0"
 
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-cache-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^1.0.0"
+    pkg-dir "^3.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
@@ -2910,149 +3778,163 @@ find-up@^1.0.0:
 find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  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"
-    del "^2.0.2"
     graceful-fs "^4.1.2"
+    rimraf "~2.6.2"
     write "^0.2.1"
 
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+flush-write-stream@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+  integrity sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.4"
 
-follow-redirects@^1.2.3:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.6.tgz#4dcdc7e4ab3dd6765a97ff89c3b4c258117c79bf"
+follow-redirects@^1.0.0, follow-redirects@^1.3.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.0.tgz#d12452c031e8c67eb6637d861bfc7a8090167933"
+  integrity sha512-4Oh4eI3S9OueVV41AgJ1oLjpaJUhbJ7JDGOMhe0AFqoSejl5Q2nn3eGglAzRUKVKZE8jG5MNn66TjCJMAnpsWA==
   dependencies:
-    debug "^3.1.0"
+    debug "=3.1.0"
 
 font-awesome@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
+  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
 
 for-in@^0.1.3:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+  integrity sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=
 
-for-in@^1.0.1:
+for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
   dependencies:
     for-in "^1.0.1"
 
 for-own@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.1.tgz#6fb94fbd71885306d73d15cc497fe4cc4ecd44bf"
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "^1.0.5"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
-fraction.js@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.2.tgz#0eae896626f334b1bde763371347a83b5575d7f0"
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-from@~0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  dependencies:
+    minipass "^2.2.1"
 
-fs-extra@^0.30.0:
-  version "0.30.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
   dependencies:
     graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    klaw "^1.0.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@*, fsevents@^1.0.0, fsevents@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+fsevents@*, fsevents@^1.2.2, fsevents@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
+  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
   dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
 
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.3.tgz#0099ae5572e9dd6f03c97d023fd92bcc5e639eac"
+function.prototype.name@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
+  integrity sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==
   dependencies:
     define-properties "^1.1.2"
-    function-bind "^1.1.0"
+    function-bind "^1.1.1"
     is-callable "^1.1.3"
 
 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@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -3063,47 +3945,44 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105"
-  dependencies:
-    globule "^1.0.0"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-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"
-  dependencies:
-    is-property "^1.0.0"
-
 generic-pool@2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
+  integrity sha1-eAw29p360FpaBF3Te+etyhGk9v8=
 
 get-caller-file@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
   dependencies:
     assert-plus "^1.0.0"
 
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
   dependencies:
     glob-parent "^2.0.0"
     is-glob "^2.0.0"
@@ -3111,22 +3990,22 @@ glob-base@^0.3.0:
 glob-parent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
   dependencies:
     is-glob "^2.0.0"
 
-glob@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -3135,28 +4014,25 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^11.0.1, globals@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
+global-modules-path@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931"
+  integrity sha512-y+shkf4InI7mPRHSo2b/k6ix6+NLDtyccYv86whhxrSGX9wjPX1VMITmrDbE1eh7zkzhiWtW2sHklJYoQ62Cxg==
+
+globals@^11.1.0, globals@^11.7.0:
+  version "11.9.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
+  integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -3164,144 +4040,143 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globule@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
-  dependencies:
-    glob "~7.1.1"
-    lodash "~4.17.4"
-    minimatch "~3.0.2"
-
-gonzales-pe@^4.0.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz#41091703625433285e0aee3aa47829fc1fbeb6f2"
-  dependencies:
-    minimist "1.1.x"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-gzip-size@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+gzip-size@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz#a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"
+  integrity sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==
   dependencies:
     duplexer "^0.1.1"
+    pify "^3.0.0"
 
-handle-thing@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+handle-thing@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
+  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.3:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.12.tgz#2c15c8a96d46da5e266700518ba8cb8d919d5bc5"
+  integrity sha512-RhmTekP+FZL+XNhwS1Wf+bTTZpdLougwt5pcgA1tuz6Jcx0fpH/7z0qd71RKnZHBCxIRBHfBOnio4gViPemNzA==
   dependencies:
-    async "^1.4.0"
+    async "^2.5.0"
     optimist "^0.6.1"
-    source-map "^0.4.4"
+    source-map "^0.6.1"
   optionalDependencies:
-    uglify-js "^2.6"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+    uglify-js "^3.1.4"
 
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
-  dependencies:
-    chalk "^1.1.1"
-    commander "^2.9.0"
-    is-my-json-valid "^2.12.4"
-    pinkie-promise "^2.0.0"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+har-validator@~5.1.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.1.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
   dependencies:
     ansi-regex "^2.0.0"
 
 has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
 
-has-flag@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
 
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
-    function-bind "^1.0.2"
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
 
-hash-base@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
-    inherits "^2.0.1"
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
 
 hash-base@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
-    minimalistic-assert "^1.0.0"
+    minimalistic-assert "^1.0.1"
 
-hawk@3.1.3, hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
+hex-color-regex@^1.1.0:
+  version "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.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"
@@ -3312,116 +4187,139 @@ history@^4.7.2:
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hoek@4.x.x:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
+hoist-non-react-statics@^2.5.0, hoist-non-react-statics@^2.5.5:
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+  integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
+hoist-non-react-statics@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz#c09c0555c84b38a7ede6912b61efddafd6e75e1e"
+  integrity sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==
+  dependencies:
+    react-is "^16.3.2"
 
 home-or-tmp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  integrity sha1-42w/LSyufXRqhX440Y1fMqeILbg=
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
+hoopy@^0.1.2:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
+  integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
+
 hosted-git-info@^2.1.4:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
+hsl-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
+  integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
+
+hsla-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
+  integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
+
 html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
-html-encoding-sniffer@^1.0.1:
+html-encoding-sniffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+  integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
   dependencies:
     whatwg-encoding "^1.0.1"
 
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 htmlparser2@^3.9.1:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz#5f5e422dcf6119c0d983ed36260ce9ded0bee464"
+  integrity sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==
   dependencies:
     domelementtype "^1.3.0"
     domhandler "^2.3.0"
     domutils "^1.5.1"
     entities "^1.1.1"
     inherits "^2.0.1"
-    readable-stream "^2.0.2"
+    readable-stream "^3.0.6"
 
 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.6.2, http-errors@~1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
   dependencies:
-    depd "1.1.1"
+    depd "~1.1.2"
     inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
 
-http-link-header@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-0.8.0.tgz#a22b41a0c9b1e2d8fac1bf1b697c6bd532d5f5e4"
+http-link-header@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/http-link-header/-/http-link-header-1.0.2.tgz#bea50f02e1c7996021f1013b428c63f77e0f4e11"
+  integrity sha512-z6YOZ8ZEnejkcCWlGZzYXNa6i+ZaTfiTg3WhlV/YvnNya3W/RbX1bMVUMTuCrg/DrtTCQxaFCkXCz4FtLpcebg==
 
 http-parser-js@>=0.4.0:
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
 
-http-proxy-middleware@~0.17.4:
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
+http-proxy-middleware@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
   dependencies:
     http-proxy "^1.16.2"
-    is-glob "^3.1.0"
-    lodash "^4.17.2"
-    micromatch "^2.3.11"
+    is-glob "^4.0.0"
+    lodash "^4.17.5"
+    micromatch "^3.1.9"
 
 http-proxy@^1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
-  dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
   dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
 
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -3430,43 +4328,103 @@ http-signature@~1.2.0:
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+iconv-lite@0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
 
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
+
+icss-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.0.0.tgz#d52cf4bcdcfa1c45c2dbefb4ffdf6b00ef608098"
+  integrity sha512-bA/xGiwWM17qjllIs9X/y0EjsB7e0AV08F3OL8UPsoNkNRibIuu8f1eKTnQ8QO1DteKKTxTUAn+IEWUToIwGOA==
+  dependencies:
+    postcss "^7.0.5"
+
+ieee754@^1.1.4:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
+  integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
+
+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-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+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@^3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
+
+import-cwd@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9"
+  integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=
+  dependencies:
+    import-from "^2.1.0"
+
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
 
-icss-utils@^2.1.0:
+import-from@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+  resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
+  integrity sha1-M1238qev/VOqpHHUuAId7ja387E=
   dependencies:
-    postcss "^6.0.1"
-
-ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-
-ignore@^3.3.3:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
-
-immutable@^3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+    resolve-from "^3.0.0"
 
-import-local@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-0.1.1.tgz#b1179572aacdc11c6a91009fb430dbcab5f668a8"
+import-local@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
   dependencies:
     pkg-dir "^2.0.0"
     resolve-cwd "^2.0.0"
 
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
 imports-loader@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69"
+  integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==
   dependencies:
     loader-utils "^1.0.2"
     source-map "^0.6.1"
@@ -3474,349 +4432,511 @@ imports-loader@^0.8.0:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-in-publish@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
-
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  dependencies:
-    repeating "^2.0.0"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
 ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^3.0.6:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+inquirer@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
+  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
     cli-cursor "^2.1.0"
     cli-width "^2.0.0"
-    external-editor "^2.0.4"
+    external-editor "^3.0.0"
     figures "^2.0.0"
-    lodash "^4.3.0"
+    lodash "^4.17.10"
     mute-stream "0.0.7"
     run-async "^2.2.0"
-    rx-lite "^4.0.8"
-    rx-lite-aggregates "^4.0.8"
+    rxjs "^6.1.0"
     string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
-internal-ip@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+internal-ip@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
   dependencies:
-    meow "^3.3.0"
+    default-gateway "^2.6.0"
+    ipaddr.js "^1.5.2"
 
-interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+interpret@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
 
-intersection-observer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.5.0.tgz#9fe8bee3953c755b1485c38efd9633d535775ea6"
+intersection-observer@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.5.1.tgz#e340fc56ce74290fe2b2394d1ce88c4353ac6dfa"
+  integrity sha512-Zd7Plneq82kiXFixs7bX62YnuZ0BMRci9br7io88LwDyF3V43cQMI+G5IiTlTNTt+LsDUppl19J/M2Fp9UkH6g==
 
 intl-format-cache@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.1.0.tgz#04a369fecbfad6da6005bae1f14333332dcf9316"
+  integrity sha1-BKNp/sv61tpgBbrh8UMzMy3PkxY=
 
 intl-messageformat-parser@1.4.0, intl-messageformat-parser@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075"
+  integrity sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=
 
 intl-messageformat@^2.0.0, intl-messageformat@^2.1.0, intl-messageformat@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc"
+  integrity sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=
   dependencies:
     intl-messageformat-parser "1.4.0"
 
-intl-relativeformat@^2.0.0, intl-relativeformat@^2.1.0:
+intl-relativeformat@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz#010f1105802251f40ac47d0e3e1a201348a255df"
+  integrity sha1-AQ8RBYAiUfQKxH0OPhogE0iiVd8=
   dependencies:
     intl-messageformat "^2.0.0"
 
 intl@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
+  integrity sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=
 
-invariant@^2.0.0, invariant@^2.1.1, invariant@^2.2.0, invariant@^2.2.1, invariant@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+invariant@^2.1.1, invariant@^2.2.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==
   dependencies:
     loose-envify "^1.0.0"
 
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
 
-ipaddr.js@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
+ipaddr.js@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+
+ipaddr.js@^1.5.2:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.1.tgz#fa4b79fa47fd3def5e3b159825161c0a519c9427"
+  integrity sha1-+kt5+kf9Pe9eOxWYJRYcClGclCc=
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-arrayish@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
+  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.0.2, is-buffer@^1.1.5:
+is-boolean-object@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
+  integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
+
+is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+is-callable@^1.1.3, is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
 is-ci@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+  dependencies:
+    ci-info "^1.5.0"
+
+is-color-stop@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
+  integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
+  dependencies:
+    css-color-names "^0.0.4"
+    hex-color-regex "^1.1.0"
+    hsl-regex "^1.0.0"
+    hsla-regex "^1.0.0"
+    rgb-regex "^1.0.1"
+    rgba-regex "^1.0.0"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
-    ci-info "^1.0.0"
+    kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
 
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
 
 is-equal-shallow@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
   dependencies:
     is-primitive "^2.0.0"
 
-is-extendable@^0.1.1:
+is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
 
 is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
 
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
   dependencies:
     number-is-nan "^1.0.0"
 
 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"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-generator-fn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+  integrity sha1-lp1J4bszKfa7fwkIm+JleLLd1Go=
 
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
   dependencies:
     is-extglob "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
-is-my-json-valid@^2.12.4:
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
+is-glob@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+  integrity sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=
   dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
+    is-extglob "^2.1.1"
 
 is-nan@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.2.1.tgz#9faf65b6fb6db24b7f5c0628475ea71f988401e2"
+  integrity sha1-n69ltvttskt/XAYoR16nH5iEAeI=
   dependencies:
     define-properties "^1.1.1"
 
+is-number-object@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
+  integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
 
 is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
   dependencies:
     is-path-inside "^1.0.0"
 
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
   dependencies:
     path-is-inside "^1.0.1"
 
-is-plain-obj@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-
-is-plain-object@^2.0.1:
+is-plain-object@^2.0.1, 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"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
 
 is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
 
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
   dependencies:
     has "^1.0.1"
 
 is-resolvable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
 is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-string@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+  integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=
 
 is-subset@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
+  integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=
 
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+is-svg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
+  integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
   dependencies:
     html-comment-regex "^1.1.0"
 
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
 
 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-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-windows@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
+is-windows@^1.0.0, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
-isobject@^3.0.1:
+isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
   dependencies:
     node-fetch "^1.0.1"
     whatwg-fetch ">=0.10.0"
@@ -3824,485 +4944,630 @@ isomorphic-fetch@^2.1.1:
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-istanbul-api@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.2.1.tgz#0c60a0515eb11c7d65c6b50bba2c6e999acd8620"
+istanbul-api@^1.3.1:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.7.tgz#a86c770d2b03e11e3f778cd7aedd82d2722092aa"
+  integrity sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==
   dependencies:
     async "^2.1.4"
     fileset "^2.0.2"
-    istanbul-lib-coverage "^1.1.1"
-    istanbul-lib-hook "^1.1.0"
-    istanbul-lib-instrument "^1.9.1"
-    istanbul-lib-report "^1.1.2"
-    istanbul-lib-source-maps "^1.2.2"
-    istanbul-reports "^1.1.3"
+    istanbul-lib-coverage "^1.2.1"
+    istanbul-lib-hook "^1.2.2"
+    istanbul-lib-instrument "^1.10.2"
+    istanbul-lib-report "^1.1.5"
+    istanbul-lib-source-maps "^1.2.6"
+    istanbul-reports "^1.5.1"
     js-yaml "^3.7.0"
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.0.1, istanbul-lib-coverage@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+istanbul-lib-coverage@^1.2.0, istanbul-lib-coverage@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz#ccf7edcd0a0bb9b8f729feeb0930470f9af664f0"
+  integrity sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==
 
-istanbul-lib-hook@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
+istanbul-lib-hook@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz#bc6bf07f12a641fbf1c85391d0daa8f0aea6bf86"
+  integrity sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
+istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz#1f55ed10ac3c47f2bdddd5307935126754d0a9ca"
+  integrity sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
     babylon "^6.18.0"
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.2.1"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425"
+istanbul-lib-report@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz#f2a657fc6282f96170aaf281eb30a458f7f4170c"
+  integrity sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==
   dependencies:
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.2.1"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
+istanbul-lib-source-maps@^1.2.4, istanbul-lib-source-maps@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz#37b9ff661580f8fca11232752ee42e08c6675d8f"
+  integrity sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==
   dependencies:
     debug "^3.1.0"
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.2.1"
     mkdirp "^0.5.1"
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
-istanbul-reports@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10"
+istanbul-reports@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.5.1.tgz#97e4dbf3b515e8c484caea15d6524eebd3ff4e1a"
+  integrity sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==
   dependencies:
     handlebars "^4.0.3"
 
-javascript-natural-sort@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59"
-
-jest-changed-files@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-21.2.0.tgz#5dbeecad42f5d88b482334902ce1cba6d9798d29"
+jest-changed-files@^23.4.2:
+  version "23.4.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.4.2.tgz#1eed688370cd5eebafe4ae93d34bb3b64968fe83"
+  integrity sha512-EyNhTAUWEfwnK0Is/09LxoqNDOn7mU7S3EHskG52djOFS/z+IT0jT3h3Ql61+dklcG7bJJitIWEMB4Sp1piHmA==
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-21.2.1.tgz#9c528b6629d651911138d228bdb033c157ec8c00"
+jest-cli@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.6.0.tgz#61ab917744338f443ef2baa282ddffdd658a5da4"
+  integrity sha512-hgeD1zRUp1E1zsiyOXjEn4LzRLWdJBV//ukAHGlx6s5mfCNJTbhbHjgxnDUXA8fsKWN/HqFFF6X5XcCwC/IvYQ==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
+    exit "^0.1.2"
     glob "^7.1.2"
     graceful-fs "^4.1.11"
+    import-local "^1.0.0"
     is-ci "^1.0.10"
-    istanbul-api "^1.1.1"
-    istanbul-lib-coverage "^1.0.1"
-    istanbul-lib-instrument "^1.4.2"
-    istanbul-lib-source-maps "^1.1.0"
-    jest-changed-files "^21.2.0"
-    jest-config "^21.2.1"
-    jest-environment-jsdom "^21.2.1"
-    jest-haste-map "^21.2.0"
-    jest-message-util "^21.2.1"
-    jest-regex-util "^21.2.0"
-    jest-resolve-dependencies "^21.2.0"
-    jest-runner "^21.2.1"
-    jest-runtime "^21.2.1"
-    jest-snapshot "^21.2.1"
-    jest-util "^21.2.1"
+    istanbul-api "^1.3.1"
+    istanbul-lib-coverage "^1.2.0"
+    istanbul-lib-instrument "^1.10.1"
+    istanbul-lib-source-maps "^1.2.4"
+    jest-changed-files "^23.4.2"
+    jest-config "^23.6.0"
+    jest-environment-jsdom "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve-dependencies "^23.6.0"
+    jest-runner "^23.6.0"
+    jest-runtime "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    jest-watcher "^23.4.0"
+    jest-worker "^23.2.0"
     micromatch "^2.3.11"
-    node-notifier "^5.0.2"
-    pify "^3.0.0"
+    node-notifier "^5.2.1"
+    prompts "^0.1.9"
+    realpath-native "^1.0.0"
+    rimraf "^2.5.4"
     slash "^1.0.0"
     string-length "^2.0.0"
     strip-ansi "^4.0.0"
     which "^1.2.12"
-    worker-farm "^1.3.1"
-    yargs "^9.0.0"
+    yargs "^11.0.0"
 
-jest-config@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-21.2.1.tgz#c7586c79ead0bcc1f38c401e55f964f13bf2a480"
+jest-config@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.6.0.tgz#f82546a90ade2d8c7026fbf6ac5207fc22f8eb1d"
+  integrity sha512-i8V7z9BeDXab1+VNo78WM0AtWpBRXJLnkT+lyT+Slx/cbP5sZJ0+NDuLcmBE5hXAoK0aUp7vI+MOxR+R4d8SRQ==
   dependencies:
+    babel-core "^6.0.0"
+    babel-jest "^23.6.0"
     chalk "^2.0.1"
     glob "^7.1.1"
-    jest-environment-jsdom "^21.2.1"
-    jest-environment-node "^21.2.1"
-    jest-get-type "^21.2.0"
-    jest-jasmine2 "^21.2.1"
-    jest-regex-util "^21.2.0"
-    jest-resolve "^21.2.0"
-    jest-util "^21.2.1"
-    jest-validate "^21.2.1"
-    pretty-format "^21.2.1"
-
-jest-diff@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-21.2.1.tgz#46cccb6cab2d02ce98bc314011764bb95b065b4f"
+    jest-environment-jsdom "^23.4.0"
+    jest-environment-node "^23.4.0"
+    jest-get-type "^22.1.0"
+    jest-jasmine2 "^23.6.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
+    micromatch "^2.3.11"
+    pretty-format "^23.6.0"
+
+jest-diff@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.6.0.tgz#1500f3f16e850bb3d71233408089be099f610c7d"
+  integrity sha512-Gz9l5Ov+X3aL5L37IT+8hoCUsof1CVYBb2QEkOupK64XyRR3h+uRpYIm97K7sY8diFxowR8pIGEdyfMKTixo3g==
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
-    jest-get-type "^21.2.0"
-    pretty-format "^21.2.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
+
+jest-docblock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.2.0.tgz#f085e1f18548d99fdd69b20207e6fd55d91383a7"
+  integrity sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=
+  dependencies:
+    detect-newline "^2.1.0"
 
-jest-docblock@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-21.2.0.tgz#51529c3b30d5fd159da60c27ceedc195faf8d414"
+jest-each@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.6.0.tgz#ba0c3a82a8054387016139c733a05242d3d71575"
+  integrity sha512-x7V6M/WGJo6/kLoissORuvLIeAoyo2YqLOoCDkohgJ4XOXSqOtyvr8FbInlAWS77ojBsZrafbozWoKVRdtxFCg==
+  dependencies:
+    chalk "^2.0.1"
+    pretty-format "^23.6.0"
 
-jest-environment-jsdom@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-21.2.1.tgz#38d9980c8259b2a608ec232deee6289a60d9d5b4"
+jest-environment-jsdom@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz#056a7952b3fea513ac62a140a2c368c79d9e6023"
+  integrity sha1-BWp5UrP+pROsYqFAosNox52eYCM=
   dependencies:
-    jest-mock "^21.2.0"
-    jest-util "^21.2.1"
-    jsdom "^9.12.0"
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
+    jsdom "^11.5.1"
 
-jest-environment-node@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-21.2.1.tgz#98c67df5663c7fbe20f6e792ac2272c740d3b8c8"
+jest-environment-node@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.4.0.tgz#57e80ed0841dea303167cce8cd79521debafde10"
+  integrity sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=
   dependencies:
-    jest-mock "^21.2.0"
-    jest-util "^21.2.1"
+    jest-mock "^23.2.0"
+    jest-util "^23.4.0"
 
-jest-get-type@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-21.2.0.tgz#f6376ab9db4b60d81e39f30749c6c466f40d4a23"
+jest-get-type@^22.1.0:
+  version "22.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+  integrity sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==
 
-jest-haste-map@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-21.2.0.tgz#1363f0a8bb4338f24f001806571eff7a4b2ff3d8"
+jest-haste-map@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.6.0.tgz#2e3eb997814ca696d62afdb3f2529f5bbc935e16"
+  integrity sha512-uyNhMyl6dr6HaXGHp8VF7cK6KpC6G9z9LiMNsst+rJIZ8l7wY0tk8qwjPmEghczojZ2/ZhtEdIabZ0OQRJSGGg==
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-docblock "^21.2.0"
+    invariant "^2.2.4"
+    jest-docblock "^23.2.0"
+    jest-serializer "^23.0.1"
+    jest-worker "^23.2.0"
     micromatch "^2.3.11"
     sane "^2.0.0"
-    worker-farm "^1.3.1"
 
-jest-jasmine2@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-21.2.1.tgz#9cc6fc108accfa97efebce10c4308548a4ea7592"
+jest-jasmine2@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.6.0.tgz#840e937f848a6c8638df24360ab869cc718592e0"
+  integrity sha512-pe2Ytgs1nyCs8IvsEJRiRTPC0eVYd8L/dXJGU08GFuBwZ4sYH/lmFDdOL3ZmvJR8QKqV9MFuwlsAi/EWkFUbsQ==
   dependencies:
+    babel-traverse "^6.0.0"
     chalk "^2.0.1"
-    expect "^21.2.1"
-    graceful-fs "^4.1.11"
-    jest-diff "^21.2.1"
-    jest-matcher-utils "^21.2.1"
-    jest-message-util "^21.2.1"
-    jest-snapshot "^21.2.1"
-    p-cancelable "^0.3.0"
-
-jest-matcher-utils@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz#72c826eaba41a093ac2b4565f865eb8475de0f64"
+    co "^4.6.0"
+    expect "^23.6.0"
+    is-generator-fn "^1.0.0"
+    jest-diff "^23.6.0"
+    jest-each "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    pretty-format "^23.6.0"
+
+jest-leak-detector@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.6.0.tgz#e4230fd42cf381a1a1971237ad56897de7e171de"
+  integrity sha512-f/8zA04rsl1Nzj10HIyEsXvYlMpMPcy0QkQilVZDFOaPbv2ur71X5u2+C4ZQJGyV/xvVXtCCZ3wQ99IgQxftCg==
+  dependencies:
+    pretty-format "^23.6.0"
+
+jest-matcher-utils@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.6.0.tgz#726bcea0c5294261a7417afb6da3186b4b8cac80"
+  integrity sha512-rosyCHQfBcol4NsckTn01cdelzWLU9Cq7aaigDf8VwwpIRvWE/9zLgX2bON+FkEW69/0UuYslUe22SOdEf2nog==
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^21.2.0"
-    pretty-format "^21.2.1"
+    jest-get-type "^22.1.0"
+    pretty-format "^23.6.0"
 
-jest-message-util@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-21.2.1.tgz#bfe5d4692c84c827d1dcf41823795558f0a1acbe"
+jest-message-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.4.0.tgz#17610c50942349508d01a3d1e0bda2c079086a9f"
+  integrity sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=
   dependencies:
+    "@babel/code-frame" "^7.0.0-beta.35"
     chalk "^2.0.1"
     micromatch "^2.3.11"
     slash "^1.0.0"
+    stack-utils "^1.0.1"
 
-jest-mock@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-21.2.0.tgz#7eb0770e7317968165f61ea2a7281131534b3c0f"
+jest-mock@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.2.0.tgz#ad1c60f29e8719d47c26e1138098b6d18b261134"
+  integrity sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=
 
-jest-regex-util@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-21.2.0.tgz#1b1e33e63143babc3e0f2e6c9b5ba1eb34b2d530"
+jest-regex-util@^23.3.0:
+  version "23.3.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
+  integrity sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=
 
-jest-resolve-dependencies@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-21.2.0.tgz#9e231e371e1a736a1ad4e4b9a843bc72bfe03d09"
+jest-resolve-dependencies@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.6.0.tgz#b4526af24c8540d9a3fab102c15081cf509b723d"
+  integrity sha512-EkQWkFWjGKwRtRyIwRwI6rtPAEyPWlUC2MpzHissYnzJeHcyCn1Hc8j7Nn1xUVrS5C6W5+ZL37XTem4D4pLZdA==
   dependencies:
-    jest-regex-util "^21.2.0"
+    jest-regex-util "^23.3.0"
+    jest-snapshot "^23.6.0"
 
-jest-resolve@^21.2.0:
-  version "21.2.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-21.2.0.tgz#068913ad2ba6a20218e5fd32471f3874005de3a6"
+jest-resolve@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.6.0.tgz#cf1d1a24ce7ee7b23d661c33ba2150f3aebfa0ae"
+  integrity sha512-XyoRxNtO7YGpQDmtQCmZjum1MljDqUCob7XlZ6jy9gsMugHdN2hY4+Acz9Qvjz2mSsOnPSH7skBmDYCHXVZqkA==
   dependencies:
-    browser-resolve "^1.11.2"
+    browser-resolve "^1.11.3"
     chalk "^2.0.1"
-    is-builtin-module "^1.0.0"
+    realpath-native "^1.0.0"
 
-jest-runner@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-21.2.1.tgz#194732e3e518bfb3d7cbfc0fd5871246c7e1a467"
-  dependencies:
-    jest-config "^21.2.1"
-    jest-docblock "^21.2.0"
-    jest-haste-map "^21.2.0"
-    jest-jasmine2 "^21.2.1"
-    jest-message-util "^21.2.1"
-    jest-runtime "^21.2.1"
-    jest-util "^21.2.1"
-    pify "^3.0.0"
+jest-runner@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.6.0.tgz#3894bd219ffc3f3cb94dc48a4170a2e6f23a5a38"
+  integrity sha512-kw0+uj710dzSJKU6ygri851CObtCD9cN8aNkg8jWJf4ewFyEa6kwmiH/r/M1Ec5IL/6VFa0wnAk6w+gzUtjJzA==
+  dependencies:
+    exit "^0.1.2"
+    graceful-fs "^4.1.11"
+    jest-config "^23.6.0"
+    jest-docblock "^23.2.0"
+    jest-haste-map "^23.6.0"
+    jest-jasmine2 "^23.6.0"
+    jest-leak-detector "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-runtime "^23.6.0"
+    jest-util "^23.4.0"
+    jest-worker "^23.2.0"
+    source-map-support "^0.5.6"
     throat "^4.0.0"
-    worker-farm "^1.3.1"
 
-jest-runtime@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-21.2.1.tgz#99dce15309c670442eee2ebe1ff53a3cbdbbb73e"
+jest-runtime@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.6.0.tgz#059e58c8ab445917cd0e0d84ac2ba68de8f23082"
+  integrity sha512-ycnLTNPT2Gv+TRhnAYAQ0B3SryEXhhRj1kA6hBPSeZaNQkJ7GbZsxOLUkwg6YmvWGdX3BB3PYKFLDQCAE1zNOw==
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^21.2.0"
-    babel-plugin-istanbul "^4.0.0"
+    babel-plugin-istanbul "^4.1.6"
     chalk "^2.0.1"
     convert-source-map "^1.4.0"
+    exit "^0.1.2"
+    fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-config "^21.2.1"
-    jest-haste-map "^21.2.0"
-    jest-regex-util "^21.2.0"
-    jest-resolve "^21.2.0"
-    jest-util "^21.2.1"
-    json-stable-stringify "^1.0.1"
+    jest-config "^23.6.0"
+    jest-haste-map "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-regex-util "^23.3.0"
+    jest-resolve "^23.6.0"
+    jest-snapshot "^23.6.0"
+    jest-util "^23.4.0"
+    jest-validate "^23.6.0"
     micromatch "^2.3.11"
+    realpath-native "^1.0.0"
     slash "^1.0.0"
     strip-bom "3.0.0"
     write-file-atomic "^2.1.0"
-    yargs "^9.0.0"
+    yargs "^11.0.0"
+
+jest-serializer@^23.0.1:
+  version "23.0.1"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
+  integrity sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=
 
-jest-snapshot@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-21.2.1.tgz#29e49f16202416e47343e757e5eff948c07fd7b0"
+jest-snapshot@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.6.0.tgz#f9c2625d1b18acda01ec2d2b826c0ce58a5aa17a"
+  integrity sha512-tM7/Bprftun6Cvj2Awh/ikS7zV3pVwjRYU2qNYS51VZHgaAMBs5l4o/69AiDHhQrj5+LA2Lq4VIvK7zYk/bswg==
   dependencies:
+    babel-types "^6.0.0"
     chalk "^2.0.1"
-    jest-diff "^21.2.1"
-    jest-matcher-utils "^21.2.1"
+    jest-diff "^23.6.0"
+    jest-matcher-utils "^23.6.0"
+    jest-message-util "^23.4.0"
+    jest-resolve "^23.6.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^21.2.1"
+    pretty-format "^23.6.0"
+    semver "^5.5.0"
 
-jest-util@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-21.2.1.tgz#a274b2f726b0897494d694a6c3d6a61ab819bb78"
+jest-util@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.4.0.tgz#4d063cb927baf0a23831ff61bec2cbbf49793561"
+  integrity sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=
   dependencies:
     callsites "^2.0.0"
     chalk "^2.0.1"
     graceful-fs "^4.1.11"
-    jest-message-util "^21.2.1"
-    jest-mock "^21.2.0"
-    jest-validate "^21.2.1"
+    is-ci "^1.0.10"
+    jest-message-util "^23.4.0"
     mkdirp "^0.5.1"
+    slash "^1.0.0"
+    source-map "^0.6.0"
 
-jest-validate@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-21.2.1.tgz#cc0cbca653cd54937ba4f2a111796774530dd3c7"
+jest-validate@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.6.0.tgz#36761f99d1ed33fcd425b4e4c5595d62b6597474"
+  integrity sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==
   dependencies:
     chalk "^2.0.1"
-    jest-get-type "^21.2.0"
+    jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^21.2.1"
+    pretty-format "^23.6.0"
+
+jest-watcher@^23.4.0:
+  version "23.4.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.4.0.tgz#d2e28ce74f8dad6c6afc922b92cabef6ed05c91c"
+  integrity sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.1"
+    string-length "^2.0.0"
 
-jest@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-21.2.1.tgz#c964e0b47383768a1438e3ccf3c3d470327604e1"
+jest-worker@^23.2.0:
+  version "23.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.2.0.tgz#faf706a8da36fae60eb26957257fa7b5d8ea02b9"
+  integrity sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=
   dependencies:
-    jest-cli "^21.2.1"
+    merge-stream "^1.0.1"
 
-js-base64@^2.1.8, js-base64@^2.1.9:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
+jest@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.6.0.tgz#ad5835e923ebf6e19e7a1d7529a432edfee7813d"
+  integrity sha512-lWzcd+HSiqeuxyhG+EnZds6iO3Y3ZEnMrfZq/OTGvF/C+Z4fPMCdhWTGSAiO2Oym9rbEXfwddHhh6jqrTF3+Lw==
+  dependencies:
+    import-local "^1.0.0"
+    jest-cli "^23.6.0"
+
+js-base64@^2.1.9:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e"
+  integrity sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==
+
+js-levenshtein@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"
+  integrity sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==
 
 js-string-escape@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.0, js-tokens@^3.0.2:
+js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^9.12.0:
-  version "9.12.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
+jsdom@^11.5.1:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+  integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
   dependencies:
-    abab "^1.0.3"
-    acorn "^4.0.4"
-    acorn-globals "^3.1.0"
+    abab "^2.0.0"
+    acorn "^5.5.3"
+    acorn-globals "^4.1.0"
     array-equal "^1.0.0"
-    content-type-parser "^1.0.1"
     cssom ">= 0.3.2 < 0.4.0"
-    cssstyle ">= 0.2.37 < 0.3.0"
-    escodegen "^1.6.1"
-    html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
-    request "^2.79.0"
-    sax "^1.2.1"
-    symbol-tree "^3.2.1"
-    tough-cookie "^2.3.2"
-    webidl-conversions "^4.0.0"
-    whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
-    xml-name-validator "^2.0.1"
+    cssstyle "^1.0.0"
+    data-urls "^1.0.0"
+    domexception "^1.0.1"
+    escodegen "^1.9.1"
+    html-encoding-sniffer "^1.0.2"
+    left-pad "^1.3.0"
+    nwsapi "^2.0.7"
+    parse5 "4.0.0"
+    pn "^1.1.0"
+    request "^2.87.0"
+    request-promise-native "^1.0.5"
+    sax "^1.2.4"
+    symbol-tree "^3.2.2"
+    tough-cookie "^2.3.4"
+    w3c-hr-time "^1.0.1"
+    webidl-conversions "^4.0.2"
+    whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
+    whatwg-url "^6.4.1"
+    ws "^5.2.0"
+    xml-name-validator "^3.0.0"
 
 jsesc@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+  integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s=
 
 jsesc@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.1.tgz#e421a2a8e20d6b0819df28908f782526b96dd1fe"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-loader@^0.5.4:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
-
-json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+  version "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-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+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"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
 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.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=
   dependencies:
     jsonify "~0.0.0"
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
 
 json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+  integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+  dependencies:
+    minimist "^1.2.0"
 
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
   dependencies:
     assert-plus "1.0.0"
     extsprintf "1.3.0"
     json-schema "0.2.3"
     verror "1.10.0"
 
-jsx-ast-utils@^2.0.0, jsx-ast-utils@^2.0.1:
+jsx-ast-utils@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  integrity sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=
   dependencies:
     array-includes "^3.0.3"
 
 keycode@^2.1.7:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
+  integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
 
 killable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
-
-kind-of@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5"
-  dependencies:
-    is-buffer "^1.0.2"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
 
-kind-of@^3.0.2, kind-of@^3.2.2:
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-lazy-cache@^0.2.3:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+kleur@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.2.tgz#b704f4944d95e255d038f0cb05fb8a602c55a300"
+  integrity sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==
+
+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=
 
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
+left-pad@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+  integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
+
 leven@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
 
 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"
@@ -4310,6 +5575,7 @@ levn@^0.3.0, levn@~0.3.0:
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -4320,301 +5586,272 @@ load-json-file@^1.0.0:
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.1.tgz#026f12fe7c3115992896ac02ba022ba92971b979"
+  integrity sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==
 
 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.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.1:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
   dependencies:
-    big.js "^3.1.3"
+    big.js "^5.2.2"
     emojis-list "^2.0.0"
-    json5 "^0.5.0"
+    json5 "^1.0.1"
 
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
   dependencies:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash-es@^4.2.0, lodash-es@^4.2.1:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
-
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-
-lodash._bindcallback@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-
-lodash._createassigner@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
-  dependencies:
-    lodash._bindcallback "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash.restparam "^3.0.0"
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-
-lodash.assign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._createassigner "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash.assign@^4.0.1, lodash.assign@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-
-lodash.clonedeep@^4.3.2:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
-lodash.cond@^4.3.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
 
-lodash.defaults@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c"
-  dependencies:
-    lodash.assign "^3.0.0"
-    lodash.restparam "^3.0.0"
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.defaults@^4.0.0, lodash.defaults@^4.0.1:
+lodash.defaults@^4.0.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
+
+lodash.escape@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+  integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
 
 lodash.flattendeep@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+  integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+lodash.get@^4.0:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+lodash.has@^4.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"
+  integrity sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=
 
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
+lodash.isboolean@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
+  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
+
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
+lodash.isobject@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
+  integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=
 
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
-lodash.mergewith@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
-
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+  integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.7.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 loglevel@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
-
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
+    js-tokens "^3.0.0 || ^4.0.0"
 
 lru-cache@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-macaddress@^0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
 
 make-dir@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+  integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.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=
   dependencies:
     tmpl "1.0.x"
 
-map-obj@^1.0.0, map-obj@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
 
-map-stream@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
+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-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
 
 mark-loader@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/mark-loader/-/mark-loader-0.1.6.tgz#0abb477dca7421d70e20128ff6489f5cae8676d5"
+  integrity sha1-CrtHfcp0IdcOIBKP9kifXK6GdtU=
 
-marky@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.0.tgz#9617ed647bbbea8f45d19526da33dec70606df42"
-
-math-expression-evaluator@^1.2.14:
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
+marky@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.1.tgz#a3fcf82ffd357756b8b8affec9fdbf3a30dc1b02"
+  integrity sha512-md9k+Gxa3qLH6sUKpeC2CNkJK/Ld+bEz5X96nYwloqphQE0CKCVEKco/6jxEZixinqNdz5RFi/KaCyfbMDMAXQ==
 
-mathjs@^3.11.5:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-3.17.0.tgz#9569d278874546175c9d0497d7417eb88fb61503"
-  dependencies:
-    complex.js "2.0.4"
-    decimal.js "7.2.3"
-    fraction.js "4.0.2"
-    javascript-natural-sort "0.7.1"
-    seed-random "2.2.0"
-    tiny-emitter "2.0.0"
-    typed-function "0.10.6"
+math-random@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
+  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
 
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+mdn-data@~1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
+  integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
 mem@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  dependencies:
+    mimic-fn "^1.0.0"
+
+mem@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  integrity sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==
   dependencies:
+    map-age-cleaner "^0.1.1"
     mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
+
+memoize-one@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-4.1.0.tgz#a2387c58c03fff27ca390c31b764a79addf3f906"
+  integrity sha512-2GApq0yI/b22J2j9rhbrAlsHb0Qcz+7yWxeLG8h+95sl1XPUgeLimQSOdur4Vw7cUhrBHwaUZxWFZueojqNRzA==
 
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
   dependencies:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-
-meow@^3.3.0, meow@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge@^1.1.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
+merge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
   dependencies:
     arr-diff "^2.0.0"
     array-unique "^0.2.1"
@@ -4630,161 +5867,294 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
+micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
   dependencies:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.30.0 < 2":
-  version "1.32.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
-
-mime-db@~1.30.0:
-  version "1.30.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
+"mime-db@>= 1.36.0 < 2", mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
-mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.17, mime-types@~2.1.7:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a"
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
-    mime-db "~1.30.0"
+    mime-db "~1.37.0"
 
 mime@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+mime@^2.3.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
+  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
 
 mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+mini-css-extract-plugin@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
+  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@1.1.x:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"
-
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+
+minipass@^2.2.1, minipass@^2.3.4:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  dependencies:
+    minipass "^2.2.1"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
 
 mixin-object@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
+  integrity sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=
   dependencies:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+mkdirp@0.5.x, mkdirp@^0.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
 
+moo@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"
+  integrity sha512-gFD2xGCl8YFgGHsqJ9NKRVdwlioeW3mI1iqfLNYQOv0+6JRwG58Zk9DIGQgyIaffSYaO1xsKnMaYzzNr1KyIAw==
+
 mousetrap@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.1.tgz#2a085f5c751294c75e7e81f6ec2545b29cbf42d9"
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.2.tgz#caadd9cf886db0986fb2fee59a82f6bd37527587"
+  integrity sha512-jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
 
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
 
 multicast-dns@^6.0.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.1.tgz#c5035defa9219d30640558a49298067352098060"
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
   dependencies:
-    dns-packet "^1.0.1"
-    thunky "^0.1.0"
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
 
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-
-nan@^2.0.0, nan@^2.3.0, nan@^2.3.2:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
+nan@^2.9.2:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
+  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
 nearley@^2.7.10:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.11.0.tgz#5e626c79a6cd2f6ab9e7e5d5805e7668967757ae"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.16.0.tgz#77c297d041941d268290ec84b739d0ee297e83a7"
+  integrity sha512-Tr9XD3Vt/EujXbZBv6UAHYoLUSMQAxSsTnm9K3koXzjzNWY195NqALeyrzLZBKzAkL3gl92BcSogqrHjD8QuUg==
   dependencies:
-    nomnom "~1.6.2"
+    commander "^2.19.0"
+    moo "^0.4.3"
     railroad-diagrams "^1.0.0"
-    randexp "^0.4.2"
+    randexp "0.4.6"
+    semver "^5.4.1"
+
+needle@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
 
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+
+neo-async@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+
+next-tick@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
   dependencies:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-forge@0.6.33:
-  version "0.6.33"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
-
-node-gyp@^3.3.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
-  dependencies:
-    fstream "^1.0.0"
-    glob "^7.0.3"
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.0"
-    nopt "2 || 3"
-    npmlog "0 || 1 || 2 || 3 || 4"
-    osenv "0"
-    request "2"
-    rimraf "2"
-    semver "~5.3.0"
-    tar "^2.0.0"
-    which "1"
+node-forge@0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
 node-libs-browser@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+  integrity sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==
   dependencies:
     assert "^1.1.1"
     browserify-zlib "^0.2.0"
@@ -4810,229 +6180,251 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-notifier@^5.0.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"
+node-notifier@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.3.0.tgz#c77a4a7b84038733d5fb351aafd8a268bfe19a01"
+  integrity sha512-AhENzCSGZnZJgBARsUjnQ7DnZbzyP+HxlVXuD0xqAnvL8q+OqtSX7lGg9e8nHzwXkMMXNdVeqq4E2M3EUAqX6Q==
   dependencies:
     growly "^1.3.0"
-    semver "^5.3.0"
-    shellwords "^0.1.0"
-    which "^1.2.12"
+    semver "^5.5.0"
+    shellwords "^0.1.1"
+    which "^1.3.0"
 
-node-pre-gyp@^0.6.39, node-pre-gyp@^0.6.4:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
   dependencies:
     detect-libc "^1.0.2"
-    hawk "3.1.3"
     mkdirp "^0.5.1"
+    needle "^2.2.1"
     nopt "^4.0.1"
+    npm-packlist "^1.1.6"
     npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "2.81.0"
+    rc "^1.2.7"
     rimraf "^2.6.1"
     semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-node-sass@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
-  dependencies:
-    async-foreach "^0.1.3"
-    chalk "^1.1.1"
-    cross-spawn "^3.0.0"
-    gaze "^1.0.0"
-    get-stdin "^4.0.1"
-    glob "^7.0.3"
-    in-publish "^2.0.0"
-    lodash.assign "^4.2.0"
-    lodash.clonedeep "^4.3.2"
-    lodash.mergewith "^4.6.0"
-    meow "^3.7.0"
-    mkdirp "^0.5.1"
-    nan "^2.3.2"
-    node-gyp "^3.3.1"
-    npmlog "^4.0.0"
-    request "~2.79.0"
-    sass-graph "^2.2.4"
-    stdout-stream "^1.4.0"
-    "true-case-path" "^1.0.2"
-
-node-zopfli@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-zopfli/-/node-zopfli-2.0.2.tgz#a7a473ae92aaea85d4c68d45bbf2c944c46116b8"
-  dependencies:
-    commander "^2.8.1"
-    defaults "^1.0.2"
-    nan "^2.0.0"
-    node-pre-gyp "^0.6.4"
-
-nomnom@~1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
-  dependencies:
-    colors "0.5.x"
-    underscore "~1.4.4"
+    tar "^4"
 
-"nopt@2 || 3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+node-releases@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.3.tgz#aad9ce0dcb98129c753f772c0aa01360fb90fbd2"
+  integrity sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==
   dependencies:
-    abbrev "1"
+    semver "^5.3.0"
 
 nopt@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
   dependencies:
     abbrev "1"
     osenv "^0.1.4"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1:
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
+normalize-url@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-run-all@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.2.tgz#90d62d078792d20669139e718621186656cea056"
+npm-bundled@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
+  integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
+
+npm-packlist@^1.1.6:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
-    ansi-styles "^3.2.0"
-    chalk "^2.1.0"
-    cross-spawn "^5.1.0"
-    memorystream "^0.3.1"
-    minimatch "^3.0.4"
-    ps-tree "^1.1.0"
-    read-pkg "^3.0.0"
-    shell-quote "^1.6.1"
-    string.prototype.padend "^3.0.0"
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+npmlog@^4.0.2, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+nth-check@^1.0.2, nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
 num2fraction@^1.2.2:
   version "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=
 
-"nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
+nwsapi@^2.0.7:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz#77ac0cdfdcad52b6a1151a84e73254edc33ed016"
+  integrity sha512-nlWFSCTYQcHk/6A9FFnfhKc14c3aFhfdNBXgo8Qgi9QTBu/qg3Ww+Uiz9wMzXd1T8GFxPc2QIHB6Qtf2XFryFQ==
 
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
 object-assign@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+  integrity sha1-ejs9DpgGPUP0wD8uiubNUahog6A=
 
 object-assign@^4.0.1, object-assign@^4.1.0, 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=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
 
 object-fit-images@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.3.tgz#4089f6d0070a3b5563d3c1ab6f1b28d61331f0ac"
+  version "3.2.4"
+  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.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
 
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
+  integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=
 
-object-keys@^1.0.10, object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+object-keys@^1.0.11, object-keys@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
+  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
-object-path@^0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
 
-object.assign@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
   dependencies:
     define-properties "^1.1.2"
-    function-bind "^1.1.0"
-    object-keys "^1.0.10"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
 
 object.entries@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
+  integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.12.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
+object.fromentries@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab"
+  integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==
   dependencies:
     define-properties "^1.1.2"
-    es-abstract "^1.6.1"
-    function-bind "^1.1.0"
+    es-abstract "^1.11.0"
+    function-bind "^1.1.1"
     has "^1.0.1"
 
+object.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
   dependencies:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
 object.values@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
+  integrity sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.6.1"
     function-bind "^1.1.0"
     has "^1.0.1"
 
-obuf@^1.0.0, obuf@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
+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@^4.8.3:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.4.tgz#1084c59f6606bded5ee5a6bf6208e2b9f5bdd339"
+offline-plugin@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-5.0.6.tgz#7a7b244220cddb8a8cabecb172ec5c0be03e74b2"
+  integrity sha512-qvcDmeI30xmvSlmqjopAj7QCuM1MEzvmDyuMTN2saDReSay5nUqCpKysexH1KUNXv5H/TfmHd+rngNPkRFj3YA==
   dependencies:
-    deep-extend "^0.4.0"
+    deep-extend "^0.5.1"
     ejs "^2.3.4"
     loader-utils "0.2.x"
     minimatch "^3.0.3"
@@ -5041,38 +6433,45 @@ offline-plugin@^4.8.3:
 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=
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+  integrity sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=
 
-once@^1.3.0, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
   dependencies:
     mimic-fn "^1.0.0"
 
-opener@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
+opener@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
+  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
 
 opn@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.1.0.tgz#72ce2306a17dbea58ff1041853352b4a8fc77519"
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
+  integrity sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==
   dependencies:
     is-wsl "^1.1.0"
 
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -5080,6 +6479,7 @@ optimist@^0.6.1:
 optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
   dependencies:
     deep-is "~0.1.3"
     fast-levenshtein "~2.0.4"
@@ -5088,78 +6488,135 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-original@>=0.0.5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b"
+original@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
   dependencies:
-    url-parse "1.0.x"
+    url-parse "^1.4.3"
 
 os-browserify@^0.3.0:
   version "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, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
-  dependencies:
-    lcid "^1.0.0"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
   dependencies:
     execa "^0.7.0"
     lcid "^1.0.0"
     mem "^1.1.0"
 
+os-locale@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0, osenv@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-cancelable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^1.1.0:
+p-is-promise@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+
+p-limit@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+  dependencies:
+    p-try "^1.0.0"
+
+p-limit@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.1.0.tgz#1d5a0d20fb12707c758a655f6bbc4386b5930d68"
+  integrity sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==
+  dependencies:
+    p-try "^2.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
 packet-reader@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27"
+  integrity sha1-zWLmCvjX/qinBexP+ZCHHEaHHyc=
 
 pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27"
+  integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
 
 parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -5170,6 +6627,7 @@ parse-asn1@^5.0.0:
 parse-css-font@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz#7b60b060705a25a9b90b7f0ed493e5823248a652"
+  integrity sha1-e2CwYHBaJam5C38O1JPlgjJIplI=
   dependencies:
     css-font-size-keywords "^1.0.0"
     css-font-stretch-keywords "^1.0.1"
@@ -5184,6 +6642,7 @@ parse-css-font@^2.0.2:
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
   dependencies:
     glob-base "^0.3.0"
     is-dotfile "^1.0.0"
@@ -5193,83 +6652,103 @@ parse-glob@^3.0.4:
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
-parse-json@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-3.0.0.tgz#fa6f47b18e23826ead32f263e744d0e1e847fb13"
-  dependencies:
-    error-ex "^1.3.1"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
 
 parse5@^3.0.1:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
+  integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
   dependencies:
     "@types/node" "*"
 
 parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
-path-complete-extname@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-0.1.0.tgz#c454702669f31452f8193aa6168915fa31692f4a"
+path-complete-extname@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-complete-extname/-/path-complete-extname-1.0.0.tgz#f889985dc91000c815515c0bfed06c5acda0752b"
+  integrity sha512-CVjiWcMRdGU8ubs08YQVzhutOR5DEfO97ipRIlOGMK5Bek5nQySknBpuxVAVJ36hseTNs+vdIcv57ZrWxH7zvg==
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
 path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   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:
   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=
 
-path-key@^2.0.0:
+path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+path-parse@^1.0.5, path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
 path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+  integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
   dependencies:
     isarray "0.0.1"
 
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
     pify "^2.0.0"
@@ -5278,24 +6757,14 @@ path-type@^1.0.0:
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
   dependencies:
     pify "^2.0.0"
 
-path-type@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  dependencies:
-    pify "^3.0.0"
-
-pause-stream@0.0.11:
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  dependencies:
-    through "~2.3"
-
 pbkdf2@^3.0.3:
-  version "3.0.14"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade"
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -5306,22 +6775,27 @@ pbkdf2@^3.0.3:
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+  integrity sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=
 
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
 pg-connection-string@0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
+  integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
 
 pg-int8@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
+  integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
 pg-pool@1.*:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz#f7ec73824c37a03f076f51bfdf70e340147c4f37"
+  integrity sha1-9+xzgkw3oD8Hb1G/33DjQBR8Tzc=
   dependencies:
     generic-pool "2.4.3"
     object-assign "4.1.0"
@@ -5329,6 +6803,7 @@ pg-pool@1.*:
 pg-types@1.*:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz#75f490b8a8abf75f1386ef5ec4455ecf6b345c63"
+  integrity sha512-lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ==
   dependencies:
     pg-int8 "1.0.1"
     postgres-array "~1.0.0"
@@ -5339,6 +6814,7 @@ pg-types@1.*:
 pg@^6.4.0:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz#c364011060eac7a507a2ae063eb857ece910e27f"
+  integrity sha1-w2QBEGDqx6UHoq4GPrhX7OkQ4n8=
   dependencies:
     buffer-writer "1.0.1"
     js-string-escape "1.0.1"
@@ -5352,722 +6828,677 @@ pg@^6.4.0:
 pgpass@1.*:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
+  integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=
   dependencies:
     split "^1.0.0"
 
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  integrity sha1-ektQio1bstYp1EcFb/TpyTFM89Q=
   dependencies:
     find-up "^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"
 
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
 
-portfinder@^1.0.9:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-postcss-advanced-variables@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-advanced-variables/-/postcss-advanced-variables-1.2.2.tgz#90a6213262e66a050a368b4a9c5d4778d72dbd74"
-  dependencies:
-    postcss "^5.0.10"
-
-postcss-atroot@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-atroot/-/postcss-atroot-0.1.3.tgz#6752c0230c745140549345b2b0e30ebeda01a405"
-  dependencies:
-    postcss "^5.0.5"
-
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
-
-postcss-color-function@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-4.0.1.tgz#402b3f2cebc3f6947e618fb6be3654fbecef6444"
-  dependencies:
-    css-color-function "~1.3.3"
-    postcss "^6.0.1"
-    postcss-message-helpers "^2.0.0"
-    postcss-value-parser "^3.3.0"
-
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
-
-postcss-custom-media@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz#be532784110ecb295044fb5395a18006eb21a737"
-  dependencies:
-    postcss "^6.0.1"
-
-postcss-custom-properties@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.2.0.tgz#5d929a7f06e9b84e0f11334194c0ba9a30acfbe9"
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^6.0.13"
-
-postcss-custom-selectors@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz#781382f94c52e727ef5ca4776ea2adf49a611382"
-  dependencies:
-    postcss "^6.0.1"
-    postcss-selector-matches "^3.0.0"
-
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  dependencies:
-    postcss "^5.0.4"
+pn@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+  integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
 
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+portfinder@^1.0.9:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
   dependencies:
-    postcss "^5.0.14"
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
 
-postcss-discard-overridden@^0.1.1:
+posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  dependencies:
-    postcss "^5.0.16"
-
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-extend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-extend/-/postcss-extend-1.0.5.tgz#5ea98bf787ba3cacf4df4609743f80a833b1d0e7"
+postcss-calc@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
+  integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
   dependencies:
-    postcss "^5.0.4"
+    css-unit-converter "^1.1.1"
+    postcss "^7.0.5"
+    postcss-selector-parser "^5.0.0-rc.4"
+    postcss-value-parser "^3.3.1"
 
-postcss-filter-plugins@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+postcss-colormin@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.2.tgz#93cd1fa11280008696887db1a528048b18e7ed99"
+  integrity sha512-1QJc2coIehnVFsz0otges8kQLsryi4lo19WD+U5xCWvXd0uw/Z+KKYnbiNDCnO9GP+PvErPHCG0jNvWTngk9Rw==
   dependencies:
-    postcss "^5.0.4"
-    uniqid "^4.0.0"
+    browserslist "^4.0.0"
+    color "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-import@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe"
+postcss-convert-values@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
+  integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==
   dependencies:
-    object-assign "^4.0.1"
-    postcss "^6.0.1"
-    postcss-value-parser "^3.2.3"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-js@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.1.tgz#ffaf29226e399ea74b5dce02cab1729d7addbc7b"
+postcss-discard-comments@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.1.tgz#30697735b0c476852a7a11050eb84387a67ef55d"
+  integrity sha512-Ay+rZu1Sz6g8IdzRjUgG2NafSNpp2MSMOQUb+9kkzzzP+kh07fP0yNbhtFejURnyVXSX3FYy2nVNW1QTnNjgBQ==
   dependencies:
-    camelcase-css "^1.0.1"
-    postcss "^6.0.11"
+    postcss "^7.0.0"
 
-postcss-load-config@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+postcss-discard-duplicates@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
+  integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==
   dependencies:
-    cosmiconfig "^2.1.0"
-    object-assign "^4.1.0"
-    postcss-load-options "^1.2.0"
-    postcss-load-plugins "^2.3.0"
+    postcss "^7.0.0"
 
-postcss-load-options@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
+postcss-discard-empty@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
+  integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==
   dependencies:
-    cosmiconfig "^2.1.0"
-    object-assign "^4.1.0"
+    postcss "^7.0.0"
 
-postcss-load-plugins@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
+postcss-discard-overridden@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
+  integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==
   dependencies:
-    cosmiconfig "^2.1.1"
-    object-assign "^4.1.0"
+    postcss "^7.0.0"
 
-postcss-loader@^2.0.9:
-  version "2.0.9"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.9.tgz#001fdf7bfeeb159405ee61d1bb8e59b528dbd309"
+postcss-load-config@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
+  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
   dependencies:
-    loader-utils "^1.1.0"
-    postcss "^6.0.0"
-    postcss-load-config "^1.2.0"
-    schema-utils "^0.3.0"
+    cosmiconfig "^4.0.0"
+    import-cwd "^2.0.0"
 
-postcss-media-minmax@^3.0.0:
+postcss-loader@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz#675256037a43ef40bc4f0760bfd06d4dc69d48d2"
-  dependencies:
-    postcss "^6.0.1"
-
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
+  integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
   dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
+    loader-utils "^1.1.0"
+    postcss "^7.0.0"
+    postcss-load-config "^2.0.0"
+    schema-utils "^1.0.0"
 
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+postcss-merge-longhand@^4.0.10:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.10.tgz#c4d63ab57bdc054ab4067ab075d488c8c2978380"
+  integrity sha512-hME10s6CSjm9nlVIcO1ukR7Jr5RisTaaC1y83jWCivpuBtPohA3pZE7cGTIVSYjXvLnXozHTiVOkG4dnnl756g==
   dependencies:
-    postcss "^5.0.4"
+    css-color-names "0.0.4"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    stylehacks "^4.0.0"
 
-postcss-merge-rules@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
+postcss-merge-rules@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.2.tgz#2be44401bf19856f27f32b8b12c0df5af1b88e74"
+  integrity sha512-UiuXwCCJtQy9tAIxsnurfF0mrNHKc4NnNx6NxqmzNNjXpQwLSukUxELHTRF0Rg1pAmcoKLih8PwvZbiordchag==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    cssnano-util-same-parent "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
     vendors "^1.0.0"
 
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+postcss-minify-font-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
+  integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==
   dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+postcss-minify-gradients@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.1.tgz#6da95c6e92a809f956bb76bf0c04494953e1a7dd"
+  integrity sha512-pySEW3E6Ly5mHm18rekbWiAjVi/Wj8KKt2vwSfVFAWdW6wOIekgqxKxLU7vJfb107o3FDNPkaYFCxGAJBFyogA==
   dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
+    cssnano-util-get-arguments "^4.0.0"
+    is-color-stop "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
+postcss-minify-params@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.1.tgz#5b2e2d0264dd645ef5d68f8fec0d4c38c1cf93d2"
+  integrity sha512-h4W0FEMEzBLxpxIVelRtMheskOKKp52ND6rJv+nBS33G1twu2tCyurYj/YtgU76+UDCvWeNs0hs8HFAWE2OUFg==
+  dependencies:
+    alphanum-sort "^1.0.0"
+    browserslist "^4.0.0"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
     uniqs "^2.0.0"
 
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
-
-postcss-mixins@^6.0.1:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-6.2.0.tgz#fa9d2c2166b2ae7745956c727ab9dd2de4b96a40"
+postcss-minify-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.1.tgz#a891c197977cc37abf60b3ea06b84248b1c1e9cd"
+  integrity sha512-8+plQkomve3G+CodLCgbhAKrb5lekAnLYuL1d7Nz+/7RANpBEVdgBkPNwljfSKvZ9xkkZTZITd04KP+zeJTJqg==
   dependencies:
-    globby "^6.1.0"
-    postcss "^6.0.13"
-    postcss-js "^1.0.1"
-    postcss-simple-vars "^4.1.0"
-    sugarss "^1.0.0"
+    alphanum-sort "^1.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
 
-postcss-modules-extract-imports@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
+postcss-modules-local-by-default@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.3.tgz#6a199d596ec3ef57b8f5ced96d786b8cb16a7dec"
+  integrity sha512-jv4CQ8IQ0+TkaAIP7H4kgu/jQbrjte8xU61SYJAIOby+o3H0MGWX6eN1WXUKHccK6/EEjcAERjyIP8MXzAWAbQ==
   dependencies:
     css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-value-parser "^3.3.1"
 
-postcss-modules-scope@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
+postcss-modules-scope@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.0.1.tgz#2c0f2394cde4cd09147db054c68917e38f6d43a4"
+  integrity sha512-7+6k9c3/AuZ5c596LJx9n923A/j3nF3ormewYBF1RrIQvjvjXe1xE8V8A1KFyFwXbvnshT6FBZFX0k/F1igneg==
   dependencies:
     css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
-postcss-modules-values@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
+postcss-modules-values@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+  integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
   dependencies:
     icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
-
-postcss-nested@^2.0.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.1.2.tgz#04057281f9631fef684857fb0119bae04ede03c6"
-  dependencies:
-    postcss "^6.0.9"
-    postcss-selector-parser "^2.2.3"
-
-postcss-nesting@^4.0.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.2.1.tgz#0483bce338b3f0828ced90ff530b29b98b00300d"
-  dependencies:
-    postcss "^6.0.11"
+    postcss "^7.0.6"
 
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+postcss-normalize-charset@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
+  integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==
   dependencies:
-    postcss "^5.0.5"
+    postcss "^7.0.0"
 
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+postcss-normalize-display-values@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.1.tgz#d9a83d47c716e8a980f22f632c8b0458cfb48a4c"
+  integrity sha512-R5mC4vaDdvsrku96yXP7zak+O3Mm9Y8IslUobk7IMP+u/g+lXvcN4jngmHY5zeJnrQvE13dfAg5ViU05ZFDwdg==
   dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-object-fit-images@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz#8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"
+postcss-normalize-positions@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.1.tgz#ee2d4b67818c961964c6be09d179894b94fd6ba1"
+  integrity sha512-GNoOaLRBM0gvH+ZRb2vKCIujzz4aclli64MBwDuYGU2EY53LwiP7MxOZGE46UGtotrSnmarPPZ69l2S/uxdaWA==
   dependencies:
-    parse-css-font "^2.0.2"
-    postcss "^5.0.16"
-    quote "^0.4.0"
+    cssnano-util-get-arguments "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+postcss-normalize-repeat-style@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.1.tgz#5293f234b94d7669a9f805495d35b82a581c50e5"
+  integrity sha512-fFHPGIjBUyUiswY2rd9rsFcC0t3oRta4wxE1h3lpwfQZwFeFjXFSiDtdJ7APCmHQOnUZnqYBADNRPKPwFAONgA==
   dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
+    cssnano-util-get-arguments "^4.0.0"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-partial-import@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-partial-import/-/postcss-partial-import-4.1.0.tgz#f6c3e78e7bbeda4d9dab96d360367b90b353f9a4"
+postcss-normalize-string@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.1.tgz#23c5030c2cc24175f66c914fa5199e2e3c10fef3"
+  integrity sha512-IJoexFTkAvAq5UZVxWXAGE0yLoNN/012v7TQh5nDo6imZJl2Fwgbhy3J2qnIoaDBrtUP0H7JrXlX1jjn2YcvCQ==
   dependencies:
-    glob "^7.1.1"
-    postcss-import "^10.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-property-lookup@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-property-lookup/-/postcss-property-lookup-1.2.1.tgz#30450a1361b7aae758bbedd5201fbe057bb8270b"
+postcss-normalize-timing-functions@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.1.tgz#8be83e0b9cb3ff2d1abddee032a49108f05f95d7"
+  integrity sha512-1nOtk7ze36+63ONWD8RCaRDYsnzorrj+Q6fxkQV+mlY5+471Qx9kspqv0O/qQNMeApg8KNrRf496zHwJ3tBZ7w==
   dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    tcomb "^2.5.1"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+postcss-normalize-unicode@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
+  integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==
   dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+postcss-normalize-url@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
+  integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==
   dependencies:
-    postcss "^5.0.4"
+    is-absolute-url "^2.0.0"
+    normalize-url "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+postcss-normalize-whitespace@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.1.tgz#d14cb639b61238418ac8bc8d3b7bdd65fc86575e"
+  integrity sha512-U8MBODMB2L+nStzOk6VvWWjZgi5kQNShCyjRhMT3s+W9Jw93yIjOnrEkKYD3Ul7ChWbEcjDWmXq0qOL9MIAnAw==
   dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-sass@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.1.0.tgz#0d2a655b5d241ec8f419bb3da38de5ca11746ddb"
+postcss-object-fit-images@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz#8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"
+  integrity sha1-i3cwQ9sUZy72zW8ssfDYsmqfVzs=
   dependencies:
-    gonzales-pe "^4.0.3"
-    mathjs "^3.11.5"
-    postcss "^5.2.6"
+    parse-css-font "^2.0.2"
+    postcss "^5.0.16"
+    quote "^0.4.0"
 
-postcss-scss@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94"
+postcss-ordered-values@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.1.tgz#2e3b432ef3e489b18333aeca1f1295eb89be9fc2"
+  integrity sha512-PeJiLgJWPzkVF8JuKSBcylaU+hDJ/TX3zqAMIjlghgn1JBi6QwQaDZoDIlqWRcCAI8SxKrt3FCPSRmOgKRB97Q==
   dependencies:
-    postcss "^6.0.3"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-selector-matches@^3.0.0, postcss-selector-matches@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz#e5634011e13950881861bbdd58c2d0111ffc96ab"
+postcss-reduce-initial@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.2.tgz#bac8e325d67510ee01fa460676dc8ea9e3b40f15"
+  integrity sha512-epUiC39NonKUKG+P3eAOKKZtm5OtAtQJL7Ye0CBN1f+UQTHzqotudp+hki7zxXm7tT0ZAKDMBj1uihpPjP25ug==
   dependencies:
-    balanced-match "^0.4.2"
-    postcss "^6.0.1"
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
 
-postcss-selector-not@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz#2e4db2f0965336c01e7cec7db6c60dff767335d9"
+postcss-reduce-transforms@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.1.tgz#8600d5553bdd3ad640f43bff81eb52f8760d4561"
+  integrity sha512-sZVr3QlGs0pjh6JAIe6DzWvBaqYw05V1t3d9Tp+VnFRT5j+rsqoWsysh/iSD7YNsULjq9IAylCznIwVd5oU/zA==
   dependencies:
-    balanced-match "^0.4.2"
-    postcss "^6.0.1"
+    cssnano-util-get-match "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2, postcss-selector-parser@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+postcss-selector-parser@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
+  integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
   dependencies:
-    flatten "^1.0.2"
+    dot-prop "^4.1.1"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-simple-vars@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.1.0.tgz#043248cfef8d3f51b3486a28c09f8375dbf1b2f9"
-  dependencies:
-    postcss "^6.0.9"
-
-postcss-smart-import@^0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/postcss-smart-import/-/postcss-smart-import-0.7.5.tgz#df9a9c6dd60d916e5e0670d1c57d03af5d3dcc31"
+postcss-selector-parser@^5.0.0-rc.4:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
+  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
   dependencies:
-    babel-runtime "^6.23.0"
-    lodash "^4.17.4"
-    object-assign "^4.1.1"
-    postcss "^6.0.6"
-    postcss-sass "^0.1.0"
-    postcss-scss "^1.0.2"
-    postcss-value-parser "^3.3.0"
-    promise-each "^2.2.0"
-    read-cache "^1.0.0"
-    resolve "^1.3.3"
-    sugarss "^1.0.0"
+    cssesc "^2.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
 
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+postcss-svgo@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.1.tgz#5628cdb38f015de6b588ce6d0bf0724b492b581d"
+  integrity sha512-YD5uIk5NDRySy0hcI+ZJHwqemv2WiqqzDgtvgMzO8EGSkK5aONyX8HMVFRFJSdO8wUWTuisUFn/d7yRRbBr5Qw==
   dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
+    is-svg "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    svgo "^1.0.0"
 
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+postcss-unique-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
+  integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==
   dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
+    alphanum-sort "^1.0.0"
+    postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.6:
+postcss@^5.0.16:
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.3, postcss@^6.0.6, postcss@^6.0.9:
-  version "6.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.14.tgz#5534c72114739e75d0afcf017db853099f562885"
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
+  integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
   dependencies:
-    chalk "^2.3.0"
+    chalk "^2.4.1"
     source-map "^0.6.1"
-    supports-color "^4.4.0"
+    supports-color "^5.5.0"
 
 postgres-array@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.2.tgz#8e0b32eb03bf77a5c0a7851e0441c169a256a238"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5"
+  integrity sha512-5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ==
 
 postgres-bytea@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
+  integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
 
 postgres-date@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.3.tgz#e2d89702efdb258ff9d9cee0fe91bd06975257a8"
+  integrity sha1-4tiXAu/bJY/52c7g/pG9BpdSV6g=
 
 postgres-interval@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.1.tgz#acdb0f897b4b1c6e496d9d4e0a853e1c428f06f0"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9"
+  integrity sha512-fC3xNHeTskCxL1dC8KOtxXt7YeFmlbTYtn7ul8MkVERuTmf7pI4DrkAxcw3kh1fQ9uz4wQmd03a1mRiXUZChfQ==
   dependencies:
     xtend "^4.0.0"
 
 precond@0.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
-
-precss@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71"
-  dependencies:
-    postcss "^6.0.3"
-    postcss-advanced-variables "1.2.2"
-    postcss-atroot "^0.1.3"
-    postcss-color-function "^4.0.0"
-    postcss-custom-media "^6.0.0"
-    postcss-custom-properties "^6.1.0"
-    postcss-custom-selectors "^4.0.1"
-    postcss-extend "^1.0.5"
-    postcss-media-minmax "^3.0.0"
-    postcss-mixins "^6.0.1"
-    postcss-nested "^2.0.2"
-    postcss-nesting "^4.0.1"
-    postcss-partial-import "^4.1.0"
-    postcss-property-lookup "^1.2.1"
-    postcss-selector-matches "^3.0.1"
-    postcss-selector-not "^3.0.1"
+  integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw=
 
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-prepend-http@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
+  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
 
 preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-pretty-format@^21.2.1:
-  version "21.2.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-21.2.1.tgz#ae5407f3cf21066cd011aa1ba5fce7b6a2eddb36"
+pretty-format@^23.6.0:
+  version "23.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"
+  integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw==
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
 
-private@^0.1.6, private@^0.1.7:
+private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
 
 process@^0.11.10:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
 progress@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz#8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-promise-each@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/promise-each/-/promise-each-2.2.0.tgz#3353174eff2694481037e04e01f77aa0fb6d1b60"
-  dependencies:
-    any-promise "^0.1.0"
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
   dependencies:
     asap "~2.0.3"
 
+prompts@^0.1.9:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-0.1.14.tgz#a8e15c612c5c9ec8f8111847df3337c9cbd443b2"
+  integrity sha512-rxkyiE9YH6zAz/rZpywySLKkpaj0NMVyNw1qhsubdbjjSgcayjTShDreZGlFMcGSu5sab3bAKPfFk78PB90+8w==
+  dependencies:
+    kleur "^2.0.1"
+    sisteransi "^0.1.1"
+
 prop-types-extra@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.0.1.tgz#a57bd4810e82d27a3ff4317ecc1b4ad005f79a82"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.0.tgz#32609910ea2dcf190366bacd3490d5a6412a605f"
+  integrity sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==
   dependencies:
+    react-is "^16.3.2"
     warning "^3.0.0"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+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:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
   dependencies:
-    fbjs "^0.8.16"
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-proxy-addr@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+proxy-addr@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.5.2"
+    ipaddr.js "1.8.0"
 
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-
-ps-tree@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014"
-  dependencies:
-    event-stream "~3.3.0"
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
 
 pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.24, psl@^1.1.28:
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
 
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
 
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
 
-punycode@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
+punycode@^2.1.0, punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+  integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.5.1, qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-qs@~6.3.0:
-  version "6.3.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
+qs@6.5.2, qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
 
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-querystringify@0.0.x:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c"
-
-querystringify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
+querystringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz#7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"
+  integrity sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==
 
 quote@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
+  integrity sha1-EIOSF/bBNiuJGUBE0psjP9fzLwE=
 
-raf@^3.1.0, raf@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
+raf@^3.1.0, raf@^3.4.0, raf@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
   dependencies:
     performance-now "^2.1.0"
 
 railroad-diagrams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
+  integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234=
 
-rails-ujs@^5.1.2:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.1.4.tgz#e2e9f7bcbfe51ee69c5f72f4beb0d88ab81a638e"
+rails-ujs@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.2.2.tgz#ab01dd087a323975637b50e93e7afcc0f9068568"
+  integrity sha512-tJl7MdysGrQEKmwF7BJkz5XwUOkdnI9E7SvSbT39yO7pdFc96D4hWKm6Sb15pU4n5mt4rLPb/6kkyTQujP1k7Q==
 
-randexp@^0.4.2:
+randexp@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
+  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
   dependencies:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+randomatic@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed"
+  integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==
   dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
+    is-number "^4.0.0"
+    kind-of "^6.0.0"
+    math-random "^1.0.1"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+  integrity sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==
   dependencies:
     safe-buffer "^5.1.0"
 
 randomfill@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
   dependencies:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
@@ -6075,95 +7506,144 @@ randomfill@^1.0.3:
 range-parser@^1.0.3, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+raw-body@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
   dependencies:
     bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
+    http-errors "1.6.3"
+    iconv-lite "0.4.23"
     unpipe "1.0.0"
 
-rc@^1.1.7:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
-    deep-extend "~0.4.0"
+    deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^16.3.0:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
+react-dom@^16.7.0:
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.7.0.tgz#a17b2a7ca89ee7390bc1ed5eb81783c7461748b8"
+  integrity sha512-D0Ufv1ExCAmF38P2Uh1lwpminZFRXEINJe53zRAbm4KPwSyd6DY/uDoS0Blj9jvPpn1+wivKpZYc8aAAN/nAkg==
   dependencies:
-    fbjs "^0.8.16"
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    prop-types "^15.6.0"
+    prop-types "^15.6.2"
+    scheduler "^0.12.0"
 
-react-event-listener@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.5.1.tgz#ba36076e47bc37c5a67ff5ccd4a9ff0f15621040"
+react-event-listener@^0.6.0:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.6.5.tgz#d374dbe5da485c9f9d4702f0e76971afbe9b6b2e"
+  integrity sha512-//lCxOM3DQ0+xmTa/u9mI9mm55zCPdIKp89d8MGjlNsOOnXQ5sFDD1eed+sMBzQXKiRBLBMtSg/2T9RJFtfovw==
   dependencies:
-    babel-runtime "^6.26.0"
-    fbjs "^0.8.16"
+    "@babel/runtime" "7.2.0"
     prop-types "^15.6.0"
-    warning "^3.0.0"
+    warning "^4.0.1"
 
-react-hotkeys@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-0.10.0.tgz#d1e78bd63f16d6db58d550d33c8eb071f35d94fb"
+react-hotkeys@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-hotkeys/-/react-hotkeys-1.1.4.tgz#a0712aa2e0c03a759fd7885808598497a4dace72"
+  integrity sha1-oHEqouDAOnWf14hYCFmEl6TaznI=
   dependencies:
-    create-react-class "^15.5.2"
-    lodash "^4.13.1"
+    lodash.isboolean "^3.0.3"
+    lodash.isequal "^4.5.0"
+    lodash.isobject "^3.0.2"
     mousetrap "^1.5.2"
-    prop-types "^15.5.8"
+    prop-types "^15.6.0"
 
 react-immutable-proptypes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
+  integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ=
 
 react-immutable-pure-component@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-1.1.1.tgz#0ff69c6d4eaecd886db16805f3bbc1d2a2c654d8"
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-1.2.3.tgz#fa33638df68cfe9f73ccbee1d5861c17f3053f86"
+  integrity sha512-kNy2A/fDrSuR8TKwB+4ynmItmp1vgF87tWxxfmadwDYo2J3ANipHqTjDIBvJvJ7libvuh76jIbvmK0krjtKH1g==
+  optionalDependencies:
+    "@types/react" "16.4.6"
 
-react-intl-translations-manager@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/react-intl-translations-manager/-/react-intl-translations-manager-5.0.1.tgz#f0ef1a9368abcac3b10b2e8b6027887dced5474e"
+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:
-    chalk "^2.1.0"
+    prop-types "^15.5.8"
+
+react-input-autosize@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
+  integrity sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==
+  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"
+  integrity sha512-EfBeugnOGFcdUbQyY9TqBMbuauQ8wm73ZqFr0UqCljhbXl7YDHQcVzclWFRkVmlUffzxitLQFhAZEVVeRNQSwA==
+  dependencies:
+    chalk "^2.3.2"
     glob "^7.1.2"
     json-stable-stringify "^1.0.1"
     mkdirp "^0.5.1"
 
-react-intl@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.4.0.tgz#66c14dc9df9a73b2fbbfbd6021726e80a613eb15"
+react-intl@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.7.2.tgz#efe97e3fc0e99b4e88a6e6150854d3d1852a4381"
+  integrity sha512-3dcNGLqEw2FKkX+1L2WYLgjP0MVJkvWuVd1uLcnwifIQe8JQvnd9Bss4hb4Gvg/YhBIRcs4LM6C2bAgyklucjw==
   dependencies:
+    hoist-non-react-statics "^2.5.5"
     intl-format-cache "^2.0.5"
     intl-messageformat "^2.1.0"
-    intl-relativeformat "^2.0.0"
+    intl-relativeformat "^2.1.0"
     invariant "^2.1.1"
 
+react-is@^16.3.2, react-is@^16.6.1, react-is@^16.6.3, react-is@^16.7.0:
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.7.0.tgz#c1bd21c64f1f1364c6f70695ec02d69392f41bfa"
+  integrity sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==
+
+react-lifecycles-compat@^3.0.2, 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"
+  integrity sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==
   dependencies:
     performance-now "^0.2.0"
     prop-types "^15.5.8"
     raf "^3.1.0"
 
-react-notification@^6.8.2:
-  version "6.8.2"
-  resolved "https://registry.yarnpkg.com/react-notification/-/react-notification-6.8.2.tgz#5d9910cc2993bd51a234d3809e94a98dc490cfb0"
+react-notification@^6.8.4:
+  version "6.8.4"
+  resolved "https://registry.yarnpkg.com/react-notification/-/react-notification-6.8.4.tgz#c189d23f47b0e1b240932f4cfab2f4082cd420bf"
+  integrity sha512-El4aaIYeXNpL2M96t4+qg3ODgvAhvpORRCXhseukYlR0X8Efiak9ixGmxgm/Bm5Z43kRdFzpgHlh0uM242IFxA==
   dependencies:
-    prop-types "^15.5.10"
+    prop-types "^15.6.2"
 
 react-overlays@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.8.3.tgz#fad65eea5b24301cca192a169f5dddb0b20d3ac5"
+  integrity sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==
   dependencies:
     classnames "^2.2.5"
     dom-helpers "^3.2.1"
@@ -6172,138 +7652,160 @@ react-overlays@^0.8.3:
     react-transition-group "^2.2.0"
     warning "^3.0.0"
 
-react-redux-loading-bar@^2.9.3:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-2.9.3.tgz#65865dddcbf597169e787edec15eec7ebfb84149"
+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==
   dependencies:
-    prop-types "^15.5.6"
+    prop-types "^15.6.2"
+    react-lifecycles-compat "^3.0.2"
 
-react-redux@^5.0.4:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946"
+react-redux@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.0.tgz#09e86eeed5febb98e9442458ad2970c8f1a173ef"
+  integrity sha512-EmbC3uLl60pw2VqSSkj6HpZ6jTk12RMrwXMBdYtM6niq0MdEaRq9KYCwpJflkOZj349BLGQm1MI/JO1W96kLWQ==
   dependencies:
-    hoist-non-react-statics "^2.2.1"
-    invariant "^2.0.0"
-    lodash "^4.2.0"
-    lodash-es "^4.2.0"
-    loose-envify "^1.1.0"
-    prop-types "^15.5.10"
+    "@babel/runtime" "^7.2.0"
+    hoist-non-react-statics "^3.2.1"
+    invariant "^2.2.4"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+    react-is "^16.6.3"
 
 react-router-dom@^4.1.1:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d"
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
+  integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
   dependencies:
     history "^4.7.2"
-    invariant "^2.2.2"
+    invariant "^2.2.4"
     loose-envify "^1.3.1"
-    prop-types "^15.5.4"
-    react-router "^4.2.0"
-    warning "^3.0.0"
+    prop-types "^15.6.1"
+    react-router "^4.3.1"
+    warning "^4.0.1"
 
 react-router-scroll-4@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/react-router-scroll-4/-/react-router-scroll-4-1.0.0-beta.1.tgz#b1838c6e67b9fe64db33176958e88836e10bc4ce"
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/react-router-scroll-4/-/react-router-scroll-4-1.0.0-beta.2.tgz#d887063ec0f66124aaf450158dd158ff7d3dc279"
+  integrity sha512-K67Dnm75naSBs/WYc2CDNxqU+eE8iA3I0wSCArgGSHb0xR/7AUcgUEXtCxrQYVTogXvjVK60gmwYvOyRQ6fuBA==
   dependencies:
-    babel-eslint "^8.0.1"
     scroll-behavior "^0.9.1"
     warning "^3.0.0"
 
-react-router@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986"
+react-router@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
+  integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
   dependencies:
     history "^4.7.2"
-    hoist-non-react-statics "^2.3.0"
-    invariant "^2.2.2"
+    hoist-non-react-statics "^2.5.0"
+    invariant "^2.2.4"
     loose-envify "^1.3.1"
     path-to-regexp "^1.7.0"
-    prop-types "^15.5.4"
-    warning "^3.0.0"
+    prop-types "^15.6.1"
+    warning "^4.0.1"
+
+react-select@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.2.0.tgz#67c8b5c2dcb8df0384f2a103efe952570f5d6b93"
+  integrity sha512-FOnsm/zrJ2pZvYsEfs58Xvru0SHL1jXAZTCFTWcOxmQSnRKgYuXUDFdpDiET90GLtJEF+t6BaZeD43bUH6/NZQ==
+  dependencies:
+    classnames "^2.2.5"
+    create-emotion "^10.0.4"
+    memoize-one "^4.0.0"
+    prop-types "^15.6.0"
+    raf "^3.4.0"
+    react-input-autosize "^2.2.1"
+    react-transition-group "^2.2.1"
 
 react-sparklines@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/react-sparklines/-/react-sparklines-1.7.0.tgz#9b1d97e8c8610095eeb2ad658d2e1fcf91f91a60"
+  integrity sha512-bJFt9K4c5Z0k44G8KtxIhbG+iyxrKjBZhdW6afP+R7EnIq+iKjbWbEFISrf3WKNFsda+C46XAfnX0StS5fbDcg==
   dependencies:
     prop-types "^15.5.10"
 
-react-swipeable-views-core@^0.12.11:
-  version "0.12.11"
-  resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.12.11.tgz#3cf2b4daffbb36f9d69bd19bf5b2d5370b6b2c1b"
+react-swipeable-views-core@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.13.0.tgz#6bf8a8132a756355444537672a14e84b1e3b53c2"
+  integrity sha512-MAe119eSN4obiqsIp+qoUWtLbyjz+dWEfz+qPurPvyIFoXxuxpBnsDy36+C7cBaCi5z4dRmfoMlm1dBAdIzvig==
   dependencies:
-    babel-runtime "^6.23.0"
-    warning "^3.0.0"
+    "@babel/runtime" "7.0.0"
+    warning "^4.0.1"
 
-react-swipeable-views-utils@^0.12.11:
-  version "0.12.11"
-  resolved "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.12.11.tgz#3c9a6a2b8dbdcc331a5d107419578f57b7e101d6"
+react-swipeable-views-utils@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.13.0.tgz#0ea17aa67f88a69d534c79d591f8d82ef98346a4"
+  integrity sha512-1I4BhDqA6qkRdW0nexnudh/QdvVAVy0a7M5OyU2TrjaTovg6ufBouzqfqjZfUZUxVdOftTkPtisHmcqqZ+b1TA==
   dependencies:
-    babel-runtime "^6.23.0"
+    "@babel/runtime" "7.0.0"
     fbjs "^0.8.4"
     keycode "^2.1.7"
     prop-types "^15.6.0"
-    react-event-listener "^0.5.1"
-    react-swipeable-views-core "^0.12.11"
+    react-event-listener "^0.6.0"
+    react-swipeable-views-core "^0.13.0"
 
-react-swipeable-views@^0.12.3:
-  version "0.12.12"
-  resolved "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.12.12.tgz#60cdc8e3682ed082aaf094f7761eaf691ed28a6f"
+react-swipeable-views@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.13.0.tgz#a200cef1005d55af6a27b97048afe9a4056e0ab8"
+  integrity sha512-r6H8lbtcI99oKykpLxYrI6O9im1lJ4D5/hf8bkNeQLdHZ9ftxS03qgEtguy3GpT5VB9yS4gErYWeaTrhCrysEg==
   dependencies:
-    babel-runtime "^6.23.0"
+    "@babel/runtime" "7.0.0"
     dom-helpers "^3.2.1"
     prop-types "^15.5.4"
-    react-swipeable-views-core "^0.12.11"
-    react-swipeable-views-utils "^0.12.11"
-    warning "^3.0.0"
+    react-swipeable-views-core "^0.13.0"
+    react-swipeable-views-utils "^0.13.0"
+    warning "^4.0.1"
 
-react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
+react-test-renderer@^16.0.0-0, react-test-renderer@^16.7.0:
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.7.0.tgz#1ca96c2b450ab47c36ba92cd8c03fcefc52ea01c"
+  integrity sha512-tFbhSjknSQ6+ttzmuGdv+SjQfmvGcq3PFKyPItohwhhOBmRoTf1We3Mlt3rJtIn85mjPXOkKV+TaKK4irvk9Yg==
   dependencies:
-    fbjs "^0.8.16"
     object-assign "^4.1.1"
-    prop-types "^15.6.0"
+    prop-types "^15.6.2"
+    react-is "^16.7.0"
+    scheduler "^0.12.0"
 
-react-textarea-autosize@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.2.1.tgz#2b78f9067180f41b08ac59f78f1581abadd61e54"
+react-textarea-autosize@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz#3132cb77e65d94417558d37c0bfe415a5afd3445"
+  integrity sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg==
   dependencies:
+    "@babel/runtime" "^7.1.2"
     prop-types "^15.6.0"
 
 react-toggle@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/react-toggle/-/react-toggle-4.0.2.tgz#77f487860efb87fafd197672a2db8c885be1440f"
+  integrity sha512-EPTWnN7gQHgEAUEmjheanZXNzY5TPnQeyyHfEs3YshaiWZf5WNjfYDrglO5F1Hl/dNveX18i4l0grTEsYH2Ccw==
   dependencies:
     classnames "^2.2.5"
 
-react-transition-group@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.2.1.tgz#e9fb677b79e6455fd391b03823afe84849df4a10"
+react-transition-group@^2.2.0, react-transition-group@^2.2.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.2.tgz#9457166a9ba6ce697a3e1b076b3c049b9fb2c408"
+  integrity sha512-vwHP++S+f6KL7rg8V1mfs62+MBKtbMeZDR8KiNmD7v98Gs3UPGsDZDahPJH2PVprFW5YHJfh6cbNim3zPndaSQ==
   dependencies:
-    chain-function "^1.0.0"
-    classnames "^2.2.5"
-    dom-helpers "^3.2.0"
-    loose-envify "^1.3.1"
-    prop-types "^15.5.8"
-    warning "^3.0.0"
+    dom-helpers "^3.3.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+    react-lifecycles-compat "^3.0.4"
 
-react@^16.3.0:
-  version "16.3.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
+react@^16.7.0:
+  version "16.7.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.7.0.tgz#b674ec396b0a5715873b350446f7ea0802ab6381"
+  integrity sha512-StCz3QY8lxTb5cl2HJxjwLFOXPIFQp+p+hxQfc8WE0QiLfCtIlKj8/+5tjjKm8uSTlAW+fCPaavGFS06V9Ar3A==
   dependencies:
-    fbjs "^0.8.16"
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
-    prop-types "^15.6.0"
-
-read-cache@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  dependencies:
-    pify "^2.3.0"
+    prop-types "^15.6.2"
+    scheduler "^0.12.0"
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
@@ -6311,6 +7813,7 @@ read-pkg-up@^1.0.1:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -6318,6 +7821,7 @@ read-pkg-up@^2.0.0:
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
     normalize-package-data "^2.3.2"
@@ -6326,335 +7830,336 @@ read-pkg@^1.0.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-read-pkg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  dependencies:
-    load-json-file "^4.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^3.0.0"
-
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9, readable-stream@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, 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.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
     isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
+    process-nextick-args "~2.0.0"
     safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
+    string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^3.0.6:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
+  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
 readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
     readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
 
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+realpath-native@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.0.2.tgz#cd51ce089b513b45cf9b1516c82989b51ccc6560"
+  integrity sha512-+S3zTvVt9yTntFrBpm7TQmQ3tzpCrnA1a/y+3cUHAc9ZR6aIjG0WNLR+Rj79QpJktY+VeW/TQtFlQ1bzsehI8g==
   dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
+    util.promisify "^1.0.0"
 
 redis-commands@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.3.1.tgz#81d826f45fa9c8b2011f4cd7a0fe597d241d442b"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f"
+  integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==
 
 redis-parser@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b"
+  integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=
 
 redis@^2.7.1:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02"
+  integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==
   dependencies:
     double-ended-queue "^2.1.0-0"
     redis-commands "^1.2.0"
     redis-parser "^2.6.0"
 
-reduce-css-calc@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  dependencies:
-    balanced-match "^0.4.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.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
+  integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
-redux@^3.7.1:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
+redux@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
+  integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
   dependencies:
-    lodash "^4.2.1"
-    lodash-es "^4.2.1"
-    loose-envify "^1.1.0"
-    symbol-observable "^1.0.3"
+    loose-envify "^1.4.0"
+    symbol-observable "^1.2.0"
 
-regenerate@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+regenerate-unicode-properties@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
+  integrity sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==
+  dependencies:
+    regenerate "^1.4.0"
+
+regenerate@^1.2.1, regenerate@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
 regenerator-runtime@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
-regenerator-transform@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+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-transform@^0.13.3:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.3.tgz#264bd9ff38a8ce24b06e0636496b2c856b57bcbb"
+  integrity sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==
   dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
     private "^0.1.6"
 
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
   dependencies:
     is-equal-shallow "^0.1.3"
 
-regex-parser@^2.2.1:
-  version "2.2.8"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.8.tgz#da4c0cda5a828559094168930f455f532b6ffbac"
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  integrity sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=
   dependencies:
     regenerate "^1.2.1"
     regjsgen "^0.2.0"
     regjsparser "^0.1.4"
 
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+regexpu-core@^4.1.3, regexpu-core@^4.2.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.4.0.tgz#8d43e0d1266883969720345e70c275ee0aec0d32"
+  integrity sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==
   dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^7.0.0"
+    regjsgen "^0.5.0"
+    regjsparser "^0.6.0"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.0.2"
 
 regjsgen@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+  integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=
+
+regjsgen@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
+  integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
 
 regjsparser@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=
+  dependencies:
+    jsesc "~0.5.0"
+
+regjsparser@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
+  integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
   dependencies:
     jsesc "~0.5.0"
 
+rellax@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/rellax/-/rellax-1.7.1.tgz#2f82aaa1c1d8116eef08fc533c59655a097c8be2"
+  integrity sha512-z31r9RjKeK5wJU5C6hKBupreKQ7xi+lQHda6ttlc0N1VEyL2ZCPMyckTtvliGRsxqTPqhdCasdhexs8N5aZ4+A==
+
 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"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^1.5.2:
+repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
   dependencies:
     is-finite "^1.0.0"
 
-request@2, request@^2.79.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+request-promise-core@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
+  integrity sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=
+  dependencies:
+    lodash "^4.13.1"
+
+request-promise-native@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+  integrity sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=
+  dependencies:
+    request-promise-core "1.1.1"
+    stealthy-require "^1.1.0"
+    tough-cookie ">=2.3.3"
+
+request@^2.87.0:
+  version "2.88.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
   dependencies:
     aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
+    aws4 "^1.8.0"
     caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
     forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
+    form-data "~2.3.2"
+    har-validator "~5.1.0"
     http-signature "~1.2.0"
     is-typedarray "~1.0.0"
     isstream "~0.1.2"
     json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
     performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.4.3"
     tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@~2.79.0:
-  version "2.79.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~2.0.6"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    qs "~6.3.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "~0.4.1"
-    uuid "^3.0.0"
+    uuid "^3.3.2"
 
 requestidlecallback@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/requestidlecallback/-/requestidlecallback-0.3.0.tgz#6fb74e0733f90df3faa4838f9f6a2a5f9b742ac5"
+  integrity sha1-b7dOBzP5DfP6pIOPn2oqX5t0KsU=
 
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
-
-require-from-string@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
+require-from-string@^2.0.1, require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 require-package-name@^2.0.1:
   version "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.3:
   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.x, requires-port@1.x.x, requires-port@~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@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+reselect@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
+  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
 
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
   dependencies:
     resolve-from "^3.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"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
 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-url-loader@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.2.0.tgz#9662feaa11debf7cf8e3feb91dae9544aa7dee88"
-  dependencies:
-    adjust-sourcemap-loader "^1.1.0"
-    camelcase "^4.0.0"
-    convert-source-map "^1.1.1"
-    loader-utils "^1.0.0"
-    lodash.defaults "^4.0.0"
-    rework "^1.0.1"
-    rework-visit "^1.0.0"
-    source-map "^0.5.6"
-    urix "^0.1.0"
-
-resolve-url@~0.2.1:
+resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+  integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.7, resolve@^1.3.3, resolve@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1, resolve@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
+  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
   dependencies:
-    path-parse "^1.0.5"
+    path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -6662,159 +8167,188 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-rework-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
-
-rework@^1.0.1:
+rgb-regex@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
-  dependencies:
-    convert-source-map "^0.3.3"
-    css "^2.0.0"
-
-rgb@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
+  resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
+  integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
 
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
+rgba-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
+  integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
   dependencies:
     glob "^7.0.5"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
   dependencies:
-    hash-base "^2.0.0"
+    hash-base "^3.0.0"
     inherits "^2.0.1"
 
 rst-selector-parser@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
+  integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE=
   dependencies:
     lodash.flattendeep "^4.4.0"
     nearley "^2.7.10"
 
+rsvp@^3.3.3:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+  integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
   dependencies:
     is-promise "^2.1.0"
 
-rx-lite-aggregates@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
   dependencies:
-    rx-lite "*"
+    aproba "^1.1.1"
 
-rx-lite@*, rx-lite@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
+rxjs@^6.1.0:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+  dependencies:
+    tslib "^1.9.0"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, 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-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.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==
 
 sane@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-2.2.0.tgz#d6d2e2fcab00e3d283c93b912b7c3a20846f1d56"
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+  integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
   dependencies:
-    anymatch "^1.3.0"
+    anymatch "^2.0.0"
+    capture-exit "^1.2.0"
     exec-sh "^0.2.0"
     fb-watchman "^2.0.0"
-    minimatch "^3.0.2"
+    micromatch "^3.1.4"
     minimist "^1.1.1"
     walker "~1.0.5"
     watch "~0.18.0"
   optionalDependencies:
-    fsevents "^1.1.1"
-
-sass-graph@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
-  dependencies:
-    glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^7.0.0"
+    fsevents "^1.2.3"
 
-sass-loader@^6.0.6:
-  version "6.0.6"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
+sass-loader@^7.0.3:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.1.0.tgz#16fd5138cb8b424bf8a759528a1972d72aad069d"
+  integrity sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==
   dependencies:
-    async "^2.1.5"
-    clone-deep "^0.3.0"
+    clone-deep "^2.0.1"
     loader-utils "^1.0.1"
     lodash.tail "^4.1.1"
+    neo-async "^2.5.0"
     pify "^3.0.0"
+    semver "^5.5.0"
+
+sass@^1.15.2:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.15.2.tgz#539f464a61e29a9e4f560ec9dc2ccc5236db8474"
+  integrity sha512-YFncPpx3ewKEhMg9sWdCxKUpPN/jwVLa0Q9iO2tcV5Y5Z/YAlFV6k6JaQwq3tmbN6FXKjUYElXRHcG0g4D1zkQ==
+  dependencies:
+    chokidar "^2.0.0"
 
-sax@^1.2.1, sax@~1.2.1:
+sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-schema-utils@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+scheduler@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.12.0.tgz#8ab17699939c0aedc5a196a657743c496538647b"
+  integrity sha512-t7MBR28Akcp4Jm+QoR63XgAi9YgCUmgvDHqf5otgAj4QvdoBE4ImCX0ffehefePPG+aitiYHp0g/mW6s4Tp+dw==
   dependencies:
-    ajv "^5.0.0"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
 
-scroll-behavior@^0.9.1:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.5.tgz#41da30b559da004eb48450f6cff6068c7696ff23"
+schema-utils@^0.4.4:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
+  integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
   dependencies:
-    dom-helpers "^3.2.1"
-    invariant "^2.2.2"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
   dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
 
-seed-random@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54"
+scroll-behavior@^0.9.1:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.9.tgz#ebfe0658455b82ad885b66195215416674dacce2"
+  integrity sha1-6/4GWEVbgq2IW2YZUhVBZnTazOI=
+  dependencies:
+    dom-helpers "^3.2.1"
+    invariant "^2.2.2"
 
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
 selfsigned@^1.9.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz#bf8cb7b83256c4551e31347c6311778db99eec52"
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
   dependencies:
-    node-forge "0.6.33"
+    node-forge "0.7.5"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7"
+  integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c=
 
-semver@~5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-send@0.16.1:
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
-    depd "~1.1.1"
+    depd "~1.1.2"
     destroy "~1.0.4"
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
@@ -6823,11 +8357,17 @@ send@0.16.1:
     ms "2.0.0"
     on-finished "~2.3.0"
     range-parser "~1.2.0"
-    statuses "~1.3.1"
+    statuses "~1.4.0"
+
+serialize-javascript@^1.4.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
 
 serve-index@^1.7.2:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -6837,451 +8377,596 @@ serve-index@^1.7.2:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
+serve-static@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
-    encodeurl "~1.0.1"
+    encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.2"
-    send "0.16.1"
+    send "0.16.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
 
 setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
 
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.9.tgz#98f64880474b74f4a38b8da9d3c0f2d104633e7d"
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shallow-clone@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060"
+shallow-clone@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
+  integrity sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==
   dependencies:
     is-extendable "^0.1.1"
-    kind-of "^2.0.1"
-    lazy-cache "^0.2.3"
+    kind-of "^5.0.0"
     mixin-object "^2.0.1"
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
-shell-quote@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
-
-shellwords@^0.1.0:
+shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+
+simple-swizzle@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
+  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
+  dependencies:
+    is-arrayish "^0.3.1"
+
+sisteransi@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-0.1.1.tgz#5431447d5f7d1675aac667ccd0b865a4994cb3ce"
+  integrity sha512-PmGOd02bM9YO5ifxpw36nrNMBTptEtfRl4qUYl9SndkolplkrZZOW7PGHjrZL53QvMVj9nQ+TKqUnRsw4tJa4g==
 
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slice-ansi@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
+slice-ansi@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.0.0.tgz#5373bdb8559b45676e8541c66916cdd6251612e7"
+  integrity sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==
   dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
     is-fullwidth-code-point "^2.0.0"
 
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
-    hoek "2.x.x"
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
 
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
-    hoek "4.x.x"
+    kind-of "^3.2.0"
 
-sockjs-client@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12"
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
-    debug "^2.6.6"
-    eventsource "0.1.6"
-    faye-websocket "~0.11.0"
-    inherits "^2.0.1"
-    json3 "^3.3.2"
-    url-parse "^1.1.8"
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
 
-sockjs@0.3.18:
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207"
+sockjs-client@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
+  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
   dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^2.0.2"
+    debug "^3.2.5"
+    eventsource "^1.0.7"
+    faye-websocket "~0.11.1"
+    inherits "^2.0.3"
+    json3 "^3.3.2"
+    url-parse "^1.4.3"
 
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+sockjs@0.3.19:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
   dependencies:
-    is-plain-obj "^1.0.0"
+    faye-websocket "^0.10.0"
+    uuid "^3.0.1"
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-resolve@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
   dependencies:
-    atob "~1.1.0"
-    resolve-url "~0.2.1"
-    source-map-url "~0.3.0"
-    urix "~0.1.0"
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
 
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
   dependencies:
     source-map "^0.5.6"
 
-source-map-url@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
-
-source-map@^0.1.38:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+source-map-support@^0.5.6, source-map-support@~0.5.6:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
   dependencies:
-    amdefine ">=0.0.4"
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
 
-source-map@^0.4.2, source-map@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
-source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.6:
+source-map@^0.5.0, source-map@^0.5.3, 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=
 
-source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+spdx-correct@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
-    spdx-license-ids "^1.0.2"
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
 
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+spdx-exceptions@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+spdx-expression-parse@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+  integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
+  integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
 
-spdy-transport@^2.0.18:
-  version "2.0.20"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d"
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
   dependencies:
-    debug "^2.6.8"
-    detect-node "^2.0.3"
+    debug "^4.1.0"
+    detect-node "^2.0.4"
     hpack.js "^2.1.6"
-    obuf "^1.1.1"
-    readable-stream "^2.2.9"
-    safe-buffer "^5.0.1"
-    wbuf "^1.7.2"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
 
-spdy@^3.4.1:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+spdy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
+  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
   dependencies:
-    debug "^2.6.8"
-    handle-thing "^1.2.5"
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
     http-deceiver "^1.2.7"
-    safe-buffer "^5.0.1"
     select-hose "^2.0.0"
-    spdy-transport "^2.0.18"
+    spdy-transport "^3.0.0"
 
-split@0.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
-    through "2"
+    extend-shallow "^3.0.0"
 
 split@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
   dependencies:
     through "2"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.0.tgz#1d4963a2fbffe58050aa9084ca20be81741c07de"
+  integrity sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-"statuses@>= 1.3.1 < 2":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
 
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+stable@~0.1.6:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
-stdout-stream@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+stack-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
-    readable-stream "^2.0.1"
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+
+stealthy-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  integrity sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-combiner@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
   dependencies:
-    duplexer "~0.1.1"
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
 
 stream-http@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
-    readable-stream "^2.2.6"
+    readable-stream "^2.3.6"
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
 string-length@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+  integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
   dependencies:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+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=
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   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"
 
-string.prototype.padend@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
+string.prototype.trim@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
+  integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
   dependencies:
     define-properties "^1.1.2"
-    es-abstract "^1.4.3"
+    es-abstract "^1.5.0"
     function-bind "^1.0.2"
 
-string_decoder@^1.0.0, string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+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"
 
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-stringz@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/stringz/-/stringz-0.3.0.tgz#58a311a8c791eee1a68f5f188b3db5e66ff49360"
+stringz@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stringz/-/stringz-1.0.0.tgz#d2acba994e4ce3c725ee15c86fff4281280d2025"
+  integrity sha512-oaqFaIAmw1MJmdPNiBqocHHrC0VzJTL3CI1z5uXm3NQSE3AyDU152ZPTSJSOKk+9z1Cm3LZzgLFjCTb8SXZvag==
+  dependencies:
+    unicode-astral-regex "^1.0.1"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   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:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
+  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
+  dependencies:
+    ansi-regex "^4.0.0"
+
 strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  dependencies:
-    get-stdin "^4.0.1"
-
-strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759"
+style-loader@0.23.1:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
   dependencies:
-    loader-utils "^1.0.2"
-    schema-utils "^0.3.0"
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+
+stylehacks@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.1.tgz#3186595d047ab0df813d213e51c8b94e0b9010f2"
+  integrity sha512-TK5zEPeD9NyC1uPIdjikzsgWxdQQN/ry1X3d1iOz1UkYDCmcr928gWD1KHgyC27F50UnE0xCTrBOO1l6KR8M4w==
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
 
 substring-trie@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.2.tgz#7b42592391628b4f2cb17365c6cce4257c7b7af5"
-
-sugarss@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
-  dependencies:
-    postcss "^6.0.14"
+  integrity sha1-e0JZI5Fii08ssXNlxszkJXx7evU=
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
 supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0, supports-color@^4.2.1, supports-color@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
-    has-flag "^2.0.0"
+    has-flag "^3.0.0"
 
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+svgo@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.1.1.tgz#12384b03335bcecd85cfa5f4e3375fed671cb985"
+  integrity sha512-GBkJbnTuFpM4jFbiERHDWhZc/S/kpHToqmZag3aEBjPYK44JAN2QBjvrGIxLOoCyMZjuFQIfTO2eJd8uwLY/9g==
   dependencies:
-    coa "~1.0.1"
+    coa "~2.0.1"
     colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
+    css-select "^2.0.0"
+    css-select-base-adapter "~0.1.0"
+    css-tree "1.0.0-alpha.28"
+    css-url-regex "^1.1.0"
+    csso "^3.5.0"
+    js-yaml "^3.12.0"
     mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
+    object.values "^1.0.4"
+    sax "~1.2.4"
+    stable "~0.1.6"
+    unquote "~1.1.1"
+    util.promisify "~1.0.0"
 
-symbol-observable@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
+symbol-observable@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-symbol-tree@^3.2.1:
+symbol-tree@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+table@^5.0.2:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.1.1.tgz#92030192f1b7b51b6eeab23ed416862e47b70837"
+  integrity sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==
   dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
+    ajv "^6.6.1"
+    lodash "^4.17.11"
+    slice-ansi "2.0.0"
     string-width "^2.1.1"
 
-tapable@^0.2.7:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
-
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.0.0, tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
+  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+
+tar@^4:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
 
-tcomb@^2.5.0, tcomb@^2.5.1:
+tcomb@^2.5.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
+  integrity sha1-ENYpWAQWaaXVNWe5pO6M3iKxwrA=
 
-test-exclude@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
+terser-webpack-plugin@^1.1.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz#7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"
+  integrity sha512-GGSt+gbT0oKcMDmPx4SRSfJPE1XaN3kQRWG4ghxKQw9cn5G9x6aCKSsgYdvyM0na9NJ4Drv0RG6jbBByZ5CMjw==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.8.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser@^3.8.1:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.14.0.tgz#49a8ddf34a1308a901d787dab03a42c51b557447"
+  integrity sha512-KQC1QNKbC/K1ZUjLIWsezW7wkTJuB4v9ptQQUNOzAPVHuVf2LrwEcB0I9t2HTEYUwAFVGiiS6wc+P4ClLDc5FQ==
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+    source-map-support "~0.5.6"
+
+test-exclude@^4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.3.tgz#a9a5e64474e4398339245a0a769ad7c2f4a97c20"
+  integrity sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -7289,269 +8974,404 @@ test-exclude@^4.1.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
-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@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+  integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
 
 throng@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz#983c6ba1993b58eae859998aa687ffe88df84c17"
+  integrity sha1-mDxroZk7WOroWZmKpof/6I34TBc=
   dependencies:
     lodash.defaults "^4.0.1"
 
-through@2, through@^2.3.6, through@~2.3, through@~2.3.1:
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+through@2, 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@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e"
-
-time-stamp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
+thunky@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
 
 timers-browserify@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6"
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
   dependencies:
     setimmediate "^1.0.4"
 
-tiny-emitter@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.0.tgz#bad327adb1804b42a231afa741532bd884cd09ad"
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
 tiny-queue@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046"
+  integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY=
 
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
 
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-tough-cookie@^2.3.2, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+tough-cookie@>=2.3.3, tough-cookie@^2.3.4:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tough-cookie@~2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
+  dependencies:
+    psl "^1.1.24"
     punycode "^1.4.1"
 
 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@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-
 trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+  integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-"true-case-path@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
-  dependencies:
-    glob "^6.0.4"
+tryer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
+  integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
+
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.1:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.15:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.15.tgz#cab10fb4909e441c82842eafe1ad646c81804410"
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.15"
-
-typed-function@0.10.6:
-  version "0.10.6"
-  resolved "https://registry.yarnpkg.com/typed-function/-/typed-function-0.10.6.tgz#314aa0ea72bd586de5920095559683e20b01688b"
+    mime-types "~2.1.18"
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-ua-parser-js@^0.7.9:
-  version "0.7.17"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+ua-parser-js@^0.7.18:
+  version "0.7.19"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
+  integrity sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==
 
-uglify-js@^2.6, uglify-js@^2.8.29:
-  version "2.8.29"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+uglify-js@^3.0.0, uglify-js@^3.1.4:
+  version "3.4.9"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.9.tgz#af02f180c1207d76432e473ed24a28f4a782bae3"
+  integrity sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==
   dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
+    commander "~2.17.1"
+    source-map "~0.6.1"
 
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+uglifyjs-webpack-plugin@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.1.1.tgz#6937d7513a37280d4792f1fb536bef35e08e420a"
+  integrity sha512-TQEcyMNkObX/H+FfcKjiDgs5RcXX8vW2UUUrDTOfQgg3lrafztfeM5WAwXo+AzqozJK6NP9w98xNpG/dutzSsg==
+  dependencies:
+    cacache "^11.2.0"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    uglify-js "^3.0.0"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
 
-uglifyjs-webpack-plugin@^0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+unicode-astral-regex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unicode-astral-regex/-/unicode-astral-regex-1.0.1.tgz#2cab8529480646f9614ddbc7b62158ad05123feb"
+  integrity sha512-UP6cmDeiWi8bMDmkyXLRsDuVPTvPjh8Wsz+pHu1VkGgTBl4pUceYAdHXY0cdc6Q3+Z2q7QMzi/0E7L/S/yOvFw==
+
+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-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==
   dependencies:
-    source-map "^0.5.6"
-    uglify-js "^2.8.29"
-    webpack-sources "^1.0.1"
+    unicode-canonical-property-names-ecmascript "^1.0.4"
+    unicode-property-aliases-ecmascript "^1.0.4"
 
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+unicode-match-property-value-ecmascript@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz#9f1dc76926d6ccf452310564fd834ace059663d4"
+  integrity sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==
 
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
+unicode-property-aliases-ecmascript@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
+  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
 
-underscore@~1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
 
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqid@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
-  dependencies:
-    macaddress "^0.2.8"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
 
 uniqs@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+  integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
+  dependencies:
+    imurmurhash "^0.1.4"
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unquote@^1.1.0, unquote@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
+  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
 
-unquote@^1.1.0:
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.0.5:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.0.tgz#98e1fc608b6b854c75afb1b95afc099ba69d942f"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
 
-urix@^0.1.0, urix@~0.1.0:
+urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
-url-parse@1.0.x:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
-  dependencies:
-    querystringify "0.0.x"
-    requires-port "1.0.x"
-
-url-parse@^1.1.8:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
+url-parse@^1.4.3:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
+  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
   dependencies:
-    querystringify "~1.0.0"
-    requires-port "~1.0.0"
+    querystringify "^2.0.0"
+    requires-port "^1.0.0"
 
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
 
-util-deprecate@~1.0.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==
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.promisify@^1.0.0, util.promisify@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
 
-util@0.10.3, util@^0.10.3:
+util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
   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"
+
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
+uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-uuid@^3.0.0, uuid@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
+uws@10.148.0:
+  version "10.148.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-10.148.0.tgz#3fcd35f083ca515e091cd33b2d78f0f51a666215"
+  integrity sha512-aJpFgMMyxubiE/ll4nj9nWoQbv0HzZZDWXfwyu78nuFObX0Zoyv3TWjkqKPQ1vb2sMPZoz67tri7QNE6dybNmQ==
 
-uws@^8.14.0:
-  version "8.14.1"
-  resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.1.tgz#de09619f305f6174d5516a9c6942cb120904b20b"
+v8-compile-cache@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
+  integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  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 "~1.0.0"
-    spdx-expression-parse "~1.0.0"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
 
 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==
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
 vendors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
+  integrity sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==
 
 verror@1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -7560,158 +9380,217 @@ verror@1.10.0:
 vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
   dependencies:
     indexof "0.0.1"
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
 walker@~1.0.5:
   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"
 
 warning@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
+  integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=
+  dependencies:
+    loose-envify "^1.0.0"
+
+warning@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607"
+  integrity sha512-wbTp09q/9C+jJn4KKJfJfoS6VleK/Dti0yqWSm6KMvJ4MRCXFQNapHuJXutJIrWV0Cf4AhTdeIe4qdKHR1+Hug==
   dependencies:
     loose-envify "^1.0.0"
 
 watch@~0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
+  integrity sha1-KAlUdsbffJDJYxOJkMClQj60uYY=
   dependencies:
     exec-sh "^0.2.0"
     minimist "^1.2.0"
 
-watchpack@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+watchpack@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
   dependencies:
-    async "^2.1.2"
-    chokidar "^1.7.0"
+    chokidar "^2.0.2"
     graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
 
-wbuf@^1.1.0, wbuf@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
+wbuf@^1.1.0, wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0, webidl-conversions@^4.0.2:
+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==
 
-webpack-bundle-analyzer@^2.9.1:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.1.tgz#c2c8e03e8e5768ed288b39ae9e27a8b8d7b9d476"
-  dependencies:
-    acorn "^5.1.1"
-    chalk "^1.1.3"
-    commander "^2.9.0"
-    ejs "^2.5.6"
-    express "^4.15.2"
-    filesize "^3.5.9"
-    gzip-size "^3.0.0"
-    lodash "^4.17.4"
+webpack-assets-manifest@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-assets-manifest/-/webpack-assets-manifest-3.1.1.tgz#39bbc3bf2ee57fcd8ba07cda51c9ba4a3c6ae1de"
+  integrity sha512-JV9V2QKc5wEWQptdIjvXDUL1ucbPLH2f27toAY3SNdGZp+xSaStAgpoMcvMZmqtFrBc9a5pTS1058vxyMPOzRQ==
+  dependencies:
+    chalk "^2.0"
+    lodash.get "^4.0"
+    lodash.has "^4.0"
+    mkdirp "^0.5"
+    schema-utils "^1.0.0"
+    tapable "^1.0.0"
+    webpack-sources "^1.0.0"
+
+webpack-bundle-analyzer@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.0.3.tgz#dbc7fff8f52058b6714a20fddf309d0790e3e0a0"
+  integrity sha512-naLWiRfmtH4UJgtUktRTLw6FdoZJ2RvCR9ePbwM9aRMsS/KjFerkPZG9epEvXRAw5d5oPdrs9+3p+afNjxW8Xw==
+  dependencies:
+    acorn "^5.7.3"
+    bfj "^6.1.1"
+    chalk "^2.4.1"
+    commander "^2.18.0"
+    ejs "^2.6.1"
+    express "^4.16.3"
+    filesize "^3.6.1"
+    gzip-size "^5.0.0"
+    lodash "^4.17.10"
     mkdirp "^0.5.1"
-    opener "^1.4.3"
-    ws "^3.3.1"
+    opener "^1.5.1"
+    ws "^6.0.0"
+
+webpack-cli@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.2.tgz#17d7e01b77f89f884a2bbf9db545f0f6a648e746"
+  integrity sha512-Cnqo7CeqeSvC6PTdts+dywNi5CRlIPbLx1AoUPK2T6vC1YAugMG3IOoO9DmEscd+Dghw7uRlnzV1KwOe5IrtgQ==
+  dependencies:
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.1.0"
+    global-modules-path "^2.3.0"
+    import-local "^2.0.0"
+    interpret "^1.1.0"
+    loader-utils "^1.1.0"
+    supports-color "^5.5.0"
+    v8-compile-cache "^2.0.2"
+    yargs "^12.0.2"
 
-webpack-dev-middleware@^1.11.0:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+webpack-dev-middleware@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
+  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
   dependencies:
     memory-fs "~0.4.1"
-    mime "^1.5.0"
-    path-is-absolute "^1.0.0"
+    mime "^2.3.1"
     range-parser "^1.0.3"
-    time-stamp "^2.0.0"
+    webpack-log "^2.0.0"
 
-webpack-dev-server@^2.9.5:
-  version "2.9.5"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.5.tgz#79336fba0087a66ae491f4869f6545775b18daa8"
+webpack-dev-server@^3.1.14:
+  version "3.1.14"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
+  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
   dependencies:
     ansi-html "0.0.7"
-    array-includes "^3.0.3"
     bonjour "^3.5.0"
-    chokidar "^1.6.0"
+    chokidar "^2.0.0"
     compression "^1.5.2"
     connect-history-api-fallback "^1.3.0"
     debug "^3.1.0"
     del "^3.0.0"
     express "^4.16.2"
     html-entities "^1.2.0"
-    http-proxy-middleware "~0.17.4"
-    import-local "^0.1.1"
-    internal-ip "1.2.0"
+    http-proxy-middleware "~0.18.0"
+    import-local "^2.0.0"
+    internal-ip "^3.0.1"
     ip "^1.1.5"
     killable "^1.0.0"
     loglevel "^1.4.1"
     opn "^5.1.0"
     portfinder "^1.0.9"
+    schema-utils "^1.0.0"
     selfsigned "^1.9.1"
+    semver "^5.6.0"
     serve-index "^1.7.2"
-    sockjs "0.3.18"
-    sockjs-client "1.1.4"
-    spdy "^3.4.1"
-    strip-ansi "^3.0.1"
-    supports-color "^4.2.1"
-    webpack-dev-middleware "^1.11.0"
-    yargs "^6.6.0"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "3.4.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
 
-webpack-manifest-plugin@^1.2.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-1.3.2.tgz#5ea8ee5756359ddc1d98814324fe43496349a7d4"
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
   dependencies:
-    fs-extra "^0.30.0"
-    lodash ">=3.5 <5"
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
 
-webpack-merge@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.1.tgz#f1197a0a973e69c6fbeeb6d658219aa8c0c13555"
+webpack-merge@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.5.tgz#2be31e846c20767d1bef56bdca64c328a681190a"
+  integrity sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==
   dependencies:
-    lodash "^4.17.4"
+    lodash "^4.17.5"
 
-webpack-sources@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+webpack-sources@^1.0.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
   dependencies:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^3.9.1:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.9.1.tgz#9a60aa544ed5d4d454c069e3f521aa007e02643c"
-  dependencies:
-    acorn "^5.0.0"
-    acorn-dynamic-import "^2.0.0"
-    ajv "^5.1.5"
-    ajv-keywords "^2.0.0"
-    async "^2.1.2"
-    enhanced-resolve "^3.4.0"
-    escope "^3.6.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    json5 "^0.5.1"
+webpack@^4.28.3:
+  version "4.28.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.3.tgz#8acef6e77fad8a01bfd0c2b25aa3636d46511874"
+  integrity sha512-vLZN9k5I7Nr/XB1IDG9GbZB4yQd1sPuvufMFgJkx0b31fi2LD97KQIjwjxE7xytdruAYfu5S0FLBLjdxmwGJCg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    acorn "^5.6.2"
+    acorn-dynamic-import "^3.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
     loader-runner "^2.3.0"
     loader-utils "^1.1.0"
     memory-fs "~0.4.1"
+    micromatch "^3.1.8"
     mkdirp "~0.5.0"
+    neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^4.2.1"
-    tapable "^0.2.7"
-    uglifyjs-webpack-plugin "^0.4.6"
-    watchpack "^1.4.0"
-    webpack-sources "^1.0.1"
-    yargs "^8.0.2"
+    schema-utils "^0.4.4"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
 
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -7719,88 +9598,90 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
 websocket.js@^0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/websocket.js/-/websocket.js-0.1.12.tgz#46c980787c57ebc8edcf44a0263e5d639367b85b"
+  integrity sha1-RsmAeHxX68jtz0SgJj5dY5NnuFs=
   dependencies:
     backoff "^2.4.1"
 
-whatwg-encoding@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
-    iconv-lite "0.4.19"
+    iconv-lite "0.4.24"
 
 whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
+  integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
 
-whatwg-url@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
+whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.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-url@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+  integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
   dependencies:
     lodash.sortby "^4.7.0"
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+whatwg-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.12, which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+which@^1.2.12, which@^1.2.9, which@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
   dependencies:
-    string-width "^1.0.2"
-
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+    string-width "^1.0.2 || 2"
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
 
 wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-worker-farm@^1.3.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae"
+worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
   dependencies:
-    errno "^0.1.4"
-    xtend "^4.0.1"
+    errno "~0.1.7"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
@@ -7808,10 +9689,12 @@ wrap-ansi@^2.0.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 write-file-atomic@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
+  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -7820,108 +9703,146 @@ write-file-atomic@^2.1.0:
 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"
 
-ws@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
+ws@^5.2.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+  integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
   dependencies:
     async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
 
-xml-name-validator@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
+ws@^6.0.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.2.tgz#3cc7462e98792f0ac679424148903ded3b9c3ad8"
+  integrity sha512-rfUqzvz0WxmSXtJpPMX2EeASXabOrSMk1ruMOV3JBTBjo4ac2lDjGGsbQSyxj8Odhw5fBib8ZKEjDNvgouNKYw==
+  dependencies:
+    async-limiter "~1.0.0"
+
+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==
+
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
 
-xtend@^4.0.0, xtend@^4.0.1:
+xtend@^4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yargs-parser@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
   dependencies:
-    camelcase "^3.0.0"
+    camelcase "^4.1.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
   dependencies:
-    camelcase "^3.0.0"
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
   dependencies:
     camelcase "^4.1.0"
 
-yargs@^6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  integrity sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
+    camelcase "^4.1.0"
+
+yargs@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
     get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    os-locale "^3.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^4.2.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
 
-yargs@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+yargs@^11.0.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  integrity sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
+    cliui "^4.0.0"
     decamelize "^1.1.1"
+    find-up "^2.1.0"
     get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    os-locale "^2.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
     y18n "^3.2.1"
-    yargs-parser "^5.0.0"
+    yargs-parser "^9.0.2"
 
-yargs@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+yargs@^12.0.2:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
   dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
     get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
+    os-locale "^3.0.0"
     require-directory "^2.1.1"
     require-main-filename "^1.0.1"
     set-blocking "^2.0.0"
     string-width "^2.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"
 
-yargs@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
+  integrity sha1-YpmpBVsc78lp/355wdkY3Osiw2A=
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"
@@ -7936,12 +9857,3 @@ yargs@^9.0.0:
     which-module "^2.0.0"
     y18n "^3.2.1"
     yargs-parser "^7.0.0"
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"