Merge remote-tracking branch 'upstream/main'

.github/workflows/test-ruby.yml

@@ -124,7 +124,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '.ruby-version'
     steps:
@@ -226,7 +225,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '.ruby-version'
     steps:
@@ -305,7 +303,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '.ruby-version'
 
@@ -422,7 +419,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '3.1'
           - '3.2'
           - '.ruby-version'
         search-image:

.nvmrc

@@ -1 +1 @@
-20.18
+22.11

.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - lib/mastodon/migration_helpers.rb
   ExtraDetails: true
   NewCops: enable
-  TargetRubyVersion: 3.1 # Oldest supported ruby version
+  TargetRubyVersion: 3.2 # Oldest supported ruby version
 
 inherit_from:
   - .rubocop/layout.yml

.ruby-version

@@ -1 +1 @@
-3.3.5
+3.3.6

Dockerfile

@@ -12,10 +12,10 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.3.5"
+ARG RUBY_VERSION="3.3.6"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
-ARG NODE_MAJOR_VERSION="20"
+ARG NODE_MAJOR_VERSION="22"
 # Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
 ARG DEBIAN_VERSION="bookworm"
 # Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
@@ -191,7 +191,7 @@ FROM build AS libvips
 
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
-ARG VIPS_VERSION=8.15.5
+ARG VIPS_VERSION=8.16.0
 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
 

Gemfile

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-ruby '>= 3.1.0'
+ruby '>= 3.2.0'
 
 gem 'propshaft'
 gem 'puma', '~> 6.3'
 gem 'rack', '~> 2.2.7'
-gem 'rails', '~> 7.1.1'
+gem 'rails', '~> 7.2.0'
 gem 'thor', '~> 1.2'
 
 gem 'dotenv'
@@ -16,16 +16,16 @@ gem 'pghero'
 
 gem 'aws-sdk-s3', '~> 1.123', require: false
 gem 'blurhash', '~> 0.1'
-gem 'fog-core', '<= 2.5.0'
+gem 'fog-core', '<= 2.6.0'
 gem 'fog-openstack', '~> 1.0', require: false
+gem 'jd-paperclip-azure', '~> 3.0', require: false
 gem 'kt-paperclip', '~> 7.2'
-gem 'md-paperclip-azure', '~> 2.2', require: false
 gem 'ruby-vips', '~> 2.2', require: false
 
 gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.8'
 gem 'bootsnap', '~> 1.18.0', require: false
-gem 'browser', '< 6' # https://github.com/fnando/browser/issues/543
+gem 'browser'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'chewy', '~> 7.3'
 gem 'devise', '~> 4.9'
@@ -47,13 +47,14 @@ gem 'color_diff', '~> 0.1'
 gem 'csv', '~> 3.2'
 gem 'discard', '~> 1.2'
 gem 'doorkeeper', '~> 5.6'
+gem 'faraday-httpclient'
 gem 'fast_blank', '~> 1.0'
 gem 'fastimage'
 gem 'hiredis', '~> 0.6'
 gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 5.2.0'
 gem 'http_accept_language', '~> 2.1'
-gem 'httplog', '~> 1.7.0'
+gem 'httplog', '~> 1.7.0', require: false
 gem 'i18n'
 gem 'idn-ruby', require: 'idn'
 gem 'inline_svg'
@@ -62,6 +63,7 @@ gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.6.0', require: 'mime/types/columnar'
+gem 'mutex_m'
 gem 'nokogiri', '~> 1.15'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
@@ -220,7 +222,7 @@ gem 'concurrent-ruby', require: false
 gem 'connection_pool', require: false
 gem 'xorcist', '~> 1.1'
 
-gem 'net-http', '~> 0.4.0'
+gem 'net-http', '~> 0.5.0'
 gem 'rubyzip', '~> 2.3'
 
 gem 'hcaptcha', '~> 7.1'

Gemfile.lock

@@ -10,51 +10,46 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    actioncable (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      actionview (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
+      mail (>= 2.8.0)
+    actionmailer (7.2.2)
+      actionpack (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activesupport (= 7.2.2)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.4.1)
-      actionview (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    actionpack (7.2.2)
+      actionview (= 7.2.2)
+      activesupport (= 7.2.2)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+      useragent (~> 0.16)
+    actiontext (7.2.2)
+      actionpack (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.4.1)
-      activesupport (= 7.1.4.1)
+    actionview (7.2.2)
+      activesupport (= 7.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,31 +59,33 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.4.1)
-      activesupport (= 7.1.4.1)
+    activejob (7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.4.1)
-      activesupport (= 7.1.4.1)
-    activerecord (7.1.4.1)
-      activemodel (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    activemodel (7.2.2)
+      activesupport (= 7.2.2)
+    activerecord (7.2.2)
+      activemodel (= 7.2.2)
+      activesupport (= 7.2.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    activestorage (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activesupport (= 7.2.2)
       marcel (~> 1.0)
-    activesupport (7.1.4.1)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
@@ -100,8 +97,8 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.992.0)
-    aws-sdk-core (3.210.0)
+    aws-partitions (1.1001.0)
+    aws-sdk-core (3.212.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -109,23 +106,18 @@ GEM
     aws-sdk-kms (1.95.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.169.0)
+    aws-sdk-s3 (1.170.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.0)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    azure-storage-blob (2.0.3)
-      azure-storage-common (~> 2.0)
-      nokogiri (~> 1, >= 1.10.8)
-    azure-storage-common (2.0.4)
-      faraday (~> 1.0)
-      faraday_middleware (~> 1.0, >= 1.0.0.rc1)
-      net-http-persistent (~> 4.0)
-      nokogiri (~> 1, >= 1.10.8)
+    azure-blob (0.5.2)
+      rexml
     base64 (0.2.0)
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
+    benchmark (0.3.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -139,7 +131,7 @@ GEM
       msgpack (~> 1.2)
     brakeman (6.2.2)
       racc
-    browser (5.3.1)
+    browser (6.0.0)
     brpoplpush-redis_script (0.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       redis (>= 1.0, < 6)
@@ -179,7 +171,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.19.0)
+    css_parser (1.19.1)
       addressable
     csv (3.3.0)
     database_cleaner-active_record (2.2.0)
@@ -206,8 +198,8 @@ GEM
       devise (>= 4.0.0)
       rpam2 (~> 4.0)
     diff-lcs (1.5.1)
-    discard (1.3.0)
-      activerecord (>= 4.2, < 8)
+    discard (1.4.0)
+      activerecord (>= 4.2, < 9.0)
     docile (1.4.1)
     domain_name (0.6.20240107)
     doorkeeper (5.7.1)
@@ -231,38 +223,21 @@ GEM
     erubi (1.13.0)
     et-orbi (1.2.11)
       tzinfo
-    excon (0.111.0)
+    excon (0.112.0)
     fabrication (2.31.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.2)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-httpclient (2.0.1)
+      httpclient (>= 2.2)
+    faraday-net_http (3.3.0)
+      net-http
     fast_blank (1.0.1)
     fastimage (2.3.1)
-    ffi (1.16.3)
+    ffi (1.17.0)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -350,8 +325,12 @@ GEM
     irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
+    jd-paperclip-azure (3.0.0)
+      addressable (~> 2.5)
+      azure-blob (~> 0.5.2)
+      hashie (~> 5.0)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.7.4)
     json-canonicalization (1.0.0)
     json-jwt (1.15.3.1)
       activesupport (>= 4.2)
@@ -366,7 +345,7 @@ GEM
       rack (>= 2.2, < 4)
       rdf (~> 3.3)
       rexml (~> 3.2)
-    json-ld-preloaded (3.3.0)
+    json-ld-preloaded (3.3.1)
       json-ld (~> 3.3)
       rdf (~> 3.3)
     json-schema (5.0.1)
@@ -412,7 +391,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -424,10 +403,6 @@ GEM
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
     matrix (0.4.2)
-    md-paperclip-azure (2.2.0)
-      addressable (~> 2.5)
-      azure-storage-blob (~> 2.0.1)
-      hashie (~> 5.0)
     memory_profiler (1.1.0)
     mime-types (3.6.0)
       logger
@@ -436,15 +411,12 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.25.1)
-    msgpack (1.7.2)
+    msgpack (1.7.3)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
     mutex_m (0.2.0)
-    net-http (0.4.1)
+    net-http (0.5.0)
       uri
-    net-http-persistent (4.0.2)
-      connection_pool (~> 2.2)
-    net-imap (0.4.15)
+    net-imap (0.5.0)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -458,7 +430,7 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.6)
+    oj (3.16.7)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.2)
@@ -639,20 +611,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.4.1)
-      actioncable (= 7.1.4.1)
-      actionmailbox (= 7.1.4.1)
-      actionmailer (= 7.1.4.1)
-      actionpack (= 7.1.4.1)
-      actiontext (= 7.1.4.1)
-      actionview (= 7.1.4.1)
-      activejob (= 7.1.4.1)
-      activemodel (= 7.1.4.1)
-      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
+    rails (7.2.2)
+      actioncable (= 7.2.2)
+      actionmailbox (= 7.2.2)
+      actionmailer (= 7.2.2)
+      actionpack (= 7.2.2)
+      actiontext (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activemodel (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.4.1)
+      railties (= 7.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -664,13 +636,13 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.4.1)
-      actionpack (= 7.1.4.1)
-      activesupport (= 7.1.4.1)
-      irb
+    railties (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -699,9 +671,9 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.8)
+    rexml (3.3.9)
     rotp (6.3.0)
-    rouge (4.3.0)
+    rouge (4.4.0)
     rpam2 (4.0.2)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
@@ -711,14 +683,14 @@ GEM
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.1)
+    rspec-core (3.13.2)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.2)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-github (2.4.0)
       rspec-core (~> 3.0)
-    rspec-mocks (3.13.1)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-rails (7.0.1)
@@ -752,12 +724,12 @@ GEM
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.2)
+    rubocop-rails (2.27.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.1.0)
+    rubocop-rspec (3.2.0)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -770,7 +742,6 @@ GEM
     ruby-vips (2.2.2)
       ffi (~> 1.12)
       logger
-    ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     rufus-scheduler (3.9.1)
       fugit (~> 1.1, >= 1.1.6)
@@ -782,7 +753,8 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    selenium-webdriver (4.25.0)
+    securerandom (0.3.1)
+    selenium-webdriver (4.26.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
@@ -823,7 +795,7 @@ GEM
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.1)
-    strong_migrations (2.0.1)
+    strong_migrations (2.0.2)
       activerecord (>= 6.1)
     swd (1.3.0)
       activesupport (>= 3)
@@ -865,6 +837,7 @@ GEM
     unf_ext (0.0.9.1)
     unicode-display_width (2.6.0)
     uri (0.13.1)
+    useragent (0.16.10)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
@@ -903,7 +876,7 @@ GEM
     xorcist (1.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.18)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   ruby
@@ -918,7 +891,7 @@ DEPENDENCIES
   blurhash (~> 0.1)
   bootsnap (~> 1.18.0)
   brakeman (~> 6.0)
-  browser (< 6)
+  browser
   bundler-audit (~> 0.9)
   capybara (~> 3.39)
   charlock_holmes (~> 0.7.7)
@@ -940,10 +913,11 @@ DEPENDENCIES
   email_spec
   fabrication (~> 2.30)
   faker (~> 3.2)
+  faraday-httpclient
   fast_blank (~> 1.0)
   fastimage
   flatware-rspec
-  fog-core (<= 2.5.0)
+  fog-core (<= 2.6.0)
   fog-openstack (~> 1.0)
   haml-rails (~> 2.0)
   haml_lint
@@ -958,6 +932,7 @@ DEPENDENCIES
   idn-ruby
   inline_svg
   irb (~> 1.8)
+  jd-paperclip-azure (~> 3.0)
   json-ld
   json-ld-preloaded (~> 3.2)
   json-schema (~> 5.0)
@@ -969,10 +944,10 @@ DEPENDENCIES
   lograge (~> 0.12)
   mail (~> 2.8)
   mario-redis-lock (~> 1.2)
-  md-paperclip-azure (~> 2.2)
   memory_profiler
   mime-types (~> 3.6.0)
-  net-http (~> 0.4.0)
+  mutex_m
+  net-http (~> 0.5.0)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
   oj (~> 3.14)
@@ -1010,7 +985,7 @@ DEPENDENCIES
   rack-attack (~> 6.6)
   rack-cors (~> 2.0)
   rack-test (~> 2.1)
-  rails (~> 7.1.1)
+  rails (~> 7.2.0)
   rails-controller-testing (~> 1.0)
   rails-i18n (~> 7.0)
   rdf-normalize (~> 0.5)

README.md

@@ -69,7 +69,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre
 
 - **PostgreSQL** 12+
 - **Redis** 4+
-- **Ruby** 3.1+
+- **Ruby** 3.2+
 - **Node.js** 18+
 
 The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, and **Scalingo**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.

Rakefile

@@ -3,6 +3,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('config/application', __dir__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

app/controllers/activitypub/outboxes_controller.rb

@@ -41,11 +41,11 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
     end
   end
 
-  def outbox_url(**kwargs)
+  def outbox_url(**)
     if params[:account_username].present?
-      account_outbox_url(@account, **kwargs)
+      account_outbox_url(@account, **)
     else
-      instance_actor_outbox_url(**kwargs)
+      instance_actor_outbox_url(**)
     end
   end
 

app/controllers/admin/email_domain_blocks_controller.rb

@@ -5,7 +5,7 @@ module Admin
     def index
       authorize :email_domain_block, :index?
 
-      @email_domain_blocks = EmailDomainBlock.where(parent_id: nil).includes(:children).order(id: :desc).page(params[:page])
+      @email_domain_blocks = EmailDomainBlock.parents.includes(:children).order(id: :desc).page(params[:page])
       @form                = Form::EmailDomainBlockBatch.new
     end
 

app/controllers/admin/invites_controller.rb

@@ -32,7 +32,7 @@ module Admin
 
     def deactivate_all
       authorize :invite, :deactivate_all?
-      Invite.available.in_batches.update_all(expires_at: Time.now.utc)
+      Invite.available.in_batches.touch_all(:expires_at)
       redirect_to admin_invites_path
     end
 

app/controllers/admin/trends/links_controller.rb

@@ -4,7 +4,7 @@ class Admin::Trends::LinksController < Admin::BaseController
   def index
     authorize :preview_card, :review?
 
-    @locales       = PreviewCardTrend.pluck('distinct language')
+    @locales       = PreviewCardTrend.locales
     @preview_cards = filtered_preview_cards.page(params[:page])
     @form          = Trends::PreviewCardBatch.new
   end

app/controllers/admin/trends/statuses_controller.rb

@@ -4,7 +4,7 @@ class Admin::Trends::StatusesController < Admin::BaseController
   def index
     authorize [:admin, :status], :review?
 
-    @locales  = StatusTrend.pluck('distinct language')
+    @locales  = StatusTrend.locales
     @statuses = filtered_statuses.page(params[:page])
     @form     = Trends::StatusBatch.new
   end

app/controllers/api/v1/accounts_controller.rb

@@ -106,8 +106,8 @@ class Api::V1::AccountsController < Api::BaseController
     render json: { error: I18n.t('accounts.self_follow_error') }, status: 403 if current_user.account.id == @account.id
   end
 
-  def relationships(**options)
-    AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
+  def relationships(**)
+    AccountRelationshipsPresenter.new([@account], current_user.account_id, **)
   end
 
   def account_ids

app/controllers/api/v1/annual_reports_controller.rb

@@ -17,6 +17,17 @@ class Api::V1::AnnualReportsController < Api::BaseController
            relationships: @relationships
   end
 
+  def show
+    with_read_replica do
+      @presenter = AnnualReportsPresenter.new([@annual_report])
+      @relationships = StatusRelationshipsPresenter.new(@presenter.statuses, current_account.id)
+    end
+
+    render json: @presenter,
+           serializer: REST::AnnualReportsSerializer,
+           relationships: @relationships
+  end
+
   def read
     @annual_report.view!
     render_empty

app/controllers/api/v1/follow_requests_controller.rb

@@ -28,8 +28,8 @@ class Api::V1::FollowRequestsController < Api::BaseController
     @account ||= Account.find(params[:id])
   end
 
-  def relationships(**options)
-    AccountRelationshipsPresenter.new([account], current_user.account_id, **options)
+  def relationships(**)
+    AccountRelationshipsPresenter.new([account], current_user.account_id, **)
   end
 
   def load_accounts

app/controllers/oauth/userinfo_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Oauth::UserinfoController < Api::BaseController
+  before_action -> { doorkeeper_authorize! :profile }, only: [:show]
+  before_action :require_user!
+
+  def show
+    @account = current_account
+    render json: @account, serializer: OauthUserinfoSerializer
+  end
+end

app/helpers/formatting_helper.rb

@@ -27,7 +27,14 @@ module FormattingHelper
   module_function :extract_status_plain_text
 
   def status_content_format(status)
-    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
+    MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span|
+      span.add_attributes(
+        'app.formatter.content.type' => 'status',
+        'app.formatter.content.origin' => status.local? ? 'local' : 'remote'
+      )
+
+      html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
+    end
   end
 
   def rss_status_content_format(status)
@@ -39,7 +46,14 @@ module FormattingHelper
   end
 
   def account_bio_format(account)
-    html_aware_format(account.note, account.local?)
+    MastodonOTELTracer.in_span('HtmlAwareFormatter rendering') do |span|
+      span.add_attributes(
+        'app.formatter.content.type' => 'account_bio',
+        'app.formatter.content.origin' => account.local? ? 'local' : 'remote'
+      )
+
+      html_aware_format(account.note, account.local?)
+    end
   end
 
   def account_field_value_format(field, with_rel_me: true)

app/helpers/media_component_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MediaComponentHelper
-  def render_video_component(status, **options)
+  def render_video_component(status, **)
     video = status.ordered_media_attachments.first
 
     meta = video.file.meta || {}
@@ -18,14 +18,14 @@ module MediaComponentHelper
       media: [
         serialize_media_attachment(video),
       ].as_json,
-    }.merge(**options)
+    }.merge(**)
 
     react_component :video, component_params do
       render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
     end
   end
 
-  def render_audio_component(status, **options)
+  def render_audio_component(status, **)
     audio = status.ordered_media_attachments.first
 
     meta = audio.file.meta || {}
@@ -38,19 +38,19 @@ module MediaComponentHelper
       foregroundColor: meta.dig('colors', 'foreground'),
       accentColor: meta.dig('colors', 'accent'),
       duration: meta.dig('original', 'duration'),
-    }.merge(**options)
+    }.merge(**)
 
     react_component :audio, component_params do
       render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }
     end
   end
 
-  def render_media_gallery_component(status, **options)
+  def render_media_gallery_component(status, **)
     component_params = {
       sensitive: sensitive_viewer?(status, current_account),
       autoplay: prefers_autoplay?,
       media: status.ordered_media_attachments.map { |a| serialize_media_attachment(a).as_json },
-    }.merge(**options)
+    }.merge(**)
 
     react_component :media_gallery, component_params do
       render partial: 'statuses/attachment_list', locals: { attachments: status.ordered_media_attachments }

app/helpers/registration_helper.rb

@@ -16,6 +16,6 @@ module RegistrationHelper
   end
 
   def ip_blocked?(remote_ip)
-    IpBlock.where(severity: :sign_up_block).exists?(['ip >>= ?', remote_ip.to_s])
+    IpBlock.severity_sign_up_block.containing(remote_ip.to_s).exists?
   end
 end

app/helpers/routing_helper.rb

@@ -14,8 +14,8 @@ module RoutingHelper
     end
   end
 
-  def full_asset_url(source, **options)
-    source = ActionController::Base.helpers.asset_url(source, **options) unless use_storage?
+  def full_asset_url(source, **)
+    source = ActionController::Base.helpers.asset_url(source, **) unless use_storage?
 
     URI.join(asset_host, source).to_s
   end
@@ -24,12 +24,12 @@ module RoutingHelper
     Rails.configuration.action_controller.asset_host || root_url
   end
 
-  def frontend_asset_path(source, **options)
-    asset_pack_path("media/#{source}", **options)
+  def frontend_asset_path(source, **)
+    asset_pack_path("media/#{source}", **)
   end
 
-  def frontend_asset_url(source, **options)
-    full_asset_url(frontend_asset_path(source, **options))
+  def frontend_asset_url(source, **)
+    full_asset_url(frontend_asset_path(source, **))
   end
 
   def use_storage?

app/javascript/mastodon/api_types/notifications.ts

@@ -20,6 +20,7 @@ export const allNotificationTypes = [
   'admin.report',
   'moderation_warning',
   'severed_relationships',
+  'annual_report',
 ];
 
 export type NotificationWithStatusType =
@@ -37,7 +38,8 @@ export type NotificationType =
   | 'moderation_warning'
   | 'severed_relationships'
   | 'admin.sign_up'
-  | 'admin.report';
+  | 'admin.report'
+  | 'annual_report';
 
 export interface BaseNotificationJSON {
   id: string;
@@ -130,6 +132,15 @@ interface AccountRelationshipSeveranceNotificationJSON
   event: ApiAccountRelationshipSeveranceEventJSON;
 }
 
+export interface ApiAnnualReportEventJSON {
+  year: string;
+}
+
+interface AnnualReportNotificationGroupJSON extends BaseNotificationGroupJSON {
+  type: 'annual_report';
+  annual_report: ApiAnnualReportEventJSON;
+}
+
 export type ApiNotificationJSON =
   | SimpleNotificationJSON
   | ReportNotificationJSON
@@ -142,7 +153,8 @@ export type ApiNotificationGroupJSON =
   | ReportNotificationGroupJSON
   | AccountRelationshipSeveranceNotificationGroupJSON
   | NotificationGroupWithStatusJSON
-  | ModerationWarningNotificationGroupJSON;
+  | ModerationWarningNotificationGroupJSON
+  | AnnualReportNotificationGroupJSON;
 
 export interface ApiNotificationGroupsResultJSON {
   accounts: ApiAccountJSON[];

app/javascript/mastodon/components/media_gallery.jsx

@@ -97,12 +97,12 @@ class Item extends PureComponent {
       height = 50;
     }
 
-    if (attachment.get('description')?.length > 0) {
-      badges.push(<AltTextBadge key='alt' description={attachment.get('description')} />);
-    }
-
     const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
+    if (description?.length > 0) {
+      badges.push(<AltTextBadge key='alt' description={description} />);
+    }
+
     if (attachment.get('type') === 'unknown') {
       return (
         <div className={classNames('media-gallery__item', { standalone, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100 })} key={attachment.get('id')}>

app/javascript/mastodon/components/modal_root.jsx

@@ -13,11 +13,14 @@ class ModalRoot extends PureComponent {
   static propTypes = {
     children: PropTypes.node,
     onClose: PropTypes.func.isRequired,
-    backgroundColor: PropTypes.shape({
-      r: PropTypes.number,
-      g: PropTypes.number,
-      b: PropTypes.number,
-    }),
+    backgroundColor: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.shape({
+        r: PropTypes.number,
+        g: PropTypes.number,
+        b: PropTypes.number,
+      }),
+    ]),
     ignoreFocus: PropTypes.bool,
     ...WithOptionalRouterPropTypes,
   };
@@ -141,14 +144,17 @@ class ModalRoot extends PureComponent {
 
     let backgroundColor = null;
 
-    if (this.props.backgroundColor) {
-      backgroundColor = multiply({ ...this.props.backgroundColor, a: 1 }, { r: 0, g: 0, b: 0, a: 0.7 });
+    if (this.props.backgroundColor && typeof this.props.backgroundColor === 'string') {
+      backgroundColor = this.props.backgroundColor;
+    } else if (this.props.backgroundColor) {
+      const darkenedColor = multiply({ ...this.props.backgroundColor, a: 1 }, { r: 0, g: 0, b: 0, a: 0.7 });
+      backgroundColor = `rgb(${darkenedColor.r}, ${darkenedColor.g}, ${darkenedColor.b})`;
     }
 
     return (
       <div className='modal-root' ref={this.setRef}>
         <div style={{ pointerEvents: visible ? 'auto' : 'none' }}>
-          <div role='presentation' className='modal-root__overlay' onClick={onClose} style={{ backgroundColor: backgroundColor ? `rgba(${backgroundColor.r}, ${backgroundColor.g}, ${backgroundColor.b}, 0.9)` : null }} />
+          <div role='presentation' className='modal-root__overlay' onClick={onClose} style={{ backgroundColor }} />
           <div role='dialog' className='modal-root__container'>{children}</div>
         </div>
       </div>

app/javascript/mastodon/components/poll.jsx

@@ -41,12 +41,14 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
 class Poll extends ImmutablePureComponent {
   static propTypes = {
     identity: identityContextPropShape,
-    poll: ImmutablePropTypes.map,
+    poll: ImmutablePropTypes.map.isRequired,
+    status: ImmutablePropTypes.map.isRequired,
     lang: PropTypes.string,
     intl: PropTypes.object.isRequired,
     disabled: PropTypes.bool,
     refresh: PropTypes.func,
     onVote: PropTypes.func,
+    onInteractionModal: PropTypes.func,
   };
 
   state = {
@@ -117,7 +119,11 @@ class Poll extends ImmutablePureComponent {
       return;
     }
 
-    this.props.onVote(Object.keys(this.state.selected));
+    if (this.props.identity.signedIn) {
+      this.props.onVote(Object.keys(this.state.selected));
+    } else {
+      this.props.onInteractionModal('vote', this.props.status);
+    }
   };
 
   handleRefresh = () => {
@@ -232,7 +238,7 @@ class Poll extends ImmutablePureComponent {
         </ul>
 
         <div className='poll__footer'>
-          {!showResults && <button className='button button-secondary' disabled={disabled || !this.props.identity.signedIn} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
+          {!showResults && <button className='button button-secondary' disabled={disabled} onClick={this.handleVote}><FormattedMessage id='poll.vote' defaultMessage='Vote' /></button>}
           {!showResults && <><button className='poll__link' onClick={this.handleReveal}><FormattedMessage id='poll.reveal' defaultMessage='See results' /></button> · </>}
           {showResults && !this.props.disabled && <><button className='poll__link' onClick={this.handleRefresh}><FormattedMessage id='poll.refresh' defaultMessage='Refresh' /></button> · </>}
           {votesCount}

app/javascript/mastodon/components/status.jsx

@@ -393,13 +393,16 @@ class Status extends ImmutablePureComponent {
     };
 
     let media, statusAvatar, prepend, rebloggedByText;
+    const matchedFilters = status.get('matched_filters');
+    const expanded = (!matchedFilters || this.state.showDespiteFilter) && (!status.get('hidden') || status.get('spoiler_text').length === 0);
 
     if (hidden) {
       return (
         <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
           <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex={unfocusable ? null : 0}>
             <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
-            <span>{status.get('content')}</span>
+            {status.get('spoiler_text').length > 0 && (<span>{status.get('spoiler_text')}</span>)}
+            {expanded && <span>{status.get('content')}</span>}
           </div>
         </HotKeys>
       );
@@ -408,7 +411,6 @@ class Status extends ImmutablePureComponent {
     const connectUp = previousId && previousId === status.get('in_reply_to_id');
     const connectToRoot = rootId && rootId === status.get('in_reply_to_id');
     const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
-    const matchedFilters = status.get('matched_filters');
 
     if (featured) {
       prepend = (
@@ -538,7 +540,6 @@ class Status extends ImmutablePureComponent {
     }
 
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
-    const expanded = (!matchedFilters || this.state.showDespiteFilter) && (!status.get('hidden') || status.get('spoiler_text').length === 0);
 
     return (
       <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>

app/javascript/mastodon/components/status_content.jsx

@@ -245,7 +245,7 @@ class StatusContent extends PureComponent {
     );
 
     const poll = !!status.get('poll') && (
-      <PollContainer pollId={status.get('poll')} lang={language} />
+      <PollContainer pollId={status.get('poll')} status={status} lang={language} />
     );
 
     if (this.props.onClick) {

app/javascript/mastodon/containers/poll_container.js

@@ -2,6 +2,7 @@ import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
 
+import { openModal } from 'mastodon/actions/modal';
 import { fetchPoll, vote } from 'mastodon/actions/polls';
 import Poll from 'mastodon/components/poll';
 
@@ -17,6 +18,17 @@ const mapDispatchToProps = (dispatch, { pollId }) => ({
   onVote (choices) {
     dispatch(vote(pollId, choices));
   },
+
+  onInteractionModal (type, status) {
+    dispatch(openModal({
+      modalType: 'INTERACTION',
+      modalProps: {
+        type,
+        accountId: status.getIn(['account', 'id']),
+        url: status.get('uri'),
+      },
+    }));
+  }
 });
 
 const mapStateToProps = (state, { pollId }) => ({

app/javascript/mastodon/features/annual_report/archetype.tsx

@@ -0,0 +1,69 @@
+import { FormattedMessage } from 'react-intl';
+
+import booster from '@/images/archetypes/booster.png';
+import lurker from '@/images/archetypes/lurker.png';
+import oracle from '@/images/archetypes/oracle.png';
+import pollster from '@/images/archetypes/pollster.png';
+import replier from '@/images/archetypes/replier.png';
+import type { Archetype as ArchetypeData } from 'mastodon/models/annual_report';
+
+export const Archetype: React.FC<{
+  data: ArchetypeData;
+}> = ({ data }) => {
+  let illustration, label;
+
+  switch (data) {
+    case 'booster':
+      illustration = booster;
+      label = (
+        <FormattedMessage
+          id='annual_report.summary.archetype.booster'
+          defaultMessage='The cool-hunter'
+        />
+      );
+      break;
+    case 'replier':
+      illustration = replier;
+      label = (
+        <FormattedMessage
+          id='annual_report.summary.archetype.replier'
+          defaultMessage='The social butterfly'
+        />
+      );
+      break;
+    case 'pollster':
+      illustration = pollster;
+      label = (
+        <FormattedMessage
+          id='annual_report.summary.archetype.pollster'
+          defaultMessage='The pollster'
+        />
+      );
+      break;
+    case 'lurker':
+      illustration = lurker;
+      label = (
+        <FormattedMessage
+          id='annual_report.summary.archetype.lurker'
+          defaultMessage='The lurker'
+        />
+      );
+      break;
+    case 'oracle':
+      illustration = oracle;
+      label = (
+        <FormattedMessage
+          id='annual_report.summary.archetype.oracle'
+          defaultMessage='The oracle'
+        />
+      );
+      break;
+  }
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__archetype'>
+      <div className='annual-report__summary__archetype__label'>{label}</div>
+      <img src={illustration} alt='' />
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/followers.tsx

@@ -0,0 +1,69 @@
+import { FormattedMessage, FormattedNumber } from 'react-intl';
+
+import { Sparklines, SparklinesCurve } from 'react-sparklines';
+
+import { ShortNumber } from 'mastodon/components/short_number';
+import type { TimeSeriesMonth } from 'mastodon/models/annual_report';
+
+export const Followers: React.FC<{
+  data: TimeSeriesMonth[];
+  total?: number;
+}> = ({ data, total }) => {
+  const change = data.reduce((sum, item) => sum + item.followers, 0);
+
+  const cumulativeGraph = data.reduce(
+    (newData, item) => [
+      ...newData,
+      item.followers + (newData[newData.length - 1] ?? 0),
+    ],
+    [0],
+  );
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__followers'>
+      <Sparklines data={cumulativeGraph} margin={0}>
+        <svg>
+          <defs>
+            <linearGradient id='gradient' x1='0%' y1='0%' x2='0%' y2='100%'>
+              <stop
+                offset='0%'
+                stopColor='var(--sparkline-gradient-top)'
+                stopOpacity='1'
+              />
+              <stop
+                offset='100%'
+                stopColor='var(--sparkline-gradient-bottom)'
+                stopOpacity='0'
+              />
+            </linearGradient>
+          </defs>
+        </svg>
+
+        <SparklinesCurve style={{ fill: 'none' }} />
+      </Sparklines>
+
+      <div className='annual-report__summary__followers__foreground'>
+        <div className='annual-report__summary__followers__number'>
+          {change > -1 ? '+' : '-'}
+          <FormattedNumber value={change} />
+        </div>
+
+        <div className='annual-report__summary__followers__label'>
+          <span>
+            <FormattedMessage
+              id='annual_report.summary.followers.followers'
+              defaultMessage='followers'
+            />
+          </span>
+          <div className='annual-report__summary__followers__footnote'>
+            <FormattedMessage
+              id='annual_report.summary.followers.total'
+              defaultMessage='{count} total'
+              values={{ count: <ShortNumber value={total ?? 0} /> }}
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/highlighted_post.tsx

@@ -0,0 +1,105 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return,
+                  @typescript-eslint/no-explicit-any,
+                  @typescript-eslint/no-unsafe-assignment */
+
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
+import { DetailedStatus } from 'mastodon/features/status/components/detailed_status';
+import { me } from 'mastodon/initial_state';
+import type { TopStatuses } from 'mastodon/models/annual_report';
+import { makeGetStatus, makeGetPictureInPicture } from 'mastodon/selectors';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+const getStatus = makeGetStatus() as unknown as (arg0: any, arg1: any) => any;
+const getPictureInPicture = makeGetPictureInPicture() as unknown as (
+  arg0: any,
+  arg1: any,
+) => any;
+
+export const HighlightedPost: React.FC<{
+  data: TopStatuses;
+}> = ({ data }) => {
+  let statusId, label;
+
+  if (data.by_reblogs) {
+    statusId = data.by_reblogs;
+    label = (
+      <FormattedMessage
+        id='annual_report.summary.highlighted_post.by_reblogs'
+        defaultMessage='most boosted post'
+      />
+    );
+  } else if (data.by_favourites) {
+    statusId = data.by_favourites;
+    label = (
+      <FormattedMessage
+        id='annual_report.summary.highlighted_post.by_favourites'
+        defaultMessage='most favourited post'
+      />
+    );
+  } else {
+    statusId = data.by_replies;
+    label = (
+      <FormattedMessage
+        id='annual_report.summary.highlighted_post.by_replies'
+        defaultMessage='post with the most replies'
+      />
+    );
+  }
+
+  const dispatch = useAppDispatch();
+  const domain = useAppSelector((state) => state.meta.get('domain'));
+  const status = useAppSelector((state) =>
+    statusId ? getStatus(state, { id: statusId }) : undefined,
+  );
+  const pictureInPicture = useAppSelector((state) =>
+    statusId ? getPictureInPicture(state, { id: statusId }) : undefined,
+  );
+  const account = useAppSelector((state) =>
+    me ? state.accounts.get(me) : undefined,
+  );
+
+  const handleToggleHidden = useCallback(() => {
+    dispatch(toggleStatusSpoilers(statusId));
+  }, [dispatch, statusId]);
+
+  if (!status) {
+    return (
+      <div className='annual-report__bento__box annual-report__summary__most-boosted-post' />
+    );
+  }
+
+  const displayName = (
+    <span className='display-name'>
+      <strong className='display-name__html'>
+        <FormattedMessage
+          id='annual_report.summary.highlighted_post.possessive'
+          defaultMessage="{name}'s"
+          values={{
+            name: account && (
+              <bdi
+                dangerouslySetInnerHTML={{ __html: account.display_name_html }}
+              />
+            ),
+          }}
+        />
+      </strong>
+      <span className='display-name__account'>{label}</span>
+    </span>
+  );
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__most-boosted-post'>
+      <DetailedStatus
+        status={status}
+        pictureInPicture={pictureInPicture}
+        domain={domain}
+        onToggleHidden={handleToggleHidden}
+        overrideDisplayName={displayName}
+      />
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/index.tsx

@@ -0,0 +1,99 @@
+import { useState, useEffect } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import {
+  importFetchedStatuses,
+  importFetchedAccounts,
+} from 'mastodon/actions/importer';
+import { apiRequestGet, apiRequestPost } from 'mastodon/api';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { me } from 'mastodon/initial_state';
+import type { Account } from 'mastodon/models/account';
+import type { AnnualReport as AnnualReportData } from 'mastodon/models/annual_report';
+import type { Status } from 'mastodon/models/status';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+import { Archetype } from './archetype';
+import { Followers } from './followers';
+import { HighlightedPost } from './highlighted_post';
+import { MostUsedHashtag } from './most_used_hashtag';
+import { NewPosts } from './new_posts';
+import { Percentile } from './percentile';
+
+interface AnnualReportResponse {
+  annual_reports: AnnualReportData[];
+  accounts: Account[];
+  statuses: Status[];
+}
+
+export const AnnualReport: React.FC<{
+  year: string;
+}> = ({ year }) => {
+  const [response, setResponse] = useState<AnnualReportResponse | null>(null);
+  const [loading, setLoading] = useState(false);
+  const currentAccount = useAppSelector((state) =>
+    me ? state.accounts.get(me) : undefined,
+  );
+  const dispatch = useAppDispatch();
+
+  useEffect(() => {
+    setLoading(true);
+
+    apiRequestGet<AnnualReportResponse>(`v1/annual_reports/${year}`)
+      .then((data) => {
+        dispatch(importFetchedStatuses(data.statuses));
+        dispatch(importFetchedAccounts(data.accounts));
+
+        setResponse(data);
+        setLoading(false);
+
+        return apiRequestPost(`v1/annual_reports/${year}/read`);
+      })
+      .catch(() => {
+        setLoading(false);
+      });
+  }, [dispatch, year, setResponse, setLoading]);
+
+  if (loading) {
+    return <LoadingIndicator />;
+  }
+
+  const report = response?.annual_reports[0];
+
+  if (!report) {
+    return null;
+  }
+
+  return (
+    <div className='annual-report'>
+      <div className='annual-report__header'>
+        <h1>
+          <FormattedMessage
+            id='annual_report.summary.thanks'
+            defaultMessage='Thanks for being part of Mastodon!'
+          />
+        </h1>
+        <p>
+          <FormattedMessage
+            id='annual_report.summary.here_it_is'
+            defaultMessage='Here is your {year} in review:'
+            values={{ year: report.year }}
+          />
+        </p>
+      </div>
+
+      <div className='annual-report__bento annual-report__summary'>
+        <Archetype data={report.data.archetype} />
+        <HighlightedPost data={report.data.top_statuses} />
+        <Followers
+          data={report.data.time_series}
+          total={currentAccount?.followers_count}
+        />
+        <MostUsedHashtag data={report.data.top_hashtags} />
+        <Percentile data={report.data.percentiles} />
+        <NewPosts data={report.data.time_series} />
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/most_used_app.tsx

@@ -0,0 +1,29 @@
+import { FormattedMessage } from 'react-intl';
+
+import type { NameAndCount } from 'mastodon/models/annual_report';
+
+export const MostUsedApp: React.FC<{
+  data: NameAndCount[];
+}> = ({ data }) => {
+  const app = data[0];
+
+  if (!app) {
+    return (
+      <div className='annual-report__bento__box annual-report__summary__most-used-app' />
+    );
+  }
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__most-used-app'>
+      <div className='annual-report__summary__most-used-app__icon'>
+        {app.name}
+      </div>
+      <div className='annual-report__summary__most-used-app__label'>
+        <FormattedMessage
+          id='annual_report.summary.most_used_app.most_used_app'
+          defaultMessage='most used app'
+        />
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/most_used_hashtag.tsx

@@ -0,0 +1,29 @@
+import { FormattedMessage } from 'react-intl';
+
+import type { NameAndCount } from 'mastodon/models/annual_report';
+
+export const MostUsedHashtag: React.FC<{
+  data: NameAndCount[];
+}> = ({ data }) => {
+  const hashtag = data[0];
+
+  if (!hashtag) {
+    return (
+      <div className='annual-report__bento__box annual-report__summary__most-used-hashtag' />
+    );
+  }
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__most-used-hashtag'>
+      <div className='annual-report__summary__most-used-hashtag__hashtag'>
+        #{hashtag.name}
+      </div>
+      <div className='annual-report__summary__most-used-hashtag__label'>
+        <FormattedMessage
+          id='annual_report.summary.most_used_hashtag.most_used_hashtag'
+          defaultMessage='most used hashtag'
+        />
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/new_posts.tsx

@@ -0,0 +1,53 @@
+import { FormattedNumber, FormattedMessage } from 'react-intl';
+
+import ChatBubbleIcon from '@/material-icons/400-24px/chat_bubble.svg?react';
+import type { TimeSeriesMonth } from 'mastodon/models/annual_report';
+
+export const NewPosts: React.FC<{
+  data: TimeSeriesMonth[];
+}> = ({ data }) => {
+  const posts = data.reduce((sum, item) => sum + item.statuses, 0);
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__new-posts'>
+      <svg width={500} height={500}>
+        <defs>
+          <pattern
+            id='posts'
+            x='0'
+            y='0'
+            width='32'
+            height='35'
+            patternUnits='userSpaceOnUse'
+          >
+            <circle cx='12' cy='12' r='12' fill='var(--lime)' />
+            <ChatBubbleIcon
+              fill='var(--indigo-1)'
+              x='4'
+              y='4'
+              width='16'
+              height='16'
+            />
+          </pattern>
+        </defs>
+
+        <rect
+          width={500}
+          height={500}
+          fill='url(#posts)'
+          style={{ opacity: 0.2 }}
+        />
+      </svg>
+
+      <div className='annual-report__summary__new-posts__number'>
+        <FormattedNumber value={posts} />
+      </div>
+      <div className='annual-report__summary__new-posts__label'>
+        <FormattedMessage
+          id='annual_report.summary.new_posts.new_posts'
+          defaultMessage='new posts'
+        />
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/annual_report/percentile.tsx

@@ -0,0 +1,53 @@
+/* eslint-disable react/jsx-no-useless-fragment */
+import { FormattedMessage, FormattedNumber } from 'react-intl';
+
+import type { Percentiles } from 'mastodon/models/annual_report';
+
+export const Percentile: React.FC<{
+  data: Percentiles;
+}> = ({ data }) => {
+  const percentile = data.statuses;
+
+  return (
+    <div className='annual-report__bento__box annual-report__summary__percentile'>
+      <FormattedMessage
+        id='annual_report.summary.percentile.text'
+        defaultMessage='<topLabel>That puts you in the top</topLabel><percentage></percentage><bottomLabel>of Mastodon users.</bottomLabel>'
+        values={{
+          topLabel: (str) => (
+            <div className='annual-report__summary__percentile__label'>
+              {str}
+            </div>
+          ),
+          percentage: () => (
+            <div className='annual-report__summary__percentile__number'>
+              <FormattedNumber
+                value={percentile / 100}
+                style='percent'
+                maximumFractionDigits={1}
+              />
+            </div>
+          ),
+          bottomLabel: (str) => (
+            <div>
+              <div className='annual-report__summary__percentile__label'>
+                {str}
+              </div>
+
+              {percentile < 6 && (
+                <div className='annual-report__summary__percentile__footnote'>
+                  <FormattedMessage
+                    id='annual_report.summary.percentile.we_wont_tell_bernie'
+                    defaultMessage="We won't tell Bernie."
+                  />
+                </div>
+              )}
+            </div>
+          ),
+        }}
+      >
+        {(message) => <>{message}</>}
+      </FormattedMessage>
+    </div>
+  );
+};

app/javascript/mastodon/features/follow_requests/index.jsx

@@ -68,7 +68,7 @@ class FollowRequests extends ImmutablePureComponent {
     );
 
     return (
-      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)}>
+      <Column bindToDocument={!multiColumn} icon='user-plus' iconComponent={PersonAddIcon} heading={intl.formatMessage(messages.heading)} alwaysShowBackButton>
         <ScrollableList
           scrollKey='follow_requests'
           onLoadMore={this.handleLoadMore}

app/javascript/mastodon/features/interaction_modal/index.jsx

@@ -9,6 +9,7 @@ import { connect } from 'react-redux';
 
 import { throttle, escapeRegExp } from 'lodash';
 
+import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
 import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@@ -340,7 +341,7 @@ class InteractionModal extends React.PureComponent {
   static propTypes = {
     displayNameHtml: PropTypes.string,
     url: PropTypes.string,
-    type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow']),
+    type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow', 'vote']),
     onSignupClick: PropTypes.func.isRequired,
     signupUrl: PropTypes.string.isRequired,
   };
@@ -377,6 +378,11 @@ class InteractionModal extends React.PureComponent {
       title = <FormattedMessage id='interaction_modal.title.follow' defaultMessage='Follow {name}' values={{ name }} />;
       actionDescription = <FormattedMessage id='interaction_modal.description.follow' defaultMessage='With an account on Mastodon, you can follow {name} to receive their posts in your home feed.' values={{ name }} />;
       break;
+    case 'vote':
+      icon = <Icon id='tasks' icon={InsertChartIcon} />;
+      title = <FormattedMessage id='interaction_modal.title.vote' defaultMessage="Vote in {name}'s poll" values={{ name }} />;
+      actionDescription = <FormattedMessage id='interaction_modal.description.vote' defaultMessage='With an account on Mastodon, you can vote in this poll.' />;
+      break;
     }
 
     let signupButton;

app/javascript/mastodon/features/notifications_v2/components/notification_annual_report.tsx

@@ -0,0 +1,59 @@
+import { useCallback } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import CelebrationIcon from '@/material-icons/400-24px/celebration.svg?react';
+import { openModal } from 'mastodon/actions/modal';
+import { Icon } from 'mastodon/components/icon';
+import type { NotificationGroupAnnualReport } from 'mastodon/models/notification_group';
+import { useAppDispatch } from 'mastodon/store';
+
+export const NotificationAnnualReport: React.FC<{
+  notification: NotificationGroupAnnualReport;
+  unread: boolean;
+}> = ({ notification: { annualReport }, unread }) => {
+  const dispatch = useAppDispatch();
+  const year = annualReport.year;
+
+  const handleClick = useCallback(() => {
+    dispatch(
+      openModal({
+        modalType: 'ANNUAL_REPORT',
+        modalProps: { year },
+      }),
+    );
+  }, [dispatch, year]);
+
+  return (
+    <div
+      role='button'
+      className={classNames(
+        'notification-group notification-group--link notification-group--annual-report focusable',
+        { 'notification-group--unread': unread },
+      )}
+      tabIndex={0}
+    >
+      <div className='notification-group__icon'>
+        <Icon id='celebration' icon={CelebrationIcon} />
+      </div>
+
+      <div className='notification-group__main'>
+        <p>
+          <FormattedMessage
+            id='notification.annual_report.message'
+            defaultMessage="Your {year} #Wrapstodon awaits! Unveil your year's highlights and memorable moments on Mastodon!"
+            values={{ year }}
+          />
+        </p>
+        <button onClick={handleClick} className='link-button'>
+          <FormattedMessage
+            id='notification.annual_report.view'
+            defaultMessage='View #Wrapstodon'
+          />
+        </button>
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx

@@ -9,6 +9,7 @@ import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { NotificationAdminReport } from './notification_admin_report';
 import { NotificationAdminSignUp } from './notification_admin_sign_up';
+import { NotificationAnnualReport } from './notification_annual_report';
 import { NotificationFavourite } from './notification_favourite';
 import { NotificationFollow } from './notification_follow';
 import { NotificationFollowRequest } from './notification_follow_request';
@@ -143,6 +144,14 @@ export const NotificationGroup: React.FC<{
         />
       );
       break;
+    case 'annual_report':
+      content = (
+        <NotificationAnnualReport
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
     default:
       return null;
   }

app/javascript/mastodon/features/status/components/detailed_status.tsx

@@ -49,6 +49,7 @@ export const DetailedStatus: React.FC<{
   domain: string;
   showMedia?: boolean;
   withLogo?: boolean;
+  overrideDisplayName?: React.ReactNode;
   pictureInPicture: any;
   onToggleHidden?: (status: any) => void;
   onToggleMediaVisibility?: () => void;
@@ -62,6 +63,7 @@ export const DetailedStatus: React.FC<{
   domain,
   showMedia,
   withLogo,
+  overrideDisplayName,
   pictureInPicture,
   onToggleMediaVisibility,
   onToggleHidden,
@@ -152,7 +154,7 @@ export const DetailedStatus: React.FC<{
     media = <PictureInPicturePlaceholder aspectRatio={attachmentAspectRatio} />;
   } else if (status.get('media_attachments').size > 0) {
     if (
-      ['image', 'gifv'].includes(
+      ['image', 'gifv', 'unknown'].includes(
         status.getIn(['media_attachments', 0, 'type']) as string,
       ) ||
       status.get('media_attachments').size > 1
@@ -319,7 +321,11 @@ export const DetailedStatus: React.FC<{
           <div className='detailed-status__display-avatar'>
             <Avatar account={status.get('account')} size={46} />
           </div>
-          <DisplayName account={status.get('account')} localDomain={domain} />
+
+          {overrideDisplayName ?? (
+            <DisplayName account={status.get('account')} localDomain={domain} />
+          )}
+
           {withLogo && (
             <>
               <div className='spacer' />

app/javascript/mastodon/features/ui/components/annual_report_modal.tsx

@@ -0,0 +1,21 @@
+import { useEffect } from 'react';
+
+import { AnnualReport } from 'mastodon/features/annual_report';
+
+const AnnualReportModal: React.FC<{
+  year: string;
+  onChangeBackgroundColor: (arg0: string) => void;
+}> = ({ year, onChangeBackgroundColor }) => {
+  useEffect(() => {
+    onChangeBackgroundColor('var(--indigo-1)');
+  }, [onChangeBackgroundColor]);
+
+  return (
+    <div className='modal-root__modal annual-report-modal'>
+      <AnnualReport year={year} />
+    </div>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default AnnualReportModal;

app/javascript/mastodon/features/ui/components/modal_root.jsx

@@ -18,6 +18,7 @@ import {
   SubscribedLanguagesModal,
   ClosedRegistrationsModal,
   IgnoreNotificationsModal,
+  AnnualReportModal,
 } from 'mastodon/features/ui/util/async-components';
 import { getScrollbarWidth } from 'mastodon/utils/scrollbar';
 
@@ -72,6 +73,7 @@ export const MODAL_COMPONENTS = {
   'INTERACTION': InteractionModal,
   'CLOSED_REGISTRATIONS': ClosedRegistrationsModal,
   'IGNORE_NOTIFICATIONS': IgnoreNotificationsModal,
+  'ANNUAL_REPORT': AnnualReportModal,
 };
 
 export default class ModalRoot extends PureComponent {

app/javascript/mastodon/features/ui/index.jsx

@@ -482,7 +482,9 @@ class UI extends PureComponent {
     }
   };
 
-  handleHotkeyBack = () => {
+  handleHotkeyBack = e => {
+    e.preventDefault();
+
     const { history } = this.props;
 
     if (history.location?.state?.fromMastodon) {

app/javascript/mastodon/features/ui/util/async-components.js

@@ -217,3 +217,7 @@ export function NotificationRequest () {
 export function LinkTimeline () {
   return import(/*webpackChunkName: "features/link_timeline" */'../../link_timeline');
 }
+
+export function AnnualReportModal () {
+  return import(/*webpackChunkName: "modals/annual_report_modal" */'../components/annual_report_modal');
+}

app/javascript/mastodon/locales/ar.json

@@ -301,7 +301,6 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
-  "filter_warning.matches_filter": "يطابق عامل التصفية \"{title}\"",
   "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",

app/javascript/mastodon/locales/ast.json

@@ -214,6 +214,7 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
+  "hints.threads.replies_may_be_missing": "Ye posible que falten les rempuestes d'otros sirvidores.",
   "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
   "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",

app/javascript/mastodon/locales/be.json

@@ -98,6 +98,8 @@
   "block_modal.title": "Заблакіраваць карыстальніка?",
   "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
+  "boost_modal.reblog": "Пашырыць допіс?",
+  "boost_modal.undo_reblog": "Прыбраць допіс?",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
   "bundle_column_error.error.title": "Халера!",
@@ -156,6 +158,7 @@
   "compose_form.poll.duration": "Працягласць апытання",
   "compose_form.poll.multiple": "Множны выбар",
   "compose_form.poll.option_placeholder": "Варыянт {number}",
+  "compose_form.poll.single": "Адзін варыянт",
   "compose_form.poll.switch_to_multiple": "Змяніце апытанне, каб дазволіць некалькі варыянтаў адказу",
   "compose_form.poll.switch_to_single": "Змяніце апытанне, каб дазволіць адзіны варыянт адказу",
   "compose_form.poll.type": "Стыль",
@@ -194,6 +197,7 @@
   "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
   "content_warning.hide": "Схаваць допіс",
   "content_warning.show": "Усё адно паказаць",
+  "content_warning.show_more": "Паказаць усё роўна",
   "conversation.delete": "Выдаліць размову",
   "conversation.mark_as_read": "Адзначыць прачытаным",
   "conversation.open": "Прагледзець размову",
@@ -219,6 +223,8 @@
   "domain_block_modal.they_cant_follow": "Ніхто з гэтага сервера не зможа падпісацца на вас.",
   "domain_block_modal.they_wont_know": "Карыстальнік не будзе ведаць пра блакіроўку.",
   "domain_block_modal.title": "Заблакіраваць дамен?",
+  "domain_block_modal.you_will_lose_num_followers": "Вы страціце {followersCount, plural, one {{followersCountDisplay} падпісчыка} other {{followersCountDisplay} падпісчыкаў}} і {followingCount, plural, one {{followingCountDisplay} чалавека, на якога падпісаны} other {{followingCountDisplay} людзей, на якіх падпісаны}}.",
+  "domain_block_modal.you_will_lose_relationships": "Вы страціце ўсех падпісчыкаў і людзей на якіх падпісаны на гэтым.",
   "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
   "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
   "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
@@ -300,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
-  "filter_warning.matches_filter": "Адпавядае фільтру \"{title}\"",
+  "filter_warning.matches_filter": "Адпавядае фільтру \"<span>{title}</span>\"",
   "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
@@ -350,6 +356,9 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
+  "hints.profiles.followers_may_be_missing": "Падпісчыкі гэтага профілю могуць адсутнічаць.",
+  "hints.profiles.follows_may_be_missing": "Падпіскі гэтага профілю могуць адсутнічаць.",
+  "hints.profiles.posts_may_be_missing": "Некаторыя допісы гэтага профілю могуць адсутнічаць.",
   "home.column_settings.show_reblogs": "Паказваць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
@@ -434,6 +443,7 @@
   "lists.subheading": "Вашыя спісы",
   "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
   "loading_indicator.label": "Загрузка…",
+  "media_gallery.hide": "Схаваць",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
   "mute_modal.hide_options": "Схаваць опцыі",
@@ -479,11 +489,13 @@
   "notification.favourite": "Ваш допіс упадабаны {name}",
   "notification.follow": "{name} падпісаўся на вас",
   "notification.follow_request": "{name} адправіў запыт на падпіску",
+  "notification.follow_request.name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}} запыталіся падпісацца на вас",
   "notification.label.mention": "Згадванне",
   "notification.label.private_mention": "Асабістае згадванне",
   "notification.label.private_reply": "Асабісты адказ",
   "notification.label.reply": "Адказ",
   "notification.mention": "Згадванне",
+  "notification.mentioned_you": "{name} згадаў вас",
   "notification.moderation-warning.learn_more": "Даведацца больш",
   "notification.moderation_warning": "Вы атрымалі папярэджанне аб мадэрацыі",
   "notification.moderation_warning.action_delete_statuses": "Некаторыя вашыя допісы былі выдаленыя.",
@@ -496,6 +508,7 @@
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.reblog.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a> абагулілі ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
   "notification.relationships_severance_event.domain_block": "Адміністратар з {from} заблакіраваў {target}, у тым ліку {followersCount} вашых падпісчыка(-аў) і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}.",
@@ -525,6 +538,7 @@
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
+  "notifications.column_settings.group": "Аб'яднаць апавяшчэнні ад падпісчыкаў",
   "notifications.column_settings.mention": "Згадванні:",
   "notifications.column_settings.poll": "Вынікі апытання:",
   "notifications.column_settings.push": "Push-апавяшчэнні",
@@ -743,6 +757,7 @@
   "status.edit": "Рэдагаваць",
   "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
+  "status.embed": "Атрымаць убудаваны код",
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",

app/javascript/mastodon/locales/br.json

@@ -82,6 +82,8 @@
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
   "alert.unexpected.title": "Hopala !",
   "announcement.announcement": "Kemennad",
+  "annual_report.summary.followers.followers": "heulier",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
   "block_modal.show_less": "Diskouez nebeutoc'h",
@@ -171,6 +173,7 @@
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.unfollow.confirm": "Diheuliañ",
   "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
+  "content_warning.show_more": "Diskouez muioc'h",
   "conversation.delete": "Dilemel ar gaozeadenn",
   "conversation.mark_as_read": "Merkañ evel lennet",
   "conversation.open": "Gwelout ar gaozeadenn",
@@ -249,6 +252,7 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
+  "filter_warning.matches_filter": "A glot gant ar sil “<span>{title}</span>”",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
   "firehose.remote": "Servijerioù all",

app/javascript/mastodon/locales/ca.json

@@ -87,6 +87,18 @@
   "alert.unexpected.title": "Vaja!",
   "alt_text_badge.title": "Text alternatiu",
   "announcement.announcement": "Anunci",
+  "annual_report.summary.archetype.oracle": "L'Oracle",
+  "annual_report.summary.followers.followers": "seguidors",
+  "annual_report.summary.followers.total": "{count} en total",
+  "annual_report.summary.here_it_is": "El repàs del vostre {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "la publicació més afavorida",
+  "annual_report.summary.highlighted_post.by_reblogs": "la publicació més impulsada",
+  "annual_report.summary.highlighted_post.by_replies": "la publicació amb més respostes",
+  "annual_report.summary.highlighted_post.possessive": "de {name}",
+  "annual_report.summary.most_used_app.most_used_app": "l'aplicació més utilitzada",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "l'etiqueta més utilitzada",
+  "annual_report.summary.new_posts.new_posts": "publicacions noves",
+  "annual_report.summary.thanks": "Gràcies per formar part de Mastodon!",
   "attachments_list.unprocessed": "(sense processar)",
   "audio.hide": "Amaga l'àudio",
   "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
@@ -158,6 +170,7 @@
   "compose_form.poll.duration": "Durada de l'enquesta",
   "compose_form.poll.multiple": "Opcions múltiples",
   "compose_form.poll.option_placeholder": "Opció {number}",
+  "compose_form.poll.single": "Única opció",
   "compose_form.poll.switch_to_multiple": "Canvia l’enquesta per a permetre múltiples opcions",
   "compose_form.poll.switch_to_single": "Canvia l’enquesta per a permetre una única opció",
   "compose_form.poll.type": "Estil",
@@ -196,6 +209,7 @@
   "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
   "content_warning.hide": "Amaga la publicació",
   "content_warning.show": "Mostra-la igualment",
+  "content_warning.show_more": "Mostra'n més",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -304,7 +318,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
-  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
@@ -384,6 +398,7 @@
   "interaction_modal.description.follow": "Amb un compte a Mastodon, pots seguir a {name} per a rebre els seus tuts en la teva línia de temps d'Inici.",
   "interaction_modal.description.reblog": "Amb un compte a Mastodon, pots impulsar aquest tut per a compartir-lo amb els teus seguidors.",
   "interaction_modal.description.reply": "Amb un compte a Mastodon, pots respondre aquest tut.",
+  "interaction_modal.description.vote": "Si teniu compte a Mastodon, podeu votar aquesta enquesta.",
   "interaction_modal.login.action": "Torna a l'inici",
   "interaction_modal.login.prompt": "Domini del teu servidor domèstic, p.ex. mastodon.social",
   "interaction_modal.no_account_yet": "No a Mastodon?",
@@ -395,6 +410,7 @@
   "interaction_modal.title.follow": "Segueix {name}",
   "interaction_modal.title.reblog": "Impulsa el tut de {name}",
   "interaction_modal.title.reply": "Respon al tut de {name}",
+  "interaction_modal.title.vote": "Voteu l'enquesta de {name}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minuts}}",
@@ -507,6 +523,7 @@
   "notification.favourite": "{name} ha afavorit el teu tut",
   "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han afavorit la vostra publicació",
   "notification.follow": "{name} et segueix",
+  "notification.follow.name_and_others": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> us han seguit",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
   "notification.follow_request.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} han demanat de seguir-vos",
   "notification.label.mention": "Menció",
@@ -565,6 +582,7 @@
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
+  "notifications.column_settings.group": "Agrupa",
   "notifications.column_settings.mention": "Mencions:",
   "notifications.column_settings.poll": "Resultats de l’enquesta:",
   "notifications.column_settings.push": "Notificacions push",

app/javascript/mastodon/locales/cy.json

@@ -13,7 +13,7 @@
   "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn personol",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Awtomataidd",
   "account.badges.group": "Grŵp",
   "account.block": "Blocio @{name}",
   "account.block_domain": "Blocio parth {domain}",
@@ -36,7 +36,7 @@
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
   "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwyr}}",
   "account.following": "Yn dilyn",
-  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter}}}",
+  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter} arall}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
@@ -62,7 +62,7 @@
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos hybiau gan @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
+  "account.statuses_counter": "{count, plural, one {{counter} postiad} two {{counter} bostiad} few {{counter} phostiad} many {{counter} postiad} other {{counter} postiad}}",
   "account.unblock": "Dadflocio @{name}",
   "account.unblock_domain": "Dadflocio parth {domain}",
   "account.unblock_short": "Dadflocio",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
   "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
+  "content_warning.show_more": "Dangos rhagor",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -305,8 +306,8 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
-  "filter_warning.matches_filter": "Yn cydweddu'r hidlydd “{title}”",
-  "filtered_notifications_banner.pending_requests": "Gan {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
+  "filter_warning.matches_filter": "Yn cyd-fynd â'r hidlydd “ <span>{title}</span> ”",
+  "filtered_notifications_banner.pending_requests": "Oddi wrth {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
@@ -349,12 +350,12 @@
   "hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
   "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "hashtag.counter_by_accounts": "{cyfrif, lluosog, un {{counter} cyfranogwr} arall {{counter} cyfranogwr}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} cyfranogwr} other {{counter} cyfranogwr}}",
   "hashtag.counter_by_uses": "{count, plural, one {postiad {counter}} other {postiad {counter}}}",
-  "hashtag.counter_by_uses_today": "{cyfrif, lluosog, un {{counter} postiad} arall {{counter} postiad}} heddiw",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postiad} other {{counter} postiad}} heddiw",
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
-  "hashtags.and_other": "…a {count, plural, other {# more}}",
+  "hashtags.and_other": "…a {count, plural, other {# arall}}",
   "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
   "hints.profiles.follows_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
   "hints.profiles.posts_may_be_missing": "Mae'n bosibl bod rhai postiadau y proffil hwn ar goll.",
@@ -385,6 +386,7 @@
   "interaction_modal.description.follow": "Gyda chyfrif ar Mastodon, gallwch ddilyn {name} i dderbyn eu postiadau yn eich ffrwd gartref.",
   "interaction_modal.description.reblog": "Gyda chyfrif ar Mastodon, gallwch hybu'r postiad hwn i'w rannu â'ch dilynwyr.",
   "interaction_modal.description.reply": "Gyda chyfrif ar Mastodon, gallwch ymateb i'r postiad hwn.",
+  "interaction_modal.description.vote": "Gyda chyfrif ar Mastodon, gallwch bleidleisio yn y bleidlais hon.",
   "interaction_modal.login.action": "Mynd i'm ffrwd gartref",
   "interaction_modal.login.prompt": "Parth eich gweinydd cartref, e.e. mastodon.social",
   "interaction_modal.no_account_yet": "Dim ar Mastodon?",
@@ -396,6 +398,7 @@
   "interaction_modal.title.follow": "Dilyn {name}",
   "interaction_modal.title.reblog": "Hybu postiad {name}",
   "interaction_modal.title.reply": "Ymateb i bostiad {name}",
+  "interaction_modal.title.vote": "Pleidleisiwch ym mhleidlais {name}",
   "intervals.full.days": "{number, plural, one {# diwrnod} two {# ddiwrnod} other {# diwrnod}}",
   "intervals.full.hours": "{number, plural, one {# awr} other {# o oriau}}",
   "intervals.full.minutes": "{number, plural, one {# funud} other {# o funudau}}",
@@ -442,7 +445,7 @@
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
   "link_preview.author": "Gan {name}",
   "link_preview.more_from_author": "Mwy gan {name}",
-  "link_preview.shares": "{count, plural, one {{counter} ostiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
+  "link_preview.shares": "{count, plural, one {{counter} postiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -499,18 +502,18 @@
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
   "notification.admin.report": "Adroddwyd ar {name} {target}",
-  "notification.admin.report_account": "{name} reported {count, plural, one {un postiad} other {# postiad}} from {target} for {category}",
-  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# phost} other {# postiad}} gan {target}",
+  "notification.admin.report_account": "Adroddodd {name} {count, plural, one {un postiad} other {# postiad}} gan {target} oherwydd {category}",
+  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# postiad} other {# postiad}} gan {target}",
   "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
   "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
-  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # eraill}}",
+  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # arall}}",
   "notification.favourite": "Ffafriodd {name} eich postiad",
-  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# eraill}}</a> eich postiad",
+  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# arall}}</a> eich postiad",
   "notification.follow": "Dilynodd {name} chi",
-  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# other} two {# others} few {# others} many {# others} other {# others}}</a> nawr yn eich dilyn chi",
+  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# arall} two {# arall} few {# arall} many {# others} other {# arall}}</a> nawr yn eich dilyn chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# other} other {# others}} wedi gofyn i'ch dilyn chi",
+  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# arall} other {# arall}} wedi gofyn i'ch dilyn chi",
   "notification.label.mention": "Crybwyll",
   "notification.label.private_mention": "Crybwyll preifat",
   "notification.label.private_reply": "Ateb preifat",
@@ -529,7 +532,7 @@
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
-  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# other} other {# others}}</a> wedi hybu eich postiad",
+  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# arall} other {# arall}}</a> wedi hybu eich postiad",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
   "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
@@ -538,9 +541,9 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
-  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
-  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
-  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {one notification request} other {# notification requests}}. Ydych chi'n siŵr eich bod am barhau?",
+  "notification_requests.accept_multiple": "{count, plural, one {Derbyn # cais…} other {Derbyn # cais…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Derbyn cais} other {Derbyn cais}}",
+  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {un cais hysbysiad} other {# cais hysbysiad}}. Ydych chi'n siŵr eich bod am barhau?",
   "notification_requests.confirm_accept_multiple.title": "Derbyn ceisiadau hysbysu?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Diystyru cais} other {Diystyru ceisiadau}}",
   "notification_requests.confirm_dismiss_multiple.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Fyddwch chi ddim yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. Ydych chi'n yn siŵr eich bod am fwrw ymlaen?",
@@ -689,7 +692,7 @@
   "relative_time.minutes": "{number} munud",
   "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
-  "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
+  "reply_indicator.attachments": "{count, plural, one {# atodiad} other {# atodiad}}",
   "reply_indicator.cancel": "Canslo",
   "reply_indicator.poll": "Arolwg",
   "report.block": "Blocio",
@@ -732,7 +735,7 @@
   "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
   "report.unfollow": "Dad-ddilyn @{name}",
   "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich ffrwd gartref mwyach, dad-ddilynwch nhw.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} other {{count} postiad}} wedi'i atodi",
   "report_notification.categories.legal": "Cyfreithiol",
   "report_notification.categories.legal_sentence": "cynnwys anghyfreithlon",
   "report_notification.categories.other": "Arall",
@@ -812,7 +815,7 @@
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
-  "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
+  "status.reblogs": "{count, plural, one {# hwb} other {# hwb}}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
   "status.remove_bookmark": "Tynnu nod tudalen",

app/javascript/mastodon/locales/da.json

@@ -196,6 +196,7 @@
   "confirmations.unfollow.title": "Følg ikke længere bruger?",
   "content_warning.hide": "Skjul indlæg",
   "content_warning.show": "Vis alligevel",
+  "content_warning.show_more": "Vis flere",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -304,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
-  "filter_warning.matches_filter": "Matcher filteret “{title}”",
+  "filter_warning.matches_filter": "Matcher filteret “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
@@ -384,6 +385,7 @@
   "interaction_modal.description.follow": "Med en konto på Mastodon kan du følge {name} for at modtage vedkommendes indlæg i dit hjemmefeed.",
   "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
   "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.",
+  "interaction_modal.description.vote": "Med en konto på Mastodon kan man deltage i denne afstemning.",
   "interaction_modal.login.action": "Gå til hjemmeserver",
   "interaction_modal.login.prompt": "Hjemmeserverdomænet, f.eks. mastodon.social",
   "interaction_modal.no_account_yet": "Ikke på Mastodon?",
@@ -395,6 +397,7 @@
   "interaction_modal.title.follow": "Følg {name}",
   "interaction_modal.title.reblog": "Boost {name}s indlæg",
   "interaction_modal.title.reply": "Besvar {name}s indlæg",
+  "interaction_modal.title.vote": "Deltag i {name}s afstemning",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",

app/javascript/mastodon/locales/de.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Oha!",
   "alt_text_badge.title": "Bildbeschreibung",
   "announcement.announcement": "Ankündigung",
+  "annual_report.summary.archetype.booster": "Trendjäger*in",
+  "annual_report.summary.archetype.lurker": "Beobachter*in",
+  "annual_report.summary.archetype.oracle": "Orakel",
+  "annual_report.summary.archetype.pollster": "Meinungsforscher*in",
+  "annual_report.summary.archetype.replier": "Geselliger Schmetterling",
+  "annual_report.summary.followers.followers": "Follower",
+  "annual_report.summary.followers.total": "{count} insgesamt",
+  "annual_report.summary.here_it_is": "Dein Jahresrückblick für {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "am häufigsten favorisierter Beitrag",
+  "annual_report.summary.highlighted_post.by_reblogs": "am häufigsten geteilter Beitrag",
+  "annual_report.summary.highlighted_post.by_replies": "Beitrag mit den meisten Antworten",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "am häufigsten verwendete App",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "am häufigsten verwendeter Hashtag",
+  "annual_report.summary.new_posts.new_posts": "neue Beiträge",
+  "annual_report.summary.percentile.text": "<topLabel>Damit gehörst du zu den obersten</topLabel><percentage></percentage><bottomLabel>der Mastodon-Nutzer*innen.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Wir werden Bernie nichts verraten.",
+  "annual_report.summary.thanks": "Danke, dass du Teil von Mastodon bist!",
   "attachments_list.unprocessed": "(ausstehend)",
   "audio.hide": "Audio ausblenden",
   "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "Profil entfolgen?",
   "content_warning.hide": "Beitrag ausblenden",
   "content_warning.show": "Trotzdem anzeigen",
+  "content_warning.show_more": "Mehr anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „<span>{title}</span>“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Mit einem Mastodon-Konto kannst du {name} folgen, um die Beiträge auf deiner Startseite zu sehen.",
   "interaction_modal.description.reblog": "Mit einem Mastodon-Konto kannst du die Reichweite dieses Beitrags erhöhen, indem du ihn mit deinen Followern teilst.",
   "interaction_modal.description.reply": "Mit einem Mastodon-Konto kannst du auf diesen Beitrag antworten.",
+  "interaction_modal.description.vote": "Mit einem Mastodon-Konto kannst du an dieser Umfrage teilnehmen.",
   "interaction_modal.login.action": "Zurück zur Startseite",
   "interaction_modal.login.prompt": "Adresse deines Servers, z. B. mastodon.social",
   "interaction_modal.no_account_yet": "Nicht auf Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Folge {name}",
   "interaction_modal.title.reblog": "Beitrag von {name} teilen",
   "interaction_modal.title.reply": "Auf Beitrag von {name} antworten",
+  "interaction_modal.title.vote": "An der Umfrage von {name} teilnehmen",
   "intervals.full.days": "{number, plural, one {# Tag} other {# Tage}}",
   "intervals.full.hours": "{number, plural, one {# Stunde} other {# Stunden}}",
   "intervals.full.minutes": "{number, plural, one {# Minute} other {# Minuten}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} meldete {target}",
   "notification.admin.sign_up": "{name} registrierte sich",
   "notification.admin.sign_up.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} registrierten sich",
+  "notification.annual_report.message": "Dein {year} #Wrapstodon erwartet dich! Lass deine Highlights und unvergesslichen Momente auf Mastodon erneut aufleben!",
+  "notification.annual_report.view": "#Wrapstodon ansehen",
   "notification.favourite": "{name} favorisierte deinen Beitrag",
   "notification.favourite.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> favorisierten deinen Beitrag",
   "notification.follow": "{name} folgt dir",
@@ -598,15 +621,15 @@
   "notifications.policy.filter": "Filtern",
   "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
   "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
-  "notifications.policy.filter_limited_accounts_title": "Moderierte Konten",
+  "notifications.policy.filter_limited_accounts_title": "moderierten Konten",
   "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
-  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+  "notifications.policy.filter_new_accounts_title": "neuen Konten",
   "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
   "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
   "notifications.policy.filter_not_following_hint": "Bis du sie manuell genehmigst",
   "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
   "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
-  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+  "notifications.policy.filter_private_mentions_title": "unerwünschten privaten Erwähnungen",
   "notifications.policy.title": "Benachrichtigungen verwalten von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",

app/javascript/mastodon/locales/el.json

@@ -304,7 +304,6 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
-  "filter_warning.matches_filter": "Ταιριάζει με το φίλτρο “{title}”",
   "filtered_notifications_banner.pending_requests": "Από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
   "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
   "firehose.all": "Όλα",

app/javascript/mastodon/locales/en-GB.json

@@ -304,7 +304,6 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filter_warning.matches_filter": "Matches filter “{title}”",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",

app/javascript/mastodon/locales/en.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Oops!",
   "alt_text_badge.title": "Alt text",
   "announcement.announcement": "Announcement",
+  "annual_report.summary.archetype.booster": "The cool-hunter",
+  "annual_report.summary.archetype.lurker": "The lurker",
+  "annual_report.summary.archetype.oracle": "The oracle",
+  "annual_report.summary.archetype.pollster": "The pollster",
+  "annual_report.summary.archetype.replier": "The social butterfly",
+  "annual_report.summary.followers.followers": "followers",
+  "annual_report.summary.followers.total": "{count} total",
+  "annual_report.summary.here_it_is": "Here is your {year} in review:",
+  "annual_report.summary.highlighted_post.by_favourites": "most favourited post",
+  "annual_report.summary.highlighted_post.by_reblogs": "most boosted post",
+  "annual_report.summary.highlighted_post.by_replies": "post with the most replies",
+  "annual_report.summary.highlighted_post.possessive": "{name}'s",
+  "annual_report.summary.most_used_app.most_used_app": "most used app",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "most used hashtag",
+  "annual_report.summary.new_posts.new_posts": "new posts",
+  "annual_report.summary.percentile.text": "<topLabel>That puts you in the top</topLabel><percentage></percentage><bottomLabel>of Mastodon users.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "We won't tell Bernie.",
+  "annual_report.summary.thanks": "Thanks for being part of Mastodon!",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
   "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
@@ -386,6 +404,7 @@
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
   "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.description.vote": "With an account on Mastodon, you can vote in this poll.",
   "interaction_modal.login.action": "Take me home",
   "interaction_modal.login.prompt": "Domain of your home server, e.g. mastodon.social",
   "interaction_modal.no_account_yet": "Not on Mastodon?",
@@ -397,6 +416,7 @@
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Boost {name}'s post",
   "interaction_modal.title.reply": "Reply to {name}'s post",
+  "interaction_modal.title.vote": "Vote in {name}'s poll",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -506,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
   "notification.admin.sign_up.name_and_others": "{name} and {count, plural, one {# other} other {# others}} signed up",
+  "notification.annual_report.message": "Your {year} #Wrapstodon awaits! Unveil your year's highlights and memorable moments on Mastodon!",
+  "notification.annual_report.view": "View #Wrapstodon",
   "notification.favourite": "{name} favorited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favorited your post",
   "notification.follow": "{name} followed you",

app/javascript/mastodon/locales/eo.json

@@ -2,7 +2,7 @@
   "about.blocks": "Administritaj serviloj",
   "about.contact": "Kontakto:",
   "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Kialo ne disponebla",
+  "about.domain_blocks.no_reason_available": "Kialo ne disponeblas",
   "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
   "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.",
   "about.domain_blocks.silenced.title": "Limigita",
@@ -45,7 +45,7 @@
   "account.languages": "Ŝanĝi la abonitajn lingvojn",
   "account.link_verified_on": "Propreco de tiu ligilo estis konfirmita je {date}",
   "account.locked_info": "Tiu konto estas privatigita. La posedanto mane akceptas tiun, kiu povas sekvi rin.",
-  "account.media": "Plurmedioj",
+  "account.media": "Plurmedio",
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
   "account.mute": "Silentigi @{name}",
@@ -87,6 +87,11 @@
   "alert.unexpected.title": "Aj!",
   "alt_text_badge.title": "Alt-teksto",
   "announcement.announcement": "Anonco",
+  "annual_report.summary.archetype.replier": "La plej societema",
+  "annual_report.summary.followers.followers": "sekvantoj",
+  "annual_report.summary.highlighted_post.by_replies": "afiŝo kun la plej multaj respondoj",
+  "annual_report.summary.new_posts.new_posts": "novaj afiŝoj",
+  "annual_report.summary.thanks": "Dankon pro esti parto de Mastodon!",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
   "block_modal.remote_users_caveat": "Ni petos al la servilo {domain} respekti vian elekton. Tamen, plenumo ne estas garantiita ĉar iuj serviloj eble manipulas blokojn malsame. Publikaj afiŝoj eble ankoraŭ estas videbla por ne-ensalutintaj uzantoj.",
@@ -142,7 +147,7 @@
   "column_header.unpin": "Malfiksi",
   "column_subheading.settings": "Agordoj",
   "community.column_settings.local_only": "Nur loka",
-  "community.column_settings.media_only": "Nur plurmedioj",
+  "community.column_settings.media_only": "Nur plurmedio",
   "community.column_settings.remote_only": "Nur fora",
   "compose.language.change": "Ŝanĝi lingvon",
   "compose.language.search": "Serĉi lingvojn...",
@@ -197,6 +202,7 @@
   "confirmations.unfollow.title": "Ĉu ĉesi sekvi uzanton?",
   "content_warning.hide": "Kaŝi afiŝon",
   "content_warning.show": "Montri ĉiukaze",
+  "content_warning.show_more": "Montri pli",
   "conversation.delete": "Forigi konversacion",
   "conversation.mark_as_read": "Marku kiel legita",
   "conversation.open": "Vidi konversacion",
@@ -305,7 +311,7 @@
   "filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
   "filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
   "filter_modal.title.status": "Filtri afiŝon",
-  "filter_warning.matches_filter": "Filtrilo de kongruoj “{title}”",
+  "filter_warning.matches_filter": "Filtrilo de kongruoj “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
   "filtered_notifications_banner.title": "Filtritaj sciigoj",
   "firehose.all": "Ĉiuj",
@@ -385,6 +391,7 @@
   "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
   "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
   "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
+  "interaction_modal.description.vote": "Kun konto ĉe Mastodon, vi povas voĉdoni en ĉi tiu balotenketo.",
   "interaction_modal.login.action": "Prenu min hejmen",
   "interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
   "interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
@@ -396,6 +403,7 @@
   "interaction_modal.title.follow": "Sekvi {name}",
   "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
   "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
+  "interaction_modal.title.vote": "Voĉdonu en la balotenketo de {name}",
   "intervals.full.days": "{number, plural, one {# tago} other {# tagoj}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# horoj}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutoj}}",
@@ -505,6 +513,7 @@
   "notification.admin.report_statuses_other": "{name} raportis {target}",
   "notification.admin.sign_up": "{name} kreis konton",
   "notification.admin.sign_up.name_and_others": "{name} kaj {count, plural, one {# alia} other {# aliaj}} kreis konton",
+  "notification.annual_report.view": "Vidu #Wrapstodon",
   "notification.favourite": "{name} stelumis vian afiŝon",
   "notification.favourite.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> ŝatis vian afiŝon",
   "notification.follow": "{name} eksekvis vin",
@@ -526,7 +535,7 @@
   "notification.moderation_warning.action_sensitive": "Viaj afiŝoj estos markitaj kiel sentemaj ekde nun.",
   "notification.moderation_warning.action_silence": "Via konto estis limigita.",
   "notification.moderation_warning.action_suspend": "Via konto estas malakceptita.",
-  "notification.own_poll": "Via enketo finiĝis",
+  "notification.own_poll": "Via balotenketo finiĝitis",
   "notification.poll": "Balotenketo, en kiu vi voĉdonis, finiĝis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.reblog.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> diskonigis vian afiŝon",
@@ -567,7 +576,7 @@
   "notifications.column_settings.filter_bar.category": "Rapida filtrila breto",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
-  "notifications.column_settings.group": "Grupo",
+  "notifications.column_settings.group": "Grupigi",
   "notifications.column_settings.mention": "Mencioj:",
   "notifications.column_settings.poll": "Balotenketaj rezultoj:",
   "notifications.column_settings.push": "Puŝsciigoj",
@@ -658,7 +667,7 @@
   "poll.total_people": "{count, plural, one {# homo} other {# homoj}}",
   "poll.total_votes": "{count, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll.vote": "Voĉdoni",
-  "poll.voted": "Vi elektis por ĉi tiu respondo",
+  "poll.voted": "Vi voĉdonis por ĉi tiu respondo",
   "poll.votes": "{votes, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",

app/javascript/mastodon/locales/es-AR.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "¡Epa!",
   "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Anuncio",
+  "annual_report.summary.archetype.booster": "El cazador de tendencias",
+  "annual_report.summary.archetype.lurker": "El acechador",
+  "annual_report.summary.archetype.oracle": "El oráculo",
+  "annual_report.summary.archetype.pollster": "El encuestador",
+  "annual_report.summary.archetype.replier": "El más sociable",
+  "annual_report.summary.followers.followers": "seguidores",
+  "annual_report.summary.followers.total": "{count} en total",
+  "annual_report.summary.here_it_is": "Aquí está tu resumen de {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "publicación con más favoritos",
+  "annual_report.summary.highlighted_post.by_reblogs": "publicación más impulsada",
+  "annual_report.summary.highlighted_post.by_replies": "publicación con más respuestas",
+  "annual_report.summary.highlighted_post.possessive": "de {name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplicación más usada",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "etiqueta más usada",
+  "annual_report.summary.new_posts.new_posts": "nuevas publicaciones",
+  "annual_report.summary.percentile.text": "<topLabel>Eso te pone en el top</topLabel><percentage></percentage><bottomLabel>de usuarios de Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "No se lo diremos a Bernie.",
+  "annual_report.summary.thanks": "¡Gracias por ser parte de Mastodon!",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar mensaje",
   "content_warning.show": "Mostrar de todos modos",
+  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Eliminar conversación",
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, podés seguir a {name} para recibir sus mensajes en tu línea temporal principal.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, podés adherir a este mensaje para compartirlo con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, podés responder a este mensaje.",
+  "interaction_modal.description.vote": "Con una cuenta en Mastodon, podés votar en esta encuesta.",
   "interaction_modal.login.action": "Llevame al comienzo",
   "interaction_modal.login.prompt": "Dominio de su servidor de inicio, p. ej., mastodon.social",
   "interaction_modal.no_account_yet": "¿No tenés cuenta en Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Adherir al mensaje de {name}",
   "interaction_modal.title.reply": "Responder al mensaje de {name}",
+  "interaction_modal.title.vote": "Votá en la encuesta de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} denunció a {target}",
   "notification.admin.sign_up": "Se registró {name}",
   "notification.admin.sign_up.name_and_others": "Se registraron {name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
+  "notification.annual_report.message": "¡Tu #Wrapstodon {year} te espera! ¡Desvela los momentos más destacados y memorables de tu año en Mastodon!",
+  "notification.annual_report.view": "Ver #Wrapstodon",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
@@ -856,7 +879,7 @@
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
   "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
-  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue soltado.",
   "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
   "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
   "upload_form.edit": "Editar",

app/javascript/mastodon/locales/es-MX.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "¡Ups!",
   "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Anuncio",
+  "annual_report.summary.archetype.booster": "El cazador de tendencias",
+  "annual_report.summary.archetype.lurker": "El acechador",
+  "annual_report.summary.archetype.oracle": "El oráculo",
+  "annual_report.summary.archetype.pollster": "El encuestador",
+  "annual_report.summary.archetype.replier": "El más sociable",
+  "annual_report.summary.followers.followers": "seguidores",
+  "annual_report.summary.followers.total": "{count} en total",
+  "annual_report.summary.here_it_is": "Aquí está tu resumen de {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "publicación con más favoritos",
+  "annual_report.summary.highlighted_post.by_reblogs": "publicación más impulsada",
+  "annual_report.summary.highlighted_post.by_replies": "publicación con más respuestas",
+  "annual_report.summary.highlighted_post.possessive": "de {name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplicación más usada",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "etiqueta más usada",
+  "annual_report.summary.new_posts.new_posts": "nuevas publicaciones",
+  "annual_report.summary.percentile.text": "<topLabel>Eso te pone en el top</topLabel><percentage></percentage><bottomLabel>de usuarios de Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "No se lo diremos a Bernie.",
+  "annual_report.summary.thanks": "¡Gracias por ser parte de Mastodon!",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
+  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# people}} que puede que tú conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.description.vote": "Con una cuenta en Mastodon, puedes votar en esta encuesta.",
   "interaction_modal.login.action": "Ir a Inicio",
   "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo: mastodon.social",
   "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
   "interaction_modal.title.reply": "Responder la publicación de {name}",
+  "interaction_modal.title.vote": "Votar en la encuesta de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} reportó {target}",
   "notification.admin.sign_up": "{name} se unio",
   "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# otro} other {# otros}} se registraron",
+  "notification.annual_report.message": "¡Tu #Wrapstodon {year} te espera! ¡Desvela los momentos más destacados y memorables de tu año en Mastodon!",
+  "notification.annual_report.view": "Ver #Wrapstodon",
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# otro} other {# otros}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",

app/javascript/mastodon/locales/es.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "¡Ups!",
   "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Anuncio",
+  "annual_report.summary.archetype.booster": "El cazador de tendencias",
+  "annual_report.summary.archetype.lurker": "El acechador",
+  "annual_report.summary.archetype.oracle": "El oráculo",
+  "annual_report.summary.archetype.pollster": "El encuestador",
+  "annual_report.summary.archetype.replier": "El más sociable",
+  "annual_report.summary.followers.followers": "seguidores",
+  "annual_report.summary.followers.total": "{count} en total",
+  "annual_report.summary.here_it_is": "Aquí está tu resumen de {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "publicación con más favoritos",
+  "annual_report.summary.highlighted_post.by_reblogs": "publicación más impulsada",
+  "annual_report.summary.highlighted_post.by_replies": "publicación con más respuestas",
+  "annual_report.summary.highlighted_post.possessive": "de {name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplicación más usada",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "etiqueta más usada",
+  "annual_report.summary.new_posts.new_posts": "nuevas publicaciones",
+  "annual_report.summary.percentile.text": "<topLabel>Eso te pone en el top</topLabel><percentage></percentage><bottomLabel>de usuarios de Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "No se lo diremos a Bernie.",
+  "annual_report.summary.thanks": "¡Gracias por ser parte de Mastodon!",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
+  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.description.vote": "Con una cuenta en Mastodon, puedes votar en esta encuesta.",
   "interaction_modal.login.action": "Ir a Inicio",
   "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo mastodon.social",
   "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
   "interaction_modal.title.reply": "Responder a la publicación de {name}",
+  "interaction_modal.title.vote": "Vota en la encuesta de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se registró",
   "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# más} other {# más}} se registraron",
+  "notification.annual_report.message": "¡Tu #Wrapstodon {year} te espera! ¡Desvela los momentos más destacados y memorables de tu año en Mastodon!",
+  "notification.annual_report.view": "Ver #Wrapstodon",
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
@@ -567,7 +590,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
-  "notifications.column_settings.group": "Grupo",
+  "notifications.column_settings.group": "Agrupar",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",

app/javascript/mastodon/locales/et.json

@@ -158,6 +158,7 @@
   "compose_form.poll.duration": "Küsitluse kestus",
   "compose_form.poll.multiple": "Mitu vastust",
   "compose_form.poll.option_placeholder": "Valik {number}",
+  "compose_form.poll.single": "Üks valik",
   "compose_form.poll.switch_to_multiple": "Muuda küsitlust mitmikvaliku lubamiseks",
   "compose_form.poll.switch_to_single": "Muuda küsitlust ainult ühe valiku lubamiseks",
   "compose_form.poll.type": "Stiil",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
   "content_warning.hide": "Peida postitus",
   "content_warning.show": "Näita ikkagi",
+  "content_warning.show_more": "Näita rohkem",
   "conversation.delete": "Kustuta vestlus",
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
@@ -304,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
-  "filter_warning.matches_filter": "Sobib filtriga “{title}”",
+  "filter_warning.matches_filter": "Sobib filtriga “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Mitte üheltki inimeselt} one {Ühelt inimeselt} other {# inimeselt}}, keda võid teada",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
@@ -384,6 +386,7 @@
   "interaction_modal.description.follow": "Mastodoni kontoga saad jälgida kasutajat {name}, et tema postitusi oma koduvoos näha.",
   "interaction_modal.description.reblog": "Mastodoni kontoga saad seda postitust levitada, jagades seda oma jälgijatele.",
   "interaction_modal.description.reply": "Mastodoni kontoga saad sellele postitusele vastata.",
+  "interaction_modal.description.vote": "Mastodoni kontoga saad sellest küsitlusest osa võtta.",
   "interaction_modal.login.action": "Vii mind avalehele",
   "interaction_modal.login.prompt": "Sinu koduserveri domeen, näiteks mastodon.social",
   "interaction_modal.no_account_yet": "Pole Mastodonis?",
@@ -395,6 +398,7 @@
   "interaction_modal.title.follow": "Jälgi kontot {name}",
   "interaction_modal.title.reblog": "Jaga {name} postitust",
   "interaction_modal.title.reply": "Vasta kasutaja {name} postitusele",
+  "interaction_modal.title.vote": "Hääleta {name} küsitluses",
   "intervals.full.days": "{number, plural, one {# päev} other {# päeva}}",
   "intervals.full.hours": "{number, plural, one {# tund} other {# tundi}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutit}}",
@@ -507,6 +511,7 @@
   "notification.favourite": "{name} märkis su postituse lemmikuks",
   "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> märkis su postituse lemmikuks",
   "notification.follow": "{name} alustas su jälgimist",
+  "notification.follow.name_and_others": "{name} ja veel {count, plural, one {# kasutaja} other {# kasutajat}} hakkas sind jälgima",
   "notification.follow_request": "{name} soovib sind jälgida",
   "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} taotles sinu jälgimist",
   "notification.label.mention": "Mainimine",
@@ -565,6 +570,7 @@
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
+  "notifications.column_settings.group": "Grupp",
   "notifications.column_settings.mention": "Mainimised:",
   "notifications.column_settings.poll": "Küsitluse tulemused:",
   "notifications.column_settings.push": "Push teated",

app/javascript/mastodon/locales/eu.json

@@ -302,7 +302,6 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
-  "filter_warning.matches_filter": "“{title}” iragazkiarekin bat dator",
   "filtered_notifications_banner.pending_requests": "Ezagutu dezakezun {count, plural, =0 {inoren} one {pertsona baten} other {# pertsonen}}",
   "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",

app/javascript/mastodon/locales/fa.json

@@ -158,6 +158,7 @@
   "compose_form.poll.duration": "مدت نظرسنجی",
   "compose_form.poll.multiple": "چند گزینه‌ای",
   "compose_form.poll.option_placeholder": "گزینهٔ {number}",
+  "compose_form.poll.single": "تک گزینه‌ای",
   "compose_form.poll.switch_to_multiple": "تغییر نظرسنجی برای اجازه به چندین گزینه",
   "compose_form.poll.switch_to_single": "تبدیل به نظرسنجی تک‌گزینه‌ای",
   "compose_form.poll.type": "سبک",
@@ -195,7 +196,7 @@
   "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
   "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
   "content_warning.hide": "نهفتن فرسته",
-  "content_warning.show": "نمایش به هر روی",
+  "content_warning.show": "در هر صورت نشان داده شود",
   "conversation.delete": "حذف گفتگو",
   "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
   "conversation.open": "دیدن گفتگو",
@@ -221,6 +222,7 @@
   "domain_block_modal.they_cant_follow": "هیچ‌کسی از این کارساز نمی‌تواند پیتان بگیرد.",
   "domain_block_modal.they_wont_know": "نخواهند دانست که مسدود شده‌اند.",
   "domain_block_modal.title": "انسداد دامنه؟",
+  "domain_block_modal.you_will_lose_num_followers": "تعداد {followersCount, plural,other {{followersCount}}} پی‌گیرنده و {followingCount, plural,other {{followingCount}}} شخص پی‌گرفته شده را از دست خواهید داد.",
   "domain_block_modal.you_will_lose_relationships": "شما تمام پیگیرکنندگان و افرادی که از این کارساز پیگیری می‌کنید را از دست خواهید داد.",
   "domain_block_modal.you_wont_see_posts": "فرسته‌ها یا آگاهی‌ها از کاربران روی این کارساز را نخواهید دید.",
   "domain_pill.activitypub_lets_connect": "این به شما اجازه می‌دهد تا نه تنها در ماستودون، بلکه در برنامه‌های اجتماعی مختلف نیز با افراد ارتباط برقرار کرده و تعامل داشته باشید.",
@@ -302,7 +304,6 @@
   "filter_modal.select_filter.subtitle": "استفاده از یک دستهً موجود یا ایجاد دسته‌ای جدید",
   "filter_modal.select_filter.title": "پالایش این فرسته",
   "filter_modal.title.status": "پالایش یک فرسته",
-  "filter_warning.matches_filter": "مطابق با پالایهٔ «{title}»",
   "filtered_notifications_banner.pending_requests": "از {count, plural, =0 {هیچ‌کسی} one {فردی} other {# نفر}} که ممکن است بشناسید",
   "filtered_notifications_banner.title": "آگاهی‌های پالوده",
   "firehose.all": "همه",
@@ -367,6 +368,7 @@
   "home.pending_critical_update.link": "دیدن به‌روز رسانی‌ها",
   "home.pending_critical_update.title": "به‌روز رسانی امنیتی بحرانی موجود است!",
   "home.show_announcements": "نمایش اعلامیه‌ها",
+  "ignore_notifications_modal.filter_instead": "به جایش پالوده شود",
   "ignore_notifications_modal.ignore": "چشم‌پوشی از آگاهی‌ها",
   "ignore_notifications_modal.limited_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های نظارت شده؟",
   "ignore_notifications_modal.new_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های جدید؟",
@@ -428,6 +430,8 @@
   "lightbox.close": "بستن",
   "lightbox.next": "بعدی",
   "lightbox.previous": "قبلی",
+  "lightbox.zoom_in": "بزرگ‌نمایی به اندازهٔ اصلی",
+  "lightbox.zoom_out": "بزرگ نمایی برای برازش",
   "limited_account_hint.action": "به هر روی نمایه نشان داده شود",
   "limited_account_hint.title": "این نمایه از سوی ناظم‌های {domain} پنهان شده.",
   "link_preview.author": "از {name}",
@@ -455,6 +459,7 @@
   "mute_modal.hide_options": "گزینه‌های نهفتن",
   "mute_modal.indefinite": "تا وقتی ناخموشش کنم",
   "mute_modal.show_options": "نمایش گزینه‌ها",
+  "mute_modal.they_can_mention_and_follow": "می‌توانند به شما اشاره کرده و پیتان بگیرند، ولی نخواهید دیدشان.",
   "mute_modal.they_wont_know": "نخواهند دانست که خموش شده‌اند.",
   "mute_modal.title": "خموشی کاربر؟",
   "mute_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
@@ -494,6 +499,7 @@
   "notification.favourite": "{name} فرسته‌تان را برگزید",
   "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
+  "notification.follow.name_and_others": "{name} و <a>{count, plural, other {#}} نفر دیگر</a> پیتان گرفتند",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
   "notification.follow_request.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} درخواست پی‌گیریتان را دادند",
   "notification.label.mention": "اشاره",
@@ -501,6 +507,7 @@
   "notification.label.private_reply": "پاسخ خصوصی",
   "notification.label.reply": "پاسخ",
   "notification.mention": "اشاره",
+  "notification.mentioned_you": "‫{name}‬ از شما نام برد",
   "notification.moderation-warning.learn_more": "بیشتر بدانید",
   "notification.moderation_warning": "هشداری مدیریتی گرفته‌اید",
   "notification.moderation_warning.action_delete_statuses": "برخی از فرسته‌هایتان برداشته شدند.",
@@ -519,7 +526,10 @@
   "notification.status": "{name} چیزی فرستاد",
   "notification.update": "{name} فرسته‌ای را ویرایش کرد",
   "notification_requests.accept": "پذیرش",
+  "notification_requests.confirm_accept_multiple.button": "پذیرش {count, plural,one {درخواست} other {درخواست‌ها}}",
+  "notification_requests.confirm_accept_multiple.message": "در حال پذیرش {count, plural,one {یک}other {#}} درخواست آگاهی هستید. مطمئنید که می‌خواهید ادامه دهید؟",
   "notification_requests.confirm_accept_multiple.title": "پذیرش درخواست‌های آگاهی؟",
+  "notification_requests.confirm_dismiss_multiple.button": "رد {count, plural,one {درخواست} other {درخواست‌ها}}",
   "notification_requests.confirm_dismiss_multiple.title": "رد کردن درخواست‌های آگاهی؟",
   "notification_requests.dismiss": "دورانداختن",
   "notification_requests.edit_selection": "ویرایش",
@@ -540,6 +550,7 @@
   "notifications.column_settings.filter_bar.category": "نوار پالایش سریع",
   "notifications.column_settings.follow": "پی‌گیرندگان جدید:",
   "notifications.column_settings.follow_request": "درخواست‌های جدید پی‌گیری:",
+  "notifications.column_settings.group": "گروه",
   "notifications.column_settings.mention": "اشاره‌ها:",
   "notifications.column_settings.poll": "نتایج نظرسنجی:",
   "notifications.column_settings.push": "آگاهی‌های ارسالی",
@@ -595,7 +606,7 @@
   "onboarding.profile.discoverable_hint": "خواسته‌اید روی ماستودون کشف شوید. ممکن است فرسته‌هایتان در نتیحهٔ جست‌وجوها و فرسته‌های داغ ظاهر شده و نمایه‌تان به افرادی با علایق مشابهتان پیشنهاد شود.",
   "onboarding.profile.display_name": "نام نمایشی",
   "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
-  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌ّای شخصی سازی بیش‌تری نیز دارد کامل کنید.",
+  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌های شخصی سازی بیش‌تری نیز دارد کامل کنید.",
   "onboarding.profile.note": "درباره شما",
   "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
   "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
@@ -760,6 +771,7 @@
   "status.edit": "ویرایش",
   "status.edited": "آخرین ویرایش {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
+  "status.embed": "گرفتن کد تعبیه",
   "status.favourite": "برگزیده‌",
   "status.favourites": "{count, plural, one {برگزیده} other {برگزیده}}",
   "status.filter": "پالایش این فرسته",

app/javascript/mastodon/locales/fi.json

@@ -87,6 +87,11 @@
   "alert.unexpected.title": "Hups!",
   "alt_text_badge.title": "Vaihtoehtoinen teksti",
   "announcement.announcement": "Tiedote",
+  "annual_report.summary.archetype.replier": "Sosiaalinen perhonen",
+  "annual_report.summary.highlighted_post.by_reblogs": "tehostetuin julkaisu",
+  "annual_report.summary.most_used_app.most_used_app": "käytetyin sovellus",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "käytetyin aihetunniste",
+  "annual_report.summary.thanks": "Kiitos, että olet osa Mastodonia!",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
   "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
@@ -197,6 +202,7 @@
   "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
   "content_warning.hide": "Piilota julkaisu",
   "content_warning.show": "Näytä kuitenkin",
+  "content_warning.show_more": "Näytä lisää",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -305,7 +311,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
-  "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
+  "filter_warning.matches_filter": "Vastaa suodatinta ”<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {Yhdeltä käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
@@ -385,6 +391,7 @@
   "interaction_modal.description.follow": "Mastodon-tilillä voit seurata käyttäjää {name} saadaksesi hänen julkaisunsa kotisyötteeseesi.",
   "interaction_modal.description.reblog": "Mastodon-tilillä voit tehostaa tätä julkaisua jakaaksesi sen seuraajiesi kanssa.",
   "interaction_modal.description.reply": "Mastodon-tilillä voit vastata tähän julkaisuun.",
+  "interaction_modal.description.vote": "Mastodon-tilillä voit osallistua tähän äänestykseen.",
   "interaction_modal.login.action": "Siirry kotiin",
   "interaction_modal.login.prompt": "Kotipalvelimesi verkkotunnus, kuten mastodon.social",
   "interaction_modal.no_account_yet": "Etkö ole vielä Mastodonissa?",
@@ -396,6 +403,7 @@
   "interaction_modal.title.follow": "Seuraa käyttäjää {name}",
   "interaction_modal.title.reblog": "Tehosta käyttäjän {name} julkaisua",
   "interaction_modal.title.reply": "Vastaa käyttäjän {name} julkaisuun",
+  "interaction_modal.title.vote": "Osallistu käyttäjän {name} äänestykseen",
   "intervals.full.days": "{number, plural, one {# päivä} other {# päivää}}",
   "intervals.full.hours": "{number, plural, one {# tunti} other {# tuntia}}",
   "intervals.full.minutes": "{number, plural, one {# minuutti} other {# minuuttia}}",
@@ -436,8 +444,8 @@
   "lightbox.close": "Sulje",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
-  "lightbox.zoom_in": "Zoomaa todelliseen kokoon",
-  "lightbox.zoom_out": "Zoomaa mahtumaan",
+  "lightbox.zoom_in": "Näytä todellisen kokoisena",
+  "lightbox.zoom_out": "Näytä sovitettuna",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Tehnyt {name}",
@@ -505,6 +513,7 @@
   "notification.admin.report_statuses_other": "{name} raportoi käyttäjän {target}",
   "notification.admin.sign_up": "{name} rekisteröityi",
   "notification.admin.sign_up.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} rekisteröityivät",
+  "notification.annual_report.view": "Näytä #Wrapstodon",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> lisäsivät julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",

app/javascript/mastodon/locales/fil.json

@@ -129,6 +129,7 @@
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
+  "content_warning.show_more": "Magpakita ng higit pa",
   "conversation.mark_as_read": "Markahan bilang nabasa na",
   "conversation.open": "Tingnan ang pag-uusap",
   "copy_icon_button.copied": "Sinipi sa clipboard",
@@ -190,6 +191,7 @@
   "explore.title": "Tuklasin",
   "explore.trending_links": "Mga balita",
   "filter_modal.select_filter.search": "Hanapin o gumawa",
+  "filter_warning.matches_filter": "Tinutugma ang pangsala \"<span>{title}</span>\"",
   "firehose.all": "Lahat",
   "firehose.local": "Itong serbiro",
   "firehose.remote": "Ibang mga serbiro",
@@ -218,6 +220,7 @@
   "interaction_modal.on_another_server": "Sa ibang serbiro",
   "interaction_modal.on_this_server": "Sa serbirong ito",
   "interaction_modal.title.follow": "Sundan si {name}",
+  "interaction_modal.title.vote": "Bumoto sa botohan ni {name}",
   "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
   "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
@@ -256,6 +259,7 @@
   "navigation_bar.search": "Maghanap",
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
+  "notification.follow.name_and_others": "Sinundan ka ng/nina {name} at <a>{count,  plural, one {# iba pa} other {# na iba pa}}</a>",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
   "notification.label.private_mention": "Palihim na banggit",
   "notification.mentioned_you": "Binanggit ka ni {name}",
@@ -270,6 +274,7 @@
   "notifications.column_settings.alert": "Mga abiso sa Desktop",
   "notifications.column_settings.favourite": "Mga paborito:",
   "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.column_settings.group": "Pangkat",
   "notifications.column_settings.poll": "Resulta ng botohan:",
   "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
   "notifications.column_settings.update": "Mga pagbago:",

app/javascript/mastodon/locales/fo.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Annar tekstur",
   "announcement.announcement": "Kunngerð",
+  "annual_report.summary.archetype.booster": "Kuli jagarin",
+  "annual_report.summary.archetype.lurker": "Lúrarin",
+  "annual_report.summary.archetype.oracle": "Oraklið",
+  "annual_report.summary.archetype.pollster": "Spyrjarin",
+  "annual_report.summary.archetype.replier": "Sosiali firvaldurin",
+  "annual_report.summary.followers.followers": "fylgjarar",
+  "annual_report.summary.followers.total": "{count} íalt",
+  "annual_report.summary.here_it_is": "Her er ein samandráttur av {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "mest dámdi postur",
+  "annual_report.summary.highlighted_post.by_reblogs": "oftast lyfti postur",
+  "annual_report.summary.highlighted_post.by_replies": "postur við flestum svarum",
+  "annual_report.summary.highlighted_post.possessive": "hjá {name}",
+  "annual_report.summary.most_used_app.most_used_app": "mest brúkta app",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "mest brúkta frámerki",
+  "annual_report.summary.new_posts.new_posts": "nýggir postar",
+  "annual_report.summary.percentile.text": "<topLabel>Tað fær teg í topp</topLabel><percentage></percentage><bottomLabel>av Mastodon brúkarum.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Vit fara ikki at fortelja Bernie tað.",
+  "annual_report.summary.thanks": "Takk fyri at tú er partur av Mastodon!",
   "attachments_list.unprocessed": "(óviðgjørt)",
   "audio.hide": "Fjal ljóð",
   "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
   "content_warning.hide": "Fjal post",
   "content_warning.show": "Vís kortini",
+  "content_warning.show_more": "Vís meiri",
   "conversation.delete": "Strika samrøðu",
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
-  "filter_warning.matches_filter": "Samsvarar við filtrið “{title}”",
+  "filter_warning.matches_filter": "Samsvarar við filtrið “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Filtreraðar fráboðanir",
   "firehose.all": "Allar",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.",
   "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.",
   "interaction_modal.description.reply": "Við eini kontu á Mastodon, so kanst tú svara hesum posti.",
+  "interaction_modal.description.vote": "Við eini kontu á Mastodon, so kanst tú atkvøða í hesi spurnarkanningini.",
   "interaction_modal.login.action": "Tak meg heim",
   "interaction_modal.login.prompt": "Navnaøki hjá tínum heimaambætara, t.d. mastodon.social",
   "interaction_modal.no_account_yet": "Ikki á Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Fylg {name}",
   "interaction_modal.title.reblog": "Stimbra postin hjá {name}",
   "interaction_modal.title.reply": "Svara postinum hjá {name}",
+  "interaction_modal.title.vote": "Atkvøði í spurnarkanningini hjá {name}",
   "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# tími} other {# tímar}}",
   "intervals.full.minutes": "{number, plural, one {# minuttur} other {# minuttir}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} meldaði {target}",
   "notification.admin.sign_up": "{name} meldaði seg til",
   "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} teknaðu seg",
+  "notification.annual_report.message": "Títt {year} #Wrapstodon bíðar! Avdúka hæddarpunktini og minniligu løturnar á Mastodon!",
+  "notification.annual_report.view": "Sí #Wrapstodon",
   "notification.favourite": "{name} dámdi postin hjá tær",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> yndisfrámerktu postin hjá tær",
   "notification.follow": "{name} fylgdi tær",

app/javascript/mastodon/locales/fr-CA.json

@@ -305,7 +305,6 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
-  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
   "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
@@ -856,6 +855,7 @@
   "upload_form.description": "Décrire pour les malvoyants",
   "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
+  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",

app/javascript/mastodon/locales/fr.json

@@ -305,7 +305,6 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou créez-en une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
-  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
   "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
@@ -856,6 +855,7 @@
   "upload_form.description": "Décrire pour les malvoyant·e·s",
   "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
+  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",

app/javascript/mastodon/locales/fy.json

@@ -158,6 +158,7 @@
   "compose_form.poll.duration": "Doer fan de enkête",
   "compose_form.poll.multiple": "Mearkar",
   "compose_form.poll.option_placeholder": "Opsje {number}",
+  "compose_form.poll.single": "Inkelde kar",
   "compose_form.poll.switch_to_multiple": "Enkête wizigje om meardere karren ta te stean",
   "compose_form.poll.switch_to_single": "Enkête wizigje om in inkelde kar ta te stean",
   "compose_form.poll.type": "Styl",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "Brûker net mear folgje?",
   "content_warning.hide": "Berjocht ferstopje",
   "content_warning.show": "Dochs toane",
+  "content_warning.show_more": "Mear toane",
   "conversation.delete": "Petear fuortsmite",
   "conversation.mark_as_read": "As lêzen markearje",
   "conversation.open": "Petear toane",
@@ -304,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
-  "filter_warning.matches_filter": "Komt oerien mei filter ‘{title}’",
+  "filter_warning.matches_filter": "Komt oerien mei filter ‘<span>{title}</span>’",
   "filtered_notifications_banner.pending_requests": "Fan {count, plural, =0 {net ien} one {ien persoan} other {# persoanen}} dy’t jo mooglik kinne",
   "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
@@ -384,6 +386,7 @@
   "interaction_modal.description.follow": "Jo kinne mei in Mastodon-account {name} folgje, om sa harren berjochten op jo starttiidline te ûntfangen.",
   "interaction_modal.description.reblog": "Jo kinne mei in Mastodon-account dit berjocht booste, om it sa mei jo folgers te dielen.",
   "interaction_modal.description.reply": "Jo kinne mei in Mastodon-account op dit berjocht reagearje.",
+  "interaction_modal.description.vote": "Mei in Mastodon-account kinne jo yn dizze enkête stimme.",
   "interaction_modal.login.action": "Gean nei start",
   "interaction_modal.login.prompt": "Domein fan jo server, byg. mastodon.social",
   "interaction_modal.no_account_yet": "Net op Mastodon?",
@@ -395,6 +398,7 @@
   "interaction_modal.title.follow": "{name} folgje",
   "interaction_modal.title.reblog": "Berjocht fan {name} booste",
   "interaction_modal.title.reply": "Op it berjocht fan {name} reagearje",
+  "interaction_modal.title.vote": "Stimme yn {name}’s peiling",
   "intervals.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
   "intervals.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",
   "intervals.full.minutes": "{number, plural, one {# minút} other {# minuten}} lyn",
@@ -507,6 +511,7 @@
   "notification.favourite": "{name} hat jo berjocht as favoryt markearre",
   "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo berjocht as favoryt markearre",
   "notification.follow": "{name} folget dy",
+  "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# oar persoan} other {# oare persoanen}}</a> folgje jo no",
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
   "notification.follow_request.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe frege om jo te folgjen",
   "notification.label.mention": "Fermelding",
@@ -565,6 +570,7 @@
   "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
+  "notifications.column_settings.group": "Groepearje",
   "notifications.column_settings.mention": "Fermeldingen:",
   "notifications.column_settings.poll": "Enkêteresultaten:",
   "notifications.column_settings.push": "Pushmeldingen",

app/javascript/mastodon/locales/ga.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Hiúps!",
   "alt_text_badge.title": "Téacs alt",
   "announcement.announcement": "Fógra",
+  "annual_report.summary.archetype.booster": "An sealgair fionnuar",
+  "annual_report.summary.archetype.lurker": "An lurker",
+  "annual_report.summary.archetype.oracle": "An oracal",
+  "annual_report.summary.archetype.pollster": "An pollaire",
+  "annual_report.summary.archetype.replier": "An féileacán sóisialta",
+  "annual_report.summary.followers.followers": "leanúna",
+  "annual_report.summary.followers.total": "{count} san iomlán",
+  "annual_report.summary.here_it_is": "Seo do {year} faoi athbhreithniú:",
+  "annual_report.summary.highlighted_post.by_favourites": "post is fearr leat",
+  "annual_report.summary.highlighted_post.by_reblogs": "post is treisithe",
+  "annual_report.summary.highlighted_post.by_replies": "post leis an líon is mó freagraí",
+  "annual_report.summary.highlighted_post.possessive": "{name}'s",
+  "annual_report.summary.most_used_app.most_used_app": "aip is mó a úsáidtear",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag is mó a úsáidtear",
+  "annual_report.summary.new_posts.new_posts": "postanna nua",
+  "annual_report.summary.percentile.text": "<topLabel>Cuireann sé sin i mbarr</topLabel><percentage></percentage><bottomLabel> úsáideoirí Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Ní inseoidh muid do Bernie.",
+  "annual_report.summary.thanks": "Go raibh maith agat as a bheith mar chuid de Mastodon!",
   "attachments_list.unprocessed": "(neamhphróiseáilte)",
   "audio.hide": "Cuir fuaim i bhfolach",
   "block_modal.remote_users_caveat": "Iarrfaimid ar an bhfreastalaí {domain} meas a bheith agat ar do chinneadh. Mar sin féin, ní ráthaítear comhlíonadh toisc go bhféadfadh roinnt freastalaithe bloic a láimhseáil ar bhealach difriúil. Seans go mbeidh postálacha poiblí fós le feiceáil ag úsáideoirí nach bhfuil logáilte isteach.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "Dílean ​​an t-úsáideoir?",
   "content_warning.hide": "Folaigh postáil",
   "content_warning.show": "Taispeáin ar aon nós",
+  "content_warning.show_more": "Taispeáin níos mó",
   "conversation.delete": "Scrios comhrá",
   "conversation.mark_as_read": "Marcáil mar léite",
   "conversation.open": "Féach ar comhrá",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
-  "filter_warning.matches_filter": "Meaitseálann an scagaire “{title}”",
+  "filter_warning.matches_filter": "Meaitseálann an scagaire “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b’fhéidir go bhfuil aithne agat orthu",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Le cuntas ar Mastodon, is féidir leat {name} a leanúint chun a gcuid postálacha a fháil i do fhotha baile.",
   "interaction_modal.description.reblog": "Le cuntas ar Mastodon, is féidir leat an postáil seo a threisiú chun é a roinnt le do leantóirí féin.",
   "interaction_modal.description.reply": "Le cuntas ar Mastodon, is féidir leat freagra a thabhairt ar an bpostáil seo.",
+  "interaction_modal.description.vote": "Le cuntas ar Mastodon, is féidir leat vótáil sa vótaíocht seo.",
   "interaction_modal.login.action": "Thabhairt dom abhaile",
   "interaction_modal.login.prompt": "Fearann ​​do fhreastalaí baile, e.g. mastodon.sóisialta",
   "interaction_modal.no_account_yet": "Ní ar Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Lean {name}",
   "interaction_modal.title.reblog": "Mol postáil de chuid {name}",
   "interaction_modal.title.reply": "Freagair postáil {name}",
+  "interaction_modal.title.vote": "Vótáil i vótaíocht {name}",
   "intervals.full.days": "{number, plural, one {# lá} other {# lá}}",
   "intervals.full.hours": "{number, plural, one {# uair} other {# uair}}",
   "intervals.full.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} tuairiscithe {target}",
   "notification.admin.sign_up": "Chláraigh {name}",
   "notification.admin.sign_up.name_and_others": "{name} agus {count, plural, one {# duine eile} two {# daoine eile} few {# daoine eile} many {# daoine eile} other {# daoine eile}} a chláraigh",
+  "notification.annual_report.message": "Tá do {year} #Wrapstodon ag fanacht! Nocht buaicphointí na bliana agus chuimhneacháin i gcuimhne ar Mastodon!",
+  "notification.annual_report.view": "Amharc #Wrapstodon",
   "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.favourite.name_and_others_with_link": "{name} agus <a>{count, plural, one {# duine eile} other {# daoine eile}}</a> thaitin le do phost",
   "notification.follow": "Lean {name} thú",

app/javascript/mastodon/locales/gd.json

@@ -158,6 +158,7 @@
   "compose_form.poll.duration": "Faide a’ chunntais",
   "compose_form.poll.multiple": "Iomadh-roghainn",
   "compose_form.poll.option_placeholder": "Roghainn {number}",
+  "compose_form.poll.single": "Aon taghadh",
   "compose_form.poll.switch_to_multiple": "Atharraich an cunntas-bheachd ach an gabh iomadh roghainn a thaghadh",
   "compose_form.poll.switch_to_single": "Atharraich an cunntas-bheachd gus nach gabh ach aon roghainn a thaghadh",
   "compose_form.poll.type": "Stoidhle",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
   "content_warning.hide": "Falaich am post",
   "content_warning.show": "Seall e co-dhiù",
+  "content_warning.show_more": "Seall barrachd dheth",
   "conversation.delete": "Sguab às an còmhradh",
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
@@ -304,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
-  "filter_warning.matches_filter": "A’ maidseadh na criathraige “{title}”",
+  "filter_warning.matches_filter": "A’ maidseadh na criathraige “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil gin ann} one {O # neach} two {O # neach} few {O # daoine} other {O # duine}} air a bheil thu eòlach ’s dòcha",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
@@ -384,6 +386,7 @@
   "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.",
   "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.",
   "interaction_modal.description.reply": "Le cunntas air Mastodon, ’s urrainn dhut freagairt a chur dhan phost seo.",
+  "interaction_modal.description.vote": "Le cunntas air Mastodon, ’s urrainn dhut bhòtadh sa chunntas-bheachd seo.",
   "interaction_modal.login.action": "Thoir dhachaigh mi",
   "interaction_modal.login.prompt": "Àrainn-lìn an fhrithealaiche dachaigh agad, can ailbhean.co-shaoghal.net",
   "interaction_modal.no_account_yet": "Nach eil thu air Mastodon?",
@@ -395,6 +398,7 @@
   "interaction_modal.title.follow": "Lean {name}",
   "interaction_modal.title.reblog": "Brosnaich am post aig {name}",
   "interaction_modal.title.reply": "Freagair dhan phost aig {name}",
+  "interaction_modal.title.vote": "Bhòt sa chunntas-bheachd aig {name}",
   "intervals.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "intervals.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}}",
   "intervals.full.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}}",
@@ -461,7 +465,7 @@
   "media_gallery.hide": "Falaich",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Falaich o na brathan",
-  "mute_modal.hide_options": "Roghainnean falaich",
+  "mute_modal.hide_options": "Falaich na roghainnean",
   "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
   "mute_modal.show_options": "Seall na roghainnean",
   "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
@@ -507,6 +511,7 @@
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.favourite.name_and_others_with_link": "Is annsa le {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
+  "notification.follow.name_and_others": "Lean {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> thu",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.follow_request.name_and_others": "Dh’iarr {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} ’gad leantainn",
   "notification.label.mention": "Iomradh",
@@ -565,6 +570,7 @@
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
+  "notifications.column_settings.group": "Buidheann",
   "notifications.column_settings.mention": "Iomraidhean:",
   "notifications.column_settings.poll": "Toraidhean cunntais-bheachd:",
   "notifications.column_settings.push": "Brathan putaidh",

app/javascript/mastodon/locales/gl.json

@@ -87,6 +87,18 @@
   "alert.unexpected.title": "Vaites!",
   "alt_text_badge.title": "Texto Alt",
   "announcement.announcement": "Anuncio",
+  "annual_report.summary.followers.followers": "seguidoras",
+  "annual_report.summary.followers.total": "{count} en total",
+  "annual_report.summary.here_it_is": "Este é o resumo do teu {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "a publicación mais favorecida",
+  "annual_report.summary.highlighted_post.by_reblogs": "a publicación con mais promocións",
+  "annual_report.summary.highlighted_post.by_replies": "a publicación con mais respostas",
+  "annual_report.summary.highlighted_post.possessive": "de {name}",
+  "annual_report.summary.most_used_app.most_used_app": "app que mais usaches",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "o cancelo mais utilizado",
+  "annual_report.summary.new_posts.new_posts": "novas publicacións",
+  "annual_report.summary.percentile.text": "<topLabel>Sitúante no top</topLabel><percentage></percentage><bottomLabel> das usuarias de Mastodon.</bottomLabel>",
+  "annual_report.summary.thanks": "Grazas por ser parte de Mastodon!",
   "attachments_list.unprocessed": "(sen procesar)",
   "audio.hide": "Agochar audio",
   "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
@@ -197,6 +209,7 @@
   "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
   "content_warning.hide": "Agochar publicación",
   "content_warning.show": "Mostrar igualmente",
+  "content_warning.show_more": "Mostrar máis",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
@@ -305,7 +318,7 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
-  "filter_warning.matches_filter": "Debido ao filtro “{title}”",
+  "filter_warning.matches_filter": "Concorda co filtro «<span>{title}</span>»",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que igual coñeces",
   "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
@@ -385,6 +398,7 @@
   "interaction_modal.description.follow": "Cunha conta en Mastodon, poderás seguir a {name} e recibir as súas publicacións na túa cronoloxía de inicio.",
   "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.",
   "interaction_modal.description.reply": "Cunha conta en Mastodon, poderás responder a esta publicación.",
+  "interaction_modal.description.vote": "Podes votar nesta enquisa se tes unha conta en Mastodon.",
   "interaction_modal.login.action": "Lévame ao inicio",
   "interaction_modal.login.prompt": "Dominio do teu servidor de inicio, ex. mastodon.social",
   "interaction_modal.no_account_yet": "Aínda non tes unha conta?",
@@ -396,6 +410,7 @@
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Promover a publicación de {name}",
   "interaction_modal.title.reply": "Responder á publicación de {name}",
+  "interaction_modal.title.vote": "Vota na enquisa de {name}",
   "intervals.full.days": "{number, plural,one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -451,7 +466,7 @@
   "lists.exclusive": "Agocha estas publicacións no Inicio",
   "lists.new.create": "Engadir listaxe",
   "lists.new.title_placeholder": "Título da nova listaxe",
-  "lists.replies_policy.followed": "Toda usuaria seguida",
+  "lists.replies_policy.followed": "Calquera usuaria que siga",
   "lists.replies_policy.list": "Membros da lista",
   "lists.replies_policy.none": "Ninguén",
   "lists.replies_policy.title": "Mostrar respostas a:",

app/javascript/mastodon/locales/he.json

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
   "content_warning.hide": "הסתרת חיצרוץ",
   "content_warning.show": "להציג בכל זאת",
+  "content_warning.show_more": "הצג עוד",
   "conversation.delete": "מחיקת שיחה",
   "conversation.mark_as_read": "סמן כנקרא",
   "conversation.open": "צפו בשיחה",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
-  "filter_warning.matches_filter": "תואם לסנן “{title}”",
+  "filter_warning.matches_filter": "תואם לסנן “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין בקשות ממשתמשים }one {בקשה אחת ממישהו/מישהי }two {יש בקשותיים ממשתמשים }other {יש # בקשות ממשתמשים }}שאולי מוכרים לך",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
@@ -385,6 +386,7 @@
   "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הפוסטים שלו/ה בפיד הבית.",
   "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
   "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.",
+  "interaction_modal.description.vote": "עם חשבון מסטודון, ניתן להצביע בסקר.",
   "interaction_modal.login.action": "קח אותי לדף הבית",
   "interaction_modal.login.prompt": "שם השרת שלך, למשל mastodon.social",
   "interaction_modal.no_account_yet": "עדיין לא במסטודון?",
@@ -396,6 +398,7 @@
   "interaction_modal.title.follow": "לעקוב אחרי {name}",
   "interaction_modal.title.reblog": "להדהד את החצרוץ של {name}",
   "interaction_modal.title.reply": "תשובה לחצרוץ של {name}",
+  "interaction_modal.title.vote": "הצביעו בסקר של {name}",
   "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
   "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
   "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}",

app/javascript/mastodon/locales/hu.json

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
   "content_warning.hide": "Bejegyzés elrejtése",
   "content_warning.show": "Megjelenítés mindenképp",
+  "content_warning.show_more": "Több megjelenítése",
   "conversation.delete": "Beszélgetés törlése",
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
-  "filter_warning.matches_filter": "Megfelel a szűrőnek: „{title}”",
+  "filter_warning.matches_filter": "Megfelel a szűrőnek: „<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {senkitől} one {egy valószínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
@@ -385,6 +386,7 @@
   "interaction_modal.description.follow": "Egy Mastodon-fiókkal követheted {name} fiókját, hogy lásd a bejegyzéseit a kezdőlapodon.",
   "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
   "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
+  "interaction_modal.description.vote": "Egy Mastodon fiókkal szavazhatsz ebben a szavazásban.",
   "interaction_modal.login.action": "Vigyen haza",
   "interaction_modal.login.prompt": "A saját kiszolgálód tartományneve, pl.: mastodon.social",
   "interaction_modal.no_account_yet": "Nem vagy Mastodonon?",
@@ -396,6 +398,7 @@
   "interaction_modal.title.follow": "{name} követése",
   "interaction_modal.title.reblog": "{name} bejegyzésének megtolása",
   "interaction_modal.title.reply": "Válasz {name} bejegyzésére",
+  "interaction_modal.title.vote": "Szavazz {name} szavazásában",
   "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
   "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
   "intervals.full.minutes": "{number, plural, one {# perc} other {# perc}}",

app/javascript/mastodon/locales/ia.json

@@ -304,7 +304,6 @@
   "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
-  "filter_warning.matches_filter": "Corresponde al filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nemo} one {un persona} other {# personas}} que tu pote cognoscer",
   "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",

app/javascript/mastodon/locales/id.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Jumlah akses dibatasi",
   "alert.unexpected.message": "Terjadi kesalahan yang tidak terduga.",
   "alert.unexpected.title": "Ups!",
+  "alt_text_badge.title": "Teks Alternatif",
   "announcement.announcement": "Pengumuman",
   "attachments_list.unprocessed": "(tidak diproses)",
   "audio.hide": "Sembunyikan audio",
@@ -97,6 +98,8 @@
   "block_modal.title": "Blokir pengguna?",
   "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
+  "boost_modal.reblog": "Pacu kiriman?",
+  "boost_modal.undo_reblog": "Jangan pacu kiriman?",
   "bundle_column_error.copy_stacktrace": "Salin laporan kesalahan",
   "bundle_column_error.error.body": "Laman yang diminta tidak dapat ditampilkan. Mungkin karena sebuah kutu dalam kode kami, atau masalah kompatibilitas peramban.",
   "bundle_column_error.error.title": "Oh, tidak!",
@@ -155,6 +158,7 @@
   "compose_form.poll.duration": "Durasi japat",
   "compose_form.poll.multiple": "Pilihan ganda",
   "compose_form.poll.option_placeholder": "Opsi {number}",
+  "compose_form.poll.single": "Pilihan tunggal",
   "compose_form.poll.switch_to_multiple": "Ubah japat menjadi pilihan ganda",
   "compose_form.poll.switch_to_single": "Ubah japat menjadi pilihan tunggal",
   "compose_form.poll.type": "Gaya",
@@ -218,6 +222,7 @@
   "domain_block_modal.they_cant_follow": "Tidak ada seorangpun dari server ini yang dapat mengikuti anda.",
   "domain_block_modal.they_wont_know": "Mereka tidak akan tahu bahwa mereka diblokir.",
   "domain_block_modal.title": "Blokir domain?",
+  "domain_block_modal.you_will_lose_relationships": "Kamu akan kehilangan semua pengikut dan orang yang kamu ikuti dari server ini.",
   "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
   "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
   "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
@@ -231,6 +236,7 @@
   "domain_pill.who_you_are": "<button>ActivityPub-powered platforms</button>.",
   "domain_pill.your_handle": "Nama pengguna anda:",
   "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
+  "domain_pill.your_username": "Pengenal unik anda di server ini. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
   "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
   "embed.preview": "Tampilan akan seperti ini nantinya:",
   "emoji_button.activity": "Aktivitas",
@@ -293,6 +299,7 @@
   "filter_modal.select_filter.subtitle": "Gunakan kategori yang sudah ada atau buat yang baru",
   "filter_modal.select_filter.title": "Saring kiriman ini",
   "filter_modal.title.status": "Saring sebuah kiriman",
+  "filtered_notifications_banner.title": "Notifikasi yang disaring",
   "firehose.all": "Semua",
   "firehose.local": "Server Ini",
   "firehose.remote": "Server Lain",
@@ -301,6 +308,7 @@
   "follow_requests.unlocked_explanation": "Meskipun akun Anda tidak dikunci, staf {domain} menyarankan Anda untuk meninjau permintaan mengikuti dari akun-akun ini secara manual.",
   "follow_suggestions.curated_suggestion": "Pilihan staf",
   "follow_suggestions.dismiss": "Jangan tampilkan lagi",
+  "follow_suggestions.friends_of_friends_longer": "Populer di antara orang yang anda ikuti",
   "follow_suggestions.hints.featured": "Profil ini telah dipilih sendiri oleh tim {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Profil ini populer di kalangan orang yang anda ikuti.",
   "follow_suggestions.personalized_suggestion": "Saran yang dipersonalisasi",
@@ -308,6 +316,7 @@
   "follow_suggestions.popular_suggestion_longer": "Populer di {domain}",
   "follow_suggestions.similar_to_recently_followed_longer": "Serupa dengan profil yang baru Anda ikuti",
   "follow_suggestions.view_all": "Lihat semua",
+  "follow_suggestions.who_to_follow": "Siapa yang harus diikuti",
   "followed_tags": "Tagar yang diikuti",
   "footer.about": "Tentang",
   "footer.directory": "Direktori profil",

app/javascript/mastodon/locales/io.json

@@ -304,7 +304,6 @@
   "filter_modal.select_filter.subtitle": "Usez disponebla grupo o kreez novajo",
   "filter_modal.select_filter.title": "Filtragez ca posto",
   "filter_modal.title.status": "Filtragez posto",
-  "filter_warning.matches_filter": "Sama kam filtrilo \"{title}\"",
   "filtered_notifications_banner.pending_requests": "De {count, plural,=0 {nulu} one {1 persono} other {# personi}} quan vu forsan konocas",
   "filtered_notifications_banner.title": "Filtrilita savigi",
   "firehose.all": "Omno",

app/javascript/mastodon/locales/is.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Úbbs!",
   "alt_text_badge.title": "Hjálpartexti mynda",
   "announcement.announcement": "Auglýsing",
+  "annual_report.summary.archetype.booster": "Svali gaurinn",
+  "annual_report.summary.archetype.lurker": "Lurkurinn",
+  "annual_report.summary.archetype.oracle": "Völvan",
+  "annual_report.summary.archetype.pollster": "Kannanafíkillinn",
+  "annual_report.summary.archetype.replier": "Félagsveran",
+  "annual_report.summary.followers.followers": "fylgjendur",
+  "annual_report.summary.followers.total": "{count} alls",
+  "annual_report.summary.here_it_is": "Hér er yfirlitið þitt fyrir {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "færsla sett oftast í eftirlæti",
+  "annual_report.summary.highlighted_post.by_reblogs": "færsla oftast endurbirt",
+  "annual_report.summary.highlighted_post.by_replies": "færsla með flestum svörum",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "mest notaða forrit",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "mest notaða myllumerki",
+  "annual_report.summary.new_posts.new_posts": "nýjar færslur",
+  "annual_report.summary.percentile.text": "<topLabel>Það setur þig á meðal efstu</topLabel><percentage></percentage><bottomLabel>notenda Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Við förum ekkert að raupa um þetta.",
+  "annual_report.summary.thanks": "Takk fyrir að vera hluti af Mastodon-samfélaginu!",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
   "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
   "content_warning.hide": "Fela færslu",
   "content_warning.show": "Birta samt",
+  "content_warning.show_more": "Sýna meira",
   "conversation.delete": "Eyða samtali",
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
-  "filter_warning.matches_filter": "Samsvarar síunni“{title}”",
+  "filter_warning.matches_filter": "Samsvarar síunni “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {engum} one {einum aðila} other {# manns}} sem þú gætir þekkt",
   "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Með notandaaðgangi á Mastodon geturðu fylgst með {name} og fengið færslur frá viðkomandi í heimastreymið þitt.",
   "interaction_modal.description.reblog": "Með notandaaðgangi á Mastodon geturðu endurbirt þessa færslu til að deila henni með þeim sem fylgjast með þér.",
   "interaction_modal.description.reply": "Með notandaaðgangi á Mastodon geturðu svarað þessari færslu.",
+  "interaction_modal.description.vote": "Þú getur greitt atkvæði í þessari könnun ef þú ert með aðgang á Mastodon.",
   "interaction_modal.login.action": "Fara á heimastreymið mitt",
   "interaction_modal.login.prompt": "Lén heimanetþjónsins þíns, t.d. mastodon.social",
   "interaction_modal.no_account_yet": "Ekki á Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Fylgjast með {name}",
   "interaction_modal.title.reblog": "Endurbirta færsluna frá {name}",
   "interaction_modal.title.reply": "Svara færslunni frá {name}",
+  "interaction_modal.title.vote": "Greiða atkvæði í könnun á vegum {name}",
   "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# klukkustund} other {# klukkustundir}}",
   "intervals.full.minutes": "{number, plural, one {# mínúta} other {# mínútur}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} kærði {target}",
   "notification.admin.sign_up": "{name} skráði sig",
   "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} skráð sig",
+  "notification.annual_report.message": "{year} á #Wrapstodon bíður! Afhjúpaðu hvað bar hæst á árinu og minnistæðustu augnablikin á Mastodon!",
+  "notification.annual_report.view": "Skoða #Wrapstodon",
   "notification.favourite": "{name} setti færsluna þína í eftirlæti",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> sett færsluna þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",

app/javascript/mastodon/locales/it.json

@@ -87,6 +87,19 @@
   "alert.unexpected.title": "Oops!",
   "alt_text_badge.title": "Testo alternativo",
   "announcement.announcement": "Annuncio",
+  "annual_report.summary.archetype.oracle": "L'oracolo",
+  "annual_report.summary.followers.followers": "seguaci",
+  "annual_report.summary.followers.total": "{count} in totale",
+  "annual_report.summary.here_it_is": "Ecco il tuo {year} in sintesi:",
+  "annual_report.summary.highlighted_post.by_favourites": "il post più apprezzato",
+  "annual_report.summary.highlighted_post.by_reblogs": "il post più condiviso",
+  "annual_report.summary.highlighted_post.by_replies": "il post con più risposte",
+  "annual_report.summary.highlighted_post.possessive": "di {name}",
+  "annual_report.summary.most_used_app.most_used_app": "l'app più utilizzata",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "l'hashtag più usato",
+  "annual_report.summary.new_posts.new_posts": "nuovi post",
+  "annual_report.summary.percentile.text": "<topLabel>Questo ti colloca tra il</topLabel><percentage></percentage><bottomLabel>dei migliori utenti Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Non lo diremo a Bernie.",
   "attachments_list.unprocessed": "(non elaborato)",
   "audio.hide": "Nascondi audio",
   "block_modal.remote_users_caveat": "Chiederemo al server {domain} di rispettare la tua decisione. Tuttavia, la conformità non è garantita poiché alcuni server potrebbero gestire i blocchi in modo diverso. I post pubblici potrebbero essere ancora visibili agli utenti che non hanno effettuato l'accesso.",
@@ -197,6 +210,7 @@
   "confirmations.unfollow.title": "Smettere di seguire l'utente?",
   "content_warning.hide": "Nascondi post",
   "content_warning.show": "Mostra comunque",
+  "content_warning.show_more": "Mostra di più",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
@@ -305,7 +319,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
-  "filter_warning.matches_filter": "Corrisponde al filtro \"{title}\"",
+  "filter_warning.matches_filter": "Corrisponde al filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
@@ -385,6 +399,7 @@
   "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
   "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
   "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
+  "interaction_modal.description.vote": "Con un account su Mastodon puoi votare in questo sondaggio.",
   "interaction_modal.login.action": "Portami alla pagina iniziale",
   "interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
   "interaction_modal.no_account_yet": "Non su Mastodon?",
@@ -396,6 +411,7 @@
   "interaction_modal.title.follow": "Segui {name}",
   "interaction_modal.title.reblog": "Reblogga il post di {name}",
   "interaction_modal.title.reply": "Rispondi al post di {name}",
+  "interaction_modal.title.vote": "Vota nel sondaggio di {name}",
   "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minuti}}",
@@ -505,6 +521,8 @@
   "notification.admin.report_statuses_other": "{name} ha segnalato {target}",
   "notification.admin.sign_up": "{name} si è iscritto",
   "notification.admin.sign_up.name_and_others": "Si sono iscritti: {name} e {count, plural, one {# altro utente} other {altri # utenti}}",
+  "notification.annual_report.message": "Il tuo #Wrapstodon {year} ti aspetta! Scopri i momenti salienti e memorabili del tuo anno su Mastodon!",
+  "notification.annual_report.view": "Visualizza #Wrapstodon",
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# altro} other {altri #}}</a> hanno aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",

app/javascript/mastodon/locales/ja.json

@@ -158,6 +158,7 @@
   "compose_form.poll.duration": "アンケート期間",
   "compose_form.poll.multiple": "複数選択",
   "compose_form.poll.option_placeholder": "項目{number}",
+  "compose_form.poll.single": "単一選択",
   "compose_form.poll.switch_to_multiple": "複数選択に変更",
   "compose_form.poll.switch_to_single": "単一選択に変更",
   "compose_form.poll.type": "スタイル",
@@ -195,7 +196,8 @@
   "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
   "confirmations.unfollow.title": "フォローを解除しようとしています",
   "content_warning.hide": "内容を隠す",
-  "content_warning.show": "承知の上で表示",
+  "content_warning.show": "承知して表示",
+  "content_warning.show_more": "続きを表示",
   "conversation.delete": "会話を削除",
   "conversation.mark_as_read": "既読にする",
   "conversation.open": "会話を表示",
@@ -304,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
-  "filter_warning.matches_filter": "フィルター「{title}」に一致する投稿です",
+  "filter_warning.matches_filter": "フィルター「<span>{title}</span>」に一致する投稿",
   "filtered_notifications_banner.pending_requests": "{count, plural,  =0 {すべて完了しました} other {#人の通知がブロックされています}}",
   "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
@@ -384,6 +386,7 @@
   "interaction_modal.description.follow": "Mastodonのアカウントで{name}さんをフォローしてホームフィードで投稿を受け取れます。",
   "interaction_modal.description.reblog": "Mastodonのアカウントでこの投稿をブーストして自分のフォロワーに共有できます。",
   "interaction_modal.description.reply": "Mastodonのアカウントでこの投稿に反応できます。",
+  "interaction_modal.description.vote": "Mastodonのアカウントでこのアンケートに票を入れることができます。",
   "interaction_modal.login.action": "サーバーに移動",
   "interaction_modal.login.prompt": "登録したサーバーのドメイン (例: mastodon.social)",
   "interaction_modal.no_account_yet": "Mastodonにアカウントがない場合は",
@@ -395,6 +398,7 @@
   "interaction_modal.title.follow": "{name}さんをフォロー",
   "interaction_modal.title.reblog": "{name}さんの投稿をブースト",
   "interaction_modal.title.reply": "{name}さんの投稿にリプライ",
+  "interaction_modal.title.vote": "{name}さんのアンケートに投票",
   "intervals.full.days": "{number}日",
   "intervals.full.hours": "{number}時間",
   "intervals.full.minutes": "{number}分",
@@ -503,12 +507,13 @@
   "notification.admin.report_statuses": "{name}さんが{target}さんを「{category}」として通報しました",
   "notification.admin.report_statuses_other": "{name}さんが{target}さんを通報しました",
   "notification.admin.sign_up": "{name}さんがサインアップしました",
-  "notification.admin.sign_up.name_and_others": "{name}さんほか{count, plural, other {#人}}がサインアップしました",
+  "notification.admin.sign_up.name_and_others": "{name}さんとほか{count, plural, other {#人}}がサインアップしました",
   "notification.favourite": "{name}さんがお気に入りしました",
-  "notification.favourite.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
+  "notification.favourite.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
   "notification.follow": "{name}さんにフォローされました",
+  "notification.follow.name_and_others": "{name}さんと<a>ほか{count, plural, other {#人}}</a>にフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
-  "notification.follow_request.name_and_others": "{name}さんほか{count, plural, other {#人}}があなたにフォローリクエストしました",
+  "notification.follow_request.name_and_others": "{name}さんとほか{count, plural, other {#人}}があなたにフォローリクエストしました",
   "notification.label.mention": "メンション",
   "notification.label.private_mention": "非公開の返信 (メンション)",
   "notification.label.private_reply": "非公開の返信",
@@ -527,7 +532,7 @@
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "投票したアンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
-  "notification.reblog.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>にブーストされました",
+  "notification.reblog.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がブーストしました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
   "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
   "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
@@ -565,6 +570,7 @@
   "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
+  "notifications.column_settings.group": "グループ",
   "notifications.column_settings.mention": "返信:",
   "notifications.column_settings.poll": "アンケート結果:",
   "notifications.column_settings.push": "プッシュ通知",

app/javascript/mastodon/locales/ko.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "앗!",
   "alt_text_badge.title": "대체 문구",
   "announcement.announcement": "공지사항",
+  "annual_report.summary.archetype.booster": "연쇄부스트마",
+  "annual_report.summary.archetype.lurker": "은둔자",
+  "annual_report.summary.archetype.oracle": "예언자",
+  "annual_report.summary.archetype.pollster": "여론조사원",
+  "annual_report.summary.archetype.replier": "인싸",
+  "annual_report.summary.followers.followers": "팔로워",
+  "annual_report.summary.followers.total": "총 {count}",
+  "annual_report.summary.here_it_is": "{year}년 결산입니다:",
+  "annual_report.summary.highlighted_post.by_favourites": "가장 많은 좋아요를 받은 게시물",
+  "annual_report.summary.highlighted_post.by_reblogs": "가장 많이 부스트된 게시물",
+  "annual_report.summary.highlighted_post.by_replies": "가장 많은 답글을 받은 게시물",
+  "annual_report.summary.highlighted_post.possessive": "{name} 님의",
+  "annual_report.summary.most_used_app.most_used_app": "가장 많이 사용한 앱",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "가장 많이 사용한 해시태그",
+  "annual_report.summary.new_posts.new_posts": "새 게시물",
+  "annual_report.summary.percentile.text": "<topLabel>마스토돈 사용자의 상위</topLabel><percentage></percentage><bottomLabel>입니다.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "엄마한테 말 안 할게요.",
+  "annual_report.summary.thanks": "마스토돈과 함께 해주셔서 감사합니다!",
   "attachments_list.unprocessed": "(처리 안 됨)",
   "audio.hide": "소리 숨기기",
   "block_modal.remote_users_caveat": "우리는 {domain} 서버가 당신의 결정을 존중해 주길 부탁할 것입니다. 하지만 몇몇 서버는 차단을 다르게 취급할 수 있기 때문에 규정이 준수되는 것을 보장할 수는 없습니다. 공개 게시물은 로그인 하지 않은 사용자들에게 여전히 보여질 수 있습니다.",
@@ -113,7 +131,7 @@
   "bundle_modal_error.message": "컴포넌트를 불러오는 중 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
   "closed_registrations.other_server_instructions": "마스토돈은 분산화 되어 있기 때문에, 다른 서버에서 계정을 만들더라도 이 서버와 상호작용 할 수 있습니다.",
-  "closed_registrations_modal.description": "{domain}은 현재 가입이 막혀있는 상태입니다, 마스토돈을 이용하기 위해 꼭 {domain}을 사용할 필요는 없다는 사실을 인지해 두세요.",
+  "closed_registrations_modal.description": "{domain}은 현재 가입이 불가능합니다. 하지만 마스토돈을 이용하기 위해 꼭 {domain}을 사용할 필요는 없다는 사실을 인지해 두세요.",
   "closed_registrations_modal.find_another_server": "다른 서버 찾기",
   "closed_registrations_modal.preamble": "마스토돈은 분산화 되어 있습니다, 그렇기 때문에 어디에서 계정을 생성하든, 이 서버에 있는 누구와도 팔로우와 상호작용을 할 수 있습니다. 심지어는 스스로 서버를 만드는 것도 가능합니다!",
   "closed_registrations_modal.title": "마스토돈에서 가입",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
   "content_warning.hide": "게시물 숨기기",
   "content_warning.show": "무시하고 보기",
+  "content_warning.show_more": "더 보기",
   "conversation.delete": "대화 삭제",
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
-  "filter_warning.matches_filter": "\"{title}\" 필터에 걸림",
+  "filter_warning.matches_filter": "\"<span>{title}</span>\" 필터에 걸림",
   "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
@@ -351,7 +370,7 @@
   "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
   "hashtag.counter_by_accounts": "{count, plural, other {참여자 {counter}명}}",
   "hashtag.counter_by_uses": "{count, plural, other {게시물 {counter}개}}",
-  "hashtag.counter_by_uses_today": "금일 {count, plural, other {게시물 {counter}개}}",
+  "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
   "hashtag.follow": "해시태그 팔로우",
   "hashtag.unfollow": "해시태그 팔로우 해제",
   "hashtags.and_other": "…및 {count, plural,other {#개}}",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "마스토돈 계정을 통해, {name} 님을 팔로우 하고 그의 게시물을 홈 피드에서 받아 볼 수 있습니다.",
   "interaction_modal.description.reblog": "마스토돈 계정을 통해, 이 게시물을 부스트 하고 자신의 팔로워들에게 공유할 수 있습니다.",
   "interaction_modal.description.reply": "마스토돈 계정을 통해, 이 게시물에 응답할 수 있습니다.",
+  "interaction_modal.description.vote": "마스토돈 계정을 통해, 이 투표에 참여할 수 있습니다.",
   "interaction_modal.login.action": "홈 서버로 가기",
   "interaction_modal.login.prompt": "내 홈 서버의 도메인. 예시: mastodon.social",
   "interaction_modal.no_account_yet": "Mastodon 계정이 없나요?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "{name} 님을 팔로우",
   "interaction_modal.title.reblog": "{name} 님의 게시물을 부스트",
   "interaction_modal.title.reply": "{name} 님의 게시물에 답글",
+  "interaction_modal.title.vote": "{name} 님의 투표에 참여",
   "intervals.full.days": "{number} 일",
   "intervals.full.hours": "{number} 시간",
   "intervals.full.minutes": "{number} 분",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} 님이 {target}을 신고했습니다",
   "notification.admin.sign_up": "{name} 님이 가입했습니다",
   "notification.admin.sign_up.name_and_others": "{name} 외 {count, plural, other {# 명}}이 가입했습니다",
+  "notification.annual_report.message": "{year} #Wrapstodon 이 기다리고 있습니다! 올 해 마스토돈에서 있었던 최고의 순간과 기억들을 열어보세요!",
+  "notification.annual_report.view": "#Wrapstodon 보기",
   "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
   "notification.favourite.name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",

app/javascript/mastodon/locales/la.json

@@ -13,6 +13,8 @@
   "account.edit_profile": "Recolere notionem",
   "account.featured_tags.last_status_never": "Nulla contributa",
   "account.featured_tags.title": "Hashtag notātī {name}",
+  "account.followers_counter": "{count, plural, one {{counter} sectator} other {{counter} sectatores}}",
+  "account.following_counter": "{count, plural, one {{counter} sectans} other {{counter} sectans}}",
   "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",
   "account.muted": "Confutatus",
   "account.requested_follow": "{name} postulavit ut te sequeretur",
@@ -230,6 +232,7 @@
   "search_results.all": "Omnis",
   "server_banner.active_users": "Usūrāriī āctīvī",
   "server_banner.administered_by": "Administratur:",
+  "server_banner.is_one_of_many": "{domain} est unum ex multis independentibus servientibus Mastodon quos adhibere potes ut participes in fediverso.",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",
   "status.block": "Impedire @{name}",

app/javascript/mastodon/locales/lad.json

@@ -191,6 +191,7 @@
   "confirmations.unfollow.title": "Desige utilizador?",
   "content_warning.hide": "Eskonde puvlikasyon",
   "content_warning.show": "Amostra entanto",
+  "content_warning.show_more": "Amostra mas",
   "conversation.delete": "Efasa konversasyon",
   "conversation.mark_as_read": "Marka komo meldado",
   "conversation.open": "Ve konversasyon",

app/javascript/mastodon/locales/lt.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Alternatyvus tekstas",
   "announcement.announcement": "Skelbimas",
+  "annual_report.summary.archetype.booster": "Šaunus medžiotojas",
+  "annual_report.summary.archetype.lurker": "Stebėtojas",
+  "annual_report.summary.archetype.oracle": "Vydūnas",
+  "annual_report.summary.archetype.pollster": "Apklausos rengėjas",
+  "annual_report.summary.archetype.replier": "Socialinis drugelis",
+  "annual_report.summary.followers.followers": "sekėjai (-ų)",
+  "annual_report.summary.followers.total": "iš viso {count}",
+  "annual_report.summary.here_it_is": "Štai jūsų {year} apžvalga:",
+  "annual_report.summary.highlighted_post.by_favourites": "labiausiai pamėgtas įrašas",
+  "annual_report.summary.highlighted_post.by_reblogs": "labiausiai pasidalintas įrašas",
+  "annual_report.summary.highlighted_post.by_replies": "įrašas su daugiausiai atsakymų",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "labiausiai naudota programa",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "labiausiai naudotas saitažodis",
+  "annual_report.summary.new_posts.new_posts": "nauji įrašai",
+  "annual_report.summary.percentile.text": "<topLabel>Tai reiškia, kad esate tarp</topLabel><percentage></percentage><bottomLabel>populiariausių „Mastodon“ naudotojų.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Mes nesakysime Bernie.",
+  "annual_report.summary.thanks": "Dėkojame, kad esate „Mastodon“ dalis!",
   "attachments_list.unprocessed": "(neapdorotas)",
   "audio.hide": "Slėpti garsą",
   "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.",
@@ -158,6 +176,7 @@
   "compose_form.poll.duration": "Apklausos trukmė",
   "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} parinktis",
+  "compose_form.poll.single": "Vienas pasirinkimas",
   "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų leidžiama pasirinkti kelis pasirinkimus",
   "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų leidžiama pasirinkti vieną pasirinkimą",
   "compose_form.poll.type": "Stilius",
@@ -196,6 +215,7 @@
   "confirmations.unfollow.title": "Nebesekti naudotoją?",
   "content_warning.hide": "Slėpti įrašą",
   "content_warning.show": "Rodyti vis tiek",
+  "content_warning.show_more": "Rodyti daugiau",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -304,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
-  "filter_warning.matches_filter": "Atitinka filtrą „{title}“",
+  "filter_warning.matches_filter": "Atitinka filtrą „<span>{title}</span>“",
   "filtered_notifications_banner.pending_requests": "Iš {count, plural, =0 {nė vieno} one {žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
   "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
@@ -384,6 +404,7 @@
   "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
   "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
   "interaction_modal.description.reply": "Su Mastodon paskyra gali atsakyti į šį įrašą.",
+  "interaction_modal.description.vote": "Su „Mastodon“ paskyra galite balsuoti šioje apklausoje.",
   "interaction_modal.login.action": "Į pagrindinį puslapį",
   "interaction_modal.login.prompt": "Tavo pagrindinio serverio domenas, pvz., mastodon.social.",
   "interaction_modal.no_account_yet": "Nesi Mastodon?",
@@ -395,6 +416,7 @@
   "interaction_modal.title.follow": "Sekti {name}",
   "interaction_modal.title.reblog": "Pakelti {name} įrašą",
   "interaction_modal.title.reply": "Atsakyti į {name} įrašą",
+  "interaction_modal.title.vote": "Balsuoti {name} apklausoje",
   "intervals.full.days": "{number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
   "intervals.full.hours": "{number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
   "intervals.full.minutes": "{number, plural, one {# minutė} few {# minutes} many {# minutės} other {# minučių}}",
@@ -503,6 +525,8 @@
   "notification.admin.report_statuses": "{name} pranešė {target} kategorijai {category}",
   "notification.admin.report_statuses_other": "{name} pranešė {target}",
   "notification.admin.sign_up": "{name} užsiregistravo",
+  "notification.annual_report.message": "Jūsų laukia {year} #Wrapstodon! Atskleiskite savo metų svarbiausius įvykius ir įsimintinas akimirkas platformoje „Mastodon“.",
+  "notification.annual_report.view": "Peržiūrėti #Wrapstodon",
   "notification.favourite": "{name} pamėgo tavo įrašą",
   "notification.follow": "{name} seka tave",
   "notification.follow.name_and_others": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a> seka tave",

app/javascript/mastodon/locales/lv.json

@@ -36,6 +36,7 @@
   "account.followers.empty": "Šim lietotājam vēl nav sekotāju.",
   "account.followers_counter": "{count, plural, zero {{count} sekotāju} one {{count} sekotājs} other {{count} sekotāji}}",
   "account.following": "Seko",
+  "account.following_counter": "{count, plural, one {seko {counter}} other {seko {counter}}}",
   "account.follows.empty": "Šis lietotājs pagaidām nevienam neseko.",
   "account.go_to_profile": "Doties uz profilu",
   "account.hide_reblogs": "Paslēpt @{name} pastiprinātos ierakstus",
@@ -61,6 +62,7 @@
   "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "account.share": "Dalīties ar @{name} profilu",
   "account.show_reblogs": "Parādīt @{name} pastiprinātos ierakstus",
+  "account.statuses_counter": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
   "account.unblock": "Atbloķēt @{name}",
   "account.unblock_domain": "Atbloķēt domēnu {domain}",
   "account.unblock_short": "Atbloķēt",
@@ -146,7 +148,7 @@
   "compose.saved.body": "Ziņa saglabāta.",
   "compose_form.direct_message_warning_learn_more": "Uzzināt vairāk",
   "compose_form.encryption_warning": "Mastodon ieraksti nav pilnībā šifrēti. Nedalies ar jebkādu jutīgu informāciju caur Mastodon!",
-  "compose_form.hashtag_warning": "Šī ziņa netiks norādīta zem nevienas atsauces, jo tā nav publiska. Tikai publiskās ziņās var meklēt pēc atsauces.",
+  "compose_form.hashtag_warning": "Šis ieraksts netiks uzrādīts nevienā tēmturī, jo tas nav redzams visiem. Tikai visiem redzamos ierakstus var meklēt pēc tēmtura.",
   "compose_form.lock_disclaimer": "Tavs konts nav {locked}. Ikviens var Tev sekot, lai redzētu tikai sekotājiem paredzētos ierakstus.",
   "compose_form.lock_disclaimer.lock": "slēgts",
   "compose_form.placeholder": "Kas Tev padomā?",
@@ -191,6 +193,7 @@
   "confirmations.unfollow.title": "Pārtraukt sekošanu lietotājam?",
   "content_warning.hide": "Paslēpt ierakstu",
   "content_warning.show": "Tomēr rādīt",
+  "content_warning.show_more": "Rādīt vairāk",
   "conversation.delete": "Dzēst sarunu",
   "conversation.mark_as_read": "Atzīmēt kā izlasītu",
   "conversation.open": "Skatīt sarunu",
@@ -208,9 +211,10 @@
   "dismissable_banner.dismiss": "Atcelt",
   "dismissable_banner.explore_links": "Par šiem jaunumiem šobrīd runā cilvēki šajā un citos decentralizētā tīkla serveros.",
   "dismissable_banner.explore_statuses": "Šie ir ieraksti, kas šodien gūst arvien lielāku ievērību visā sociālajā tīklā. Augstāk tiek kārtoti jaunāki ieraksti, kuri tiek vairāk pastiprināti un ievietoti izlasēs.",
-  "dismissable_banner.explore_tags": "Šie tēmturi šobrīd kļūst arvien populārāki cilvēku vidū šajā un citos decentralizētā tīkla serveros.",
+  "dismissable_banner.explore_tags": "Šie ir tēmturi, kas šodien gūst uzmanību sabiedriskajā tīmeklī. Tēmturi, kurus izmanto vairāk dažādu cilvēku, tiek vērtēti augstāk.",
   "dismissable_banner.public_timeline": "Šie ir jaunākie publiskie ieraksti no lietotājiem sociālajā tīmeklī, kuriem {domain} seko cilvēki.",
   "domain_block_modal.block": "Bloķēt serveri",
+  "domain_block_modal.block_account_instead": "Tā vietā liegt @{name}",
   "domain_block_modal.they_cant_follow": "Neviens šajā serverī nevar Tev sekot.",
   "domain_block_modal.they_wont_know": "Viņi nezinās, ka tikuši bloķēti.",
   "domain_block_modal.title": "Bloķēt domēnu?",
@@ -246,7 +250,7 @@
   "empty_column.favourited_statuses": "Tev vēl nav iecienītāko ierakstu. Kad pievienosi kādu izlasei, tas tiks parādīts šeit.",
   "empty_column.favourites": "Šo ziņu neviens vēl nav pievienojis izlasei. Kad kāds to izdarīs, tas parādīsies šeit.",
   "empty_column.follow_requests": "Šobrīd Tev nav sekošanas pieprasījumu. Kad saņemsi kādu, tas parādīsies šeit.",
-  "empty_column.followed_tags": "Tu vēl neesi sekojis nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
+  "empty_column.followed_tags": "Tu vēl neseko nevienam tēmturim. Kad to izdarīsi, tie tiks parādīti šeit.",
   "empty_column.hashtag": "Ar šo tēmturi nekas nav atrodams.",
   "empty_column.home": "Tava mājas laikjosla ir tukša. Seko vairāk cilvēkiem, lai to piepildītu!",
   "empty_column.list": "Pagaidām šajā sarakstā nekā nav. Kad šī saraksta dalībnieki ievietos jaunus ierakstus, tie parādīsies šeit.",
@@ -282,7 +286,6 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Filtrēt šo ziņu",
   "filter_modal.title.status": "Filtrēt ziņu",
-  "filter_warning.matches_filter": "Atbilst filtram “{title}”",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
   "firehose.remote": "Citi serveri",
@@ -315,8 +318,8 @@
   "hashtag.column_settings.tag_mode.all": "Visi no šiem",
   "hashtag.column_settings.tag_mode.any": "Kāds no šiem",
   "hashtag.column_settings.tag_mode.none": "Neviens no šiem",
-  "hashtag.column_settings.tag_toggle": "Pievienot kolonnai papildu tēmturus",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalībnieks} other {{counter} dalībnieki}}",
+  "hashtag.column_settings.tag_toggle": "Iekļaut šajā kolonnā papildu birkas",
+  "hashtag.counter_by_accounts": "{count, plural, zero{{counter} dalībnieku} one {{counter} dalībnieks} other {{counter} dalībnieki}}",
   "hashtag.counter_by_uses": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}}",
   "hashtag.counter_by_uses_today": "{count, plural, zero {{counter} ierakstu} one {{counter} ieraksts} other {{counter} ieraksti}} šodien",
   "hashtag.follow": "Sekot tēmturim",
@@ -330,6 +333,7 @@
   "home.pending_critical_update.link": "Skatīt jauninājumus",
   "home.pending_critical_update.title": "Ir pieejams būtisks drošības atjauninājums.",
   "home.show_announcements": "Rādīt paziņojumus",
+  "ignore_notifications_modal.ignore": "Neņemt vērā paziņojumus",
   "interaction_modal.description.favourite": "Ar Mastodon kontu tu vari pievienot šo ziņu izlasei, lai informētu autoru, ka to novērtē, un saglabātu to vēlākai lasīšanai.",
   "interaction_modal.description.follow": "Ar Mastodon kontu Tu vari sekot {name}, lai saņemtu lietotāja ierakstus savā mājas plūsmā.",
   "interaction_modal.description.reblog": "Ar Mastodon kontu Tu vari izvirzīt šo ierakstu, lai kopīgotu to ar saviem sekotājiem.",
@@ -412,6 +416,7 @@
   "mute_modal.show_options": "Parādīt iespējas",
   "mute_modal.title": "Apklusināt lietotāju?",
   "navigation_bar.about": "Par",
+  "navigation_bar.administration": "Pārvaldība",
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
   "navigation_bar.blocks": "Bloķētie lietotāji",
   "navigation_bar.bookmarks": "Grāmatzīmes",
@@ -428,6 +433,7 @@
   "navigation_bar.follows_and_followers": "Sekojamie un sekotāji",
   "navigation_bar.lists": "Saraksti",
   "navigation_bar.logout": "Iziet",
+  "navigation_bar.moderation": "Satura pārraudzība",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
   "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
   "navigation_bar.personal": "Personīgie",
@@ -443,9 +449,11 @@
   "notification.follow": "{name} uzsāka Tev sekot",
   "notification.follow_request": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "notification.moderation-warning.learn_more": "Uzzināt vairāk",
+  "notification.moderation_warning": "Ir saņemts satura pārraudzības brīdinājums",
   "notification.moderation_warning.action_delete_statuses": "Daži no Taviem ierakstiem tika noņemti.",
   "notification.moderation_warning.action_disable": "Tavs konts tika atspējots.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Daži no Taviem ierakstiem tika atzīmēti kā jutīgi.",
+  "notification.moderation_warning.action_none": "Konts ir saņēmis satura pārraudzības brīdinājumu.",
   "notification.moderation_warning.action_sensitive": "Tavi ieraksti turpmāk tiks atzīmēti kā jutīgi.",
   "notification.moderation_warning.action_silence": "Tavs konts tika ierobežots.",
   "notification.moderation_warning.action_suspend": "Tava konta darbība tika apturēta.",
@@ -502,10 +510,10 @@
   "onboarding.action.back": "Aizved mani atpakaļ",
   "onboarding.actions.back": "Aizved mani atpakaļ",
   "onboarding.actions.go_to_explore": "Skatīt tendences",
-  "onboarding.actions.go_to_home": "Dodieties uz manu mājas plūsmu",
+  "onboarding.actions.go_to_home": "Doties uz manu sākuma plūsmu",
   "onboarding.compose.template": "Sveiki, #Mastodon!",
   "onboarding.follows.empty": "Diemžēl pašlaik nevar parādīt rezultātus. Vari mēģināt izmantot meklēšanu vai pārlūkot izpētes lapu, lai atrastu cilvēkus, kuriem sekot, vai vēlāk mēģināt vēlreiz.",
-  "onboarding.follows.lead": "Tava mājas plūsma ir galvenais veids, kā pieredzēt Mastodon. Jo vairāk cilvēkiem sekosi, jo dzīvīgāka un aizraujošāka tā būs. Lai sāktu, šeit ir daži ieteikumi:",
+  "onboarding.follows.lead": "Tava sākuma plūsma ir galvenais veids, kā pieredzēt Mastodon. Jo vairāk cilvēkiem sekosi, jo dzīvīgāka un aizraujošāka tā būs. Lai sāktu, šeit ir daži ieteikumi:",
   "onboarding.follows.title": "Pielāgo savu mājas barotni",
   "onboarding.profile.discoverable": "Padarīt manu profilu atklājamu",
   "onboarding.profile.display_name": "Attēlojamais vārds",
@@ -523,7 +531,7 @@
   "onboarding.start.lead": "Tagad Tu esi daļa no Mastodon — vienreizējas, decentralizētas sociālās mediju platformas, kurā Tu, nevis algoritms, veido Tavu pieredzi. Sāksim darbu šajā jaunajā sociālajā jomā:",
   "onboarding.start.skip": "Nav nepieciešama palīdzība darba sākšanai?",
   "onboarding.start.title": "Tev tas izdevās!",
-  "onboarding.steps.follow_people.body": "Tu pats veido savu plūsmu. Piepildīsim to ar interesantiem cilvēkiem.",
+  "onboarding.steps.follow_people.body": "Sekošana aizraujošiem cilvēkiem ir tas, par ko ir Mastodon.",
   "onboarding.steps.follow_people.title": "Pielāgo savu mājas barotni",
   "onboarding.steps.publish_status.body": "Pasveicini pasauli ar tekstu, attēliem, video vai aptaujām {emoji}",
   "onboarding.steps.publish_status.title": "Izveido savu pirmo ziņu",
@@ -554,7 +562,8 @@
   "privacy.private.long": "Tikai Tavi sekotāji",
   "privacy.private.short": "Sekotāji",
   "privacy.public.long": "Jebkurš Mastodon un ārpus tā",
-  "privacy.public.short": "Publiska",
+  "privacy.public.short": "Redzams visiem",
+  "privacy.unlisted.additional": "Šis uzvedas tieši kā publisks, izņemot to, ka ieraksts neparādīsies tiešraides barotnēs vai tēmturos, izpētē vai Mastodon meklēšanā, pat ja esi to norādījis visa konta ietvaros.",
   "privacy.unlisted.long": "Mazāk algoritmisku fanfaru",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
@@ -652,9 +661,9 @@
   "sign_in_banner.create_account": "Izveidot kontu",
   "sign_in_banner.sign_in": "Pieteikties",
   "sign_in_banner.sso_redirect": "Piesakies vai Reģistrējies",
-  "status.admin_account": "Atvērt @{name} moderēšanas saskarni",
-  "status.admin_domain": "Atvērt {domain} moderēšanas saskarni",
-  "status.admin_status": "Atvērt šo ziņu moderācijas saskarnē",
+  "status.admin_account": "Atvērt @{name} satura pārraudzības saskarni",
+  "status.admin_domain": "Atvērt {domain} satura pārraudzības saskarni",
+  "status.admin_status": "Atvērt šo ziņu satura pārraudzības saskarnē",
   "status.block": "Bloķēt @{name}",
   "status.bookmark": "Grāmatzīme",
   "status.cancel_reblog_private": "Nepastiprināt",

app/javascript/mastodon/locales/nl.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Oeps!",
   "alt_text_badge.title": "Alt-tekst",
   "announcement.announcement": "Mededeling",
+  "annual_report.summary.archetype.booster": "De cool-hunter",
+  "annual_report.summary.archetype.lurker": "De lurker",
+  "annual_report.summary.archetype.oracle": "Het orakel",
+  "annual_report.summary.archetype.pollster": "De opiniepeiler",
+  "annual_report.summary.archetype.replier": "De sociale vlinder",
+  "annual_report.summary.followers.followers": "volgers",
+  "annual_report.summary.followers.total": "totaal {count}",
+  "annual_report.summary.here_it_is": "Hier is jouw terugblik op {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "bericht met de meeste favorieten",
+  "annual_report.summary.highlighted_post.by_reblogs": "bericht met de meeste boosts",
+  "annual_report.summary.highlighted_post.by_replies": "bericht met de meeste reacties",
+  "annual_report.summary.highlighted_post.possessive": "{name}'s",
+  "annual_report.summary.most_used_app.most_used_app": "meest gebruikte app",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "meest gebruikte hashtag",
+  "annual_report.summary.new_posts.new_posts": "nieuwe berichten",
+  "annual_report.summary.percentile.text": "<topLabel>Dat zet je in de top</topLabel><percentage></percentage><bottomLabel>van Mastodon-gebruikers.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "We zullen Bernie niets vertellen.",
+  "annual_report.summary.thanks": "Bedankt dat je deel uitmaakt van Mastodon!",
   "attachments_list.unprocessed": "(niet verwerkt)",
   "audio.hide": "Audio verbergen",
   "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "Gebruiker ontvolgen?",
   "content_warning.hide": "Bericht verbergen",
   "content_warning.show": "Alsnog tonen",
+  "content_warning.show_more": "Meer tonen",
   "conversation.delete": "Gesprek verwijderen",
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
-  "filter_warning.matches_filter": "Komt overeen met filter “{title}”",
+  "filter_warning.matches_filter": "Komt overeen met filter \"<span>{title}</span>\"",
   "filtered_notifications_banner.pending_requests": "Van {count, plural, =0 {niemand} one {een persoon} other {# personen}} die je mogelijk kent",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Je kunt met een Mastodon-account {name} volgen, om zo diens berichten op jouw starttijdlijn te ontvangen.",
   "interaction_modal.description.reblog": "Je kunt met een Mastodon-account dit bericht boosten, om het zo met jouw volgers te delen.",
   "interaction_modal.description.reply": "Je kunt met een Mastodon-account op dit bericht reageren.",
+  "interaction_modal.description.vote": "Met een Mastodon-account kun je stemmen in deze peiling.",
   "interaction_modal.login.action": "Ga naar start",
   "interaction_modal.login.prompt": "Domein van jouw server, bv. mastodon.social",
   "interaction_modal.no_account_yet": "Niet op Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "{name} volgen",
   "interaction_modal.title.reblog": "Bericht van {name} boosten",
   "interaction_modal.title.reply": "Op het bericht van {name} reageren",
+  "interaction_modal.title.vote": "Stemmen in {name}'s peiling",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagen}}",
   "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
   "intervals.full.minutes": "{number, plural, one {# minuut} other {# minuten}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} rapporteerde {target}",
   "notification.admin.sign_up": "{name} heeft zich geregistreerd",
   "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben zich geregistreerd",
+  "notification.annual_report.message": "Jouw {year} #Wrapstodon staat klaar! Laat de hoogtepunten en memorabele momenten van jouw jaar zien op Mastodon!",
+  "notification.annual_report.view": "#Wrapstodon bekijken",
   "notification.favourite": "{name} markeerde jouw bericht als favoriet",
   "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht als favoriet gemarkeerd",
   "notification.follow": "{name} volgt jou nu",

app/javascript/mastodon/locales/nn.json

@@ -305,7 +305,6 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
-  "filter_warning.matches_filter": "Passar med filteret «{title}»",
   "filtered_notifications_banner.pending_requests": "Frå {count, plural, =0 {ingen} one {éin person} other {# personar}} du kanskje kjenner",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",
@@ -385,6 +384,7 @@
   "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.",
   "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.",
   "interaction_modal.description.reply": "Med ein konto på Mastodon kan du svara på dette innlegget.",
+  "interaction_modal.description.vote": "Med ein konto på Mastodon kan du røyste i denne avrøystinga.",
   "interaction_modal.login.action": "Ta meg heim",
   "interaction_modal.login.prompt": "Domenenamnet til din heime-tenar. t.d. mastodon.social",
   "interaction_modal.no_account_yet": "Ikkje på Mastodon?",
@@ -396,6 +396,7 @@
   "interaction_modal.title.follow": "Fylg {name}",
   "interaction_modal.title.reblog": "Framhev {name} sitt innlegg",
   "interaction_modal.title.reply": "Svar på innlegge til {name}",
+  "interaction_modal.title.vote": "Røyst i {name} si avrøysting",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timar}}",
   "intervals.full.minutes": "{number, plural, one {# minutt} other {# minutt}}",

app/javascript/mastodon/locales/no.json

@@ -301,7 +301,6 @@
   "filter_modal.select_filter.subtitle": "Bruk en eksisterende kategori eller opprett en ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer et innlegg",
-  "filter_warning.matches_filter": "Passer med filteret «{title}»",
   "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {en person} other {# folk}} du kanskje kjenner",
   "filtered_notifications_banner.title": "Filtrerte varsler",
   "firehose.all": "Alt",

app/javascript/mastodon/locales/pl.json

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Przestać obserwować?",
   "content_warning.hide": "Ukryj wpis",
   "content_warning.show": "Pokaż mimo to",
+  "content_warning.show_more": "Rozwiń",
   "conversation.delete": "Usuń konwersację",
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz konwersację",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
-  "filter_warning.matches_filter": "Pasuje do filtra \"{title}\"",
+  "filter_warning.matches_filter": "Pasuje do filtra \"<span>{title}</span>\"",
   "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
   "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",
@@ -385,6 +386,7 @@
   "interaction_modal.description.follow": "Mając konto na Mastodonie, możesz śledzić {name} by widzieć jego wpisy na swojej głównej osi czasu.",
   "interaction_modal.description.reblog": "Mając konto na Mastodonie, możesz podbić ten wpis i udostępnić go Twoim obserwującym.",
   "interaction_modal.description.reply": "Mając konto na Mastodonie, możesz odpowiedzieć na ten wpis.",
+  "interaction_modal.description.vote": "Mając konto na Mastodonie, możesz wziąć udział w tym głosowaniu.",
   "interaction_modal.login.action": "Wróć na stronę główną",
   "interaction_modal.login.prompt": "Domena twojego serwera domowego, np. \"mastodon.social\"",
   "interaction_modal.no_account_yet": "Nie masz konta na Mastodonie?",
@@ -396,6 +398,7 @@
   "interaction_modal.title.follow": "Śledź {name}",
   "interaction_modal.title.reblog": "Podbij wpis {name}",
   "interaction_modal.title.reply": "Odpowiedz na post {name}",
+  "interaction_modal.title.vote": "Weź udział w głosowaniu {name}",
   "intervals.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}}",
   "intervals.full.hours": "{number, plural, one {# godzina} few {# godziny} many {# godzin} other {# godzin}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minuty} many {# minut} other {# minut}}",

app/javascript/mastodon/locales/pt-BR.json

@@ -87,6 +87,24 @@
   "alert.unexpected.title": "Eita!",
   "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Comunicados",
+  "annual_report.summary.archetype.booster": "Caçador legal",
+  "annual_report.summary.archetype.lurker": "O espreitador",
+  "annual_report.summary.archetype.oracle": "O oráculo",
+  "annual_report.summary.archetype.pollster": "O pesquisador",
+  "annual_report.summary.archetype.replier": "A borboleta social",
+  "annual_report.summary.followers.followers": "seguidores",
+  "annual_report.summary.followers.total": "{count} total",
+  "annual_report.summary.here_it_is": "Aqui está seu {year} em revisão:",
+  "annual_report.summary.highlighted_post.by_favourites": "publicação mais favoritada",
+  "annual_report.summary.highlighted_post.by_reblogs": "publicação mais impulsionada",
+  "annual_report.summary.highlighted_post.by_replies": "publicação com mais respostas",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplicativo mais usado",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag mais usada",
+  "annual_report.summary.new_posts.new_posts": "novas publicações",
+  "annual_report.summary.percentile.text": "<topLabel>Isso o coloca no topo</topLabel></percentage><bottomLabel>dos usuários de Mastodon.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Não contaremos à Bernie.",
+  "annual_report.summary.thanks": "Obrigada por fazer parte do Mastodon!",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
   "block_modal.remote_users_caveat": "Pediremos ao servidor {domínio} que respeite sua decisão. No entanto, a conformidade não é garantida pois alguns servidores podem lidar com os blocos de maneira diferente. As postagens públicas ainda podem estar visíveis para usuários não logados.",
@@ -197,6 +215,7 @@
   "confirmations.unfollow.title": "Deixar de seguir o usuário?",
   "content_warning.hide": "Ocultar post",
   "content_warning.show": "Mostrar mesmo assim",
+  "content_warning.show_more": "Mostrar mais",
   "conversation.delete": "Excluir conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -305,7 +324,7 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
-  "filter_warning.matches_filter": "Correspondente ao filtro “{title}”",
+  "filter_warning.matches_filter": "Corresponder filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Por {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",
@@ -385,6 +404,7 @@
   "interaction_modal.description.follow": "Com uma conta no Mastodon, você pode seguir {name} para receber publicações na sua página inicial.",
   "interaction_modal.description.reblog": "Com uma conta no Mastodon, você pode impulsionar esta publicação para compartilhá-lo com seus próprios seguidores.",
   "interaction_modal.description.reply": "Com uma conta no Mastodon, você pode responder a esta publicação.",
+  "interaction_modal.description.vote": "Com uma conta no Mastodon, você pode votar nesta enquete.",
   "interaction_modal.login.action": "Leve-me para casa",
   "interaction_modal.login.prompt": "Domínio do seu servidor hospedeiro; por exemplo, mastodon.social",
   "interaction_modal.no_account_yet": "Ainda não está no Mastodon?",
@@ -396,6 +416,7 @@
   "interaction_modal.title.follow": "Seguir {name}",
   "interaction_modal.title.reblog": "Impulsionar publicação de {name}",
   "interaction_modal.title.reply": "Responder à publicação de {name}",
+  "interaction_modal.title.vote": "Votar na enquete de {name}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -505,6 +526,8 @@
   "notification.admin.report_statuses_other": "{name} denunciou {target}",
   "notification.admin.sign_up": "{name} se inscreveu",
   "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# other} other {# outros}}",
+  "notification.annual_report.message": "O #Wrapstodon do seu {year} está esperando! Desvende seus destaques do ano e momentos memoráveis no Mastodon!",
+  "notification.annual_report.view": "Ver #Wrapstodon",
   "notification.favourite": "{name} favoritou sua publicação",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# others}}</a> favoritaram a publicação",
   "notification.follow": "{name} te seguiu",

app/javascript/mastodon/locales/pt-PT.json

@@ -301,7 +301,6 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
-  "filter_warning.matches_filter": "Corresponde ao filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que pode conhecer",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
@@ -773,7 +772,7 @@
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Deixar de reforçar",
   "status.cannot_reblog": "Não é possível partilhar esta publicação",
-  "status.continued_thread": "Continuação da conserva",
+  "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar hiperligação para a publicação",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista pormenorizada da conversa",

app/javascript/mastodon/locales/ru.json

@@ -36,11 +36,11 @@
   "account.followers.empty": "На этого пользователя пока никто не подписан.",
   "account.followers_counter": "{count, plural, one {{counter} подписчик} few {{counter} подписчика} other {{counter} подписчиков}}",
   "account.following": "Подписки",
-  "account.following_counter": "{count, plural, one {{counter} последующий} other {{counter} последующие}}",
+  "account.following_counter": "{count, plural, one {# подписка} many {# подписок} other {# подписки}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
   "account.go_to_profile": "Перейти к профилю",
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
-  "account.in_memoriam": "В Памяти.",
+  "account.in_memoriam": "Вечная память.",
   "account.joined_short": "Присоединился",
   "account.languages": "Изменить языки подписки",
   "account.link_verified_on": "Владение этой ссылкой было проверено {date}",
@@ -62,13 +62,13 @@
   "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
   "account.show_reblogs": "Показывать продвижения от @{name}",
-  "account.statuses_counter": "{count, plural, one {# пост} few {# поста} many {# постов} other {# постов}}",
+  "account.statuses_counter": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}}",
   "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
   "account.unblock_short": "Разблокировать",
   "account.unendorse": "Не рекомендовать в профиле",
   "account.unfollow": "Отписаться",
-  "account.unmute": "Убрать {name} из игнорируемых",
+  "account.unmute": "Перестать игнорировать @{name}",
   "account.unmute_notifications_short": "Включить уведомления",
   "account.unmute_short": "Не игнорировать",
   "account_note.placeholder": "Текст заметки",
@@ -84,9 +84,23 @@
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ограничение количества запросов",
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
-  "alert.unexpected.title": "Упс!",
+  "alert.unexpected.title": "Ой!",
   "alt_text_badge.title": "Альтернативный текст",
   "announcement.announcement": "Объявление",
+  "annual_report.summary.archetype.booster": "Репостер",
+  "annual_report.summary.archetype.lurker": "Молчун",
+  "annual_report.summary.archetype.pollster": "Опросчик",
+  "annual_report.summary.archetype.replier": "Душа компании",
+  "annual_report.summary.followers.followers": "подписчиков",
+  "annual_report.summary.here_it_is": "Вот ваши итоги {year} года:",
+  "annual_report.summary.highlighted_post.by_favourites": "пост с наибольшим количеством звёздочек",
+  "annual_report.summary.highlighted_post.by_reblogs": "пост с наибольшим количеством продвижений",
+  "annual_report.summary.highlighted_post.by_replies": "пост с наибольшим количеством ответов",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "наиболее часто используемое приложение",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "наиболее часто используемый хэштег",
+  "annual_report.summary.new_posts.new_posts": "новых постов",
+  "annual_report.summary.thanks": "Спасибо за то, что были вместе с Mastodon!",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
   "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение. Однако, соблюдение требований не гарантировано, поскольку некоторые серверы могут работать с блокировками по-разному. Публичные записи по-прежнему могут быть видны неавторизованным пользователям.",
@@ -95,11 +109,11 @@
   "block_modal.they_cant_mention": "Он не может упоминать или подписываться на вас.",
   "block_modal.they_cant_see_posts": "Он не может видеть ваши сообщения, и вы не увидите его.",
   "block_modal.they_will_know": "Он может видеть, что он заблокирован.",
-  "block_modal.title": "Заблокировать пользователя?",
+  "block_modal.title": "Заблокируем пользователя?",
   "block_modal.you_wont_see_mentions": "Вы не увидите записи, которые упоминают его.",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
-  "boost_modal.reblog": "Повысить пост?",
-  "boost_modal.undo_reblog": "Разгрузить пост?",
+  "boost_modal.reblog": "Репостнуть?",
+  "boost_modal.undo_reblog": "Убрать репост?",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
   "bundle_column_error.error.title": "О нет!",
@@ -144,12 +158,12 @@
   "community.column_settings.local_only": "Только локальные",
   "community.column_settings.media_only": "Только с медиафайлами",
   "community.column_settings.remote_only": "Только удалённые",
-  "compose.language.change": "Изменить язык",
+  "compose.language.change": "Сменить язык",
   "compose.language.search": "Поиск языков...",
-  "compose.published.body": "Запись опубликована.",
+  "compose.published.body": "Пост опубликован.",
   "compose.published.open": "Открыть",
-  "compose.saved.body": "Запись сохранена.",
-  "compose_form.direct_message_warning_learn_more": "Подробнее",
+  "compose.saved.body": "Пост отредактирован.",
+  "compose_form.direct_message_warning_learn_more": "Узнать больше",
   "compose_form.encryption_warning": "Посты в Mastodon не защищены сквозным шифрованием. Не делитесь конфиденциальной информацией через Mastodon.",
   "compose_form.hashtag_warning": "Этот пост не будет виден ни под одним из хэштегов, так как он не публичный. Только публичные посты можно найти по хэштегу.",
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
@@ -158,16 +172,17 @@
   "compose_form.poll.duration": "Продолжительность опроса",
   "compose_form.poll.multiple": "Несколько вариантов ответа",
   "compose_form.poll.option_placeholder": "Вариант {number}",
+  "compose_form.poll.single": "Один вариант ответа",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
-  "compose_form.poll.type": "Стиль",
+  "compose_form.poll.type": "Тип",
   "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
   "compose_form.reply": "Ответить",
   "compose_form.save_changes": "Сохранить",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
-  "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
+  "compose_form.spoiler_placeholder": "Предупреждение о содержимом (необязательно)",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.confirm": "Заблокировать",
   "confirmations.delete.confirm": "Удалить",
@@ -177,17 +192,17 @@
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
   "confirmations.delete_list.title": "Удалить список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
-  "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
+  "confirmations.discard_edit_media.message": "У вас имеются несохранённые изменения превью и описания медиафайла, отменить их?",
   "confirmations.edit.confirm": "Редактировать",
-  "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
+  "confirmations.edit.message": "При редактировании, текст набираемого поста будет очищен. Продолжить?",
   "confirmations.edit.title": "Переписать сообщение?",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.logout.title": "Выйти?",
   "confirmations.mute.confirm": "Игнорировать",
   "confirmations.redraft.confirm": "Удалить и исправить",
-  "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут удалены.",
-  "confirmations.redraft.title": "Удалим и исправим пост?",
+  "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут потеряны.",
+  "confirmations.redraft.title": "Создать пост заново?",
   "confirmations.reply.confirm": "Ответить",
   "confirmations.reply.message": "При ответе, текст набираемого поста будет очищен. Продолжить?",
   "confirmations.reply.title": "Перепишем пост?",
@@ -196,6 +211,7 @@
   "confirmations.unfollow.title": "Отписаться?",
   "content_warning.hide": "Скрыть пост",
   "content_warning.show": "Всё равно показать",
+  "content_warning.show_more": "Покажи ещё",
   "conversation.delete": "Удалить беседу",
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
@@ -221,6 +237,7 @@
   "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
   "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
   "domain_block_modal.title": "Заблокировать домен?",
+  "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} other {{followingCountDisplay} подписок}}.",
   "domain_block_modal.you_will_lose_relationships": "Вы потеряете всех подписчиков и людей, на которых вы подписаны, на этом сервере.",
   "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
   "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
@@ -240,7 +257,7 @@
   "embed.preview": "Так это будет выглядеть:",
   "emoji_button.activity": "Занятия",
   "emoji_button.clear": "Очистить",
-  "emoji_button.custom": "С этого узла",
+  "emoji_button.custom": "С этого сервера",
   "emoji_button.flags": "Флаги",
   "emoji_button.food": "Еда и напитки",
   "emoji_button.label": "Вставить эмодзи",
@@ -303,8 +320,8 @@
   "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
-  "filter_warning.matches_filter": "Соответствует фильтру \"{title}\"",
-  "filtered_notifications_banner.pending_requests": "Вы можете знать {count, plural, =0 {ни один} one {один человек} other {# люди}}",
+  "filter_warning.matches_filter": "Соответствует фильтру \"<span>{title}</span>\"",
+  "filtered_notifications_banner.pending_requests": "Вы можете знать {count, plural, =0 {ни одного человека} one {одного человека} other {# человек}}",
   "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
   "firehose.local": "Текущий сервер",
@@ -347,12 +364,12 @@
   "hashtag.column_settings.tag_mode.any": "Любой из списка",
   "hashtag.column_settings.tag_mode.none": "Ни один из списка",
   "hashtag.column_settings.tag_toggle": "Включить дополнительные теги для этой колонки",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} участник} few {{counter} участников} many {{counter} участников} other {{counter} участников}}",
-  "hashtag.counter_by_uses": "{count, plural, one {{counter} сообщение} few {{counter} сообщения} many {{counter} сообщения} other {{counter} сообщения}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} сообщение} other {{counter} сообщений}} сегодня",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} пользователь} few {{counter} пользователя} other {{counter} пользователей}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}} сегодня",
   "hashtag.follow": "Подписаться на новые посты",
   "hashtag.unfollow": "Отписаться",
-  "hashtags.and_other": "...и {count, plural, other {# ещё}}",
+  "hashtags.and_other": "…и {count, plural, other {ещё #}}",
   "hints.profiles.followers_may_be_missing": "Подписчики у этого профиля могут отсутствовать.",
   "hints.profiles.follows_may_be_missing": "Фолловеры для этого профиля могут отсутствовать.",
   "hints.profiles.posts_may_be_missing": "Некоторые сообщения из этого профиля могут отсутствовать.",
@@ -383,6 +400,7 @@
   "interaction_modal.description.follow": "С учётной записью Mastodon вы можете подписаться на {name}, чтобы получать их посты в своей домашней ленте.",
   "interaction_modal.description.reblog": "С учётной записью Mastodon, вы можете продвинуть этот пост, чтобы поделиться им со своими подписчиками.",
   "interaction_modal.description.reply": "Вы можете ответить на этот пост с учётной записью Mastodon.",
+  "interaction_modal.description.vote": "Вы сможете проголосовать тут имея аккаунт Mastodon.",
   "interaction_modal.login.action": "Перейти на домашнюю страницу",
   "interaction_modal.login.prompt": "Домен вашего домашнего сервера, например, mastodon.social",
   "interaction_modal.no_account_yet": "Еще не на Mastodon?",
@@ -394,6 +412,7 @@
   "interaction_modal.title.follow": "Подписаться на {name}",
   "interaction_modal.title.reblog": "Продвинуть публикацию {name}",
   "interaction_modal.title.reply": "Ответить на пост {name}",
+  "interaction_modal.title.vote": "Голосовать в опросе {name}",
   "intervals.full.days": "{number, plural, one {# день} few {# дня} other {# дней}}",
   "intervals.full.hours": "{number, plural, one {# час} few {# часа} other {# часов}}",
   "intervals.full.minutes": "{number, plural, one {# минута} few {# минуты} other {# минут}}",
@@ -406,8 +425,8 @@
   "keyboard_shortcuts.direct": "чтобы открыть столбец личных упоминаний",
   "keyboard_shortcuts.down": "вниз по списку",
   "keyboard_shortcuts.enter": "открыть пост",
-  "keyboard_shortcuts.favourite": "Добавить пост в избранное",
-  "keyboard_shortcuts.favourites": "Открыть «Избранное»",
+  "keyboard_shortcuts.favourite": "добавить пост в избранное",
+  "keyboard_shortcuts.favourites": "открыть «Избранные»",
   "keyboard_shortcuts.federated": "перейти к глобальной ленте",
   "keyboard_shortcuts.heading": "Сочетания клавиш",
   "keyboard_shortcuts.home": "перейти к домашней ленте",
@@ -415,7 +434,7 @@
   "keyboard_shortcuts.legend": "показать это окно",
   "keyboard_shortcuts.local": "перейти к локальной ленте",
   "keyboard_shortcuts.mention": "упомянуть автора поста",
-  "keyboard_shortcuts.muted": "Открыть список игнорируемых",
+  "keyboard_shortcuts.muted": "открыть список игнорируемых",
   "keyboard_shortcuts.my_profile": "перейти к своему профилю",
   "keyboard_shortcuts.notifications": "перейти к уведомлениям",
   "keyboard_shortcuts.open_media": "открыть вложение",
@@ -427,7 +446,7 @@
   "keyboard_shortcuts.spoilers": "показать/скрыть поле предупреждения о содержании",
   "keyboard_shortcuts.start": "Перейти к разделу \"Начать\"",
   "keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
-  "keyboard_shortcuts.toggle_sensitivity": "Показать/скрыть медиафайлы",
+  "keyboard_shortcuts.toggle_sensitivity": "показать/скрыть медиафайлы",
   "keyboard_shortcuts.toot": "начать писать новый пост",
   "keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",
   "keyboard_shortcuts.up": "вверх по списку",
@@ -469,8 +488,8 @@
   "mute_modal.you_wont_see_mentions": "Вы не увидите постов, которые их упоминают.",
   "mute_modal.you_wont_see_posts": "Они по-прежнему смогут видеть ваши посты, но вы не сможете видеть их посты.",
   "navigation_bar.about": "О проекте",
-  "navigation_bar.administration": "Администрация",
-  "navigation_bar.advanced_interface": "Включить многоколоночный интерфейс",
+  "navigation_bar.administration": "Администрирование",
+  "navigation_bar.advanced_interface": "Открыть в многоколоночном интерфейсе",
   "navigation_bar.blocks": "Заблокированные пользователи",
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальная лента",
@@ -496,26 +515,29 @@
   "navigation_bar.search": "Поиск",
   "navigation_bar.security": "Безопасность",
   "not_signed_in_indicator.not_signed_in": "Вам нужно войти, чтобы иметь доступ к этому ресурсу.",
-  "notification.admin.report": "{name} сообщил о {target}",
-  "notification.admin.report_account": "{name} сообщил {count, plural, one {один пост} other {# постов}} от {target} для {category}",
-  "notification.admin.report_account_other": "{name} сообщил {count, plural, one {одно сообщение} other {# сообщений}} от {target}",
-  "notification.admin.report_statuses": "{name} сообщил {target} для {category}",
-  "notification.admin.report_statuses_other": "{name} сообщает {target}",
-  "notification.admin.sign_up": "{name} зарегистрирован",
-  "notification.admin.sign_up.name_and_others": "{name} и {count, plural, one {# другой} other {# другие}} подписались",
+  "notification.admin.report": "{name} пожаловался на {target}",
+  "notification.admin.report_account": "{name} пожаловался на {count, plural, one {# пост} few {# поста} other {# постов}} от пользователя {target} по причине: {category}",
+  "notification.admin.report_account_other": "{name} пожаловался на {count, plural, one {# пост} few {# поста} other {# постов}} от пользователя {target}",
+  "notification.admin.report_statuses": "{name} пожаловался на {target} по причине: {category}",
+  "notification.admin.report_statuses_other": "{name} пожаловался на {target}",
+  "notification.admin.sign_up": "{name} зарегистрировался",
+  "notification.admin.sign_up.name_and_others": "{name} и ещё {count, plural, one {# пользователь} few {# пользователя} other {# пользователей}} зарегистрировались",
+  "notification.annual_report.message": "#Wrapstodon за {year} год ждёт вас! Откройте для себя итоги и памятные моменты этого года в Mastodon!",
+  "notification.annual_report.view": "Перейти к #Wrapstodon",
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
-  "notification.favourite.name_and_others_with_link": "{name} и <a>{count, plural, one {# другие} other {# другие}}</a> отдали предпочтение вашему посту",
+  "notification.favourite.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> добавили ваш пост в избранное",
   "notification.follow": "{name} подписался (-лась) на вас",
+  "notification.follow.name_and_others": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> подписались на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
   "notification.follow_request.name_and_others": "{name} и ещё {count, plural, one {#} other {# других}} подписались на вас",
   "notification.label.mention": "Упоминание",
-  "notification.label.private_mention": "Частное упоминание",
-  "notification.label.private_reply": "Частный ответ",
-  "notification.label.reply": "Ответить",
+  "notification.label.private_mention": "Личное упоминание",
+  "notification.label.private_reply": "Приватный ответ",
+  "notification.label.reply": "Ответ",
   "notification.mention": "Упоминание",
   "notification.mentioned_you": "{name} упомянул(а) вас",
   "notification.moderation-warning.learn_more": "Узнать больше",
-  "notification.moderation_warning": "Вы получили предупреждение от модерации",
+  "notification.moderation_warning": "Модераторы вынесли вам предупреждение",
   "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
   "notification.moderation_warning.action_disable": "Ваша учётная запись была отключена.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некоторые из ваших сообщений были отмечены как деликатные.",
@@ -526,7 +548,7 @@
   "notification.own_poll": "Ваш опрос закончился",
   "notification.poll": "Голосование, в котором вы приняли участие, завершилось",
   "notification.reblog": "{name} продвинул(а) ваш пост",
-  "notification.reblog.name_and_others_with_link": "{name} и <a>{count, plural, one {# other} other {# others}}</a> увеличили ваш пост",
+  "notification.reblog.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> продвинули ваш пост",
   "notification.relationships_severance_event": "Потеряно соединение с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
   "notification.relationships_severance_event.domain_block": "Администратор {from} заблокировал {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
@@ -535,10 +557,15 @@
   "notification.status": "{name} только что запостил",
   "notification.update": "{name} изменил(а) пост",
   "notification_requests.accept": "Принять",
+  "notification_requests.accept_multiple": "{count, plural, one {Принять # запрос…} few {Принять # запроса…} other {Принять # запросов…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Принять запрос} other {Принять запросы}}",
+  "notification_requests.confirm_accept_multiple.message": "Вы собираетесь принять {count, plural, one {# запрос на показ уведомлений} few {# запроса на показ уведомлений} other {# запросов на показ уведомлений}}. Продолжить?",
   "notification_requests.confirm_accept_multiple.title": "Принимать запросы на уведомления?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Отклонить запрос} other {Отклонить запросы}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Вы собираетесь отклонить {count, plural, one {# запрос на показ уведомлений} few {# запроса на показ уведомлений} other {# запросов на показ уведомлений}}. Вы не сможете просмотреть {count, plural, other {их}} потом. Продолжить?",
   "notification_requests.confirm_dismiss_multiple.title": "Отклонять запросы на уведомления?",
   "notification_requests.dismiss": "Отклонить",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Отклонить # запрос…} few {Отклонить # запроса…} other {Отклонить # запросов…}}",
   "notification_requests.edit_selection": "Редактировать",
   "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Уведомления от этой учетной записи были отфильтрованы, поскольку учетная запись была ограничена модератором.",
@@ -550,15 +577,16 @@
   "notification_requests.view": "Просмотр уведомлений",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
-  "notifications.clear_title": "Сбросить уведомления?",
+  "notifications.clear_title": "Очистить уведомления?",
   "notifications.column_settings.admin.report": "Новые жалобы:",
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
-  "notifications.column_settings.favourite": "Избранные:",
-  "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
+  "notifications.column_settings.favourite": "Ваш пост добавили в избранные:",
+  "notifications.column_settings.filter_bar.advanced": "Показать все категории",
   "notifications.column_settings.filter_bar.category": "Панель сортировки",
   "notifications.column_settings.follow": "У вас новый подписчик:",
   "notifications.column_settings.follow_request": "Новые запросы на подписку:",
+  "notifications.column_settings.group": "Группировать",
   "notifications.column_settings.mention": "Вас упомянули в посте:",
   "notifications.column_settings.poll": "Опрос, в котором вы приняли участие, завершился:",
   "notifications.column_settings.push": "Пуш-уведомления",
@@ -578,31 +606,32 @@
   "notifications.filter.statuses": "Обновления от людей, на которых вы подписаны",
   "notifications.grant_permission": "Предоставить разрешение.",
   "notifications.group": "{count} уведомл.",
-  "notifications.mark_as_read": "Отмечать все уведомления прочитанными",
+  "notifications.mark_as_read": "Отметить все уведомления прочитанными",
   "notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
   "notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
   "notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
-  "notifications.policy.accept": "Принять",
-  "notifications.policy.accept_hint": "Показать в уведомлениях",
-  "notifications.policy.drop": "Игнорируем",
-  "notifications.policy.drop_hint": "Отправить в пустоту, чтобы никогда больше не увидеть",
-  "notifications.policy.filter": "Фильтр",
-  "notifications.policy.filter_hint": "Отправка в папку фильтрованных уведомлений",
-  "notifications.policy.filter_limited_accounts_hint": "Ограничено модераторами сервера",
-  "notifications.policy.filter_limited_accounts_title": "Модерируемые аккаунты",
-  "notifications.policy.filter_new_accounts.hint": "Создано в течение последних {days, plural, one {один день} few {# дней} many {# дней} other {# дня}}",
+  "notifications.policy.accept": "Принимать",
+  "notifications.policy.accept_hint": "Показывать в уведомлениях",
+  "notifications.policy.drop": "Игнорировать",
+  "notifications.policy.drop_hint": "Отправлять в пустоту, чтобы никогда больше не увидеть",
+  "notifications.policy.filter": "Фильтровать",
+  "notifications.policy.filter_hint": "Отправлять в раздел отфильтрованных уведомлений",
+  "notifications.policy.filter_limited_accounts_hint": "Ограниченные модераторами сервера",
+  "notifications.policy.filter_limited_accounts_title": "Модерируемые учётные записи",
+  "notifications.policy.filter_new_accounts.hint": "Созданные в течение {days, plural, one {последнего # дня} other {последних # дней}}",
   "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
+  "notifications.policy.filter_not_followers_hint": "Включая людей, которые подписаны на вас меньше чем {days, plural, one {# день} few {# дня} other {# дней}}",
   "notifications.policy.filter_not_followers_title": "Люди, не подписанные на вас",
   "notifications.policy.filter_not_following_hint": "Пока вы не одобрите их вручную",
   "notifications.policy.filter_not_following_title": "Люди, на которых вы не подписаны",
-  "notifications.policy.filter_private_mentions_hint": "Фильтруется, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
+  "notifications.policy.filter_private_mentions_hint": "Фильтруются, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
   "notifications.policy.filter_private_mentions_title": "Нежелательные личные упоминания",
-  "notifications.policy.title": "………Управлять уведомлениями от…",
+  "notifications.policy.title": "Управление уведомлениями",
   "notifications_permission_banner.enable": "Включить уведомления",
   "notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
-  "onboarding.action.back": "Вернуть меня",
-  "onboarding.actions.back": "Вернуть меня",
+  "onboarding.action.back": "Верните меня",
+  "onboarding.actions.back": "Верните меня",
   "onboarding.actions.go_to_explore": "Посмотреть, что актуально",
   "onboarding.actions.go_to_home": "Перейти к домашней ленте новостей",
   "onboarding.compose.template": "Привет, #Mastodon!",
@@ -620,7 +649,7 @@
   "onboarding.profile.title": "Настройка профиля",
   "onboarding.profile.upload_avatar": "Загрузить фотографию профиля",
   "onboarding.profile.upload_header": "Загрузить заголовок профиля",
-  "onboarding.share.lead": "Расскажите людям, как они могут найти вас на Mastodon!",
+  "onboarding.share.lead": "Расскажите людям, как найти вас на Mastodon!",
   "onboarding.share.message": "Я {username} на #Mastodon! Следуйте за мной по адресу {url}",
   "onboarding.share.next_steps": "Возможные дальнейшие шаги:",
   "onboarding.share.title": "Поделиться вашим профилем",
@@ -635,7 +664,7 @@
   "onboarding.steps.setup_profile.title": "Настройте свой профиль",
   "onboarding.steps.share_profile.body": "Расскажите своим друзьям как найти вас на Mastodon!",
   "onboarding.steps.share_profile.title": "Поделитесь вашим профилем",
-  "onboarding.tips.2fa": "<strong>Знаете ли вы? </strong> Вы можете защитить свой аккаунт, настроив двухфакторную аутентификацию в настройках аккаунта. Она работает с любым приложением TOTP по вашему выбору, номер телефона не требуется!",
+  "onboarding.tips.2fa": "<strong>А вы знали? </strong> Можно защитить свой аккаунт, настроив двухфакторную аутентификацию в настройках аккаунта. Она работает с любым приложением TOTP по вашему выбору, номер телефона не нужен!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Знали ли вы? </strong> Поскольку Mastodon децентрализован, некоторые профили, с которыми вы столкнетесь, будут размещены на серверах, отличных от вашего. И все же вы можете взаимодействовать с ними без проблем! Их сервер находится во второй половине имени пользователя!",
   "onboarding.tips.migration": "<strong>Знаете ли вы? </strong> Если вы чувствуете, что {domain} не подходит вам в качестве сервера в будущем, вы можете переехать на другой сервер Mastodon без потери своих подписчиков. Вы даже можете разместить свой собственный сервер!",
   "onboarding.tips.verification": "<strong>Знали ли вы? </strong> Вы можете подтвердить свою учетную запись, разместив ссылку на свой профиль Mastodon на собственном сайте и добавив сайт в свой профиль. Никаких сборов или документов не требуется!",
@@ -679,15 +708,15 @@
   "relative_time.minutes": "{number} мин",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сегодня",
-  "reply_indicator.attachments": "{count, plural, one {# вложение} other {# вложения}}",
+  "reply_indicator.attachments": "{count, plural, one {# вложение} few {# вложения} other {# вложений}}",
   "reply_indicator.cancel": "Отмена",
   "reply_indicator.poll": "Опрос",
   "report.block": "Заблокировать",
   "report.block_explanation": "Вы перестанете видеть посты этого пользователя, и он(а) больше не сможет подписаться на вас и читать ваши посты. Он(а) сможет понять, что вы заблокировали его/её.",
-  "report.categories.legal": "Правовая информация",
+  "report.categories.legal": "Нарушение закона",
   "report.categories.other": "Другое",
   "report.categories.spam": "Спам",
-  "report.categories.violation": "Содержимое нарушает одно или несколько правил узла",
+  "report.categories.violation": "Содержимое нарушает одно или несколько правил сервера",
   "report.category.subtitle": "Выберите наиболее подходящее",
   "report.category.title": "Расскажите нам, что не так с {type}",
   "report.category.title_account": "этим профилем",
@@ -758,31 +787,32 @@
   "server_banner.about_active_users": "Люди, заходившие на этот сервер за последние 30 дней (ежемесячные активные пользователи)",
   "server_banner.active_users": "активные пользователи",
   "server_banner.administered_by": "Управляется:",
-  "server_banner.is_one_of_many": "{domain} - это один из многих независимых серверов Mastodon, которые вы можете использовать для участия в fediverse.",
+  "server_banner.is_one_of_many": "{domain} — это один из многих независимых серверов Mastodon, которые вы можете использовать для участия в сети Fediverse.",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Зарегистрироваться",
-  "sign_in_banner.follow_anyone": "Следите за любым человеком в федеральной вселенной и смотрите все в хронологическом порядке. Никаких алгоритмов, рекламы или клик бейта.",
-  "sign_in_banner.mastodon_is": "Mastodon - лучший способ быть в курсе всего происходящего.",
+  "sign_in_banner.follow_anyone": "Подписывайтесь на кого угодно в федивёрсе и смотрите ленту в хронологическом порядке. Никаких алгоритмов, рекламы или кликбейта.",
+  "sign_in_banner.mastodon_is": "Mastodon — лучший способ быть в курсе всего происходящего.",
   "sign_in_banner.sign_in": "Войти",
   "sign_in_banner.sso_redirect": "Войдите или Зарегистрируйтесь",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
-  "status.admin_domain": "Открыть интерфейс модерации {domain}",
+  "status.admin_domain": "Открыть интерфейс модератора для {domain}",
   "status.admin_status": "Открыть этот пост в интерфейсе модератора",
   "status.block": "Заблокировать @{name}",
-  "status.bookmark": "Сохранить в закладки",
+  "status.bookmark": "Добавить в закладки",
   "status.cancel_reblog_private": "Не продвигать",
   "status.cannot_reblog": "Этот пост не может быть продвинут",
   "status.continued_thread": "Продолжение темы",
   "status.copy": "Скопировать ссылку на пост",
   "status.delete": "Удалить",
   "status.detailed_status": "Подробный просмотр обсуждения",
-  "status.direct": "Лично упоминать @{name}",
-  "status.direct_indicator": "Личные упоминания",
+  "status.direct": "Упомянуть @{name} лично",
+  "status.direct_indicator": "Личное упоминание",
   "status.edit": "Изменить",
   "status.edited": "Дата последнего изменения: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Получить код для встраивания",
-  "status.favourite": "Избранное",
+  "status.favourite": "Добавить в избранное",
+  "status.favourites": "{count, plural, other {в избранном}}",
   "status.filter": "Фильтровать этот пост",
   "status.history.created": "{name} создал {date}",
   "status.history.edited": "{name} отредактировал(а) {date}",
@@ -801,6 +831,7 @@
   "status.reblog": "Продвинуть",
   "status.reblog_private": "Продвинуть для своей аудитории",
   "status.reblogged_by": "{name} продвинул(а)",
+  "status.reblogs": "{count, plural, one {boost} few {boosts} many {boosts} other {boosts}}",
   "status.reblogs.empty": "Никто ещё не продвинул этот пост. Как только кто-то это сделает, они появятся здесь.",
   "status.redraft": "Создать заново",
   "status.remove_bookmark": "Убрать из закладок",
@@ -814,13 +845,13 @@
   "status.show_less_all": "Свернуть все спойлеры в ветке",
   "status.show_more_all": "Развернуть все спойлеры в ветке",
   "status.show_original": "Показать оригинал",
-  "status.title.with_attachments": "{user} размещено {attachmentCount, plural, one {вложение} other {{attachmentCount} вложений}}",
+  "status.title.with_attachments": "{user} опубликовал {attachmentCount, plural, one {{attachmentCount} вложение} few {{attachmentCount} вложения} other {{attachmentCount} вложений}}",
   "status.translate": "Перевод",
-  "status.translated_from_with": "Переведено с {lang}, используя {provider}",
-  "status.uncached_media_warning": "Прослушивание недоступно",
+  "status.translated_from_with": "Переведено с {lang} с помощью {provider}",
+  "status.uncached_media_warning": "Предварительный просмотр недоступен",
   "status.unmute_conversation": "Не игнорировать обсуждение",
   "status.unpin": "Открепить от профиля",
-  "subscribed_languages.lead": "Посты только на выбранных языках будут отображаться на вашей домашней странице и в списке лент после изменения. Выберите «Нет», чтобы получать посты на всех языках.",
+  "subscribed_languages.lead": "Посты лишь на выбранных языках будут появляться в вашей домашней ленте и в списках после изменения. Снимите выбор, чтобы получать посты на всех языках.",
   "subscribed_languages.save": "Сохранить изменения",
   "subscribed_languages.target": "Изменить языки подписки для {target}",
   "tabs_bar.home": "Главная",
@@ -830,7 +861,7 @@
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",
   "time_remaining.moments": "остались считанные мгновения",
   "time_remaining.seconds": "{number, plural, one {# секунда} many {# секунд} other {# секунды}}",
-  "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний день} few {последние {days} дня} other {последние {days} дней}}",
+  "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний {days} день} few {последние {days} дня} other {последние {days} дней}}",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",
   "units.short.billion": "{count} млрд",
@@ -857,11 +888,11 @@
   "upload_modal.detect_text": "Найти текст на картинке",
   "upload_modal.edit_media": "Изменить файл",
   "upload_modal.hint": "Нажмите и перетащите круг в предпросмотре в точку фокуса, которая всегда будет видна на эскизах.",
-  "upload_modal.preparing_ocr": "Подготовка распознования…",
+  "upload_modal.preparing_ocr": "Подготовка распознавания…",
   "upload_modal.preview_label": "Предпросмотр ({ratio})",
   "upload_progress.label": "Загрузка...",
   "upload_progress.processing": "Обработка…",
-  "username.taken": "Данное имя пользователя уже занято. Выберите другое.",
+  "username.taken": "Это имя пользователя уже занято. Выберите другое",
   "video.close": "Закрыть видео",
   "video.download": "Загрузить файл",
   "video.exit_fullscreen": "Покинуть полноэкранный режим",

app/javascript/mastodon/locales/sk.json

@@ -87,6 +87,13 @@
   "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Alternatívny popis",
   "announcement.announcement": "Oznámenie",
+  "annual_report.summary.followers.followers": "sledovatelia",
+  "annual_report.summary.highlighted_post.by_reblogs": "najviac vyzdvihovaný príspevok",
+  "annual_report.summary.highlighted_post.by_replies": "príspevok s najviac odpoveďami",
+  "annual_report.summary.most_used_app.most_used_app": "najviac používaná aplikácia",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "najviac užívaný hashtag",
+  "annual_report.summary.new_posts.new_posts": "nové príspevky",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Nepovieme Berniemu.",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skryť zvuk",
   "block_modal.show_less": "Zobraziť menej",
@@ -155,6 +162,7 @@
   "compose_form.poll.duration": "Trvanie ankety",
   "compose_form.poll.multiple": "Viacero možností",
   "compose_form.poll.option_placeholder": "Možnosť {number}",
+  "compose_form.poll.single": "Jediná voľba",
   "compose_form.poll.switch_to_multiple": "Zmeniť anketu a povoliť viaceré možnosti",
   "compose_form.poll.switch_to_single": "Zmeniť anketu na jediný povolený výber",
   "compose_form.poll.type": "Typ",
@@ -193,6 +201,7 @@
   "confirmations.unfollow.title": "Prestať sledovať užívateľa?",
   "content_warning.hide": "Skryť príspevok",
   "content_warning.show": "Aj tak zobraziť",
+  "content_warning.show_more": "Ukázať viac",
   "conversation.delete": "Vymazať konverzáciu",
   "conversation.mark_as_read": "Označiť ako prečítanú",
   "conversation.open": "Zobraziť konverzáciu",
@@ -290,7 +299,6 @@
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
-  "filter_warning.matches_filter": "Zhody triedenia “{title}”",
   "filtered_notifications_banner.title": "Filtrované oznámenia",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
@@ -344,6 +352,9 @@
   "home.pending_critical_update.link": "Zobraziť aktualizácie",
   "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia.",
   "home.show_announcements": "Zobraziť oznámenia",
+  "ignore_notifications_modal.filter_instead": "Radšej triediť",
+  "ignore_notifications_modal.filter_to_act_users": "Stále budeš môcť akceptovať, odmietnuť, alebo nahlásiť užívateľov",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Triedenie pomáha vyvarovať sa možnému zmäteniu",
   "ignore_notifications_modal.ignore": "Ignoruj upozornenia",
   "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok ohviezdičkovať, tak dať autorovi vedieť, že sa vám páči, a uložiť si ho na neskôr.",
   "interaction_modal.description.follow": "S účtom na Mastodone môžete {name} sledovať a vidieť ich príspevky vo svojom domovskom kanáli.",
@@ -400,10 +411,12 @@
   "lightbox.close": "Zatvoriť",
   "lightbox.next": "Ďalej",
   "lightbox.previous": "Späť",
+  "lightbox.zoom_out": "Priblížiť na mieru",
   "limited_account_hint.action": "Aj tak zobraziť profil",
   "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
   "link_preview.author": "Autor: {name}",
   "link_preview.more_from_author": "Viac od {name}",
+  "link_preview.shares": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
   "lists.account.add": "Pridať do zoznamu",
   "lists.account.remove": "Odstrániť zo zoznamu",
   "lists.delete": "Vymazať zoznam",
@@ -426,7 +439,11 @@
   "mute_modal.hide_options": "Skryť možnosti",
   "mute_modal.indefinite": "Pokiaľ ich neodtíšim",
   "mute_modal.show_options": "Zobraziť možnosti",
+  "mute_modal.they_can_mention_and_follow": "Môže ťa spomenúť a nasledovať, ale ty ho/ju neuvidíš.",
+  "mute_modal.they_wont_know": "Nebude vedieť, že bol/a stíšený/á.",
   "mute_modal.title": "Stíšiť užívateľa?",
+  "mute_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ho/ju spomínajú.",
+  "mute_modal.you_wont_see_posts": "Stále uvidí tvoje príspevky, ale ty neuvidíš jeho/jej.",
   "navigation_bar.about": "O tomto serveri",
   "navigation_bar.administration": "Spravovanie",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
@@ -466,12 +483,15 @@
   "notification.label.private_reply": "Súkromná odpoveď",
   "notification.label.reply": "Odpoveď",
   "notification.mention": "Zmienka",
+  "notification.mentioned_you": "{name} ťa spomenul/a",
   "notification.moderation-warning.learn_more": "Zisti viac",
+  "notification.moderation_warning": "Dostal/a si varovanie od moderátora",
   "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
   "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
+  "notification.poll": "Anketa, v ktorej si hlasoval/a, skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
   "notification.relationships_severance_event": "Stratené prepojenia s {name}",
   "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
@@ -483,7 +503,7 @@
   "notification_requests.edit_selection": "Uprav",
   "notification_requests.exit_selection": "Hotovo",
   "notification_requests.notifications_from": "Oboznámenia od {name}",
-  "notification_requests.title": "Filtrované oboznámenia",
+  "notification_requests.title": "Filtrované oznámenia",
   "notification_requests.view": "Zobraz upozornenia",
   "notifications.clear": "Vyčistiť upozornenia",
   "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
@@ -518,6 +538,8 @@
   "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
   "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
   "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
+  "notifications.policy.accept": "Prijať",
+  "notifications.policy.accept_hint": "Ukáž v oznámeniach",
   "notifications.policy.drop": "Ignoruj",
   "notifications.policy.filter": "Triediť",
   "notifications.policy.filter_limited_accounts_title": "Moderované účty",
@@ -525,6 +547,7 @@
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
   "notifications.policy.filter_private_mentions_title": "Nevyžiadané priame spomenutia",
+  "notifications.policy.title": "Spravuj oznámenia od…",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",
@@ -695,6 +718,7 @@
   "status.bookmark": "Pridať záložku",
   "status.cancel_reblog_private": "Zrušiť zdieľanie",
   "status.cannot_reblog": "Tento príspevok nie je možné zdieľať",
+  "status.continued_thread": "Pokračujúce vlákno",
   "status.copy": "Kopírovať odkaz na príspevok",
   "status.delete": "Vymazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",

app/javascript/mastodon/locales/sq.json

@@ -87,6 +87,19 @@
   "alert.unexpected.title": "Hëm!",
   "alt_text_badge.title": "Tekst alternativ",
   "announcement.announcement": "Lajmërim",
+  "annual_report.summary.followers.followers": "ndjekës",
+  "annual_report.summary.followers.total": "{count} gjithsej",
+  "annual_report.summary.here_it_is": "Ja {year} juaj e shqyrtuar:",
+  "annual_report.summary.highlighted_post.by_favourites": "potimi më i parapëlqyer",
+  "annual_report.summary.highlighted_post.by_reblogs": "postimi me më shumë përforcime",
+  "annual_report.summary.highlighted_post.by_replies": "postimi me më tepër përgjigje",
+  "annual_report.summary.highlighted_post.possessive": "nga {name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplikacioni më i përdorur",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag-u më i përdorur",
+  "annual_report.summary.new_posts.new_posts": "postime të reja",
+  "annual_report.summary.percentile.text": "<topLabel>Kjo ju vë në krye</topLabel><percentage></percentage><bottomLabel>të përdoruesve të Mastodon-it.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Nuk do t’ia themi Bernit.",
+  "annual_report.summary.thanks": "Faleminderit që jeni pjesë e Mastodon-it!",
   "attachments_list.unprocessed": "(e papërpunuar)",
   "audio.hide": "Fshihe audion",
   "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
@@ -197,6 +210,7 @@
   "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
   "content_warning.hide": "Fshihe postimin",
   "content_warning.show": "Shfaqe, sido qoftë",
+  "content_warning.show_more": "Shfaq më tepër",
   "conversation.delete": "Fshije bisedën",
   "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
@@ -305,7 +319,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
-  "filter_warning.matches_filter": "Ka përkim me filtrin “{title}”",
+  "filter_warning.matches_filter": "Ka përkim me filtrin “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Nga {count, plural, =0 {askush} one {një person} other {# vetë}} që mund të njihni",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
@@ -385,6 +399,7 @@
   "interaction_modal.description.follow": "Me një llogari në Mastodon, mund ta ndiqni {name} për të marrë postimet e tyre në prurjen tuaj të kreut.",
   "interaction_modal.description.reblog": "Me një llogari në Mastodon, mund ta përforconi këtë postim për ta ndarë me ndjekësit tuaj.",
   "interaction_modal.description.reply": "Me një llogari në Mastodon, mund t’i përgjigjeni këtij postimi.",
+  "interaction_modal.description.vote": "Me një llogari në Mastodon, mund të votoni në këtë pyetësor.",
   "interaction_modal.login.action": "Shpjemëni në shtëpi",
   "interaction_modal.login.prompt": "Përkatësia e shërbyesit tuaj vatër, p.sh. mastodon.social",
   "interaction_modal.no_account_yet": "S’gjendeni në Mastodon?",
@@ -396,6 +411,7 @@
   "interaction_modal.title.follow": "Ndiq {name}",
   "interaction_modal.title.reblog": "Përforconi postimin e {name}",
   "interaction_modal.title.reply": "Përgjigjuni postimit të {name}",
+  "interaction_modal.title.vote": "Votoni te pyetësori nga {name}",
   "intervals.full.days": "{number, plural, one {# ditë} other {# ditë}}",
   "intervals.full.hours": "{number, plural, one {# orë} other {# orë}}",
   "intervals.full.minutes": "{number, plural, one {# minutë} other {# minuta}}",
@@ -505,6 +521,8 @@
   "notification.admin.report_statuses_other": "{name} raportoi {target}",
   "notification.admin.sign_up": "{name} u regjistrua",
   "notification.admin.sign_up.name_and_others": "U regjistrua {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
+  "notification.annual_report.message": "#Wrapstodon juaj për {year} pret! Zbuloni pikat e theksuara dhe çastet e paharrueshëm të këtij viti për ju në Mastodon!",
+  "notification.annual_report.view": "Shihni #Wrapstodon",
   "notification.favourite": "{name} i vuri shenjë postimit tuaj si të parapëlqyer",
   "notification.favourite.name_and_others_with_link": "{name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a> i vunë shenjë postimit tuaj si të parapëlqyer",
   "notification.follow": "{name} zuri t’ju ndjekë",