Merge remote-tracking branch 'parent/main' into upstream-20241231

.github/workflows/lint-ruby.yml

@@ -12,6 +12,7 @@ on:
       - 'Gemfile*'
       - '.rubocop*.yml'
       - '.ruby-version'
+      - 'bin/rubocop'
       - 'config/brakeman.ignore'
       - '**/*.rb'
       - '**/*.rake'
@@ -22,6 +23,7 @@ on:
       - 'Gemfile*'
       - '.rubocop*.yml'
       - '.ruby-version'
+      - 'bin/rubocop'
       - 'config/brakeman.ignore'
       - '**/*.rb'
       - '**/*.rake'

.github/workflows/test-ruby.yml

@@ -170,7 +170,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           files: coverage/lcov/*.lcov
         env:
@@ -256,7 +256,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           files: coverage/lcov/mastodon.lcov
         env:

Gemfile

@@ -105,7 +105,7 @@ gem 'opentelemetry-api', '~> 1.4.0'
 group :opentelemetry do
   gem 'opentelemetry-exporter-otlp', '~> 0.29.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.7.1', require: false
-  gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.20.1', require: false
+  gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.21.0', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.21.2', require: false
   gem 'opentelemetry-instrumentation-excon', '~> 0.22.0', require: false
   gem 'opentelemetry-instrumentation-faraday', '~> 0.24.1', require: false
@@ -114,7 +114,7 @@ group :opentelemetry do
   gem 'opentelemetry-instrumentation-net_http', '~> 0.22.4', require: false
   gem 'opentelemetry-instrumentation-pg', '~> 0.29.0', require: false
   gem 'opentelemetry-instrumentation-rack', '~> 0.25.0', require: false
-  gem 'opentelemetry-instrumentation-rails', '~> 0.33.0', require: false
+  gem 'opentelemetry-instrumentation-rails', '~> 0.34.0', require: false
   gem 'opentelemetry-instrumentation-redis', '~> 0.25.3', require: false
   gem 'opentelemetry-instrumentation-sidekiq', '~> 0.25.2', require: false
   gem 'opentelemetry-sdk', '~> 1.4', require: false

Gemfile.lock

@@ -94,7 +94,7 @@ GEM
     ast (2.4.2)
     attr_required (1.0.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1017.0)
+    aws-partitions (1.1025.0)
     aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -109,7 +109,7 @@ GEM
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    azure-blob (0.5.3)
+    azure-blob (0.5.4)
       rexml
     base64 (0.2.0)
     bcp47_spec (0.2.1)
@@ -168,15 +168,15 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.19.1)
+    css_parser (1.21.0)
       addressable
-    csv (3.3.0)
+    csv (3.3.1)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    debug (1.9.2)
+    debug (1.10.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
     debug_inspector (1.2.0)
@@ -201,7 +201,7 @@ GEM
     domain_name (0.6.20240107)
     doorkeeper (5.8.1)
       railties (>= 5)
-    dotenv (3.1.5)
+    dotenv (3.1.7)
     drb (2.2.1)
     elasticsearch (7.17.11)
       elasticsearch-api (= 7.17.11)
@@ -224,14 +224,14 @@ GEM
     fabrication (2.31.0)
     faker (3.5.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.12.0)
+    faraday (2.12.2)
-      faraday-net_http (>= 2.0, < 3.4)
+      faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-httpclient (2.0.1)
       httpclient (>= 2.2)
-    faraday-net_http (3.3.0)
+    faraday-net_http (3.4.0)
-      net-http
+      net-http (>= 0.5.0)
     fast_blank (1.0.1)
     fastimage (2.3.1)
     ffi (1.17.0)
@@ -279,7 +279,7 @@ GEM
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashdiff (1.1.1)
+    hashdiff (1.1.2)
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
@@ -294,7 +294,7 @@ GEM
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.5.0)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
@@ -318,8 +318,8 @@ GEM
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.7.2)
+    io-console (0.8.0)
-    irb (1.14.2)
+    irb (1.14.3)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jd-paperclip-azure (3.0.0)
@@ -327,7 +327,7 @@ GEM
       azure-blob (~> 0.5.2)
       hashie (~> 5.0)
     jmespath (1.6.2)
-    json (2.9.0)
+    json (2.9.1)
     json-canonicalization (1.0.0)
     json-jwt (1.15.3.1)
       activesupport (>= 4.2)
@@ -384,7 +384,7 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    logger (1.6.2)
+    logger (1.6.3)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -406,7 +406,7 @@ GEM
     mime-types (3.6.0)
       logger
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.1105)
+    mime-types-data (3.2024.1203)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.4)
@@ -415,7 +415,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.5.0)
       uri
-    net-imap (0.5.1)
+    net-imap (0.5.2)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -429,7 +429,7 @@ GEM
     nokogiri (1.17.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.7)
+    oj (3.16.8)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (2.1.2)
@@ -460,7 +460,7 @@ GEM
       validate_email
       validate_url
       webfinger (~> 1.2)
-    openssl (3.2.0)
+    openssl (3.2.1)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     opentelemetry-api (1.4.0)
@@ -475,29 +475,29 @@ GEM
       opentelemetry-semantic_conventions
     opentelemetry-helpers-sql-obfuscation (0.2.1)
       opentelemetry-common (~> 0.21)
-    opentelemetry-instrumentation-action_mailer (0.2.0)
+    opentelemetry-instrumentation-action_mailer (0.3.0)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-active_support (~> 0.1)
+      opentelemetry-instrumentation-active_support (~> 0.7)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-action_pack (0.10.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-action_view (0.7.3)
+    opentelemetry-instrumentation-action_view (0.8.0)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-active_support (~> 0.6)
+      opentelemetry-instrumentation-active_support (~> 0.7)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_job (0.7.8)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_model_serializers (0.20.3)
+    opentelemetry-instrumentation-active_model_serializers (0.21.0)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-active_support (>= 0.6.0)
+      opentelemetry-instrumentation-active_support (>= 0.7.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_record (0.8.1)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_support (0.6.0)
+    opentelemetry-instrumentation-active_support (0.7.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-base (0.22.6)
@@ -510,7 +510,7 @@ GEM
     opentelemetry-instrumentation-excon (0.22.5)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.24.7)
+    opentelemetry-instrumentation-faraday (0.24.8)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-http (0.23.5)
@@ -529,14 +529,14 @@ GEM
     opentelemetry-instrumentation-rack (0.25.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.33.1)
+    opentelemetry-instrumentation-rails (0.34.0)
       opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-action_mailer (~> 0.2.0)
+      opentelemetry-instrumentation-action_mailer (~> 0.3.0)
       opentelemetry-instrumentation-action_pack (~> 0.10.0)
-      opentelemetry-instrumentation-action_view (~> 0.7.0)
+      opentelemetry-instrumentation-action_view (~> 0.8.0)
       opentelemetry-instrumentation-active_job (~> 0.7.0)
       opentelemetry-instrumentation-active_record (~> 0.8.0)
-      opentelemetry-instrumentation-active_support (~> 0.6.0)
+      opentelemetry-instrumentation-active_support (~> 0.7.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-redis (0.25.7)
       opentelemetry-api (~> 1.0)
@@ -579,7 +579,7 @@ GEM
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.2.1)
+    psych (5.2.2)
       date
       stringio
     public_suffix (6.0.1)
@@ -634,7 +634,7 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.10)
@@ -656,7 +656,7 @@ GEM
       link_header (~> 0.0, >= 0.0.8)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)
-    rdoc (6.7.0)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
     redcarpet (3.6.0)
     redis (4.8.1)
@@ -665,14 +665,14 @@ GEM
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     regexp_parser (2.9.3)
-    reline (0.5.12)
+    reline (0.6.0)
       io-console (~> 0.5)
-    request_store (1.6.0)
+    request_store (1.7.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.9)
+    rexml (3.4.0)
     rotp (6.3.0)
     rouge (4.5.1)
     rpam2 (4.0.2)
@@ -707,7 +707,7 @@ GEM
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 8)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -718,7 +718,7 @@ GEM
       rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.36.2)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -744,8 +744,8 @@ GEM
       ffi (~> 1.12)
       logger
     rubyzip (2.3.2)
-    rufus-scheduler (3.9.1)
+    rufus-scheduler (3.9.2)
-      fugit (~> 1.1, >= 1.1.6)
+      fugit (~> 1.1, >= 1.11.1)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
     sanitize (6.1.3)
@@ -754,14 +754,14 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    securerandom (0.3.2)
+    securerandom (0.4.1)
     selenium-webdriver (4.27.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    semantic_range (3.0.0)
+    semantic_range (3.1.0)
     shoulda-matchers (6.4.0)
       activesupport (>= 5.2.0)
     sidekiq (6.5.12)
@@ -808,10 +808,10 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     terrapin (1.0.1)
       climate_control
-    test-prof (1.4.2)
+    test-prof (1.4.3)
     thor (1.3.2)
     tilt (2.4.0)
-    timeout (0.4.2)
+    timeout (0.4.3)
     tpm-key_attestation (0.12.1)
       bindata (~> 2.4)
       openssl (> 2.0)
@@ -837,7 +837,7 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (2.6.0)
-    uri (0.13.1)
+    uri (1.0.2)
     useragent (0.16.11)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -959,7 +959,7 @@ DEPENDENCIES
   opentelemetry-api (~> 1.4.0)
   opentelemetry-exporter-otlp (~> 0.29.0)
   opentelemetry-instrumentation-active_job (~> 0.7.1)
-  opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
+  opentelemetry-instrumentation-active_model_serializers (~> 0.21.0)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.21.2)
   opentelemetry-instrumentation-excon (~> 0.22.0)
   opentelemetry-instrumentation-faraday (~> 0.24.1)
@@ -968,7 +968,7 @@ DEPENDENCIES
   opentelemetry-instrumentation-net_http (~> 0.22.4)
   opentelemetry-instrumentation-pg (~> 0.29.0)
   opentelemetry-instrumentation-rack (~> 0.25.0)
-  opentelemetry-instrumentation-rails (~> 0.33.0)
+  opentelemetry-instrumentation-rails (~> 0.34.0)
   opentelemetry-instrumentation-redis (~> 0.25.3)
   opentelemetry-instrumentation-sidekiq (~> 0.25.2)
   opentelemetry-sdk (~> 1.4)
@@ -1036,4 +1036,4 @@ RUBY VERSION
    ruby 3.3.6p108
 
 BUNDLED WITH
-   2.5.23
+   2.6.1

app/controllers/api/v1/polls/votes_controller.rb

@@ -15,7 +15,7 @@ class Api::V1::Polls::VotesController < Api::BaseController
   private
 
   def set_poll
-    @poll = Poll.attached.find(params[:poll_id])
+    @poll = Poll.find(params[:poll_id])
     authorize @poll.status, :show?
   rescue Mastodon::NotPermittedError
     not_found

app/controllers/api/v1/polls_controller.rb

@@ -15,7 +15,7 @@ class Api::V1::PollsController < Api::BaseController
   private
 
   def set_poll
-    @poll = Poll.attached.find(params[:id])
+    @poll = Poll.find(params[:id])
     authorize @poll.status, :show?
   rescue Mastodon::NotPermittedError
     not_found

app/javascript/mastodon/actions/search.ts

@@ -79,15 +79,12 @@ export const expandSearch = createDataLoadingThunk(
 
 export const openURL = createDataLoadingThunk(
   'search/openURL',
-  ({ url }: { url: string }, { getState }) => {
+  ({ url }: { url: string }) =>
-    const signedIn = !!getState().meta.get('me');
+    apiGetSearch({
-
-    return apiGetSearch({
       q: url,
-      resolve: signedIn,
+      resolve: true,
       limit: 1,
-    });
+    }),
-  },
   (data, { dispatch }) => {
     if (data.accounts.length > 0) {
       dispatch(importFetchedAccounts(data.accounts));

app/javascript/mastodon/components/regeneration_indicator.jsx

@@ -1,18 +0,0 @@
-import { FormattedMessage } from 'react-intl';
-
-import illustration from '@/images/elephant_ui_working.svg';
-
-const RegenerationIndicator = () => (
-  <div className='regeneration-indicator'>
-    <div className='regeneration-indicator__figure'>
-      <img src={illustration} alt='' />
-    </div>
-
-    <div className='regeneration-indicator__label'>
-      <FormattedMessage id='regeneration_indicator.label' tagName='strong' defaultMessage='Loading&hellip;' />
-      <FormattedMessage id='regeneration_indicator.sublabel' defaultMessage='Your home feed is being prepared!' />
-    </div>
-  </div>
-);
-
-export default RegenerationIndicator;

app/javascript/mastodon/components/regeneration_indicator.tsx

@@ -0,0 +1,26 @@
+import { FormattedMessage } from 'react-intl';
+
+import { GIF } from './gif';
+
+export const RegenerationIndicator: React.FC = () => (
+  <div className='regeneration-indicator'>
+    <GIF
+      src='/loading.gif'
+      staticSrc='/loading.png'
+      className='regeneration-indicator__figure'
+    />
+
+    <div className='regeneration-indicator__label'>
+      <strong>
+        <FormattedMessage
+          id='regeneration_indicator.preparing_your_home_feed'
+          defaultMessage='Preparing your home feed…'
+        />
+      </strong>
+      <FormattedMessage
+        id='regeneration_indicator.please_stand_by'
+        defaultMessage='Please stand by.'
+      />
+    </div>
+  </div>
+);

app/javascript/mastodon/components/status_list.jsx

@@ -6,7 +6,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import { debounce } from 'lodash';
 
 import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'mastodon/actions/timelines';
-import RegenerationIndicator from 'mastodon/components/regeneration_indicator';
+import { RegenerationIndicator } from 'mastodon/components/regeneration_indicator';
 import { InlineFollowSuggestions } from 'mastodon/features/home_timeline/components/inline_follow_suggestions';
 
 import StatusContainer from '../containers/status_container';

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

@@ -1,433 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-
-import classNames from 'classnames';
-
-import { connect } from 'react-redux';
-
-import { throttle, escapeRegExp } from 'lodash';
-
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
-import EmojiReactionIcon from '@/material-icons/400-24px/mood.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';
-import StarIcon from '@/material-icons/400-24px/star.svg?react';
-import { openModal, closeModal } from 'mastodon/actions/modal';
-import api from 'mastodon/api';
-import { Button } from 'mastodon/components/button';
-import { Icon }  from 'mastodon/components/icon';
-import { registrationsOpen, sso_redirect } from 'mastodon/initial_state';
-
-const messages = defineMessages({
-  loginPrompt: { id: 'interaction_modal.login.prompt', defaultMessage: 'Domain of your home server, e.g. mastodon.social' },
-});
-
-const mapStateToProps = (state, { accountId }) => ({
-  displayNameHtml: state.getIn(['accounts', accountId, 'display_name_html']),
-  signupUrl: state.getIn(['server', 'server', 'registrations', 'url'], null) || '/auth/sign_up',
-});
-
-const mapDispatchToProps = (dispatch) => ({
-  onSignupClick() {
-    dispatch(closeModal({
-      modalType: undefined,
-      ignoreFocus: false,
-    }));
-    dispatch(openModal({ modalType: 'CLOSED_REGISTRATIONS' }));
-  },
-});
-
-const PERSISTENCE_KEY = 'mastodon_home';
-
-const isValidDomain = value => {
-  const url = new URL('https:///path');
-  url.hostname = value;
-  return url.hostname === value;
-};
-
-const valueToDomain = value => {
-  // If the user starts typing an URL
-  if (/^https?:\/\//.test(value)) {
-    try {
-      const url = new URL(value);
-
-      // Consider that if there is a path, the URL is more meaningful than a bare domain
-      if (url.pathname.length > 1) {
-        return '';
-      }
-
-      return url.host;
-    } catch {
-      return undefined;
-    }
-  // If the user writes their full handle including username
-  } else if (value.includes('@')) {
-    if (value.replace(/^@/, '').split('@').length > 2) {
-      return undefined;
-    }
-    return '';
-  }
-
-  return value;
-};
-
-const addInputToOptions = (value, options) => {
-  value = value.trim();
-
-  if (value.includes('.') && isValidDomain(value)) {
-    return [value].concat(options.filter((x) => x !== value));
-  }
-
-  return options;
-};
-
-class LoginForm extends React.PureComponent {
-
-  static propTypes = {
-    resourceUrl: PropTypes.string,
-    intl: PropTypes.object.isRequired,
-  };
-
-  state = {
-    value: localStorage ? (localStorage.getItem(PERSISTENCE_KEY) || '') : '',
-    expanded: false,
-    selectedOption: -1,
-    isLoading: false,
-    isSubmitting: false,
-    error: false,
-    options: [],
-    networkOptions: [],
-  };
-
-  setRef = c => {
-    this.input = c;
-  };
-
-  isValueValid = (value) => {
-    let likelyAcct = false;
-    let url = null;
-
-    if (value.startsWith('/')) {
-      return false;
-    }
-
-    if (value.startsWith('@')) {
-      value = value.slice(1);
-      likelyAcct = true;
-    }
-
-    // The user is in the middle of typing something, do not error out
-    if (value === '') {
-      return true;
-    }
-
-    if (/^https?:\/\//.test(value) && !likelyAcct) {
-      url = value;
-    } else {
-      url = `https://${value}`;
-    }
-
-    try {
-      new URL(url);
-      return true;
-    } catch {
-      return false;
-    }
-  };
-
-  handleChange = ({ target }) => {
-    const error = !this.isValueValid(target.value);
-    this.setState(state => ({ error, value: target.value, isLoading: true, options: addInputToOptions(target.value, state.networkOptions) }), () => this._loadOptions());
-  };
-
-  handleMessage = (event) => {
-    const { resourceUrl } = this.props;
-
-    if (event.origin !== window.origin || event.source !== this.iframeRef.contentWindow) {
-      return;
-    }
-
-    if (event.data?.type === 'fetchInteractionURL-failure') {
-      this.setState({ isSubmitting: false, error: true });
-    } else if (event.data?.type === 'fetchInteractionURL-success') {
-      if (/^https?:\/\//.test(event.data.template)) {
-        try {
-          const url = new URL(event.data.template.replace('{uri}', encodeURIComponent(resourceUrl)));
-
-          if (localStorage) {
-            localStorage.setItem(PERSISTENCE_KEY, event.data.uri_or_domain);
-          }
-
-          window.location.href = url;
-        } catch (e) {
-          console.error(e);
-          this.setState({ isSubmitting: false, error: true });
-        }
-      } else {
-        this.setState({ isSubmitting: false, error: true });
-      }
-    }
-  };
-
-  componentDidMount () {
-    window.addEventListener('message', this.handleMessage);
-  }
-
-  componentWillUnmount () {
-    window.removeEventListener('message', this.handleMessage);
-  }
-
-  handleSubmit = () => {
-    const { value } = this.state;
-
-    this.setState({ isSubmitting: true });
-
-    this.iframeRef.contentWindow.postMessage({
-      type: 'fetchInteractionURL',
-      uri_or_domain: value.trim(),
-    }, window.origin);
-  };
-
-  setIFrameRef = (iframe) => {
-    this.iframeRef = iframe;
-  };
-
-  handleFocus = () => {
-    this.setState({ expanded: true });
-  };
-
-  handleBlur = () => {
-    this.setState({ expanded: false });
-  };
-
-  handleKeyDown = (e) => {
-    const { options, selectedOption } = this.state;
-
-    switch(e.key) {
-    case 'ArrowDown':
-      e.preventDefault();
-
-      if (options.length > 0) {
-        this.setState({ selectedOption: Math.min(selectedOption + 1, options.length - 1) });
-      }
-
-      break;
-    case 'ArrowUp':
-      e.preventDefault();
-
-      if (options.length > 0) {
-        this.setState({ selectedOption: Math.max(selectedOption - 1, -1) });
-      }
-
-      break;
-    case 'Enter':
-      e.preventDefault();
-
-      if (selectedOption === -1) {
-        this.handleSubmit();
-      } else if (options.length > 0) {
-        this.setState({ value: options[selectedOption], error: false }, () => this.handleSubmit());
-      }
-
-      break;
-    }
-  };
-
-  handleOptionClick = e => {
-    const index  = Number(e.currentTarget.getAttribute('data-index'));
-    const option = this.state.options[index];
-
-    e.preventDefault();
-    this.setState({ selectedOption: index, value: option, error: false }, () => this.handleSubmit());
-  };
-
-  _loadOptions = throttle(() => {
-    const { value } = this.state;
-
-    const domain = valueToDomain(value.trim());
-
-    if (typeof domain === 'undefined') {
-      this.setState({ options: [], networkOptions: [], isLoading: false, error: true });
-      return;
-    }
-
-    if (domain.length === 0) {
-      this.setState({ options: [], networkOptions: [], isLoading: false });
-      return;
-    }
-
-    api().get('/api/v1/peers/search', { params: { q: domain } }).then(({ data }) => {
-      if (!data) {
-        data = [];
-      }
-
-      this.setState((state) => ({ networkOptions: data, options: addInputToOptions(state.value, data), isLoading: false }));
-    }).catch(() => {
-      this.setState({ isLoading: false });
-    });
-  }, 200, { leading: true, trailing: true });
-
-  render () {
-    const { intl } = this.props;
-    const { value, expanded, options, selectedOption, error, isSubmitting } = this.state;
-    const domain = (valueToDomain(value) || '').trim();
-    const domainRegExp = new RegExp(`(${escapeRegExp(domain)})`, 'gi');
-    const hasPopOut = domain.length > 0 && options.length > 0;
-
-    return (
-      <div className={classNames('interaction-modal__login', { focused: expanded, expanded: hasPopOut, invalid: error })}>
-
-        <iframe
-          ref={this.setIFrameRef}
-          style={{display: 'none'}}
-          src='/remote_interaction_helper'
-          sandbox='allow-scripts allow-same-origin'
-          title='remote interaction helper'
-        />
-
-        <div className='interaction-modal__login__input'>
-          <input
-            ref={this.setRef}
-            type='text'
-            value={value}
-            placeholder={intl.formatMessage(messages.loginPrompt)}
-            aria-label={intl.formatMessage(messages.loginPrompt)}
-            autoFocus
-            onChange={this.handleChange}
-            onFocus={this.handleFocus}
-            onBlur={this.handleBlur}
-            onKeyDown={this.handleKeyDown}
-            autoComplete='off'
-            autoCapitalize='off'
-            spellCheck='false'
-          />
-
-          <Button onClick={this.handleSubmit} disabled={isSubmitting || error}><FormattedMessage id='interaction_modal.login.action' defaultMessage='Take me home' /></Button>
-        </div>
-
-        {hasPopOut && (
-          <div className='search__popout'>
-            <div className='search__popout__menu'>
-              {options.map((option, i) => (
-                <button key={option} onMouseDown={this.handleOptionClick} data-index={i} className={classNames('search__popout__menu__item', { selected: selectedOption === i })}>
-                  {option.split(domainRegExp).map((part, i) => (
-                    part.toLowerCase() === domain.toLowerCase() ? (
-                      <mark key={i}>
-                        {part}
-                      </mark>
-                    ) : (
-                      <span key={i}>
-                        {part}
-                      </span>
-                    )
-                  ))}
-                </button>
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    );
-  }
-
-}
-
-const IntlLoginForm = injectIntl(LoginForm);
-
-class InteractionModal extends React.PureComponent {
-
-  static propTypes = {
-    displayNameHtml: PropTypes.string,
-    url: PropTypes.string,
-    type: PropTypes.oneOf(['reply', 'reblog', 'favourite', 'follow', 'vote']),
-    onSignupClick: PropTypes.func.isRequired,
-    signupUrl: PropTypes.string.isRequired,
-  };
-
-  handleSignupClick = () => {
-    this.props.onSignupClick();
-  };
-
-  render () {
-    const { url, type, displayNameHtml, signupUrl } = this.props;
-
-    const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
-
-    let title, actionDescription, icon;
-
-    switch(type) {
-    case 'reply':
-      icon = <Icon id='reply' icon={ReplyIcon} />;
-      title = <FormattedMessage id='interaction_modal.title.reply' defaultMessage="Reply to {name}'s post" values={{ name }} />;
-      actionDescription = <FormattedMessage id='interaction_modal.description.reply' defaultMessage='With an account on Mastodon, you can respond to this post.' />;
-      break;
-    case 'reblog':
-      icon = <Icon id='retweet' icon={RepeatIcon} />;
-      title = <FormattedMessage id='interaction_modal.title.reblog' defaultMessage="Boost {name}'s post" values={{ name }} />;
-      actionDescription = <FormattedMessage id='interaction_modal.description.reblog' defaultMessage='With an account on Mastodon, you can boost this post to share it with your own followers.' />;
-      break;
-    case 'favourite':
-      icon = <Icon id='star' icon={StarIcon} />;
-      title = <FormattedMessage id='interaction_modal.title.favourite' defaultMessage="Favorite {name}'s post" values={{ name }} />;
-      actionDescription = <FormattedMessage id='interaction_modal.description.favourite' defaultMessage='With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.' />;
-      break;
-    case 'emoji_reaction':
-      icon = <Icon id='smile-o' icon={EmojiReactionIcon} />;
-      title = <FormattedMessage id='interaction_modal.title.emoji_reaction' defaultMessage="Emoji react {name}'s post" values={{ name }} />;
-      actionDescription = <FormattedMessage id='interaction_modal.description.emoji_reaection' defaultMessage='With an account on Mastodon, you can emoji react this post to let the author know you appreciate it and save it for later.' />;
-      break;
-    case 'follow':
-      icon = <Icon id='user-plus' icon={PersonAddIcon} />;
-      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;
-
-    if (sso_redirect) {
-      signupButton = (
-        <a href={sso_redirect} data-method='post' className='link-button'>
-          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-        </a>
-      );
-    } else if (registrationsOpen) {
-      signupButton = (
-        <a href={signupUrl} className='link-button'>
-          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-        </a>
-      );
-    } else {
-      signupButton = (
-        <button className='link-button' onClick={this.handleSignupClick}>
-          <FormattedMessage id='sign_in_banner.create_account' defaultMessage='Create account' />
-        </button>
-      );
-    }
-
-    return (
-      <div className='modal-root__modal interaction-modal'>
-        <div className='interaction-modal__lead'>
-          <h3><span className='interaction-modal__icon'>{icon}</span> {title}</h3>
-          <p>{actionDescription} <strong><FormattedMessage id='interaction_modal.sign_in' defaultMessage='You are not logged in to this server. Where is your account hosted?' /></strong></p>
-        </div>
-
-        <IntlLoginForm resourceUrl={url} />
-
-        <p className='hint'><FormattedMessage id='interaction_modal.sign_in_hint' defaultMessage="Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @Mastodon@mastodon.social)" /></p>
-        <p><FormattedMessage id='interaction_modal.no_account_yet' defaultMessage='Not on Mastodon?' /> {signupButton}</p>
-      </div>
-    );
-  }
-
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);

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

@@ -0,0 +1,581 @@
+import { useCallback, useEffect, useState, useRef } from 'react';
+
+import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { escapeRegExp } from 'lodash';
+import { useDebouncedCallback } from 'use-debounce';
+
+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';
+import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { openModal, closeModal } from 'mastodon/actions/modal';
+import { apiRequest } from 'mastodon/api';
+import { Button } from 'mastodon/components/button';
+import { Icon } from 'mastodon/components/icon';
+import {
+  domain as localDomain,
+  registrationsOpen,
+  sso_redirect,
+} from 'mastodon/initial_state';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+const messages = defineMessages({
+  loginPrompt: {
+    id: 'interaction_modal.username_prompt',
+    defaultMessage: 'E.g. {example}',
+  },
+});
+
+interface LoginFormMessage {
+  type:
+    | 'fetchInteractionURL'
+    | 'fetchInteractionURL-failure'
+    | 'fetchInteractionURL-success';
+  uri_or_domain: string;
+  template?: string;
+}
+
+const PERSISTENCE_KEY = 'mastodon_home';
+
+const EXAMPLE_VALUE = 'username@mastodon.social';
+
+const isValidDomain = (value: string) => {
+  const url = new URL('https:///path');
+  url.hostname = value;
+  return url.hostname === value;
+};
+
+const valueToDomain = (value: string): string | null => {
+  // If the user starts typing an URL
+  if (/^https?:\/\//.test(value)) {
+    try {
+      const url = new URL(value);
+
+      return url.host;
+    } catch {
+      return null;
+    }
+    // If the user writes their full handle including username
+  } else if (value.includes('@')) {
+    const [_, domain, ...other] = value.replace(/^@/, '').split('@');
+
+    if (!domain || other.length > 0) {
+      return null;
+    }
+
+    return valueToDomain(domain);
+  }
+
+  return value;
+};
+
+const addInputToOptions = (value: string, options: string[]) => {
+  value = value.trim();
+
+  if (value.includes('.') && isValidDomain(value)) {
+    return [value].concat(options.filter((x) => x !== value));
+  }
+
+  return options;
+};
+
+const isValueValid = (value: string) => {
+  let likelyAcct = false;
+  let url = null;
+
+  if (value.startsWith('/')) {
+    return false;
+  }
+
+  if (value.startsWith('@')) {
+    value = value.slice(1);
+    likelyAcct = true;
+  }
+
+  // The user is in the middle of typing something, do not error out
+  if (value === '') {
+    return true;
+  }
+
+  if (/^https?:\/\//.test(value) && !likelyAcct) {
+    url = value;
+  } else {
+    url = `https://${value}`;
+  }
+
+  try {
+    new URL(url);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const sendToFrame = (frame: HTMLIFrameElement | null, value: string): void => {
+  if (valueToDomain(value.trim()) === localDomain) {
+    window.location.href = '/auth/sign_in';
+    return;
+  }
+
+  frame?.contentWindow?.postMessage(
+    {
+      type: 'fetchInteractionURL',
+      uri_or_domain: value.trim(),
+    },
+    window.origin,
+  );
+};
+
+const LoginForm: React.FC<{
+  resourceUrl: string;
+}> = ({ resourceUrl }) => {
+  const intl = useIntl();
+  const [value, setValue] = useState(
+    localStorage.getItem(PERSISTENCE_KEY) ?? '',
+  );
+  const [expanded, setExpanded] = useState(false);
+  const [selectedOption, setSelectedOption] = useState(-1);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState(false);
+  const [options, setOptions] = useState<string[]>([]);
+  const [networkOptions, setNetworkOptions] = useState<string[]>([]);
+  const [valueChanged, setValueChanged] = useState(false);
+
+  const inputRef = useRef<HTMLInputElement>(null);
+  const iframeRef = useRef<HTMLIFrameElement>(null);
+  const searchRequestRef = useRef<AbortController | null>(null);
+
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent<LoginFormMessage>) => {
+      if (
+        event.origin !== window.origin ||
+        event.source !== iframeRef.current?.contentWindow
+      ) {
+        return;
+      }
+
+      if (event.data.type === 'fetchInteractionURL-failure') {
+        setIsSubmitting(false);
+        setError(true);
+      } else if (event.data.type === 'fetchInteractionURL-success') {
+        if (event.data.template && /^https?:\/\//.test(event.data.template)) {
+          try {
+            const url = new URL(
+              event.data.template.replace(
+                '{uri}',
+                encodeURIComponent(resourceUrl),
+              ),
+            );
+
+            localStorage.setItem(PERSISTENCE_KEY, event.data.uri_or_domain);
+
+            window.location.href = url.toString();
+          } catch {
+            setIsSubmitting(false);
+            setError(true);
+          }
+        } else {
+          setIsSubmitting(false);
+          setError(true);
+        }
+      }
+    };
+
+    window.addEventListener('message', handleMessage);
+
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, [resourceUrl, setIsSubmitting, setError]);
+
+  const handleSearch = useDebouncedCallback(
+    (value: string) => {
+      if (searchRequestRef.current) {
+        searchRequestRef.current.abort();
+      }
+
+      const domain = valueToDomain(value.trim());
+
+      if (domain === null || domain.length === 0) {
+        setOptions([]);
+        setNetworkOptions([]);
+        return;
+      }
+
+      searchRequestRef.current = new AbortController();
+
+      void apiRequest<string[] | null>('GET', 'v1/peers/search', {
+        signal: searchRequestRef.current.signal,
+        params: {
+          q: domain,
+        },
+      })
+        .then((data) => {
+          setNetworkOptions(data ?? []);
+          setOptions(addInputToOptions(value, data ?? []));
+          return '';
+        })
+        .catch(() => {
+          // Nothing
+        });
+    },
+    500,
+    { leading: true, trailing: true },
+  );
+
+  const handleChange = useCallback(
+    ({ target: { value } }: React.ChangeEvent<HTMLInputElement>) => {
+      setValue(value);
+      setValueChanged(true);
+      setError(!isValueValid(value));
+      setOptions(addInputToOptions(value, networkOptions));
+      handleSearch(value);
+    },
+    [
+      setError,
+      setValue,
+      setValueChanged,
+      setOptions,
+      networkOptions,
+      handleSearch,
+    ],
+  );
+
+  const handleSubmit = useCallback(() => {
+    setIsSubmitting(true);
+    sendToFrame(iframeRef.current, value);
+  }, [setIsSubmitting, value]);
+
+  const handleFocus = useCallback(() => {
+    setExpanded(true);
+  }, [setExpanded]);
+
+  const handleBlur = useCallback(() => {
+    setExpanded(false);
+  }, [setExpanded]);
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      const selectedOptionValue = options[selectedOption];
+
+      switch (e.key) {
+        case 'ArrowDown':
+          e.preventDefault();
+
+          if (options.length > 0) {
+            setSelectedOption((selectedOption) =>
+              Math.min(selectedOption + 1, options.length - 1),
+            );
+          }
+
+          break;
+        case 'ArrowUp':
+          e.preventDefault();
+
+          if (options.length > 0) {
+            setSelectedOption((selectedOption) =>
+              Math.max(selectedOption - 1, -1),
+            );
+          }
+
+          break;
+        case 'Enter':
+          e.preventDefault();
+
+          if (selectedOption === -1) {
+            handleSubmit();
+          } else if (options.length > 0 && selectedOptionValue) {
+            setError(false);
+            setValue(selectedOptionValue);
+            setIsSubmitting(true);
+            sendToFrame(iframeRef.current, selectedOptionValue);
+          }
+
+          break;
+      }
+    },
+    [
+      handleSubmit,
+      setSelectedOption,
+      setError,
+      setValue,
+      selectedOption,
+      options,
+    ],
+  );
+
+  const handleOptionClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.preventDefault();
+
+      const index = Number(e.currentTarget.getAttribute('data-index'));
+      const option = options[index];
+
+      if (!option) {
+        return;
+      }
+
+      setSelectedOption(index);
+      setValue(option);
+      setError(false);
+      setIsSubmitting(true);
+      sendToFrame(iframeRef.current, option);
+    },
+    [options, setSelectedOption, setValue, setError],
+  );
+
+  const domain = (valueToDomain(value) ?? '').trim();
+  const domainRegExp = new RegExp(`(${escapeRegExp(domain)})`, 'gi');
+  const hasPopOut = valueChanged && domain.length > 0 && options.length > 0;
+
+  return (
+    <div
+      className={classNames('interaction-modal__login', {
+        focused: expanded,
+        expanded: hasPopOut,
+        invalid: error,
+      })}
+    >
+      <iframe
+        ref={iframeRef}
+        style={{ display: 'none' }}
+        src='/remote_interaction_helper'
+        sandbox='allow-scripts allow-same-origin'
+        title='remote interaction helper'
+      />
+
+      <div className='interaction-modal__login__input'>
+        <input
+          ref={inputRef}
+          type='text'
+          value={value}
+          placeholder={intl.formatMessage(messages.loginPrompt, {
+            example: EXAMPLE_VALUE,
+          })}
+          aria-label={intl.formatMessage(messages.loginPrompt, {
+            example: EXAMPLE_VALUE,
+          })}
+          // eslint-disable-next-line jsx-a11y/no-autofocus
+          autoFocus
+          onChange={handleChange}
+          onFocus={handleFocus}
+          onBlur={handleBlur}
+          onKeyDown={handleKeyDown}
+          autoComplete='off'
+          autoCapitalize='off'
+          spellCheck='false'
+        />
+
+        <Button onClick={handleSubmit} disabled={isSubmitting || error}>
+          <FormattedMessage id='interaction_modal.go' defaultMessage='Go' />
+        </Button>
+      </div>
+
+      {hasPopOut && (
+        <div className='search__popout'>
+          <div className='search__popout__menu'>
+            {options.map((option, i) => (
+              <button
+                key={option}
+                onMouseDown={handleOptionClick}
+                data-index={i}
+                className={classNames('search__popout__menu__item', {
+                  selected: selectedOption === i,
+                })}
+              >
+                {option
+                  .split(domainRegExp)
+                  .map((part, i) =>
+                    part.toLowerCase() === domain.toLowerCase() ? (
+                      <mark key={i}>{part}</mark>
+                    ) : (
+                      <span key={i}>{part}</span>
+                    ),
+                  )}
+              </button>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+const InteractionModal: React.FC<{
+  accountId: string;
+  url: string;
+  type: 'reply' | 'reblog' | 'favourite' | 'follow' | 'vote';
+}> = ({ accountId, url, type }) => {
+  const dispatch = useAppDispatch();
+  const displayNameHtml = useAppSelector(
+    (state) => state.accounts.get(accountId)?.display_name_html ?? '',
+  );
+  const signupUrl = useAppSelector(
+    (state) =>
+      (state.server.getIn(['server', 'registrations', 'url'], null) ||
+        '/auth/sign_up') as string,
+  );
+  const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
+
+  const handleSignupClick = useCallback(() => {
+    dispatch(
+      closeModal({
+        modalType: undefined,
+        ignoreFocus: false,
+      }),
+    );
+
+    dispatch(
+      openModal({
+        modalType: 'CLOSED_REGISTRATIONS',
+        modalProps: {},
+      }),
+    );
+  }, [dispatch]);
+
+  let title: React.ReactNode,
+    icon: React.ReactNode,
+    actionPrompt: React.ReactNode;
+
+  switch (type) {
+    case 'reply':
+      icon = <Icon id='reply' icon={ReplyIcon} />;
+      title = (
+        <FormattedMessage
+          id='interaction_modal.title.reply'
+          defaultMessage="Reply to {name}'s post"
+          values={{ name }}
+        />
+      );
+      actionPrompt = (
+        <FormattedMessage
+          id='interaction_modal.action.reply'
+          defaultMessage='To continue, you need to reply from your account.'
+        />
+      );
+      break;
+    case 'reblog':
+      icon = <Icon id='retweet' icon={RepeatIcon} />;
+      title = (
+        <FormattedMessage
+          id='interaction_modal.title.reblog'
+          defaultMessage="Boost {name}'s post"
+          values={{ name }}
+        />
+      );
+      actionPrompt = (
+        <FormattedMessage
+          id='interaction_modal.action.reblog'
+          defaultMessage='To continue, you need to reblog from your account.'
+        />
+      );
+      break;
+    case 'favourite':
+      icon = <Icon id='star' icon={StarIcon} />;
+      title = (
+        <FormattedMessage
+          id='interaction_modal.title.favourite'
+          defaultMessage="Favorite {name}'s post"
+          values={{ name }}
+        />
+      );
+      actionPrompt = (
+        <FormattedMessage
+          id='interaction_modal.action.favourite'
+          defaultMessage='To continue, you need to favorite from your account.'
+        />
+      );
+      break;
+    case 'follow':
+      icon = <Icon id='user-plus' icon={PersonAddIcon} />;
+      title = (
+        <FormattedMessage
+          id='interaction_modal.title.follow'
+          defaultMessage='Follow {name}'
+          values={{ name }}
+        />
+      );
+      actionPrompt = (
+        <FormattedMessage
+          id='interaction_modal.action.follow'
+          defaultMessage='To continue, you need to follow from your account.'
+        />
+      );
+      break;
+    case 'vote':
+      icon = <Icon id='tasks' icon={InsertChartIcon} />;
+      title = (
+        <FormattedMessage
+          id='interaction_modal.title.vote'
+          defaultMessage="Vote in {name}'s poll"
+          values={{ name }}
+        />
+      );
+      actionPrompt = (
+        <FormattedMessage
+          id='interaction_modal.action.vote'
+          defaultMessage='To continue, you need to vote from your account.'
+        />
+      );
+      break;
+  }
+
+  let signupButton;
+
+  if (sso_redirect) {
+    signupButton = (
+      <a href={sso_redirect} data-method='post' className='link-button'>
+        <FormattedMessage
+          id='sign_in_banner.create_account'
+          defaultMessage='Create account'
+        />
+      </a>
+    );
+  } else if (registrationsOpen) {
+    signupButton = (
+      <a href={signupUrl} className='link-button'>
+        <FormattedMessage
+          id='sign_in_banner.create_account'
+          defaultMessage='Create account'
+        />
+      </a>
+    );
+  } else {
+    signupButton = (
+      <button className='link-button' onClick={handleSignupClick}>
+        <FormattedMessage
+          id='sign_in_banner.create_account'
+          defaultMessage='Create account'
+        />
+      </button>
+    );
+  }
+
+  return (
+    <div className='modal-root__modal interaction-modal'>
+      <div className='interaction-modal__lead'>
+        <h3>
+          <span className='interaction-modal__icon'>{icon}</span> {title}
+        </h3>
+        <p>{actionPrompt}</p>
+      </div>
+
+      <LoginForm resourceUrl={url} />
+
+      <p>
+        <FormattedMessage
+          id='interaction_modal.no_account_yet'
+          defaultMessage="Don't have an account yet?"
+        />{' '}
+        {signupButton}
+      </p>
+    </div>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default InteractionModal;

app/javascript/mastodon/locales/af.json

@@ -172,8 +172,6 @@
   "hashtag.column_settings.tag_toggle": "Voeg meer etikette by hierdie kolom",
   "hashtag.follow": "Volg hutsetiket",
   "home.column_settings.show_reblogs": "Wys aangestuurde plasings",
-  "interaction_modal.description.reblog": "Met 'n rekening op Mastodon kan jy hierdie plasing aanstuur om dit met jou volgers te deel.",
-  "interaction_modal.description.reply": "Met 'n rekening op Mastodon kan jy op hierdie plasing reageer.",
   "interaction_modal.title.follow": "Volg {name}",
   "interaction_modal.title.reblog": "Stuur {name} se plasing aan",
   "interaction_modal.title.reply": "Reageer op {name} se plasing",
@@ -247,7 +245,6 @@
   "privacy.public.short": "Publiek",
   "privacy_policy.last_updated": "Laaste bywerking op {date}",
   "privacy_policy.title": "Privaatheidsbeleid",
-  "regeneration_indicator.sublabel": "Jou tuis-voer word voorberei!",
   "reply_indicator.cancel": "Kanselleer",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",

app/javascript/mastodon/locales/an.json

@@ -238,9 +238,6 @@
   "home.column_settings.show_replies": "Amostrar respuestas",
   "home.hide_announcements": "Amagar anuncios",
   "home.show_announcements": "Amostrar anuncios",
-  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puetz seguir {name} pa recibir las suyas publicacions en a tuya linia temporal d'inicio.",
-  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puetz empentar esta publicación pa compartir-la con os tuyos propios seguidores.",
-  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puetz responder a esta publicación.",
   "interaction_modal.on_another_server": "En un servidor diferent",
   "interaction_modal.on_this_server": "En este servidor",
   "interaction_modal.title.follow": "Seguir a {name}",
@@ -369,8 +366,6 @@
   "privacy_policy.last_updated": "Ultima vegada actualizau {date}",
   "privacy_policy.title": "Politica de Privacidat",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Cargando…",
-  "regeneration_indicator.sublabel": "La tuya historia d'inicio se ye preparando!",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "fa {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# horas}}",

app/javascript/mastodon/locales/ar.json

@@ -358,17 +358,8 @@
   "ignore_notifications_modal.ignore": "تجاهل الإشعارات",
   "ignore_notifications_modal.limited_accounts_title": "تجاهل الإشعارات من الحسابات التي هي تحت الإشراف؟",
   "ignore_notifications_modal.new_accounts_title": "تجاهل الإشعارات الصادرة من الحسابات الجديدة؟",
-  "interaction_modal.description.favourite": "بفضل حساب على ماستدون، يمكنك إضافة هذا المنشور إلى مفضلتك لإبلاغ الناشر عن تقديرك وكذا للاحتفاظ بالمنشور إلى وقت لاحق.",
-  "interaction_modal.description.follow": "بفضل حساب في ماستدون، يمكنك متابعة {name} وتلقي منشوراته في موجزات خيطك الرئيس.",
-  "interaction_modal.description.reblog": "مع حساب في ماستدون، يمكنك تعزيز هذا المنشور ومشاركته مع مُتابِعيك.",
-  "interaction_modal.description.reply": "مع حساب في ماستدون، يمكنك الرد على هذا المنشور.",
-  "interaction_modal.login.action": "خذني إلى خادمي",
-  "interaction_modal.login.prompt": "نطاق الخادم الخاص بك، على سبيل المثال mastodon.social",
-  "interaction_modal.no_account_yet": "ليست على ماستدون بعد؟",
   "interaction_modal.on_another_server": "على خادم مختلف",
   "interaction_modal.on_this_server": "على هذا الخادم",
-  "interaction_modal.sign_in": "لم تقم بتسجيل الدخول إلى هذا الخادم. أين هو مستضاف حسابك؟",
-  "interaction_modal.sign_in_hint": "تلميح: هذا هو الموقع الذي أنشأت فيه حسابك. إن لم تتذكّر/ين اسم الموقع، يمكنك البحث عن الرسالة الترحيبيّة في بريدك الإلكتروني. كما يمكنك أيضاً استخدام اسم المستخدم/ـة الكامل! (مثلاً: @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "إضافة منشور {name} إلى المفضلة",
   "interaction_modal.title.follow": "اتبع {name}",
   "interaction_modal.title.reblog": "إعادة نشر منشور {name}",
@@ -594,8 +585,6 @@
   "privacy_policy.title": "سياسة الخصوصية",
   "recommended": "موصى به",
   "refresh": "أنعِش",
-  "regeneration_indicator.label": "جارٍ التحميل…",
-  "regeneration_indicator.sublabel": "جارٍ تجهيز موجزات خيطك الرئيس!",
   "relative_time.days": "{number}ي",
   "relative_time.full.days": "منذ {number, plural, zero {} one {# يوم} two {# يومين} few {# أيام} many {# أيام} other {# يوم}}",
   "relative_time.full.hours": "منذ {number, plural, zero {} one {ساعة واحدة} two {ساعتَيْن} few {# ساعات} many {# ساعة} other {# ساعة}}",

app/javascript/mastodon/locales/ast.json

@@ -212,9 +212,6 @@
   "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!",
-  "interaction_modal.description.follow": "Con una cuenta de Mastodon, pues siguir a {name} pa recibir los artículos de so nel to feed d'aniciu.",
-  "interaction_modal.description.reblog": "Con una cuenta de Mastodon, pues compartir esti artículu colos perfiles que te sigan.",
-  "interaction_modal.description.reply": "Con una cuenta de Mastodon, pues responder a esti artículu.",
   "interaction_modal.on_another_server": "N'otru sirvidor",
   "interaction_modal.on_this_server": "Nesti sirvidor",
   "interaction_modal.title.reply": "Rempuesta al artículu de: {name}",
@@ -321,7 +318,6 @@
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
   "refresh": "Anovar",
-  "regeneration_indicator.label": "Cargando…",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "hai {number, plural, one {# día} other {# díes}}",
   "relative_time.full.hours": "hai {number, plural, one {# hora} other {# hores}}",

app/javascript/mastodon/locales/be.json

@@ -85,7 +85,7 @@
   "alert.rate_limited.title": "Ліміт перавышаны",
   "alert.unexpected.message": "Узнікла нечаканая памылка.",
   "alert.unexpected.title": "Вой!",
-  "alt_text_badge.title": "Альтернативный текст",
+  "alt_text_badge.title": "Альтэрнатыўны тэкст",
   "announcement.announcement": "Аб'ява",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
@@ -219,7 +219,7 @@
   "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_will_lose_relationships": "Вы страціце ўсіх падпісчыкаў і людзей на якіх падпісаны на гэтым серверы.",
   "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
   "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
   "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
@@ -359,17 +359,8 @@
   "home.pending_critical_update.title": "Даступна крытычнае абнаўленне бяспекі!",
   "home.show_announcements": "Паказаць аб'явы",
   "ignore_notifications_modal.not_following_title": "Ігнараваць апавяшчэнні ад людзей на якіх вы не падпісаны?",
-  "interaction_modal.description.favourite": "Маючы ўліковы запіс Mastodon, вы можаце ўпадабаць гэты допіс, каб паведаміць аўтару, што ён вам падабаецца, і захаваць яго на будучыню.",
-  "interaction_modal.description.follow": "Маючы акаўнт у Mastodon, вы можаце падпісацца на {name}, каб бачыць яго/яе допісы ў сваёй хатняй стужцы.",
-  "interaction_modal.description.reblog": "З уліковым запісам Mastodon, вы можаце пашырыць гэты пост, каб падзяліцца ім са сваімі падпісчыкамі.",
-  "interaction_modal.description.reply": "Маючы акаўнт у Mastodon, вы можаце адказаць на гэты пост.",
-  "interaction_modal.login.action": "Вярніце мяне дадому",
-  "interaction_modal.login.prompt": "Дамен вашага хатняга сервера, напрыклад, mastodon.social",
-  "interaction_modal.no_account_yet": "Яшчэ не ў Mastodon?",
   "interaction_modal.on_another_server": "На іншым серверы",
   "interaction_modal.on_this_server": "На гэтым серверы",
-  "interaction_modal.sign_in": "Вы не выканалі ўваход на гэтым серверы. Дзе размешчаны ваш уліковы запіс?",
-  "interaction_modal.sign_in_hint": "Падказка: гэта сайт, на якім вы зарэгістраваліся. Калі вы не памятаеце, знайдзіце ліст у паштовай скрыні. Вы таксама можаце ўвесці сваё поўнае імя карыстальніка! (напрыклад, @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Упадабаць допіс {name}",
   "interaction_modal.title.follow": "Падпісацца на {name}",
   "interaction_modal.title.reblog": "Пашырыць допіс ад {name}",
@@ -599,8 +590,6 @@
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
   "recommended": "Рэкамендуем",
   "refresh": "Абнавiць",
-  "regeneration_indicator.label": "Загрузка…",
-  "regeneration_indicator.sublabel": "Пачакайце, рыхтуем вашу стужку!",
   "relative_time.days": "{number} д",
   "relative_time.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}} таму",
   "relative_time.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}} таму",

app/javascript/mastodon/locales/bg.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Пренебрегвате ли известията от хора, които не са ви последвали?",
   "ignore_notifications_modal.not_following_title": "Пренебрегвате ли известията от хора, които не сте последвали?",
   "ignore_notifications_modal.private_mentions_title": "Пренебрегвате ли известия от непоискани лични споменавания?",
-  "interaction_modal.description.favourite": "Имайки акаунт в Mastodon, може да сложите тази публикации в любими, за да позволите на автора да узнае, че я цените и да я запазите за по-късно.",
+  "interaction_modal.action.favourite": "Трябва да направите любимо от акаунта си, за да продължите.",
-  "interaction_modal.description.follow": "С акаунт в Mastodon може да последвате {name}, за да получавате публикациите от този акаунт в началния си инфоканал.",
+  "interaction_modal.action.follow": "Трябва да последвате от акаунта си, за да продължите.",
-  "interaction_modal.description.reblog": "С акаунт в Mastodon може да подсилите тази публикация, за да я споделите с последователите си.",
+  "interaction_modal.action.reblog": "Трябва да разпространите нечий блог от акаунта си, за да продължите.",
-  "interaction_modal.description.reply": "С акаунт в Mastodon може да добавите отговор към тази публикация.",
+  "interaction_modal.action.reply": "Трябва да отговорите от акаунта си, за да продължите.",
-  "interaction_modal.description.vote": "Имайки акаунт в Mastodon, можете да гласувате в тази анкета.",
+  "interaction_modal.action.vote": "Трябва да гласувате от акаунта си, за да продължите.",
-  "interaction_modal.login.action": "Към началото",
+  "interaction_modal.go": "Напред",
-  "interaction_modal.login.prompt": "Домейнът на сървъра ви, примерно, mastodon.social",
+  "interaction_modal.no_account_yet": "Още ли нямате акаунт?",
-  "interaction_modal.no_account_yet": "Още ли не сте в Mastodon?",
   "interaction_modal.on_another_server": "На различен сървър",
   "interaction_modal.on_this_server": "На този сървър",
-  "interaction_modal.sign_in": "Не сте влезли в този сървър. Къде се хоства акаунтът ви?",
-  "interaction_modal.sign_in_hint": "Съвет: Ето уебсайта, където сте се регистрирали. Ако не помните, то погледнете е-писмо за добре дошли във входящата си поща. Може също да въведете пълното си потребителско име! (примерно: @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Означавам публикация на {name} като любима",
   "interaction_modal.title.follow": "Последване на {name}",
   "interaction_modal.title.reblog": "Подсилване на публикацията на {name}",
   "interaction_modal.title.reply": "Отговаряне на публикацията на {name}",
   "interaction_modal.title.vote": "Гласувайте в анкетата на {name}",
+  "interaction_modal.username_prompt": "Напр. {example}",
   "intervals.full.days": "{number, plural, one {# ден} other {# дни}}",
   "intervals.full.hours": "{number, plural, one {# час} other {# часа}}",
   "intervals.full.minutes": "{number, plural, one {# минута} other {# минути}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Политика за поверителност",
   "recommended": "Препоръчано",
   "refresh": "Опресняване",
-  "regeneration_indicator.label": "Зареждане…",
+  "regeneration_indicator.please_stand_by": "Изчакайте.",
-  "regeneration_indicator.sublabel": "Подготовка на началния ви инфоканал!",
+  "regeneration_indicator.preparing_your_home_feed": "Подготовка на вашия инфоканал начало…",
   "relative_time.days": "{number} д.",
   "relative_time.full.days": "преди {number, plural, one {# ден} other {# дни}}",
   "relative_time.full.hours": "преди {number, plural, one {# час} other {# часа}}",

app/javascript/mastodon/locales/bn.json

@@ -337,8 +337,6 @@
   "privacy.change": "লেখার গোপনীয়তা অবস্থা ঠিক করতে",
   "privacy.public.short": "সর্বজনীন প্রকাশ্য",
   "refresh": "সতেজ করা",
-  "regeneration_indicator.label": "আসছে…",
-  "regeneration_indicator.sublabel": "আপনার বাড়ির-সময়রেখা প্রস্তূত করা হচ্ছে!",
   "relative_time.days": "{number} দিন",
   "relative_time.full.just_now": "এইমাত্র",
   "relative_time.hours": "{number} ঘন্টা",

app/javascript/mastodon/locales/br.json

@@ -288,10 +288,6 @@
   "home.pending_critical_update.body": "Hizivait ho servijer Mastodon kerkent ha ma c'hallit mar plij!",
   "home.pending_critical_update.link": "Gwelet an hizivadennoù",
   "home.show_announcements": "Diskouez ar c'hemennoù",
-  "interaction_modal.description.follow": "Gant ur gont Mastodon e c'hellit heuliañ {name} evit resev an toudoù a embann war ho red degemer.",
-  "interaction_modal.description.reblog": "Gant ur gont Mastodon e c'hellit skignañ an toud-mañ evit rannañ anezhañ gant ho heulierien·ezed.",
-  "interaction_modal.description.reply": "Gant ur gont Mastodon e c'hellit respont d'an toud-mañ.",
-  "interaction_modal.no_account_yet": "N'emañ ket war vMastodon?",
   "interaction_modal.on_another_server": "War ur servijer all",
   "interaction_modal.on_this_server": "War ar servijer-mañ",
   "interaction_modal.title.favourite": "Ouzhpennañ embannadur {name} d'ar re vuiañ-karet",
@@ -447,8 +443,6 @@
   "privacy_policy.title": "Reolennoù Prevezded",
   "recommended": "Erbedet",
   "refresh": "Freskaat",
-  "regeneration_indicator.label": "O kargañ…",
-  "regeneration_indicator.sublabel": "War brientiñ emañ ho red degemer!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# devezh} two {# zevezh} few {# devezh} many {# a devezh} other {# devezh}} zo",
   "relative_time.full.hours": "{number, plural, one {# eurvezh} two {# eurvezh} few {# eurvezh} many {# eur} other {# eurvezh}} zo",

app/javascript/mastodon/locales/ca.json

@@ -407,23 +407,16 @@
   "ignore_notifications_modal.not_followers_title": "Voleu ignorar les notificacions de qui no us segueix?",
   "ignore_notifications_modal.not_following_title": "Voleu ignorar les notificacions de qui no seguiu?",
   "ignore_notifications_modal.private_mentions_title": "Voleu ignorar les notificacions de mencions privades no sol·licitades?",
-  "interaction_modal.description.favourite": "Amb un compte a Mastodon pots afavorir aquest tut perquè l'autor sàpiga que t'ha agradat i desar-lo per a més endavant.",
+  "interaction_modal.go": "Endavant",
-  "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.no_account_yet": "Encara no teniu cap compte?",
-  "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?",
   "interaction_modal.on_another_server": "A un altre servidor",
   "interaction_modal.on_this_server": "En aquest servidor",
-  "interaction_modal.sign_in": "No has iniciat sessió en aquest servidor. On tens el teu compte?",
-  "interaction_modal.sign_in_hint": "Ajuda: Aquesta és la web on vas registrar-te. Si no ho recordes, mira el correu electrònic de benvinguda en la teva safata d'entrada. També pots introduïr el teu nom d'usuari complet! (per ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Afavoreix el tut de {name}",
   "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}",
+  "interaction_modal.username_prompt": "P. ex. {example}",
   "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}}",
@@ -697,8 +690,8 @@
   "privacy_policy.title": "Política de Privacitat",
   "recommended": "Recomanat",
   "refresh": "Actualitza",
-  "regeneration_indicator.label": "Es carrega…",
+  "regeneration_indicator.please_stand_by": "Espereu.",
-  "regeneration_indicator.sublabel": "Es prepara la vostra pantalla d'Inici!",
+  "regeneration_indicator.preparing_your_home_feed": "Pantalla d'inici en preparació…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",

app/javascript/mastodon/locales/ckb.json

@@ -283,9 +283,6 @@
   "home.column_settings.show_replies": "وەڵامدانەوەکان پیشان بدە",
   "home.hide_announcements": "شاردنەوەی راگەیەنراوەکان",
   "home.show_announcements": "پیشاندانی راگەیەنراوەکان",
-  "interaction_modal.description.follow": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت شوێن {name} بکەویت بۆ ئەوەی بڵاوکراوەکانی بگاتە پەڕەی سەرەکیت.",
-  "interaction_modal.description.reblog": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت ئەم بڵاوکراوەیە بەرزبکەیتەوە تاوەکو بەژداری پێبکەیت لەگەل شوێنکەوتوانت.",
-  "interaction_modal.description.reply": "بە هەژمارێک لەسەر ماستدۆن، ئەتوانیت وەڵامی ئەم بڵاوکراوەیە بدەیتەوە.",
   "interaction_modal.on_another_server": "لەسەر ڕاژەیەکی جیا",
   "interaction_modal.on_this_server": "لەسەر ئەم ڕاژەیە",
   "interaction_modal.title.follow": "دوای {name} بکەوە",
@@ -416,8 +413,6 @@
   "privacy_policy.last_updated": "دوایین نوێکردنەوە {date}",
   "privacy_policy.title": "سیاسەتی تایبەتێتی",
   "refresh": "نوێکردنەوە",
-  "regeneration_indicator.label": "بارکردن…",
-  "regeneration_indicator.sublabel": "ڕاگەیەنەری ماڵەوەت ئامادە دەکرێت!",
   "relative_time.days": "{number}ڕۆژ",
   "relative_time.full.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژ}} ماوە",
   "relative_time.full.hours": "{number, plural, one {# کاتژمێر} other {# کاتژمێر}} ماوە",

app/javascript/mastodon/locales/co.json

@@ -263,8 +263,6 @@
   "privacy.change": "Mudificà a cunfidenzialità di u statutu",
   "privacy.public.short": "Pubblicu",
   "refresh": "Attualizà",
-  "regeneration_indicator.label": "Caricamentu…",
-  "regeneration_indicator.sublabel": "Priparazione di a vostra pagina d'accolta!",
   "relative_time.days": "{number}ghj",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "avà",

app/javascript/mastodon/locales/cs.json

@@ -347,17 +347,8 @@
   "home.pending_critical_update.link": "Zobrazit aktualizace",
   "home.pending_critical_update.title": "K dispozici je kritická bezpečnostní aktualizace!",
   "home.show_announcements": "Zobrazit oznámení",
-  "interaction_modal.description.favourite": "Pokud máte účet na Mastodonu, můžete tento příspěvek označit jako oblíbený a dát tak autorovi najevo, že si ho vážíte, a uložit si ho na později.",
-  "interaction_modal.description.follow": "S účtem na Mastodonu můžete sledovat uživatele {name} a přijímat příspěvky ve vašem domovském kanálu.",
-  "interaction_modal.description.reblog": "S účtem na Mastodonu můžete boostnout tento příspěvek a sdílet jej s vlastními sledujícími.",
-  "interaction_modal.description.reply": "S účtem na Mastodonu můžete odpovědět na tento příspěvek.",
-  "interaction_modal.login.action": "Domů",
-  "interaction_modal.login.prompt": "Doména vašeho domovského serveru, např. mastodon.social",
-  "interaction_modal.no_account_yet": "Nejste na Mastodonu?",
   "interaction_modal.on_another_server": "Na jiném serveru",
   "interaction_modal.on_this_server": "Na tomto serveru",
-  "interaction_modal.sign_in": "Nejste přihlášeni k tomuto serveru. Kde je váš účet hostován?",
-  "interaction_modal.sign_in_hint": "Tip: To je stránka, na které jste se zaregistrovali. Pokud si ji nepamatujete, vyhledejte ve své e-mailové schránce uvítací e-mail. Můžete také zadat své celé uživatelské jméno! (např. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Oblíbit si příspěvek od uživatele {name}",
   "interaction_modal.title.follow": "Sledovat {name}",
   "interaction_modal.title.reblog": "Boostnout příspěvek uživatele {name}",
@@ -565,8 +556,6 @@
   "privacy_policy.title": "Zásady ochrany osobních údajů",
   "recommended": "Doporučeno",
   "refresh": "Obnovit",
-  "regeneration_indicator.label": "Načítání…",
-  "regeneration_indicator.sublabel": "Váš domovský kanál se připravuje!",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "před {number, plural, one {# dnem} few {# dny} many {# dny} other {# dny}}",
   "relative_time.full.hours": "před {number, plural, one {# hodinou} few {# hodinami} many {# hodinami} other {# hodinami}}",

app/javascript/mastodon/locales/cy.json

@@ -407,18 +407,8 @@
   "ignore_notifications_modal.not_followers_title": "Anwybyddu hysbysiadau gan bobl nad ydynt yn eich dilyn?",
   "ignore_notifications_modal.not_following_title": "Anwybyddu hysbysiadau gan bobl nad ydych yn eu dilyn?",
   "ignore_notifications_modal.private_mentions_title": "Anwybyddu hysbysiadau o Grybwylliadau Preifat digymell?",
-  "interaction_modal.description.favourite": "Gyda chyfrif ar Mastodon, gallwch chi ffafrio'r postiad hwn er mwyn roi gwybod i'r awdur eich bod chi'n ei werthfawrogi ac yn ei gadw ar gyfer nes ymlaen.",
-  "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?",
   "interaction_modal.on_another_server": "Ar weinydd gwahanol",
   "interaction_modal.on_this_server": "Ar y gweinydd hwn",
-  "interaction_modal.sign_in": "Nid ydych wedi mewngofnodi i'r gweinydd hwn. Ble mae eich cyfrif yn cael ei gynnal?",
-  "interaction_modal.sign_in_hint": "Awgrym: Dyna'r wefan lle gwnaethoch gofrestru. Os nad ydych yn cofio, edrychwch am yr e-bost croeso yn eich blwch derbyn. Gallwch hefyd nodi eich enw defnyddiwr llawn! (e.e. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Ffafrio postiad {name}",
   "interaction_modal.title.follow": "Dilyn {name}",
   "interaction_modal.title.reblog": "Hybu postiad {name}",
@@ -696,8 +686,8 @@
   "privacy_policy.title": "Polisi Preifatrwydd",
   "recommended": "Argymhellwyd",
   "refresh": "Adnewyddu",
-  "regeneration_indicator.label": "Yn llwytho…",
+  "regeneration_indicator.please_stand_by": "Arhoswch am dipyn.",
-  "regeneration_indicator.sublabel": "Mae eich ffrwd cartref yn cael ei pharatoi!",
+  "regeneration_indicator.preparing_your_home_feed": "Paratoi eich llif cartref…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# diwrnod} other {# diwrnod}} yn ôl",
   "relative_time.full.hours": "{number, plural, one {# awr} other {# awr}} yn ôl",
@@ -781,8 +771,11 @@
   "search_results.accounts": "Proffilau",
   "search_results.all": "Popeth",
   "search_results.hashtags": "Hashnodau",
+  "search_results.no_results": "Dim canlyniadau.",
+  "search_results.no_search_yet": "Ceisiwch chwilio am bostiadau, proffiliau neu hashnodau.",
   "search_results.see_all": "Gweld y cyfan",
   "search_results.statuses": "Postiadau",
+  "search_results.title": "Chwilio am {q}",
   "server_banner.about_active_users": "Pobl sy'n defnyddio'r gweinydd hwn yn ystod y 30 diwrnod diwethaf (Defnyddwyr Gweithredol Misol)",
   "server_banner.active_users": "defnyddwyr gweithredol",
   "server_banner.administered_by": "Gweinyddir gan:",

app/javascript/mastodon/locales/da.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorér notifikationer fra folk, som ikke er følgere?",
   "ignore_notifications_modal.not_following_title": "Ignorér notifikationer fra folk, man ikke følger?",
   "ignore_notifications_modal.private_mentions_title": "Ignorér notifikationer fra uopfordrede Private omtaler?",
-  "interaction_modal.description.favourite": "Med en konto på Mastodon kan dette indlæg gøres til favorit for at lade forfatteren vide, at det værdsættes og gemmes til senere.",
+  "interaction_modal.action.favourite": "For at fortsætte, skal man vælge Gør til favorit fra sin konto.",
-  "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.action.follow": "For at fortsætte, skal man vælge Følg fra sin konto.",
-  "interaction_modal.description.reblog": "Med en konto på Mastodon kan dette indlæg fremhæves så det deles med egne følgere.",
+  "interaction_modal.action.reblog": "For at fortsætte, skal man vælge Genblog fra sin konto.",
-  "interaction_modal.description.reply": "Med en konto på Mastodon kan dette indlæg besvares.",
+  "interaction_modal.action.reply": "For at fortsætte, skal man besvar fra sin konto.",
-  "interaction_modal.description.vote": "Med en konto på Mastodon kan man deltage i denne afstemning.",
+  "interaction_modal.action.vote": "For at fortsætte, skal man stemme fra sin konto.",
-  "interaction_modal.login.action": "Gå til hjemmeserver",
+  "interaction_modal.go": "Gå",
-  "interaction_modal.login.prompt": "Hjemmeserverdomænet, f.eks. mastodon.social",
+  "interaction_modal.no_account_yet": "Har endnu ingen konto?",
-  "interaction_modal.no_account_yet": "Ikke på Mastodon?",
   "interaction_modal.on_another_server": "På en anden server",
   "interaction_modal.on_this_server": "På denne server",
-  "interaction_modal.sign_in": "Du er ikke logget ind på denne server. Hvor hostes din konto?",
-  "interaction_modal.sign_in_hint": "Tip: Det er webstedet, hvor du tilmeldte dig. Har du glemt det, så kig efter velkomstmailen i indbakken. Du kan også angive dit fulde brugernavn! (f.eks. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Gør {name}s indlæg til favorit",
   "interaction_modal.title.follow": "Følg {name}",
   "interaction_modal.title.reblog": "Boost {name}s indlæg",
   "interaction_modal.title.reply": "Besvar {name}s indlæg",
   "interaction_modal.title.vote": "Deltag i {name}s afstemning",
+  "interaction_modal.username_prompt": "F.eks. {example}",
   "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}}",
@@ -696,8 +694,8 @@
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
   "refresh": "Genindlæs",
-  "regeneration_indicator.label": "Indlæser…",
+  "regeneration_indicator.please_stand_by": "Vent venligst.",
-  "regeneration_indicator.sublabel": "Din hjemmetidslinje klargøres!",
+  "regeneration_indicator.preparing_your_home_feed": "Forbereder hjemme-feed'et…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dage}} siden",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",

app/javascript/mastodon/locales/de.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Benachrichtigungen von Profilen ignorieren, die dir nicht folgen?",
   "ignore_notifications_modal.not_following_title": "Benachrichtigungen von Profilen ignorieren, denen du nicht folgst?",
   "ignore_notifications_modal.private_mentions_title": "Benachrichtigungen von unerwünschten privaten Erwähnungen ignorieren?",
-  "interaction_modal.description.favourite": "Mit einem Mastodon-Konto kannst du diesen Beitrag favorisieren, um deine Wertschätzung auszudrücken, und ihn für einen späteren Zeitpunkt speichern.",
+  "interaction_modal.action.favourite": "Du musst von deinem Konto aus favorisieren, um fortzufahren.",
-  "interaction_modal.description.follow": "Mit einem Mastodon-Konto kannst du {name} folgen, um die Beiträge auf deiner Startseite zu sehen.",
+  "interaction_modal.action.follow": "Du musst von deinem Konto aus folgen, um fortzufahren.",
-  "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.action.reblog": "Du musst von deinem Konto aus teilen, um fortzufahren.",
-  "interaction_modal.description.reply": "Mit einem Mastodon-Konto kannst du auf diesen Beitrag antworten.",
+  "interaction_modal.action.reply": "Du musst von deinem Konto aus antworten, um fortzufahren.",
-  "interaction_modal.description.vote": "Mit einem Mastodon-Konto kannst du an dieser Umfrage teilnehmen.",
+  "interaction_modal.action.vote": "Du musst von deinem Konto aus abstimmen, um fortzufahren.",
-  "interaction_modal.login.action": "Zurück zur Startseite",
+  "interaction_modal.go": "Los",
-  "interaction_modal.login.prompt": "Adresse deines Servers, z. B. mastodon.social",
+  "interaction_modal.no_account_yet": "Du hast noch kein Konto?",
-  "interaction_modal.no_account_yet": "Nicht auf Mastodon?",
   "interaction_modal.on_another_server": "Auf einem anderen Server",
   "interaction_modal.on_this_server": "Auf diesem Server",
-  "interaction_modal.sign_in": "Du bist auf diesem Server nicht angemeldet. Auf welchem Server wird dein Konto verwaltet?",
-  "interaction_modal.sign_in_hint": "Hinweis: Hierbei handelt es sich um die Website, auf der du dich registriert hast. Wenn du dich nicht mehr daran erinnerst, dann kannst du sie in der Willkommens-E-Mail nachsehen. Du kannst auch deinen vollständigen Profilnamen eingeben! (z. B. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Beitrag von {name} favorisieren",
   "interaction_modal.title.follow": "Folge {name}",
   "interaction_modal.title.reblog": "Beitrag von {name} teilen",
   "interaction_modal.title.reply": "Auf Beitrag von {name} antworten",
   "interaction_modal.title.vote": "An der Umfrage von {name} teilnehmen",
+  "interaction_modal.username_prompt": "z. B. {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
   "refresh": "Aktualisieren",
-  "regeneration_indicator.label": "Wird geladen …",
+  "regeneration_indicator.please_stand_by": "Bitte warten.",
-  "regeneration_indicator.sublabel": "Deine Startseite wird gerade vorbereitet!",
+  "regeneration_indicator.preparing_your_home_feed": "Startseite wird vorbereitet …",
   "relative_time.days": "{number} T.",
   "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
   "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",

app/javascript/mastodon/locales/el.json

@@ -362,6 +362,7 @@
   "footer.privacy_policy": "Πολιτική απορρήτου",
   "footer.source_code": "Προβολή πηγαίου κώδικα",
   "footer.status": "Κατάσταση",
+  "footer.terms_of_service": "Όροι υπηρεσίας",
   "generic.saved": "Αποθηκεύτηκε",
   "getting_started.heading": "Ας ξεκινήσουμε",
   "hashtag.admin_moderation": "Άνοιγμα διεπαφής συντονισμού για το #{name}",
@@ -406,18 +407,8 @@
   "ignore_notifications_modal.not_followers_title": "Αγνόηση ειδοποιήσεων από άτομα που δε σας ακολουθούν;",
   "ignore_notifications_modal.not_following_title": "Αγνόηση ειδοποιήσεων από άτομα που δεν ακολουθείς;",
   "ignore_notifications_modal.private_mentions_title": "Αγνόηση ειδοποιήσεων από μη ζητηθείσες ιδιωτικές αναφορές;",
-  "interaction_modal.description.favourite": "Με ένα συντάκτη στο Mastodon μπορείς να αγαπήσεις αυτή την ανάρτηση, για να ενημερώσεις τον συγγραφέα ότι την εκτιμάς και να την αποθηκεύσεις για αργότερα.",
-  "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;",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
-  "interaction_modal.sign_in": "Δεν είσαι συνδεδεμένος σε αυτόν το διακομιστή. Πού φιλοξενείται ο λογαριασμός σου;",
-  "interaction_modal.sign_in_hint": "Συμβουλή: Αυτή είναι η ιστοσελίδα όπου έχεις εγγραφεί. Αν δεν θυμάσαι, αναζήτησε το καλώς ήρθες e-mail στα εισερχόμενά σου. Μπορείς επίσης να εισάγεις το πλήρες όνομα χρήστη! (πχ. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorite {name}'s post\nΠροτίμησε την ανάρτηση της/του {name}",
   "interaction_modal.title.follow": "Ακολούθησε {name}",
   "interaction_modal.title.reblog": "Ενίσχυσε την ανάρτηση του {name}",
@@ -694,8 +685,6 @@
   "privacy_policy.title": "Πολιτική Απορρήτου",
   "recommended": "Προτεινόμενα",
   "refresh": "Ανανέωση",
-  "regeneration_indicator.label": "Φορτώνει…",
-  "regeneration_indicator.sublabel": "Η αρχική σου ροή ετοιμάζεται!",
   "relative_time.days": "{number}η",
   "relative_time.full.days": "πριν από {number, plural, one {# μέρα} other {# μέρες}}",
   "relative_time.full.hours": "πριν από {number, plural, one {# ώρα} other {# ώρες}}",

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

@@ -396,18 +396,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
   "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
   "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
-  "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
-  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
-  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
-  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
-  "interaction_modal.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?",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.sign_in": "You are not logged in to this server. Where is your account hosted?",
-  "interaction_modal.sign_in_hint": "Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favourite {name}'s post",
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Boost {name}'s post",
@@ -683,8 +673,6 @@
   "privacy_policy.title": "Privacy Policy",
   "recommended": "Recommended",
   "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",

app/javascript/mastodon/locales/en.json

@@ -552,25 +552,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
   "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
   "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
-  "interaction_modal.description.emoji_reaection": "With an account on Mastodon, you can emoji react this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.action.favourite": "To continue, you need to favorite from your account.",
-  "interaction_modal.description.favourite": "With an account on Mastodon, you can favorite this post to let the author know you appreciate it and save it for later.",
+  "interaction_modal.action.follow": "To continue, you need to follow from your account.",
-  "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
+  "interaction_modal.action.reblog": "To continue, you need to reblog from your account.",
-  "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
+  "interaction_modal.action.reply": "To continue, you need to reply from your account.",
-  "interaction_modal.description.reply": "With an account on Mastodon, you can respond to this post.",
+  "interaction_modal.action.vote": "To continue, you need to vote from your account.",
-  "interaction_modal.description.vote": "With an account on Mastodon, you can vote in this poll.",
+  "interaction_modal.go": "Go",
-  "interaction_modal.login.action": "Take me home",
+  "interaction_modal.no_account_yet": "Don't have an account yet?",
-  "interaction_modal.login.prompt": "Domain of your home server, e.g. mastodon.social",
-  "interaction_modal.no_account_yet": "Not on Mastodon?",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.sign_in": "You are not logged in to this server. Where is your account hosted?",
-  "interaction_modal.sign_in_hint": "Tip: That's the website where you signed up. If you don't remember, look for the welcome e-mail in your inbox. You can also enter your full username! (e.g. @Mastodon@mastodon.social)",
-  "interaction_modal.title.emoji_reaction": "Emoji react {name}'s post",
   "interaction_modal.title.favourite": "Favorite {name}'s post",
   "interaction_modal.title.follow": "Follow {name}",
   "interaction_modal.title.reblog": "Boost {name}'s post",
   "interaction_modal.title.reply": "Reply to {name}'s post",
   "interaction_modal.title.vote": "Vote in {name}'s poll",
+  "interaction_modal.username_prompt": "E.g. {example}",
   "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}}",
@@ -884,8 +880,8 @@
   "reaction_deck.remove": "Remove",
   "recommended": "Recommended",
   "refresh": "Refresh",
-  "regeneration_indicator.label": "Loading…",
+  "regeneration_indicator.please_stand_by": "Please stand by.",
-  "regeneration_indicator.sublabel": "Your home feed is being prepared!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparing your home feed…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",

app/javascript/mastodon/locales/eo.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ĉu ignori sciigojn de homoj, kiuj ne sekvas vin?",
   "ignore_notifications_modal.not_following_title": "Ĉu ignori sciigojn de homoj, kiujn vi ne sekvas?",
   "ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
-  "interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumi ĉi tiun afiŝon por sciigi la afiŝanton ke vi sâtas kaj konservas ĝin por poste.",
+  "interaction_modal.action.favourite": "Por daŭrigi, vi devas stelumi el via konto.",
-  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
+  "interaction_modal.action.follow": "Por daŭrigi, vi devas sekvi el via konto.",
-  "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
+  "interaction_modal.action.reblog": "Por daŭrigi, vi devas diskonigi el via konto.",
-  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
+  "interaction_modal.action.reply": "Por daŭrigi, vi devas respondi el via konto.",
-  "interaction_modal.description.vote": "Kun konto ĉe Mastodon, vi povas voĉdoni en ĉi tiu balotenketo.",
+  "interaction_modal.action.vote": "Por daŭrigi, vi devas voĉdoni el via konto.",
-  "interaction_modal.login.action": "Prenu min hejmen",
+  "interaction_modal.go": "Iru",
-  "interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
+  "interaction_modal.no_account_yet": "Ĉu vi ankoraŭ ne havas konton?",
-  "interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
   "interaction_modal.on_another_server": "En alia servilo",
   "interaction_modal.on_this_server": "En ĉi tiu servilo",
-  "interaction_modal.sign_in": "Vi ne estas ensalutita al ĉi tiu servilo.",
-  "interaction_modal.sign_in_hint": "Gvideto: Tio estas la retejo kie vi registris. Vi ankau povas tajpi vian plenan uzantonomon!",
   "interaction_modal.title.favourite": "Stelumi la afiŝon de {name}",
   "interaction_modal.title.follow": "Sekvi {name}",
   "interaction_modal.title.reblog": "Akceli la afiŝon de {name}",
   "interaction_modal.title.reply": "Respondi al la afiŝo de {name}",
   "interaction_modal.title.vote": "Voĉdonu en la balotenketo de {name}",
+  "interaction_modal.username_prompt": "Ekz. {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Politiko de privateco",
   "recommended": "Rekomendita",
   "refresh": "Refreŝigu",
-  "regeneration_indicator.label": "Ŝargado…",
+  "regeneration_indicator.please_stand_by": "Bonvolu atendi.",
-  "regeneration_indicator.sublabel": "Via abonfluo estas preparata!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparante vian hejmpaĝon…",
   "relative_time.days": "{number}t",
   "relative_time.full.days": "antaŭ {number, plural, one {# tago} other {# tagoj}}",
   "relative_time.full.hours": "antaŭ {number, plural, one {# horo} other {# horoj}}",
@@ -782,8 +780,11 @@
   "search_results.accounts": "Profiloj",
   "search_results.all": "Ĉiuj",
   "search_results.hashtags": "Kradvortoj",
+  "search_results.no_results": "Ne estas rezultoj.",
+  "search_results.no_search_yet": "Provu serĉi afiŝojn, profilojn aŭ kradvortojn.",
   "search_results.see_all": "Vidu ĉiujn",
   "search_results.statuses": "Afiŝoj",
+  "search_results.title": "Serĉu \"{q}\"",
   "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)",
   "server_banner.active_users": "aktivaj uzantoj",
   "server_banner.administered_by": "Administrata de:",

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

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de cuentas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de cuentas a las que no seguís?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
-  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, podés marcar este mensaje como favorito para que el autor sepa que lo apreciás y lo guardás para más adelante.",
+  "interaction_modal.action.favourite": "Para continuar, tienes que marcar como favorito desde tu cuenta.",
-  "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.action.follow": "Para continuar, tienes que seguir desde tu cuenta.",
-  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, podés adherir a este mensaje para compartirlo con tus propios seguidores.",
+  "interaction_modal.action.reblog": "Para continuar, necesitas impulsar desde tu cuenta.",
-  "interaction_modal.description.reply": "Con una cuenta en Mastodon, podés responder a este mensaje.",
+  "interaction_modal.action.reply": "Para continuar, tienes que responder desde tu cuenta.",
-  "interaction_modal.description.vote": "Con una cuenta en Mastodon, podés votar en esta encuesta.",
+  "interaction_modal.action.vote": "Para continuar, tienes que votar desde tu cuenta.",
-  "interaction_modal.login.action": "Llevame al comienzo",
+  "interaction_modal.go": "Ir",
-  "interaction_modal.login.prompt": "Dominio de su servidor de inicio, p. ej., mastodon.social",
+  "interaction_modal.no_account_yet": "¿Todavía no tienes cuenta?",
-  "interaction_modal.no_account_yet": "¿No tenés cuenta en Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.sign_in": "No iniciaste sesión en este servidor. ¿Dónde se encuentra alojada tu cuenta?",
-  "interaction_modal.sign_in_hint": "Ayuda: es el sitio web en donde te registraste. Si no te acordás, buscá el correo electrónico de bienvenida en tu cuenta de email. También podés usar tu nombre de usuario entero, p. ej., @tunombredeusuario@mastodon.social.",
   "interaction_modal.title.favourite": "Marcar como favorito el mensaje de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Adherir al mensaje de {name}",
   "interaction_modal.title.reply": "Responder al mensaje de {name}",
   "interaction_modal.title.vote": "Votá en la encuesta de {name}",
+  "interaction_modal.username_prompt": "Por ejemplo: {example}",
   "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}}",
@@ -471,26 +469,26 @@
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Más de {name}",
   "link_preview.shares": "{count, plural, one {{counter} mensaje} other {{counter} mensajes}}",
-  "lists.add_member": "Añadir",
+  "lists.add_member": "Agregar",
-  "lists.add_to_list": "Añadir a la lista",
+  "lists.add_to_list": "Agregar a lista",
-  "lists.add_to_lists": "Añadir {name} a las listas",
+  "lists.add_to_lists": "Agregar a {name} a las listas",
   "lists.create": "Crear",
-  "lists.create_a_list_to_organize": "Crea una nueva lista para organizar tu página de inicio",
+  "lists.create_a_list_to_organize": "Creá una nueva lista para organizar tu línea temporal principal",
-  "lists.create_list": "Crear una lista",
+  "lists.create_list": "Crear lista",
   "lists.delete": "Eliminar lista",
-  "lists.done": "Hecho",
+  "lists.done": "Listo",
   "lists.edit": "Editar lista",
-  "lists.exclusive": "Ocultar miembros en Inicio",
+  "lists.exclusive": "Ocultar miembros en la línea temporal principal",
-  "lists.exclusive_hint": "Si alguien está en esta lista, escóndelo en tu página de inicio para evitar ver sus publicaciones dos veces.",
+  "lists.exclusive_hint": "Si alguien está en esta lista, ocultalo en tu línea temporal principal para evitar que aparezcan sus mensajes dos veces.",
-  "lists.find_users_to_add": "Buscar usuarios para añadir",
+  "lists.find_users_to_add": "Buscar usuarios para agregar",
-  "lists.list_members": "Miembros de la lista",
+  "lists.list_members": "Miembros de lista",
   "lists.list_members_count": "{count, plural,one {# miembro} other {# miembros}}",
   "lists.list_name": "Nombre de la lista",
   "lists.new_list_name": "Nombre de la nueva lista",
   "lists.no_lists_yet": "Aún no hay listas.",
   "lists.no_members_yet": "Aún no hay miembros.",
   "lists.no_results_found": "No se encontraron resultados.",
-  "lists.remove_member": "Eliminar",
+  "lists.remove_member": "Quitar",
   "lists.replies_policy.followed": "Cualquier cuenta seguida",
   "lists.replies_policy.list": "Miembros de la lista",
   "lists.replies_policy.none": "Nadie",
@@ -655,11 +653,11 @@
   "notifications_permission_banner.enable": "Habilitar notificaciones de escritorio",
   "notifications_permission_banner.how_to_control": "Para recibir notificaciones cuando Mastodon no está abierto, habilitá las notificaciones de escritorio. Podés controlar con precisión qué tipos de interacciones generan notificaciones de escritorio a través del botón {icon} de arriba, una vez que estén habilitadas.",
   "notifications_permission_banner.title": "No te pierdas nada",
-  "onboarding.follows.back": "Atrás",
+  "onboarding.follows.back": "Volver",
-  "onboarding.follows.done": "Hecho",
+  "onboarding.follows.done": "Listo",
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Podés intentar usar la búsqueda o navegar por la página de exploración para encontrar cuentas a las que seguir, o intentarlo de nuevo más tarde.",
   "onboarding.follows.search": "Buscar",
-  "onboarding.follows.title": "Sigue personas para comenzar",
+  "onboarding.follows.title": "Para comenzar, empezá a seguir cuentas",
   "onboarding.profile.discoverable": "Hacer que mi perfil sea detectable",
   "onboarding.profile.discoverable_hint": "Cuando optás por ser detectable en Mastodon, tus mensajes pueden aparecer en los resultados de búsqueda y de tendencia, y tu perfil puede ser sugerido a personas con intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre para mostrar",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Política de privacidad",
   "recommended": "Opción recomendada",
   "refresh": "Refrescar",
-  "regeneration_indicator.label": "Cargando…",
+  "regeneration_indicator.please_stand_by": "Espera, por favor.",
-  "regeneration_indicator.sublabel": "¡Se está preparando tu línea temporal principal!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparando tu página de inicio…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural,one {hace # día} other {hace # días}}",
   "relative_time.full.hours": "{number, plural,one {hace # hora} other {hace # horas}}",

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

@@ -28,16 +28,16 @@
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en mi perfil",
   "account.featured_tags.last_status_at": "Última publicación el {date}",
-  "account.featured_tags.last_status_never": "Sin publicaciones",
+  "account.featured_tags.last_status_never": "No hay publicaciones",
   "account.featured_tags.title": "Etiquetas destacadas de {name}",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
-  "account.followers.empty": "Todavía nadie sigue a este usuario.",
+  "account.followers.empty": "Nadie sigue a este usuario todavía.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, one {{counter} siguiendo} other {{counter} siguiendo}}",
-  "account.follows.empty": "Este usuario todavía no sigue a nadie.",
+  "account.follows.empty": "Este usuario no sigue a nadie todavía.",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "En memoria.",
@@ -58,7 +58,7 @@
   "account.posts": "Publicaciones",
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Haga clic para cancelar la solicitud de seguimiento",
+  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
@@ -81,7 +81,7 @@
   "admin.impact_report.instance_followers": "Seguidores que nuestros usuarios perderían",
   "admin.impact_report.instance_follows": "Seguidores que perderían sus usuarios",
   "admin.impact_report.title": "Resumen de impacto",
-  "alert.rate_limited.message": "Por favor reintente después de {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Por favor, intenta después de las {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tarifa limitada",
   "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "¡Ups!",
@@ -89,9 +89,9 @@
   "announcement.announcement": "Anuncio",
   "annual_report.summary.archetype.booster": "El cazador de tendencias",
   "annual_report.summary.archetype.lurker": "El merodeador",
-  "annual_report.summary.archetype.oracle": "El oraculo",
+  "annual_report.summary.archetype.oracle": "El oráculo",
   "annual_report.summary.archetype.pollster": "El encuestador",
-  "annual_report.summary.archetype.replier": "La mariposa sociable",
+  "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": "Este es el resumen de tu {year}:",
@@ -108,7 +108,7 @@
   "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.",
+  "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.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar más",
   "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
-  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
+  "interaction_modal.action.favourite": "Para continuar, debes marcar como favorito desde tu cuenta.",
-  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu fuente de inicio.",
+  "interaction_modal.action.follow": "Para continuar, debes seguir desde tu cuenta.",
-  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
+  "interaction_modal.action.reblog": "Para continuar, debes impulsar desde tu cuenta.",
-  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.action.reply": "Para continuar, debes responder desde tu cuenta.",
-  "interaction_modal.description.vote": "Con una cuenta en Mastodon, puedes votar en esta encuesta.",
+  "interaction_modal.action.vote": "Para continuar, debes votar desde tu cuenta.",
-  "interaction_modal.login.action": "Ir a Inicio",
+  "interaction_modal.go": "Ir",
-  "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo: mastodon.social",
+  "interaction_modal.no_account_yet": "¿Aún no tienes una cuenta?",
-  "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.sign_in": "No estás registrado en este servidor. ¿Dónde tienes tu cuenta?",
-  "interaction_modal.sign_in_hint": "Pista: Ese es el sitio donde te registraste. Si no lo recuerdas, busca el correo electrónico de bienvenida en tu bandeja de entrada. También puedes introducir tu nombre de usuario completo (por ejemplo: @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
   "interaction_modal.title.reply": "Responder la publicación de {name}",
   "interaction_modal.title.vote": "Votar en la encuesta de {name}",
+  "interaction_modal.username_prompt": "Por ejemplo: {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Cargando…",
+  "regeneration_indicator.please_stand_by": "Espera, por favor.",
-  "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparando tu página de inicio…",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {# día} other {# días hace}}",
   "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} hace",
@@ -782,11 +780,11 @@
   "search_results.accounts": "Perfiles",
   "search_results.all": "Todos",
   "search_results.hashtags": "Etiquetas",
-  "search_results.no_results": "Sin resultados.",
+  "search_results.no_results": "No hay resultados.",
   "search_results.no_search_yet": "Intenta buscar publicaciones, perfiles o etiquetas.",
   "search_results.see_all": "Ver todos",
   "search_results.statuses": "Publicaciones",
-  "search_results.title": "Búsqueda de \"{q}\"",
+  "search_results.title": "Busqueda de “{q}”",
   "server_banner.about_active_users": "Personas utilizando este servidor durante los últimos 30 días (Usuarios Activos Mensuales)",
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",

app/javascript/mastodon/locales/es.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "¿Ignorar notificaciones de personas que no te siguen?",
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
-  "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
+  "interaction_modal.action.favourite": "Para continuar, tienes que marcar como favorito desde tu cuenta.",
-  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu página de inicio.",
+  "interaction_modal.action.follow": "Para continuar, tienes que seguir desde tu cuenta.",
-  "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
+  "interaction_modal.action.reblog": "Para continuar, necesitas impulsar desde tu cuenta.",
-  "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
+  "interaction_modal.action.reply": "Para continuar, tienes que responder desde tu cuenta.",
-  "interaction_modal.description.vote": "Con una cuenta en Mastodon, puedes votar en esta encuesta.",
+  "interaction_modal.action.vote": "Para continuar, tienes que votar desde tu cuenta.",
-  "interaction_modal.login.action": "Ir a Inicio",
+  "interaction_modal.go": "Ir",
-  "interaction_modal.login.prompt": "Dominio de tu servidor, por ejemplo mastodon.social",
+  "interaction_modal.no_account_yet": "¿Todavía no tienes cuenta?",
-  "interaction_modal.no_account_yet": "¿Aún no tienes cuenta en Mastodon?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "interaction_modal.sign_in": "No estás registrado en este servidor. ¿Dónde tienes tu cuenta?",
-  "interaction_modal.sign_in_hint": "Pista: Ese es el sitio donde te registraste. Si no lo recuerdas, busca el correo electrónico de bienvenida en tu bandeja de entrada. También puedes introducir tu nombre de usuario completo (por ejemplo @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marcar como favorita la publicación de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Impulsar la publicación de {name}",
   "interaction_modal.title.reply": "Responder a la publicación de {name}",
   "interaction_modal.title.vote": "Vota en la encuesta de {name}",
+  "interaction_modal.username_prompt": "Por ejemplo: {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Política de Privacidad",
   "recommended": "Recomendado",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Cargando…",
+  "regeneration_indicator.please_stand_by": "Espera, por favor.",
-  "regeneration_indicator.sublabel": "¡Tu página de inicio se está preparando!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparando tu página de inicio…",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",

app/javascript/mastodon/locales/et.json

@@ -52,7 +52,7 @@
   "account.mute_notifications_short": "Vaigista teavitused",
   "account.mute_short": "Vaigista",
   "account.muted": "Vaigistatud",
-  "account.mutual": "Ühine",
+  "account.mutual": "Jälgite",
   "account.no_bio": "Kirjeldust pole lisatud.",
   "account.open_original_page": "Ava algne leht",
   "account.posts": "Postitused",
@@ -168,7 +168,7 @@
   "community.column_settings.remote_only": "Ainult kaug",
   "compose.language.change": "Muuda keelt",
   "compose.language.search": "Otsi keeli...",
-  "compose.published.body": "Postitus avaldatud.",
+  "compose.published.body": "Postitus tehtud.",
   "compose.published.open": "Ava",
   "compose.saved.body": "Postitus salvestatud.",
   "compose_form.direct_message_warning_learn_more": "Vaata lisa",
@@ -204,6 +204,9 @@
   "confirmations.edit.confirm": "Muuda",
   "confirmations.edit.message": "Muutes praegu kirjutatakse hetkel loodav sõnum üle. Kas oled kindel, et soovid jätkata?",
   "confirmations.edit.title": "Kirjutada postitus üle?",
+  "confirmations.follow_to_list.confirm": "Jälgi ja lisa loetellu",
+  "confirmations.follow_to_list.message": "Pead jälgima kasutajat {name}, et lisada teda loetellu.",
+  "confirmations.follow_to_list.title": "Jälgida kasutajat?",
   "confirmations.logout.confirm": "Välju",
   "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
   "confirmations.logout.title": "Logida välja?",
@@ -358,6 +361,7 @@
   "footer.privacy_policy": "Isikuandmete kaitse",
   "footer.source_code": "Lähtekood",
   "footer.status": "Olek",
+  "footer.terms_of_service": "Kasutustingimused",
   "generic.saved": "Salvestatud",
   "getting_started.heading": "Alustamine",
   "hashtag.admin_moderation": "Ava modereerimisliides #{name} jaoks",
@@ -402,18 +406,10 @@
   "ignore_notifications_modal.not_followers_title": "Ignoreeri inimeste teavitusi, kes sind ei jälgi?",
   "ignore_notifications_modal.not_following_title": "Ignoreeri inimeste teavitusi, keda sa ei jälgi?",
   "ignore_notifications_modal.private_mentions_title": "Ignoreeri soovimatute eraviisiliste mainimiste teateid?",
-  "interaction_modal.description.favourite": "Mastodoni kontoga saad postituse lemmikuks märkida, et autor teaks, et sa hindad seda, ja jätta see hiljemaks alles.",
+  "interaction_modal.action.favourite": "Jätkamiseks pead oma konto alt lemmikuks märkima.",
-  "interaction_modal.description.follow": "Mastodoni kontoga saad jälgida kasutajat {name}, et tema postitusi oma koduvoos näha.",
+  "interaction_modal.action.follow": "Jätkamiseks pead oma konto alt lemmikuks märkima.",
-  "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?",
   "interaction_modal.on_another_server": "Teises serveris",
   "interaction_modal.on_this_server": "Selles serveris",
-  "interaction_modal.sign_in": "Sa pole sellesse serverisse sisse logitud. Kus sinu konto asub?",
-  "interaction_modal.sign_in_hint": "Vihje: See on veebileht, millel sa registreerusid. Kui see ei meenu, otsi sisendkaustast tervitus-e-kirja. Võid sisestada ka oma täispika kasutajanime! (Näit. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Lisa konto {name} postitus lemmikuks",
   "interaction_modal.title.follow": "Jälgi kontot {name}",
   "interaction_modal.title.reblog": "Jaga {name} postitust",
@@ -470,9 +466,12 @@
   "lists.add_to_list": "Lisa loendisse",
   "lists.delete": "Kustuta nimekiri",
   "lists.edit": "Muuda nimekirja",
+  "lists.no_members_yet": "Pole veel liikmeid.",
   "lists.replies_policy.followed": "Igalt jälgitud kasutajalt",
   "lists.replies_policy.list": "Listi liikmetelt",
   "lists.replies_policy.none": "Mitte kelleltki",
+  "lists.save": "Salvesta",
+  "lists.search": "Otsi",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
   "loading_indicator.label": "Laadimine…",
   "media_gallery.hide": "Peida",
@@ -665,8 +664,6 @@
   "privacy_policy.title": "Isikuandmete kaitse",
   "recommended": "Soovitatud",
   "refresh": "Värskenda",
-  "regeneration_indicator.label": "Laeb…",
-  "regeneration_indicator.sublabel": "Su koduvoog on ettevalmistamisel!",
   "relative_time.days": "{number}p",
   "relative_time.full.days": "{number, plural, one {# päev} other {# päeva}} tagasi",
   "relative_time.full.hours": "{number, plural, one {# tund} other {# tundi}} tagasi",
@@ -824,6 +821,7 @@
   "subscribed_languages.target": "Muuda tellitud keeli {target} jaoks",
   "tabs_bar.home": "Kodu",
   "tabs_bar.notifications": "Teated",
+  "terms_of_service.title": "Teenuse tingimused",
   "time_remaining.days": "{number, plural, one {# päev} other {# päeva}} jäänud",
   "time_remaining.hours": "{number, plural, one {# tund} other {# tundi}} jäänud",
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutit}} jäänud",

app/javascript/mastodon/locales/eu.json

@@ -372,17 +372,8 @@
   "ignore_notifications_modal.not_followers_title": "Jarraitzen ez zaituzten pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.not_following_title": "Jarraitzen ez dituzun pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.private_mentions_title": "Eskatu gabeko aipamen pribatuen jakinarazpenei ez ikusiarena egin?",
-  "interaction_modal.description.favourite": "Mastodon kontu batekin bidalketa hau gogoko egin dezakezu, egileari eskertzeko eta gerorako gordetzeko.",
-  "interaction_modal.description.follow": "Mastodon kontu batekin {name} jarraitu dezakezu bere bidalketak zure hasierako denbora lerroan jasotzeko.",
-  "interaction_modal.description.reblog": "Mastodon kontu batekin bidalketa hau bultzatu dezakezu, zure jarraitzaileekin partekatzeko.",
-  "interaction_modal.description.reply": "Mastodon kontu batekin bidalketa honi erantzun diezaiokezu.",
-  "interaction_modal.login.action": "Itzuli hasierara",
-  "interaction_modal.login.prompt": "Zure zerbitzariko domeinua, adib. mastodon.eus",
-  "interaction_modal.no_account_yet": "Oraindik ez duzu izena eman Mastodonen?",
   "interaction_modal.on_another_server": "Beste zerbitzari batean",
   "interaction_modal.on_this_server": "Zerbitzari honetan",
-  "interaction_modal.sign_in": "Ez duzu saioa hasita zerbitzari honetan. Non dago zure kontua ostatatua?",
-  "interaction_modal.sign_in_hint": "Aholkua: Izena eman duzun zerbitzaria da. Ez baduzu gogoratzen, begiratu ongietorri-mezua zure sarrera-ontzian. Baita ere, zure erabiltzaile-izen osoa sar dezakezu! (adib. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Egin gogoko {name}(r)en bidalketa",
   "interaction_modal.title.follow": "Jarraitu {name}(r)i",
   "interaction_modal.title.reblog": "Bultzatu {name}(r)en bidalketa",
@@ -623,8 +614,7 @@
   "privacy_policy.title": "Pribatutasun politika",
   "recommended": "Gomendatua",
   "refresh": "Berritu",
-  "regeneration_indicator.label": "Kargatzen…",
+  "regeneration_indicator.please_stand_by": "Itxaron, mesedez.",
-  "regeneration_indicator.sublabel": "Zure hasiera-jarioa prestatzen ari da!",
   "relative_time.days": "{number}e",
   "relative_time.full.days": "Duela {number, plural, one {egun #} other {# egun}}",
   "relative_time.full.hours": "Duela {number, plural, one {ordu #} other {# ordu}}",

app/javascript/mastodon/locales/fa.json

@@ -401,18 +401,8 @@
   "ignore_notifications_modal.not_followers_title": "چشم‌پوشی از آگاهی‌های افرادی که پیتان نمی‌گیرند؟",
   "ignore_notifications_modal.not_following_title": "چشم‌پوشی از آگاهی‌های افرادی که پیشان نمی‌گیرید؟",
   "ignore_notifications_modal.private_mentions_title": "چشم‌پوشی از نام‌بری‌های خصوصی ناخواسته؟",
-  "interaction_modal.description.favourite": "با حسابی روی ماستودون می‌توانید این فرسته را برگزیده تا نگارنده بداند قدردانش هستید و برای آینده ذخیره‌اش می‌کنید.",
-  "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": "در ماستودون نیست؟",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
-  "interaction_modal.sign_in": "شما در این کارساز وارد نشده‌اید. حسابتان کجا میزبانی شده؟",
-  "interaction_modal.sign_in_hint": "نکته: میزبانتان، پایگاه وبیست که رویش ثبت‌نام کرده‌اید. اگر به خاطر نمی‌آورید، به رایانامهٔ خوش‌آمد در صندوق ورودیتان بنگرید. همچنین می‌توانید نام کاربری کاملتان (چون ‪@Mastodon@mastodon.social‬) را وارد کنید!",
   "interaction_modal.title.favourite": "فرسته‌های برگزیدهٔ {name}",
   "interaction_modal.title.follow": "پیگیری {name}",
   "interaction_modal.title.reblog": "تقویت فرستهٔ {name}",
@@ -677,8 +667,6 @@
   "privacy_policy.title": "سیاست محرمانگی",
   "recommended": "پیشنهادشده",
   "refresh": "نوسازی",
-  "regeneration_indicator.label": "در حال بار شدن…",
-  "regeneration_indicator.sublabel": "خوراک خانگیتان دارد آماده می‌شود!",
   "relative_time.days": "{number} روز",
   "relative_time.full.days": "{number, plural, one {# روز} other {# روز}} پیش",
   "relative_time.full.hours": "{number, plural, one {# ساعت} other {# ساعت}} پیش",

app/javascript/mastodon/locales/fi.json

@@ -406,23 +406,21 @@
   "ignore_notifications_modal.not_followers_title": "Sivuutetaanko ilmoitukset käyttäjiltä, jotka eivät seuraa sinua?",
   "ignore_notifications_modal.not_following_title": "Sivuutetaanko ilmoitukset käyttäjiltä, joita et seuraa?",
   "ignore_notifications_modal.private_mentions_title": "Sivuutetaanko ilmoitukset pyytämättömistä yksityismaininnoista?",
-  "interaction_modal.description.favourite": "Mastodon-tilillä voit lisätä tämän julkaisun suosikkeihisi osoittaaksesi tekijälle arvostavasi sitä ja tallentaaksesi sen tulevaa käyttöä varten.",
+  "interaction_modal.action.favourite": "Jotta voit jatkaa, sinun tulee lisätä julkaisu suosikiksesi omalta tililtäsi.",
-  "interaction_modal.description.follow": "Mastodon-tilillä voit seurata käyttäjää {name} saadaksesi hänen julkaisunsa kotisyötteeseesi.",
+  "interaction_modal.action.follow": "Jotta voit jatkaa, sinun tulee seurata käyttäjää omalta tililtäsi.",
-  "interaction_modal.description.reblog": "Mastodon-tilillä voit tehostaa tätä julkaisua jakaaksesi sen seuraajiesi kanssa.",
+  "interaction_modal.action.reblog": "Jotta voit jatkaa, sinun tulee uudelleenjulkaista omalta tililtäsi.",
-  "interaction_modal.description.reply": "Mastodon-tilillä voit vastata tähän julkaisuun.",
+  "interaction_modal.action.reply": "Jotta voit jatkaa, sinun tulee vastata omalta tililtäsi.",
-  "interaction_modal.description.vote": "Mastodon-tilillä voit osallistua tähän äänestykseen.",
+  "interaction_modal.action.vote": "Jotta voit jatkaa, sinun tulee äänestää omalta tililtäsi.",
-  "interaction_modal.login.action": "Siirry kotiin",
+  "interaction_modal.go": "Siirry",
-  "interaction_modal.login.prompt": "Kotipalvelimesi verkkotunnus, kuten mastodon.social",
+  "interaction_modal.no_account_yet": "Eikö sinulla ole vielä tiliä?",
-  "interaction_modal.no_account_yet": "Etkö ole vielä Mastodonissa?",
   "interaction_modal.on_another_server": "Toisella palvelimella",
   "interaction_modal.on_this_server": "Tällä palvelimella",
-  "interaction_modal.sign_in": "Et ole kirjautunut tälle palvelimelle. Millä palvelimella tilisi sijaitsee?",
-  "interaction_modal.sign_in_hint": "Vihje: Se on sama verkkosivusto, jolle rekisteröidyit. Jos et muista palvelintasi, etsi tervetulosähköposti saapuneista viesteistäsi. Voit syöttää myös koko käyttäjätunnuksesi! (Esimerkki: @Mastodon@Mastodon.social)",
   "interaction_modal.title.favourite": "Lisää käyttäjän {name} julkaisu suosikkeihin",
   "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",
+  "interaction_modal.username_prompt": "Esim. {example}",
   "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}}",
@@ -696,8 +694,8 @@
   "privacy_policy.title": "Tietosuojakäytäntö",
   "recommended": "Suositellaan",
   "refresh": "Päivitä",
-  "regeneration_indicator.label": "Ladataan…",
+  "regeneration_indicator.please_stand_by": "Ole valmiina.",
-  "regeneration_indicator.sublabel": "Kotisyötettäsi valmistellaan!",
+  "regeneration_indicator.preparing_your_home_feed": "Kotisyötettäsi valmistellaan…",
   "relative_time.days": "{number} pv",
   "relative_time.full.days": "{number, plural, one {# päivä} other {# päivää}} sitten",
   "relative_time.full.hours": "{number, plural, one {# tunti} other {# tuntia}} sitten",
@@ -785,7 +783,7 @@
   "search_results.no_search_yet": "Kokeile hakea julkaisuja, profiileja tai aihetunnisteita.",
   "search_results.see_all": "Näytä kaikki",
   "search_results.statuses": "Julkaisut",
-  "search_results.title": "Hae ”{q}”",
+  "search_results.title": "Haku ”{q}”",
   "server_banner.about_active_users": "Palvelimen käyttäjät viimeisten 30 päivän ajalta (kuukauden aktiiviset käyttäjät)",
   "server_banner.active_users": "aktiivista käyttäjää",
   "server_banner.administered_by": "Ylläpitäjä:",

app/javascript/mastodon/locales/fil.json

@@ -208,8 +208,6 @@
   "hashtags.and_other": "…at {count, plural, one {# iba pa} other {# na iba pa}}",
   "home.column_settings.show_replies": "Ipakita ang mga tugon",
   "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
-  "interaction_modal.login.action": "Iuwi mo ako",
-  "interaction_modal.no_account_yet": "Wala sa Mastodon?",
   "interaction_modal.on_another_server": "Sa ibang serbiro",
   "interaction_modal.on_this_server": "Sa serbirong ito",
   "interaction_modal.title.follow": "Sundan si {name}",
@@ -287,7 +285,6 @@
   "privacy.unlisted.short": "Hindi nakalista",
   "privacy_policy.last_updated": "Huling nabago noong {date}",
   "recommended": "Inirekomenda",
-  "regeneration_indicator.label": "Kumakarga…",
   "relative_time.days": "{number}a",
   "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
   "relative_time.full.hours": "{number, plural, one {# oras} other {# na oras}} ang nakalipas",

app/javascript/mastodon/locales/fo.json

@@ -406,23 +406,21 @@
   "ignore_notifications_modal.not_followers_title": "Lat sum um tú ikki sær fráboðanir frá fólki, sum ikki fylgja tær?",
   "ignore_notifications_modal.not_following_title": "Lat sum um tú ikki sær fráboðanir frá fólki, sum tú ikki fylgir?",
   "ignore_notifications_modal.private_mentions_title": "Lat sum um tú ikki sær fráboðanir frá óbiðnum privatum umrøðum?",
-  "interaction_modal.description.favourite": "Við einari kontu á Mastodon kanst tú dáma hendan postin fyri at vísa rithøvundanum at tú virðismetur hann og goymir hann til seinni.",
+  "interaction_modal.action.favourite": "Fyri at halda fram, so mást tú yndismerkja frá tínari kontu.",
-  "interaction_modal.description.follow": "Við eini kontu á Mastodon kanst tú fylgja {name} fyri at síggja teirra postar á tíni heimarás.",
+  "interaction_modal.action.follow": "Fyri at halda fram, mást tú fylgja frá tínari kontu.",
-  "interaction_modal.description.reblog": "Við eini kontu á Mastodon kanst tú stimbra hendan postin og soleiðis deila hann við tínar fylgjarar.",
+  "interaction_modal.action.reblog": "Fyri at halda fram, mást tú endurblogga frá tínari kontu.",
-  "interaction_modal.description.reply": "Við eini kontu á Mastodon, so kanst tú svara hesum posti.",
+  "interaction_modal.action.reply": "Fyri at halda fram, mást tú svara frá tínari kontu.",
-  "interaction_modal.description.vote": "Við eini kontu á Mastodon, so kanst tú atkvøða í hesi spurnarkanningini.",
+  "interaction_modal.action.vote": "Fyri at halda fram, mást tú atkvøða frá tínari kontu.",
-  "interaction_modal.login.action": "Tak meg heim",
+  "interaction_modal.go": "Far",
-  "interaction_modal.login.prompt": "Navnaøki hjá tínum heimaambætara, t.d. mastodon.social",
+  "interaction_modal.no_account_yet": "Hevur tú onga kontu enn?",
-  "interaction_modal.no_account_yet": "Ikki á Mastodon?",
   "interaction_modal.on_another_server": "Á øðrum ambætara",
   "interaction_modal.on_this_server": "Á hesum ambætaranum",
-  "interaction_modal.sign_in": "Tú er ikki ritað/ur inn á hesum ambætaranum. Hvar er kontan hjá tær hýst?",
-  "interaction_modal.sign_in_hint": "Góð ráð: tað er heimasíðan, har tú lat teg skráseta. Minnist tú ikki, so kanst tú leita eftir vælkomin-teldubrævinum í innbakkanum hjá tær. Tú kanst eisini innlesa fulla brúkaranavnið hjá tær! (t.d. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Dáma postin hjá {name}",
   "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}",
+  "interaction_modal.username_prompt": "T.d. {example}",
   "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}}",
@@ -696,8 +694,8 @@
   "privacy_policy.title": "Privatlívspolitikkur",
   "recommended": "Viðmælt",
   "refresh": "Endurles",
-  "regeneration_indicator.label": "Innlesur…",
+  "regeneration_indicator.please_stand_by": "Bíða við.",
-  "regeneration_indicator.sublabel": "Tín heimarás verður gjørd klár!",
+  "regeneration_indicator.preparing_your_home_feed": "Fyrireiki heimarásina hjá tær…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dagur} other {# dagar}} síðani",
   "relative_time.full.hours": "{number, plural, one {# tími} other {# tímar}} síðani",
@@ -781,8 +779,11 @@
   "search_results.accounts": "Vangar",
   "search_results.all": "Alt",
   "search_results.hashtags": "Frámerki",
+  "search_results.no_results": "Eingi úrslit.",
+  "search_results.no_search_yet": "Royn at leita eftir postum, vangum ella frámerkjum.",
   "search_results.see_all": "Sí øll",
   "search_results.statuses": "Postar",
+  "search_results.title": "Leita eftir \"{q}\"",
   "server_banner.about_active_users": "Fólk, sum hava brúkt hendan ambætaran seinastu 30 dagarnar (mánaðarligir virknir brúkarar)",
   "server_banner.active_users": "virknir brúkarar",
   "server_banner.administered_by": "Umsitari:",

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

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorer les notifications provenant des personnes qui ne vous suivent pas ?",
   "ignore_notifications_modal.not_following_title": "Ignorer les notifications provenant des personnes que vous ne suivez pas ?",
   "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
-  "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter cette publication à vos favoris pour informer l'auteur⋅rice que vous l'appréciez et la sauvegarder pour plus tard.",
+  "interaction_modal.action.favourite": "Pour continuer, vous devez ajouter en favori depuis votre compte.",
-  "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs publications dans votre fil d'accueil.",
+  "interaction_modal.action.follow": "Pour continuer, vous devez suivre depuis votre compte.",
-  "interaction_modal.description.reblog": "Avec un compte Mastodon, vous pouvez booster cette publication pour la partager avec vos propres abonné·e·s.",
+  "interaction_modal.action.reblog": "Pour continuer, vous devez booster depuis votre compte.",
-  "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à cette publication.",
+  "interaction_modal.action.reply": "Pour continuer, vous devez répondre depuis votre compte.",
-  "interaction_modal.description.vote": "Avec un compte sur Mastodon, vous pouvez répondre à cette question.",
+  "interaction_modal.action.vote": "Pour continuer, vous devez voter depuis votre compte.",
-  "interaction_modal.login.action": "Aller à mon serveur",
+  "interaction_modal.go": "Valider",
-  "interaction_modal.login.prompt": "Domaine de votre serveur, ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Vous n'avez pas encore de compte ?",
-  "interaction_modal.no_account_yet": "Pas sur Mastodon ?",
   "interaction_modal.on_another_server": "Sur un autre serveur",
   "interaction_modal.on_this_server": "Sur ce serveur",
-  "interaction_modal.sign_in": "Vous n’êtes pas connectés sur ce serveur. Où est hébergé votre compte ?",
-  "interaction_modal.sign_in_hint": "Astuce : c'est le site web sur lequel vous vous êtes inscrit. Si vous ne vous en souvenez pas, cherchez le courriel de bienvenue dans votre boîte de réception. Vous pouvez aussi indiquer votre nom d’utilisateur complet ! (par ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Ajouter la publication de {name} aux favoris",
   "interaction_modal.title.follow": "Suivre {name}",
   "interaction_modal.title.reblog": "Booster la publication de {name}",
   "interaction_modal.title.reply": "Répondre à la publication de {name}",
   "interaction_modal.title.vote": "Voter pour le sondage de {name}",
+  "interaction_modal.username_prompt": "Par exemple : {example}",
   "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
   "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
   "refresh": "Actualiser",
-  "regeneration_indicator.label": "Chargement…",
+  "regeneration_indicator.please_stand_by": "Veuillez patienter.",
-  "regeneration_indicator.sublabel": "Votre fil d'accueil est en cours de préparation!",
+  "regeneration_indicator.preparing_your_home_feed": "Préparation de votre flux principal…",
   "relative_time.days": "{number} j",
   "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
   "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",

app/javascript/mastodon/locales/fr.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorer les notifications provenant des personnes qui ne vous suivent pas ?",
   "ignore_notifications_modal.not_following_title": "Ignorer les notifications provenant des personnes que vous ne suivez pas ?",
   "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
-  "interaction_modal.description.favourite": "Avec un compte Mastodon, vous pouvez ajouter ce message à vos favoris pour informer l'auteur⋅rice que vous l'appréciez et pour le sauvegarder pour plus tard.",
+  "interaction_modal.action.favourite": "Pour continuer, vous devez ajouter en favori depuis votre compte.",
-  "interaction_modal.description.follow": "Avec un compte Mastodon, vous pouvez suivre {name} et recevoir leurs posts dans votre fil d'actualité.",
+  "interaction_modal.action.follow": "Pour continuer, vous devez suivre depuis votre compte.",
-  "interaction_modal.description.reblog": "Avec un compte sur Mastodon, vous pouvez partager ce message pour le faire découvrir à vos propres abonné⋅e⋅s.",
+  "interaction_modal.action.reblog": "Pour continuer, vous devez booster depuis votre compte.",
-  "interaction_modal.description.reply": "Avec un compte sur Mastodon, vous pouvez répondre à ce message.",
+  "interaction_modal.action.reply": "Pour continuer, vous devez répondre depuis votre compte.",
-  "interaction_modal.description.vote": "Avec un compte sur Mastodon, vous pouvez répondre à cette question.",
+  "interaction_modal.action.vote": "Pour continuer, vous devez voter depuis votre compte.",
-  "interaction_modal.login.action": "Aller à mon serveur",
+  "interaction_modal.go": "Valider",
-  "interaction_modal.login.prompt": "Domaine de votre serveur, ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Vous n'avez pas encore de compte ?",
-  "interaction_modal.no_account_yet": "Pas sur Mastodon ?",
   "interaction_modal.on_another_server": "Sur un autre serveur",
   "interaction_modal.on_this_server": "Sur ce serveur",
-  "interaction_modal.sign_in": "Vous n’êtes pas connectés sur ce serveur. Où est hébergé votre compte ?",
-  "interaction_modal.sign_in_hint": "Astuce : c'est le site web sur lequel vous vous êtes inscrit. Si vous ne vous en souvenez pas, cherchez le courriel de bienvenue dans votre boîte de réception. Vous pouvez aussi indiquer votre nom d’utilisateur complet ! (par ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Ajouter le message de {name} aux favoris",
   "interaction_modal.title.follow": "Suivre {name}",
   "interaction_modal.title.reblog": "Partager le message de {name}",
   "interaction_modal.title.reply": "Répondre au message de {name}",
   "interaction_modal.title.vote": "Voter pour le sondage de {name}",
+  "interaction_modal.username_prompt": "Par exemple : {example}",
   "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
   "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Politique de confidentialité",
   "recommended": "Recommandé",
   "refresh": "Actualiser",
-  "regeneration_indicator.label": "Chargement…",
+  "regeneration_indicator.please_stand_by": "Veuillez patienter.",
-  "regeneration_indicator.sublabel": "Votre fil principal est en cours de préparation !",
+  "regeneration_indicator.preparing_your_home_feed": "Préparation de votre flux principal…",
   "relative_time.days": "{number} j",
   "relative_time.full.days": "il y a {number, plural, one {# jour} other {# jours}}",
   "relative_time.full.hours": "il y a {number, plural, one {# heure} other {# heures}}",

app/javascript/mastodon/locales/fy.json

@@ -381,18 +381,8 @@
   "ignore_notifications_modal.not_followers_title": "Meldingen negearje fan minsken dy’t jo net folgje?",
   "ignore_notifications_modal.not_following_title": "Meldingen negearje fan minsken dy’t josels net folgje?",
   "ignore_notifications_modal.private_mentions_title": "Meldingen negearje fan net frege priveeberjochten?",
-  "interaction_modal.description.favourite": "Jo kinne mei in Mastodon-account dit berjocht as favoryt markearje, om dy brûker witte te litten dat jo it berjocht wurdearje en om it te bewarjen.",
-  "interaction_modal.description.follow": "Jo kinne mei in Mastodon-account {name} folgje, om sa harren berjochten op jo starttiidline te ûntfangen.",
-  "interaction_modal.description.reblog": "Jo kinne mei in Mastodon-account dit berjocht booste, om it sa mei jo folgers te dielen.",
-  "interaction_modal.description.reply": "Jo kinne mei in Mastodon-account op dit berjocht reagearje.",
-  "interaction_modal.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?",
   "interaction_modal.on_another_server": "Op een oare server",
   "interaction_modal.on_this_server": "Op dizze server",
-  "interaction_modal.sign_in": "Jo binne net op dizze server oanmeld. Op hokker server stiet jo account?",
-  "interaction_modal.sign_in_hint": "Tip: Dat is de website wêrop jo jo registrearre hawwe. Wannear’t jo dit ferjitten binne kinne jo nei it wolkomst-emailberjocht sykje yn jo Postfek YN. Jo kinne ek jo folsleine brûkersnamme ynfolje! (byg. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Berjocht fan {name} as favoryt markearje",
   "interaction_modal.title.follow": "{name} folgje",
   "interaction_modal.title.reblog": "Berjocht fan {name} booste",
@@ -642,8 +632,6 @@
   "privacy_policy.title": "Privacybelied",
   "recommended": "Oanrekommandearre",
   "refresh": "Ferfarskje",
-  "regeneration_indicator.label": "Lade…",
-  "regeneration_indicator.sublabel": "Jo starttiidline wurdt oanmakke!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
   "relative_time.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",

app/javascript/mastodon/locales/ga.json

@@ -362,6 +362,7 @@
   "footer.privacy_policy": "Polasaí príobháideachais",
   "footer.source_code": "Féach ar an gcód foinseach",
   "footer.status": "Stádas",
+  "footer.terms_of_service": "Téarmaí seirbhíse",
   "generic.saved": "Sábháilte",
   "getting_started.heading": "Ag tosú amach",
   "hashtag.admin_moderation": "Oscail comhéadan modhnóireachta le haghaidh #{name}",
@@ -406,18 +407,8 @@
   "ignore_notifications_modal.not_followers_title": "An dtugann tú aird ar fhógraí ó dhaoine nach leanann tú?",
   "ignore_notifications_modal.not_following_title": "An ndéanann tú neamhaird de fhógraí ó dhaoine nach leanann tú?",
   "ignore_notifications_modal.private_mentions_title": "An dtugann tú aird ar fhógraí ó Luaintí Príobháideacha gan iarraidh?",
-  "interaction_modal.description.favourite": "Le cuntas ar Mastodon, is fearr leat an postáil seo chun a chur in iúl don údar go bhfuil meas agat air agus é a shábháil ar feadh níos déanaí.",
-  "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?",
   "interaction_modal.on_another_server": "Ar freastalaí eile",
   "interaction_modal.on_this_server": "Ar an freastalaí seo",
-  "interaction_modal.sign_in": "Níl tú logáilte isteach ar an bhfreastalaí seo. Cá bhfuil do chuntas á óstáil?",
-  "interaction_modal.sign_in_hint": "Leid: Sin é an suíomh Gréasáin inar chláraigh tú. Mura cuimhin leat, lorg an ríomhphost fáilte i do bhosca isteach. Is féidir leat d'ainm úsáideora iomlán a chur isteach freisin! (m.sh. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "An postáil {name} is fearr leat",
   "interaction_modal.title.follow": "Lean {name}",
   "interaction_modal.title.reblog": "Mol postáil de chuid {name}",
@@ -548,6 +539,8 @@
   "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.favourite_pm": "B'fhearr le {name} do lua príobháideach",
+  "notification.favourite_pm.name_and_others_with_link": "{name} agus <a>{count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}</a> atá roghnaithe do do luaidh phríobháideach",
   "notification.follow": "Lean {name} thú",
   "notification.follow.name_and_others": "{name} agus <a>{count, plural, one {# other} two {# eile} few {# eile} many {# eile} other {# others}}</a> lean tú",
   "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
@@ -694,8 +687,6 @@
   "privacy_policy.title": "Polasaí príobháideachais",
   "recommended": "Molta",
   "refresh": "Athnuaigh",
-  "regeneration_indicator.label": "Ag lódáil…",
-  "regeneration_indicator.sublabel": "Tá do bheathú baile á ullmhú!",
   "relative_time.days": "{number}l",
   "relative_time.full.days": "{number, plural, one {# lá} other {# lá}} ó shin",
   "relative_time.full.hours": "{number, plural, one {# uair} other {# uair}} ó shin",
@@ -779,8 +770,11 @@
   "search_results.accounts": "Próifílí",
   "search_results.all": "Gach",
   "search_results.hashtags": "Haischlib",
+  "search_results.no_results": "Gan torthaí.",
+  "search_results.no_search_yet": "Bain triail as postálacha, próifílí nó hashtags a chuardach.",
   "search_results.see_all": "Gach rud a fheicáil",
   "search_results.statuses": "Postálacha",
+  "search_results.title": "Cuardaigh \"{q}\"",
   "server_banner.about_active_users": "Daoine a úsáideann an freastalaí seo le 30 lá anuas (Úsáideoirí Gníomhacha Míosúla)",
   "server_banner.active_users": "úsáideoirí gníomhacha",
   "server_banner.administered_by": "Arna riar ag:",
@@ -853,6 +847,7 @@
   "subscribed_languages.target": "Athraigh teangacha suibscríofa le haghaidh {target}",
   "tabs_bar.home": "Baile",
   "tabs_bar.notifications": "Fógraí",
+  "terms_of_service.title": "Téarmaí Seirbhíse",
   "time_remaining.days": "{number, plural, one {# lá} other {# lá}} fágtha",
   "time_remaining.hours": "{number, plural, one {# uair} other {# uair}} fágtha",
   "time_remaining.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}} fágtha",

app/javascript/mastodon/locales/gd.json

@@ -392,18 +392,8 @@
   "ignore_notifications_modal.not_followers_title": "A bheil thu airson na brathan o dhaoine nach eil ’gad leantainn a leigeil seachad?",
   "ignore_notifications_modal.not_following_title": "A bheil thu airson na brathan o dhaoine nach eil thu a’ leantainn a leigeil seachad?",
   "ignore_notifications_modal.private_mentions_title": "A bheil thu airson na brathan o iomraidhean phrìobhaideach gun iarraidh a leigeil seachad?",
-  "interaction_modal.description.favourite": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a chur ris na h-annsachdan airson innse dhan ùghdar gu bheil e a’ còrdadh dhut ’s a shàbhaladh do uaireigin eile.",
-  "interaction_modal.description.follow": "Le cunntas air Mastodon, ’s urrainn dhut {name} a leantainn ach am faigh thu na postaichean aca nad dhachaigh.",
-  "interaction_modal.description.reblog": "Le cunntas air Mastodon, ’s urrainn dhut am post seo a bhrosnachadh gus a cho-roinneadh leis an luchd-leantainn agad fhèin.",
-  "interaction_modal.description.reply": "Le cunntas air Mastodon, ’s urrainn dhut freagairt a chur dhan phost seo.",
-  "interaction_modal.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?",
   "interaction_modal.on_another_server": "Air frithealaiche eile",
   "interaction_modal.on_this_server": "Air an frithealaiche seo",
-  "interaction_modal.sign_in": "Cha deach do chlàradh a-steach air an fhrithealaiche seo. Càit a bheil an cunntas agad ’ga òstadh?",
-  "interaction_modal.sign_in_hint": "Gliocas: Seo an làrach-lìn far an do chlàraich thu. Mur eil cuimhne agad dè bh’ ann, thoir sùil air a’ phost-d fàilteachaidh sa bhogsa a-steach agad. ’S urrainn dhut an t-ainm-cleachdaiche slàn agad a chur a-steach cuideachd! (can @mise@ ailbhean.co-shaoghal.net)",
   "interaction_modal.title.favourite": "Cuir am post aig {name} ris na h-annsachdan",
   "interaction_modal.title.follow": "Lean {name}",
   "interaction_modal.title.reblog": "Brosnaich am post aig {name}",
@@ -655,8 +645,6 @@
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
   "recommended": "Molta",
   "refresh": "Ath-nuadhaich",
-  "regeneration_indicator.label": "’Ga luchdadh…",
-  "regeneration_indicator.sublabel": "Tha do dhachaigh ’ga ullachadh!",
   "relative_time.days": "{number}l",
   "relative_time.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}} air ais",
   "relative_time.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}} air ais",

app/javascript/mastodon/locales/gl.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificacións de persoas que non te seguen?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificacións de persoas que non segues?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificacións de Mencións Privadas non solicitadas?",
-  "interaction_modal.description.favourite": "Cunha conta Mastodon podes favorecer esta publicación e facerlle saber á autora que che gustou e que a gardas para máis tarde.",
+  "interaction_modal.action.favourite": "Para continuar, debes favorecer desde a túa conta.",
-  "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.action.follow": "Para continuar, debes facer seguimento desde a túa conta.",
-  "interaction_modal.description.reblog": "Cunha conta en Mastodon, poderás promover esta publicación para compartila con quen te siga.",
+  "interaction_modal.action.reblog": "Para continuar, debes promover desde a túa conta.",
-  "interaction_modal.description.reply": "Cunha conta en Mastodon, poderás responder a esta publicación.",
+  "interaction_modal.action.reply": "Para continuar, debes responder desde a túa conta.",
-  "interaction_modal.description.vote": "Podes votar nesta enquisa se tes unha conta en Mastodon.",
+  "interaction_modal.action.vote": "Para continuar, debes votar desde a túa conta.",
-  "interaction_modal.login.action": "Seguir desde alá",
+  "interaction_modal.go": "Ir",
-  "interaction_modal.login.prompt": "Dominio do teu servidor de inicio, ex. mastodon.social",
   "interaction_modal.no_account_yet": "Aínda non tes unha conta?",
   "interaction_modal.on_another_server": "Nun servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.sign_in": "Non iniciaches sesión neste servidor. Onde creaches a túa conta?",
-  "interaction_modal.sign_in_hint": "Axuda: trátase da web na que te rexistraches. Se non a lembras, busca na caixa de correo a mensaxe de benvida. Tamén podes escribir o teu identificador completo! (ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marcar coma favorita a publicación de {name}",
   "interaction_modal.title.follow": "Seguir a {name}",
   "interaction_modal.title.reblog": "Promover a publicación de {name}",
   "interaction_modal.title.reply": "Responder á publicación de {name}",
   "interaction_modal.title.vote": "Vota na enquisa de {name}",
+  "interaction_modal.username_prompt": "Ex. {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Política de Privacidade",
   "recommended": "Aconsellable",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Estase a cargar…",
+  "regeneration_indicator.please_stand_by": "Por favor, agarda.",
-  "regeneration_indicator.sublabel": "Estase a preparar a túa cronoloxía de inicio!",
+  "regeneration_indicator.preparing_your_home_feed": "Creando a túa cronoloxía…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "hai {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hai {number, plural, one {# hora} other {# horas}}",

app/javascript/mastodon/locales/he.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "להתעלם מהתראות מא.נשים שאינם עוקביך?",
   "ignore_notifications_modal.not_following_title": "להתעלם מהתראות מא.נשים שאינם נעקביך?",
   "ignore_notifications_modal.private_mentions_title": "להתעלם מהתראות מאיזכורים פרטיים?",
-  "interaction_modal.description.favourite": "עם חשבון מסטודון, ניתן לחבב את ההודעה כדי לומר למחבר/ת שהערכת את תוכנו או כדי לשמור אותו לקריאה בעתיד.",
+  "interaction_modal.action.favourite": "כדי להמשיך, עליך לחבב מחשבונך.",
-  "interaction_modal.description.follow": "עם חשבון מסטודון, ניתן לעקוב אחרי {name} כדי לקבל את הפוסטים שלו/ה בפיד הבית.",
+  "interaction_modal.action.follow": "כדי להמשיך, עליך לעקוב מחשבונך.",
-  "interaction_modal.description.reblog": "עם חשבון מסטודון, ניתן להדהד את החצרוץ ולשתף עם עוקבים.",
+  "interaction_modal.action.reblog": "כדי להמשיך, עליך להדהד מחשבונך.",
-  "interaction_modal.description.reply": "עם חשבון מסטודון, ניתן לענות לחצרוץ.",
+  "interaction_modal.action.reply": "כדי להמשיך, עליך לענות מחשבונך.",
-  "interaction_modal.description.vote": "עם חשבון מסטודון, ניתן להצביע בסקר.",
+  "interaction_modal.action.vote": "כדי להמשיך, עליך להצביע מחשבונך.",
-  "interaction_modal.login.action": "קח אותי לדף הבית",
+  "interaction_modal.go": "המשך",
-  "interaction_modal.login.prompt": "שם השרת שלך, למשל mastodon.social",
+  "interaction_modal.no_account_yet": "אין לך עדיין חשבון?",
-  "interaction_modal.no_account_yet": "עדיין לא במסטודון?",
   "interaction_modal.on_another_server": "על שרת אחר",
   "interaction_modal.on_this_server": "על שרת זה",
-  "interaction_modal.sign_in": "אינך מחובר.ת לשרת זה. היכן מתאכסן החשבון שלך?",
-  "interaction_modal.sign_in_hint": "רמז: זהו האתר שבו נרשמת. אם שכחת, יש לך הודעת \"ברוכים הבאים\" בתיבת הדוא\"ל. ניתן גם לכתוב את שם המשתמש המלא (למשל @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "חיבוב החצרוץ של {name}",
   "interaction_modal.title.follow": "לעקוב אחרי {name}",
   "interaction_modal.title.reblog": "להדהד את החצרוץ של {name}",
   "interaction_modal.title.reply": "תשובה לחצרוץ של {name}",
   "interaction_modal.title.vote": "הצביעו בסקר של {name}",
+  "interaction_modal.username_prompt": "למשל {example}",
   "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
   "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
   "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "מדיניות פרטיות",
   "recommended": "מומלץ",
   "refresh": "רענון",
-  "regeneration_indicator.label": "טוען…",
+  "regeneration_indicator.please_stand_by": "נא להמתין.",
-  "regeneration_indicator.sublabel": "פיד הבית שלך בהכנה!",
+  "regeneration_indicator.preparing_your_home_feed": "מכין לך את פיד הבית…",
   "relative_time.days": "{number} ימים",
   "relative_time.full.days": "לפני {number, plural, one {# יום} other {# ימים}}",
   "relative_time.full.hours": "לפני {number, plural, one {# שעה} other {# שעות}}",
@@ -782,8 +780,11 @@
   "search_results.accounts": "פרופילים",
   "search_results.all": "כל התוצאות",
   "search_results.hashtags": "תגיות",
+  "search_results.no_results": "אין תוצאות.",
+  "search_results.no_search_yet": "נסו לחפש אחר הודעות, פרופילי משתמשים או תגיות.",
   "search_results.see_all": "הראה הכל",
   "search_results.statuses": "הודעות",
+  "search_results.title": "חיפוש אחר \"{q}\"",
   "server_banner.about_active_users": "משתמשים פעילים בשרת ב־30 הימים האחרונים (משתמשים פעילים חודשיים)",
   "server_banner.active_users": "משתמשים פעילים",
   "server_banner.administered_by": "מנוהל ע\"י:",

app/javascript/mastodon/locales/hi.json

@@ -295,13 +295,8 @@
   "home.column_settings.show_replies": "जवाबों को दिखाए",
   "home.hide_announcements": "घोषणाएँ छिपाएँ",
   "home.show_announcements": "घोषणाएं दिखाएं",
-  "interaction_modal.description.follow": "मास्टोडन पर एक अकाउंट के साथ, आप अपने होम फीड में उनकी पोस्ट प्राप्त करने के लिए {name} का अनुसरण कर सकते हैं",
-  "interaction_modal.description.reblog": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट को अपने फोल्लोवेर्स के साथ साझा करने के लिए बढ़ा सकते हैं।",
-  "interaction_modal.description.reply": "मास्टोडन पर एक अकाउंट के साथ, आप इस पोस्ट का जवाब दे सकते हैं।",
-  "interaction_modal.no_account_yet": "मस्टाडोन पर नहीं है?",
   "interaction_modal.on_another_server": "एक अलग सर्वर पर",
   "interaction_modal.on_this_server": "इस सर्वर पे",
-  "interaction_modal.sign_in": "आप इस सर्वर पर प्रवेशित नहिं है | आपका खाता कहां साजा है?",
   "interaction_modal.title.favourite": "मनपसंद {name} की पोस्ट",
   "interaction_modal.title.follow": "फॉलो {name}",
   "interaction_modal.title.reblog": "बूस्ट {name} की पोस्ट",
@@ -408,7 +403,6 @@
   "privacy.public.short": "सार्वजनिक",
   "recommended": "अनुशंसित",
   "refresh": "रीफ्रेश करें",
-  "regeneration_indicator.label": "लोड हो रहा है...",
   "relative_time.days": "{number}दिन",
   "relative_time.full.days": "{number, plural, one {# दिन} other {# दिन}} पहले",
   "relative_time.full.hours": "{number, plural,one {# घंटा} other {# घंटे}} पहले",

app/javascript/mastodon/locales/hr.json

@@ -248,8 +248,6 @@
   "home.hide_announcements": "Sakrij najave",
   "home.pending_critical_update.title": "Dostupno je kritično sigurnosno ažuriranje!",
   "home.show_announcements": "Prikaži najave",
-  "interaction_modal.login.action": "Odvedi me kući",
-  "interaction_modal.no_account_yet": "Nisi na Mastodonu?",
   "interaction_modal.on_this_server": "Na ovom serveru",
   "interaction_modal.title.follow": "Prati {name}",
   "intervals.full.days": "{number, plural, one {# dan} other {# dana}}",
@@ -360,8 +358,6 @@
   "privacy_policy.title": "Pravila o zaštiti privatnosti",
   "recommended": "Preporučeno",
   "refresh": "Osvježi",
-  "regeneration_indicator.label": "Učitavanje…",
-  "regeneration_indicator.sublabel": "Priprema se Vaša početna stranica!",
   "relative_time.days": "{number}d",
   "relative_time.full.just_now": "upravo sad",
   "relative_time.just_now": "sada",

app/javascript/mastodon/locales/hu.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Nem követőktől érkező értesítések figyelmen kívül hagyása?",
   "ignore_notifications_modal.not_following_title": "Nem követettektől érkező értesítések figyelmen kívül hagyása?",
   "ignore_notifications_modal.private_mentions_title": "Figyelmen kívül hagyod a kéretlen privát említéseket?",
-  "interaction_modal.description.favourite": "Egy Mastodon fiókkal kedvencnek jelölheted ezt a bejegyzést, tudatva a szerzővel, hogy értékeled és elteszed későbbre.",
+  "interaction_modal.action.favourite": "A folytatáshoz a fiókodból kell kedvencnek jelölnöd.",
-  "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.action.follow": "A folytatáshoz a fiókodból kell követned.",
-  "interaction_modal.description.reblog": "Egy Mastodon fiókkal megtolhatod ezt a bejegyzést, hogy megoszd a saját követőiddel.",
+  "interaction_modal.action.reblog": "A folytatáshoz a fiókodból kell megosztanod.",
-  "interaction_modal.description.reply": "Egy Mastodon fiókkal válaszolhatsz erre a bejegyzésre.",
+  "interaction_modal.action.reply": "A folytatáshoz a fiókodból kell válaszolnod rá.",
-  "interaction_modal.description.vote": "Egy Mastodon fiókkal szavazhatsz ebben a szavazásban.",
+  "interaction_modal.action.vote": "A folytatáshoz a fiókodból kell szavaznod.",
-  "interaction_modal.login.action": "Vigyen haza",
+  "interaction_modal.go": "Ugrás",
-  "interaction_modal.login.prompt": "A saját kiszolgálód tartományneve, pl.: mastodon.social",
+  "interaction_modal.no_account_yet": "Még nincs fiókod?",
-  "interaction_modal.no_account_yet": "Nem vagy Mastodonon?",
   "interaction_modal.on_another_server": "Másik kiszolgálón",
   "interaction_modal.on_this_server": "Ezen a kiszolgálón",
-  "interaction_modal.sign_in": "Nem vagy bejelentkezve ezen a kiszolgálón. Hol van a fiókod hosztolva?",
-  "interaction_modal.sign_in_hint": "Tip: Ez az a weboldal, ahol regisztráltál. Ha nem emlékszel, keresd meg az üdvözlőlevelet a bejövő leveleid között. Beírhatod a teljes felhasználónevedet is! (pl.: @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "{name} bejegyzésének megjelölése kedvencként",
   "interaction_modal.title.follow": "{name} követése",
   "interaction_modal.title.reblog": "{name} bejegyzésének megtolása",
   "interaction_modal.title.reply": "Válasz {name} bejegyzésére",
   "interaction_modal.title.vote": "Szavazz {name} szavazásában",
+  "interaction_modal.username_prompt": "Például {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Adatvédelmi szabályzat",
   "recommended": "Ajánlott",
   "refresh": "Frissítés",
-  "regeneration_indicator.label": "Betöltés…",
+  "regeneration_indicator.please_stand_by": "Kis türelmet.",
-  "regeneration_indicator.sublabel": "A kezdőlapod hírfolyama épp készül!",
+  "regeneration_indicator.preparing_your_home_feed": "Kezdőlapi hírfolyam előkészítése…",
   "relative_time.days": "{number}n",
   "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}",
   "relative_time.full.hours": "{number, plural, one {# órája} other {# órája}}",
@@ -786,7 +784,7 @@
   "search_results.no_search_yet": "Próbálj meg bejegyzések, profilok vagy címkék után keresni.",
   "search_results.see_all": "Összes megtekintése",
   "search_results.statuses": "Bejegyzések",
-  "search_results.title": "\"{q}\" keresése",
+  "search_results.title": "Keresés erre: „{q}”",
   "server_banner.about_active_users": "Az elmúlt 30 napban ezt a kiszolgálót használók száma (Havi aktív felhasználók)",
   "server_banner.active_users": "aktív felhasználó",
   "server_banner.administered_by": "Adminisztrátor:",

app/javascript/mastodon/locales/hy.json

@@ -352,8 +352,6 @@
   "privacy_policy.last_updated": "Վերջին անգամ թարմացուել է՝ {date}",
   "privacy_policy.title": "Գաղտնիութեան քաղաքականութիւն",
   "refresh": "Թարմացնել",
-  "regeneration_indicator.label": "Բեռնւում է…",
-  "regeneration_indicator.sublabel": "պատրաստւում է հիմնական հոսքդ",
   "relative_time.days": "{number}օր",
   "relative_time.full.days": "{number, plural, one {# օր} other {# օր}} առաջ",
   "relative_time.full.hours": "{number, plural, one {# ժամ} other {# ժամ}} առաջ",

app/javascript/mastodon/locales/ia.json

@@ -253,7 +253,7 @@
   "domain_block_modal.you_will_lose_relationships": "Tu perdera tote le sequitores e personas que tu seque de iste servitor.",
   "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes de usatores sur iste servitor.",
   "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
-  "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
+  "domain_pill.activitypub_like_language": "ActivityPub es le linguage commun que Mastodon parla con altere retes social.",
   "domain_pill.server": "Servitor",
   "domain_pill.their_handle": "Su pseudonymo:",
   "domain_pill.their_server": "Su casa digital, ubi vive tote su messages.",
@@ -387,7 +387,7 @@
   "hints.profiles.see_more_followers": "Vider plus de sequitores sur {domain}",
   "hints.profiles.see_more_follows": "Vider plus de sequites sur {domain}",
   "hints.profiles.see_more_posts": "Vider plus de messages sur {domain}",
-  "hints.threads.replies_may_be_missing": "Responsas de altere servitores pote esser perdite.",
+  "hints.threads.replies_may_be_missing": "Responsas de altere servitores pote mancar.",
   "hints.threads.see_more": "Vider plus de responsas sur {domain}",
   "home.column_settings.show_reblogs": "Monstrar impulsos",
   "home.column_settings.show_replies": "Monstrar responsas",
@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificationes de personas qui non te seque?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificationes de personas que tu non seque?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificationes de mentiones private non requestate?",
-  "interaction_modal.description.favourite": "Con un conto sur Mastodon, tu pote marcar iste message como favorite pro informar le autor que tu lo apprecia e lo salva pro plus tarde.",
+  "interaction_modal.action.favourite": "Per favor reveni a tu conto pro marcar isto como favorite.",
-  "interaction_modal.description.follow": "Con un conto sur Mastodon, tu pote sequer {name} e reciper su messages in tu fluxo de initio.",
+  "interaction_modal.action.follow": "Per favor reveni a tu conto pro sequer.",
-  "interaction_modal.description.reblog": "Con un conto sur Mastodon, tu pote impulsar iste message pro condivider lo con tu proprie sequitores.",
+  "interaction_modal.action.reblog": "Per favor reveni a tu conto pro impulsar.",
-  "interaction_modal.description.reply": "Con un conto sur Mastodon, tu pote responder a iste message.",
+  "interaction_modal.action.reply": "Per favor reveni a tu conto pro responder.",
-  "interaction_modal.description.vote": "Con un conto sur Mastodon, tu pote votar in iste sondage.",
+  "interaction_modal.action.vote": "Per favor reveni a tu conto pro votar.",
-  "interaction_modal.login.action": "Porta me a casa",
+  "interaction_modal.go": "Revenir",
-  "interaction_modal.login.prompt": "Dominio de tu servitor, p.ex. mastodon.social",
+  "interaction_modal.no_account_yet": "Tu non ha ancora un conto?",
-  "interaction_modal.no_account_yet": "Non sur Mstodon?",
   "interaction_modal.on_another_server": "Sur un altere servitor",
   "interaction_modal.on_this_server": "Sur iste servitor",
-  "interaction_modal.sign_in": "Tu non es in session sur iste servitor. Sur qual servitor se trova tu conto?",
-  "interaction_modal.sign_in_hint": "Consilio: Se tracta del sito web ubi tu te ha inscribite. Si tu non te lo rememora, cerca le e-mail de benvenita in tu cassa de entrata. Tu pote etiam inserer tu pseudonymo complete! (p.ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marcar le message de {name} como favorite",
   "interaction_modal.title.follow": "Sequer {name}",
   "interaction_modal.title.reblog": "Impulsar le message de {name}",
   "interaction_modal.title.reply": "Responder al message de {name}",
   "interaction_modal.title.vote": "Votar in le sondage de {name}",
+  "interaction_modal.username_prompt": "P.ex. {example}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} other {# minutas}}",
@@ -596,7 +594,7 @@
   "notification_requests.explainer_for_limited_account": "Le notificationes de iste conto ha essite filtrate perque le conto ha essite limitate per un moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Le notificationes de iste conto ha essite filtrate perque le conto o su servitor ha essite limitate per un moderator.",
   "notification_requests.maximize": "Maximisar",
-  "notification_requests.minimize_banner": "Minimisar le bandiera del avisos filtrate",
+  "notification_requests.minimize_banner": "Minimisar le bandiera de notificationes filtrate",
   "notification_requests.notifications_from": "Notificationes de {name}",
   "notification_requests.title": "Notificationes filtrate",
   "notification_requests.view": "Vider notificationes",
@@ -638,10 +636,10 @@
   "notifications.policy.accept": "Acceptar",
   "notifications.policy.accept_hint": "Monstrar in le notificationes",
   "notifications.policy.drop": "Ignorar",
-  "notifications.policy.drop_hint": "Inviar al nihil, pro jammais esser vidite ancora",
+  "notifications.policy.drop_hint": "Inviar al vacuo, pro non esser jammais plus vidite",
   "notifications.policy.filter": "Filtrar",
   "notifications.policy.filter_hint": "Inviar al cassa de notificationes filtrate",
-  "notifications.policy.filter_limited_accounts_hint": "Limitate per moderatores de servitor",
+  "notifications.policy.filter_limited_accounts_hint": "Limitate per le moderatores del servitor",
   "notifications.policy.filter_limited_accounts_title": "Contos moderate",
   "notifications.policy.filter_new_accounts.hint": "Create in le ultime {days, plural, one {die} other {# dies}}",
   "notifications.policy.filter_new_accounts_title": "Nove contos",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Politica de confidentialitate",
   "recommended": "Recommendate",
   "refresh": "Refrescar",
-  "regeneration_indicator.label": "Cargamento…",
+  "regeneration_indicator.please_stand_by": "Un momento, per favor.",
-  "regeneration_indicator.sublabel": "Tu fluxo de initio es in preparation!",
+  "regeneration_indicator.preparing_your_home_feed": "Fluxo de initio in preparation…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# die} other {# dies}} retro",
   "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} retro",
@@ -782,8 +780,11 @@
   "search_results.accounts": "Profilos",
   "search_results.all": "Toto",
   "search_results.hashtags": "Hashtags",
+  "search_results.no_results": "Necun resultato.",
+  "search_results.no_search_yet": "Tenta cercar messages, profilos o hashtags.",
   "search_results.see_all": "Vider toto",
   "search_results.statuses": "Messages",
+  "search_results.title": "Recerca de “{q}”",
   "server_banner.about_active_users": "Personas que ha usate iste servitor in le ultime 30 dies (usatores active per mense)",
   "server_banner.active_users": "usatores active",
   "server_banner.administered_by": "Administrate per:",
@@ -801,7 +802,7 @@
   "status.bookmark": "Adder al marcapaginas",
   "status.cancel_reblog_private": "Disfacer impulso",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
-  "status.continued_thread": "Continuation del discussion",
+  "status.continued_thread": "Discussion continuate",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
   "status.detailed_status": "Vista detaliate del conversation",
@@ -810,7 +811,7 @@
   "status.edit": "Modificar",
   "status.edited": "Ultime modification le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
-  "status.embed": "Obtener codice incorporate",
+  "status.embed": "Obtener codice de incorporation",
   "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
@@ -876,7 +877,7 @@
   "upload_form.description": "Describe lo pro le gente con difficultates visual",
   "upload_form.drag_and_drop.instructions": "Pro prender un annexo multimedial, preme sur le barra de spatios o Enter. Trahente lo, usa le claves de flecha pro displaciar le annexo multimedial in un certe direction. Preme le barra de spatios o Enter de novo pro deponer le annexo multimedial in su nove position, o preme sur Escape pro cancellar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le displaciamento ha essite cancellate. Le annexo multimedial {item} ha essite deponite.",
-  "upload_form.drag_and_drop.on_drag_end": "Le annexo de medios {item} ha essite deponite.",
+  "upload_form.drag_and_drop.on_drag_end": "Le annexo multimedial {item} ha essite deponite.",
   "upload_form.drag_and_drop.on_drag_over": "Le annexo multimedial {item} ha essite displaciate.",
   "upload_form.drag_and_drop.on_drag_start": "Le annexo multimedial {item} ha essite prendite.",
   "upload_form.edit": "Modificar",

app/javascript/mastodon/locales/id.json

@@ -336,9 +336,6 @@
   "home.hide_announcements": "Sembunyikan pengumuman",
   "home.pending_critical_update.link": "Lihat pembaruan",
   "home.show_announcements": "Tampilkan pengumuman",
-  "interaction_modal.description.follow": "Dengan sebuah akun di Mastodon, Anda bisa mengikuti {name} untuk menerima kirimannya di beranda Anda.",
-  "interaction_modal.description.reblog": "Dengan sebuah akun di Mastodon, Anda bisa mem-boost kiriman ini untuk membagikannya ke pengikut Anda sendiri.",
-  "interaction_modal.description.reply": "Dengan sebuah akun di Mastodon, Anda bisa menanggapi kiriman ini.",
   "interaction_modal.on_another_server": "Di server lain",
   "interaction_modal.on_this_server": "Di server ini",
   "interaction_modal.title.follow": "Ikuti {name}",
@@ -473,8 +470,6 @@
   "privacy_policy.last_updated": "Terakhir diperbarui {date}",
   "privacy_policy.title": "Kebijakan Privasi",
   "refresh": "Segarkan",
-  "regeneration_indicator.label": "Memuat…",
-  "regeneration_indicator.sublabel": "Beranda Anda sedang disiapkan!",
   "relative_time.days": "{number}h",
   "relative_time.full.days": "{number, plural, other {# hari}} yang lalu",
   "relative_time.full.hours": "{number, plural, other {# jam}} yang lalu",

app/javascript/mastodon/locales/ie.json

@@ -333,17 +333,8 @@
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Urgent actualisation de securitá disponibil!",
   "home.show_announcements": "Monstrar proclamationes",
-  "interaction_modal.description.favourite": "Con un conto de Mastodon, tu posse favoritisar ti-ci posta por informar li autor pri quant mult tu aprecia it e conservar it por plu tard.",
-  "interaction_modal.description.follow": "Con un conto de Mastodon, tu posse sequer {name} por reciver su postas in tui hemal témpor-linea.",
-  "interaction_modal.description.reblog": "Con un conto de Mastodon, tu posse boostar ti-ci posta por distribuer it a tui propri sequitores.",
-  "interaction_modal.description.reply": "Con un conto de Mastodon, tu posse responder a ti-ci posta.",
-  "interaction_modal.login.action": "Retorna a hem",
-  "interaction_modal.login.prompt": "Dominia de tui hemal servitor, p.ex. mastodon.social",
-  "interaction_modal.no_account_yet": "Ne sur Mastodon?",
   "interaction_modal.on_another_server": "Sur un servitor diferent",
   "interaction_modal.on_this_server": "Sur ti-ci servitor",
-  "interaction_modal.sign_in": "Tu ne ha initiat session che ti-ci servitor. U logia tui conto?",
-  "interaction_modal.sign_in_hint": "Nota: To es li websitu u tu adheret. Si tu ne rememora, sercha li benevenit-email in tui inbuxe. Tu anc posse introducter tui plen usator-nómine! (p.ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favoritisar li posta de {name}",
   "interaction_modal.title.follow": "Sequer {name}",
   "interaction_modal.title.reblog": "Boostar li posta de {name}",
@@ -543,8 +534,6 @@
   "privacy_policy.title": "Politica pri Privatie",
   "recommended": "Recomandat",
   "refresh": "Recargar",
-  "regeneration_indicator.label": "Cargant…",
-  "regeneration_indicator.sublabel": "On es preparant tui hemal témpor-linea!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "Ante {number, plural, one {# die} other {# dies}}",
   "relative_time.full.hours": "Ante {number, plural, one {# hor} other {# hores}}",

app/javascript/mastodon/locales/io.json

@@ -371,17 +371,8 @@
   "ignore_notifications_modal.not_followers_title": "Ka ignorar savigi de personi qua ne sequas vu?",
   "ignore_notifications_modal.not_following_title": "Ka ignorar savigi de personi quan vu ne sequas?",
   "ignore_notifications_modal.private_mentions_title": "Ka ignorar savigi de nekonocita privata mencionii?",
-  "interaction_modal.description.favourite": "Kun konto che Mastodon, vu povas favorizar ca posto por savigar la autoro ke vu prizas ol e sparar ol por pose.",
-  "interaction_modal.description.follow": "Per konto che Mastodon, vu povas sequar {name} por ganar ola posti en vua hemniuzeto.",
-  "interaction_modal.description.reblog": "Per konto che Mastodon, vu povas repetar ca posti por dissemar lo a vua propra sequati.",
-  "interaction_modal.description.reply": "Per konto che Mastodon, vu povas respondar ca posto.",
-  "interaction_modal.login.action": "Irar a hemo",
-  "interaction_modal.login.prompt": "Domeno di vua hemala servilo, ex. mastodon.social",
-  "interaction_modal.no_account_yet": "Ka vu ne havas Mastodon-konto?",
   "interaction_modal.on_another_server": "Che diferanta servilo",
   "interaction_modal.on_this_server": "Che ca servilo",
-  "interaction_modal.sign_in": "Vu ne eniris ca servilo. Ube vua konto lokizesas?",
-  "interaction_modal.sign_in_hint": "Averto: To es la retsituo ube vu kreis konto. Se vu ne rimemoras, serchez vua bonvenanta e-posto. Vu anke povas enpozar vua kompleta uzantnomo! (ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorizez ca posto da {name}",
   "interaction_modal.title.follow": "Sequez {name}",
   "interaction_modal.title.reblog": "Repetez posto di {name}",
@@ -627,8 +618,6 @@
   "privacy_policy.title": "Privatesguidilo",
   "recommended": "Rekomendata",
   "refresh": "Rifreshez",
-  "regeneration_indicator.label": "Chargas…",
-  "regeneration_indicator.sublabel": "Vua hemniuzeto preparesas!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dio} other {# dii}} ante nun",
   "relative_time.full.hours": "{number, plural, one {# horo} other {# hori}} ante nun",

app/javascript/mastodon/locales/is.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Hunsa tilkynningar frá fólki sem fylgist ekki með þér?",
   "ignore_notifications_modal.not_following_title": "Hunsa tilkynningar frá fólki sem þú fylgist ekki með?",
   "ignore_notifications_modal.private_mentions_title": "Hunsa tilkynningar frá óumbeðnum tilvísunum í einkaspjalli?",
-  "interaction_modal.description.favourite": "Með notandaaðgangi á Mastodon geturðu sett þessa færslu í eftirlæti og þannig látið höfundinn vita að þú kunnir að meta hana og vistað hana til síðari tíma.",
+  "interaction_modal.action.favourite": "Til að halda áfram þarftu að setja eitthvað í eftirlæti, verandi inni á aðgangnum þínum.",
-  "interaction_modal.description.follow": "Með notandaaðgangi á Mastodon geturðu fylgst með {name} og fengið færslur frá viðkomandi í heimastreymið þitt.",
+  "interaction_modal.action.follow": "Til að halda áfram þarftu að fylgjast með einhverjum, verandi inni á aðgangnum þínum.",
-  "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.action.reblog": "Til að halda áfram þarftu að endurbirta frá einhverjum, verandi inni á aðgangnum þínum.",
-  "interaction_modal.description.reply": "Með notandaaðgangi á Mastodon geturðu svarað þessari færslu.",
+  "interaction_modal.action.reply": "Til að halda áfram þarftu að svara einhverjum, verandi inni á aðgangnum þínum.",
-  "interaction_modal.description.vote": "Þú getur greitt atkvæði í þessari könnun ef þú ert með aðgang á Mastodon.",
+  "interaction_modal.action.vote": "Til að halda áfram þarftu að greiða atkvæði, verandi inni á aðgangnum þínum.",
-  "interaction_modal.login.action": "Fara á heimastreymið mitt",
+  "interaction_modal.go": "Áfram",
-  "interaction_modal.login.prompt": "Lén heimanetþjónsins þíns, t.d. mastodon.social",
+  "interaction_modal.no_account_yet": "Ertu ekki ennþá með aðgang?",
-  "interaction_modal.no_account_yet": "Ekki á Mastodon?",
   "interaction_modal.on_another_server": "Á öðrum netþjóni",
   "interaction_modal.on_this_server": "Á þessum netþjóni",
-  "interaction_modal.sign_in": "Þú ert ekki skráð/ur inn á þennan netþjón. Hvar er aðgangurinn þinn hýstur?",
-  "interaction_modal.sign_in_hint": "Ábending: Það er vefsvæðið þar sem þú skráðir þig. Ef þú manst ekki hvar, geturðu leitað að kynningarpóstinum í pósthólfinu þínu. Þú getur líka sett inn fullt notandanafn þitt (t.d. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Setja færsluna frá {name} í eftirlæti",
   "interaction_modal.title.follow": "Fylgjast með {name}",
   "interaction_modal.title.reblog": "Endurbirta færsluna frá {name}",
   "interaction_modal.title.reply": "Svara færslunni frá {name}",
   "interaction_modal.title.vote": "Greiða atkvæði í könnun á vegum {name}",
+  "interaction_modal.username_prompt": "Til dæmis {example}",
   "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}}",
@@ -549,6 +547,8 @@
   "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.favourite_pm": "{name} setti í eftirlæti færslu í einkaspjalli þar sem þú minntist á viðkomandi",
+  "notification.favourite_pm.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót} other {# í viðbót}}</a> settu í eftirlæti færslu í einkaspjalli þar sem þú minntist á viðkomandi",
   "notification.follow": "{name} fylgist með þér",
   "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# í viðbót fylgdist} other {# í viðbót fylgdust}}</a> með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
@@ -695,8 +695,8 @@
   "privacy_policy.title": "Persónuverndarstefna",
   "recommended": "Mælt með",
   "refresh": "Endurlesa",
-  "regeneration_indicator.label": "Hleð inn…",
+  "regeneration_indicator.please_stand_by": "Hinkraðu við.",
-  "regeneration_indicator.sublabel": "Verið er að útbúa heimastreymið þitt!",
+  "regeneration_indicator.preparing_your_home_feed": "Undirbý heimastreymið þitt…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "Fyrir {number, plural, one {# degi} other {# dögum}} síðan",
   "relative_time.full.hours": "Fyrir {number, plural, one {# klukkustund} other {# klukkustundum}} síðan",
@@ -780,8 +780,11 @@
   "search_results.accounts": "Notendasnið",
   "search_results.all": "Allt",
   "search_results.hashtags": "Myllumerki",
+  "search_results.no_results": "Engar niðurstöður.",
+  "search_results.no_search_yet": "Prófaðu að leita að færslum, notendum eða myllumerkjum.",
   "search_results.see_all": "Sjá allt",
   "search_results.statuses": "Færslur",
+  "search_results.title": "Leita að {q}\"",
   "server_banner.about_active_users": "Folk sem hefur notað þennan netþjón síðustu 30 daga (virkir notendur í mánuðinum)",
   "server_banner.active_users": "virkir notendur",
   "server_banner.administered_by": "Stýrt af:",

app/javascript/mastodon/locales/it.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorare le notifiche delle persone che non ti seguono?",
   "ignore_notifications_modal.not_following_title": "Ignorare le notifiche delle persone che non segui?",
   "ignore_notifications_modal.private_mentions_title": "Ignorare le notifiche provenienti da menzioni private indesiderate?",
-  "interaction_modal.description.favourite": "Con un account su Mastodon, puoi aggiungere questo post ai preferiti per far sapere all'autore che lo apprezzi e salvarlo per dopo.",
+  "interaction_modal.action.favourite": "Per continuare, devi aggiungere ai preferiti il ​​tuo account.",
-  "interaction_modal.description.follow": "Con un profilo di Mastodon, puoi seguire {name} per ricevere i suoi post nel feed della tua home.",
+  "interaction_modal.action.follow": "Per continuare, devi seguire dal tuo account.",
-  "interaction_modal.description.reblog": "Con un profilo di Mastodon, puoi rebloggare questo post per condividerlo con i tuoi seguaci.",
+  "interaction_modal.action.reblog": "Per continuare, devi condividere dal tuo account.",
-  "interaction_modal.description.reply": "Con un profilo di Mastodon, puoi rispondere a questo post.",
+  "interaction_modal.action.reply": "Per continuare, devi rispondere dal tuo account.",
-  "interaction_modal.description.vote": "Con un account su Mastodon puoi votare in questo sondaggio.",
+  "interaction_modal.action.vote": "Per continuare, devi votare dal tuo account.",
-  "interaction_modal.login.action": "Portami alla pagina iniziale",
+  "interaction_modal.go": "Vai",
-  "interaction_modal.login.prompt": "Dominio del tuo server principale, ad esempio mastodon.social",
+  "interaction_modal.no_account_yet": "Non hai ancora un account?",
-  "interaction_modal.no_account_yet": "Non su Mastodon?",
   "interaction_modal.on_another_server": "Su un altro server",
   "interaction_modal.on_this_server": "Su questo server",
-  "interaction_modal.sign_in": "Non sei connesso a questo server. Dove è ospitato il tuo account?",
-  "interaction_modal.sign_in_hint": "Suggerimento: questo è il sito in cui ti sei registrato. Se non ti ricordi, cerca l'e-mail di benvenuto nella tua casella di posta. Puoi anche inserire il tuo nome utente completo! (es. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Contrassegna il post di {name} come preferito",
   "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}",
+  "interaction_modal.username_prompt": "Es. {example}",
   "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}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Politica sulla Privacy",
   "recommended": "Consigliato",
   "refresh": "Ricarica",
-  "regeneration_indicator.label": "Caricamento…",
+  "regeneration_indicator.please_stand_by": "Si prega di rimanere in attesa.",
-  "regeneration_indicator.sublabel": "Il feed della tua home è in preparazione!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparazione della tua home feed in corso…",
   "relative_time.days": "{number}g",
   "relative_time.full.days": "{number, plural, one {# giorno} other {# giorni}} fa",
   "relative_time.full.hours": "{number, plural, one {# ora} other {# ore}} fa",

app/javascript/mastodon/locales/ja.json

@@ -488,6 +488,7 @@
   "footer.privacy_policy": "プライバシーポリシー",
   "footer.source_code": "ソースコードを表示",
   "footer.status": "ステータス",
+  "footer.terms_of_service": "サービス利用規約",
   "generic.saved": "保存しました",
   "getting_started.heading": "スタート",
   "hashtag.admin_moderation": "#{name}のモデレーション画面を開く",
@@ -532,18 +533,8 @@
   "ignore_notifications_modal.not_followers_title": "本当に「フォローされていないアカウントからの通知」を無視するようにしますか？",
   "ignore_notifications_modal.not_following_title": "本当に「フォローしていないアカウントからの通知」を無視するようにしますか？",
   "ignore_notifications_modal.private_mentions_title": "本当に「外部からの非公開の返信」を無視するようにしますか？",
-  "interaction_modal.description.favourite": "Mastodonのアカウントがあれば投稿をお気に入り登録して投稿者に気持ちを伝えたり、あとで見返すことができます。",
-  "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にアカウントがない場合は",
   "interaction_modal.on_another_server": "別のサーバー",
   "interaction_modal.on_this_server": "このサーバー",
-  "interaction_modal.sign_in": "このサーバーにアカウントがなくても、ほかのサーバーや互換性のあるプラットフォームのアカウントを使用できます。",
-  "interaction_modal.sign_in_hint": "ワンポイント: ここでは自分のアカウントのドメインを入力します。うまくいかない場合はドメインまで含めた完全なユーザー名を入力してみてください (例: @Mastodon@mastodon.social)。ドメインやユーザー名は登録完了時のメールに記載されています。",
   "interaction_modal.title.favourite": "{name}さんの投稿をお気に入り登録",
   "interaction_modal.title.follow": "{name}さんをフォロー",
   "interaction_modal.title.reblog": "{name}さんの投稿をブースト",
@@ -689,6 +680,8 @@
   "notification.emoji_reaction.name_and_others_with_link": "{name}さんと<a>{count, plural, other {他#名}}</a>があなたの投稿に絵文字をつけました",
   "notification.favourite": "{name}さんがお気に入りしました",
   "notification.favourite.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
+  "notification.favourite_pm": "{name} があなたのプライベートメンションをお気に入りにしました",
+  "notification.favourite_pm.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}さんがあなたにフォローリクエストしました",
@@ -857,8 +850,8 @@
   "reaction_deck.remove": "削除",
   "recommended": "おすすめ",
   "refresh": "更新",
-  "regeneration_indicator.label": "読み込み中…",
+  "regeneration_indicator.please_stand_by": "しばらくお待ちください。",
-  "regeneration_indicator.sublabel": "ホームタイムラインは準備中です！",
+  "regeneration_indicator.preparing_your_home_feed": "ホームタイムライン準備中…",
   "relative_time.days": "{number}日前",
   "relative_time.full.days": "{number}日前",
   "relative_time.full.hours": "{number}時間前",
@@ -954,8 +947,11 @@
   "search_results.accounts": "ユーザー",
   "search_results.all": "すべて",
   "search_results.hashtags": "ハッシュタグ",
+  "search_results.no_results": "結果なし。",
+  "search_results.no_search_yet": "投稿、プロフィール、またはハッシュタグを検索してみてください。",
   "search_results.see_all": "すべて表示",
   "search_results.statuses": "投稿",
+  "search_results.title": "「{q}」を検索",
   "server_banner.about_active_users": "過去30日間にこのサーバーを使用している人 (月間アクティブユーザー)",
   "server_banner.active_users": "人のアクティブユーザー",
   "server_banner.administered_by": "管理者",
@@ -1047,6 +1043,7 @@
   "subscribed_languages.target": "{target}さんの購読言語を変更します",
   "tabs_bar.home": "ホーム",
   "tabs_bar.notifications": "通知",
+  "terms_of_service.title": "サービス利用規約",
   "time_remaining.days": "残り{number}日",
   "time_remaining.hours": "残り{number}時間",
   "time_remaining.minutes": "残り{number}分",

app/javascript/mastodon/locales/ka.json

@@ -175,8 +175,6 @@
   "notifications.group": "{count} შეტყობინება",
   "privacy.change": "სტატუსის კონფიდენციალურობის მითითება",
   "privacy.public.short": "საჯარო",
-  "regeneration_indicator.label": "იტვირთება…",
-  "regeneration_indicator.sublabel": "თქვენი სახლის ლენტა მზადდება!",
   "relative_time.days": "{number}დღ",
   "relative_time.hours": "{number}სთ",
   "relative_time.just_now": "ახლა",

app/javascript/mastodon/locales/kab.json

@@ -278,17 +278,8 @@
   "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
   "home.pending_critical_update.link": "Wali ileqman",
   "home.show_announcements": "Ssken-d ulɣuyen",
-  "interaction_modal.description.favourite": "S umiḍan ɣef Mastodon, tzemreḍ ad tesmenyifeḍ tasuffeɣt-a akken ad teǧǧeḍ amaru ad iẓer belli tḥemmleḍ-tt u ad tt-id-tsellkeḍ i ticki.",
-  "interaction_modal.description.follow": "S umiḍan deg Mastodon, tzemreḍ ad tḍefreḍ {name} akken ad d-teṭṭfeḍ iznan-is deg lxiḍ-ik·im agejdan.",
-  "interaction_modal.description.reblog": "S umiḍan deg Mastodon, tzemreḍ ad tesnerniḍ tasuffeɣt-a akken ad tt-tebḍuḍ d yineḍfaren-ik·im.",
-  "interaction_modal.description.reply": "S umiḍan deg Mastodon, tzemreḍ ad d-terreḍ ɣef tsuffeɣt-a.",
-  "interaction_modal.login.action": "Awi-yi ɣer uqeddac-iw",
-  "interaction_modal.login.prompt": "Taɣult n uqeddac-ik·im agejdan, amedya mastodon.social",
-  "interaction_modal.no_account_yet": "Ulac-ik·ikem deg Maṣṭudun?",
   "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
-  "interaction_modal.sign_in": "Ur tekcimeḍ ara ɣer uqeddac-a. Anda yella umiḍan-ik·im ?",
-  "interaction_modal.sign_in_hint": "Ihi : Wa d asmel ideg tjerdeḍ. Ma ur tecfiḍ ara, nadi imayl n ummager deg tenkult-ik·im. Tzemreḍ daɣen ad d-tefkeḍ isem-ik·im n useqdac ummid ! (amedya @Mastodon@mastodon.social)",
   "interaction_modal.title.follow": "Ḍfer {name}",
   "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
   "intervals.full.days": "{number, plural, one {# wass} other {# wussan}}",
@@ -469,8 +460,6 @@
   "privacy_policy.title": "Tasertit tabaḍnit",
   "recommended": "Yettuwelleh",
   "refresh": "Smiren",
-  "regeneration_indicator.label": "Yessalay-d…",
-  "regeneration_indicator.sublabel": "Tasuddemt tagejdant ara d-tettwaheggay!",
   "relative_time.days": "{number}u",
   "relative_time.full.just_now": "tura kan",
   "relative_time.hours": "{number}isr",

app/javascript/mastodon/locales/kk.json

@@ -262,8 +262,6 @@
   "privacy.change": "Құпиялылықты реттеу",
   "privacy.public.short": "Ашық",
   "refresh": "Жаңарту",
-  "regeneration_indicator.label": "Жүктеу…",
-  "regeneration_indicator.sublabel": "Жергілікті желі құрылуда!",
   "relative_time.days": "{number}күн",
   "relative_time.hours": "{number}сағ",
   "relative_time.just_now": "жаңа",

app/javascript/mastodon/locales/ko.json

@@ -407,18 +407,8 @@
   "ignore_notifications_modal.not_followers_title": "나를 팔로우하지 않는 사람들의 알림을 무시할까요?",
   "ignore_notifications_modal.not_following_title": "내가 팔로우하지 않는 사람들의 알림을 무시할까요?",
   "ignore_notifications_modal.private_mentions_title": "요청하지 않은 개인 멘션 알림을 무시할까요?",
-  "interaction_modal.description.favourite": "마스토돈 계정을 통해, 게시물을 좋아하는 것으로 작성자에게 호의를 표하고 나중에 보기 위해 저장할 수 있습니다.",
-  "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 계정이 없나요?",
   "interaction_modal.on_another_server": "다른 서버에",
   "interaction_modal.on_this_server": "이 서버에서",
-  "interaction_modal.sign_in": "이 서버에 로그인하지 않았습니다. 계정이 어디에 속해있습니까?",
-  "interaction_modal.sign_in_hint": "팁: 여러분이 가입한 사이트입니다. 만약 기억이 나지 않는다면 가입환영 이메일을 찾아보는 것도 좋습니다. 전체 사용자이름(예: @mastodon@mastodon.social)을 넣어도 됩니다!",
   "interaction_modal.title.favourite": "{name} 님의 게시물을 좋아하기",
   "interaction_modal.title.follow": "{name} 님을 팔로우",
   "interaction_modal.title.reblog": "{name} 님의 게시물을 부스트",
@@ -641,7 +631,7 @@
   "notifications.policy.drop_hint": "공허로 보내고, 다시는 보지 않습니다",
   "notifications.policy.filter": "필터",
   "notifications.policy.filter_hint": "걸러진 알림 목록으로 보내기",
-  "notifications.policy.filter_limited_accounts_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": "새 계정",
@@ -697,8 +687,8 @@
   "privacy_policy.title": "개인정보처리방침",
   "recommended": "추천함",
   "refresh": "새로고침",
-  "regeneration_indicator.label": "불러오는 중…",
+  "regeneration_indicator.please_stand_by": "잠시 기다려주세요.",
-  "regeneration_indicator.sublabel": "홈 피드를 준비하고 있습니다!",
+  "regeneration_indicator.preparing_your_home_feed": "홈 피드를 준비 중입니다…",
   "relative_time.days": "{number}일 전",
   "relative_time.full.days": "{number} 일 전",
   "relative_time.full.hours": "{number} 시간 전",
@@ -782,8 +772,11 @@
   "search_results.accounts": "프로필",
   "search_results.all": "전부",
   "search_results.hashtags": "해시태그",
+  "search_results.no_results": "결과가 없습니다.",
+  "search_results.no_search_yet": "게시물, 프로필, 해시태그를 검색해보세요.",
   "search_results.see_all": "모두 보기",
   "search_results.statuses": "게시물",
+  "search_results.title": "\"{q}\"에 대한 검색",
   "server_banner.about_active_users": "30일 동안 이 서버를 사용한 사람들 (월간 활성 이용자)",
   "server_banner.active_users": "활성 사용자",
   "server_banner.administered_by": "관리자:",

app/javascript/mastodon/locales/ku.json

@@ -243,9 +243,6 @@
   "home.column_settings.show_replies": "Bersivan nîşan bide",
   "home.hide_announcements": "Reklaman veşêre",
   "home.show_announcements": "Reklaman nîşan bide",
-  "interaction_modal.description.follow": "Bi ajimêrekê li ser Mastodon, tu dikarî {name} bişopînî da ku şandiyan li ser rojeva rûpela xwe bi dest bixe.",
-  "interaction_modal.description.reblog": "Bi ajimêrekê li ser Mastodon, tu dikarî vê şandiyê bilind bikî da ku wê bi şopînerên xwe re parve bikî.",
-  "interaction_modal.description.reply": "Bi ajimêrekê li ser Mastodon, tu dikarî bersiva vê şandiyê bidî.",
   "interaction_modal.on_another_server": "Li ser rajekareke cuda",
   "interaction_modal.on_this_server": "Li ser ev rajekar",
   "interaction_modal.title.follow": "{name} bişopîne",
@@ -376,8 +373,6 @@
   "privacy_policy.last_updated": "Rojanekirina dawî {date}",
   "privacy_policy.title": "Politîka taybetiyê",
   "refresh": "Nû bike",
-  "regeneration_indicator.label": "Tê barkirin…",
-  "regeneration_indicator.sublabel": "Naveroka rûpela sereke ya te tê amedekirin!",
   "relative_time.days": "{number}r",
   "relative_time.full.days": "{number, plural, one {# roj} other {# roj}} berê",
   "relative_time.full.hours": "{number, plural, one {# demjimêr} other {# demjimêr}} berê",

app/javascript/mastodon/locales/kw.json

@@ -261,8 +261,6 @@
   "privacy.change": "Chanjya privetter an post",
   "privacy.public.short": "Poblek",
   "refresh": "Daskarga",
-  "regeneration_indicator.label": "Ow karga…",
-  "regeneration_indicator.sublabel": "Yma agas lin dre ow pos pareusys!",
   "relative_time.days": "{number}d",
   "relative_time.hours": "{number}o",
   "relative_time.just_now": "lemmyn",

app/javascript/mastodon/locales/la.json

@@ -95,10 +95,6 @@
   "hashtags.and_other": "…et {count, plural, other {# plus}}",
   "ignore_notifications_modal.filter_to_act_users": "Adhuc poteris accipere, reicere, vel referre usores",
   "ignore_notifications_modal.filter_to_review_separately": "Percolantur notificatiōnes separātim recensere potes",
-  "interaction_modal.description.favourite": "Cum accūntū in Mastodon, hanc postem praeferre potes ut auctōrī indicēs tē eam aestimāre et ad posterius servēs.",
-  "interaction_modal.description.follow": "Cum accūntū in Mastodon, {name} sequī potes ut eōrum postēs in tēlā domī tuā recipiās.",
-  "interaction_modal.description.reply": "Mastodon de Ratione, huic nuntio respondere potes.",
-  "interaction_modal.sign_in": "Ad hōc servientem nōn dēlūxī. Ubi accūntum tuum hospitātum est?",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horae}}",
   "intervals.full.minutes": "{number, plural, one {# minutum} other {# minuta}}",
@@ -177,7 +173,6 @@
   "poll_button.remove_poll": "Auferre electionem",
   "privacy.change": "Adjust status privacy",
   "privacy.public.short": "Coram publico",
-  "regeneration_indicator.sublabel": "Tua domus feed praeparātur!",
   "relative_time.full.days": "{number, plural, one {# ante die} other {# ante dies}}",
   "relative_time.full.hours": "{number, plural, one {# ante horam} other {# ante horas}}",
   "relative_time.full.just_now": "nunc",

app/javascript/mastodon/locales/lad.json

@@ -363,18 +363,8 @@
   "ignore_notifications_modal.not_followers_title": "Inyorar avizos de personas a las kualas no te sigen?",
   "ignore_notifications_modal.not_following_title": "Inyorar avizos de personas a las kualas no siges?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar avizos de mensyones privadas no solisitadas?",
-  "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
-  "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
-  "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
-  "interaction_modal.description.reply": "Kon un kuento en Mastodon, puedes arispondir a esta publikasyon.",
-  "interaction_modal.description.vote": "Kon un kuento en Mastodon, puedes votar en esta anketa.",
-  "interaction_modal.login.action": "Va a tu sirvidor",
-  "interaction_modal.login.prompt": "Domeno del sirvidor de tu kuento, por enshemplo mastodon.social",
-  "interaction_modal.no_account_yet": "No tyenes kuento de Mastodon?",
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
-  "interaction_modal.sign_in": "No estas konektado kon este sirvidor. Ande tyenes tu kuento?",
-  "interaction_modal.sign_in_hint": "Konsejo: Akel es el sitio adonde te enrejistrates. Si no lo akodras, bushka el mesaj de posta elektronika de bienvenida en tu kuti de arivo. Tambien puedes eskrivir tu nombre de utilizador kompleto (por enshemplo @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
   "interaction_modal.title.follow": "Sige a {name}",
   "interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
@@ -592,8 +582,6 @@
   "privacy_policy.title": "Politika de privasita",
   "recommended": "Rekomendado",
   "refresh": "Arefreska",
-  "regeneration_indicator.label": "Eskargando…",
-  "regeneration_indicator.sublabel": "Tu linya de tiempo prinsipala esta preparando!",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "antes {number, plural, one {# diya} other {# diyas}}",
   "relative_time.full.hours": "antes {number, plural, one {# ora} other {# oras}}",

app/javascript/mastodon/locales/lt.json

@@ -403,23 +403,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignoruoti pranešimus iš žmonių, kurie tave neseka?",
   "ignore_notifications_modal.not_following_title": "Ignoruoti pranešimus iš žmonių, kuriuos neseki?",
   "ignore_notifications_modal.private_mentions_title": "Ignoruoti pranešimus iš neprašytų privačių paminėjimų?",
-  "interaction_modal.description.favourite": "Su Mastodon paskyra gali pamėgti šį įrašą, kad autorius (-ė) žinotų, jog vertinti tai ir išsaugoti jį vėliau.",
+  "interaction_modal.action.favourite": "Kad tęstumėte, turite pamėgti iš savo paskyros.",
-  "interaction_modal.description.follow": "Su Mastodon paskyra gali sekti {name}, kad gautum jų įrašus į pagrindinį srautą.",
+  "interaction_modal.action.follow": "Kad tęstumėte, turite sekti iš savo paskyros.",
-  "interaction_modal.description.reblog": "Su Mastodon paskyra gali pakelti šią įrašą ir pasidalyti juo su savo sekėjais.",
+  "interaction_modal.action.reblog": "Kad tęstumėte, turite pasidalinti iš savo paskyros.",
-  "interaction_modal.description.reply": "Su Mastodon paskyra gali atsakyti į šį įrašą.",
+  "interaction_modal.action.reply": "Kad tęstumėte, turite atsakyti iš savo paskyros.",
-  "interaction_modal.description.vote": "Su „Mastodon“ paskyra galite balsuoti šioje apklausoje.",
+  "interaction_modal.action.vote": "Kad tęstumėte, turite balsuoti iš savo paskyros.",
-  "interaction_modal.login.action": "Į pagrindinį puslapį",
+  "interaction_modal.go": "Eiti",
-  "interaction_modal.login.prompt": "Tavo pagrindinio serverio domenas, pvz., mastodon.social.",
+  "interaction_modal.no_account_yet": "Dar neturite paskyros?",
-  "interaction_modal.no_account_yet": "Nesi Mastodon?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
-  "interaction_modal.sign_in": "Nesi prisijungęs (-usi) prie šio serverio. Kur yra talpinama tavo paskyra?",
-  "interaction_modal.sign_in_hint": "Patarimas: tai svetainė, kurioje užsiregistravai. Jei neprisimeni, ieškok sveikinimo el. laiško savo pašto dėžutėje. Taip pat gali įvesti visą savo naudotojo vardą (pvz., @Mastodon@mastodon.social).",
   "interaction_modal.title.favourite": "Pamėgti {name} įrašą",
   "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",
+  "interaction_modal.username_prompt": "Pvz., {example}",
   "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ų}}",
@@ -684,8 +682,8 @@
   "privacy_policy.title": "Privatumo politika",
   "recommended": "Rekomenduojama",
   "refresh": "Atnaujinti",
-  "regeneration_indicator.label": "Kraunama…",
+  "regeneration_indicator.please_stand_by": "Laukite.",
-  "regeneration_indicator.sublabel": "Ruošiamas tavo pagrindinis srautas!",
+  "regeneration_indicator.preparing_your_home_feed": "Ruošimas jūsų pagrindinis srautas…",
   "relative_time.days": "{number} d.",
   "relative_time.full.days": "prieš {number, plural, one {# dieną} few {# dienas} many {# dienos} other {# dienų}}",
   "relative_time.full.hours": "prieš {number, plural, one {# valandą} few {# valandas} many {# valandos} other {# valandų}}",
@@ -769,8 +767,11 @@
   "search_results.accounts": "Profiliai",
   "search_results.all": "Visi",
   "search_results.hashtags": "Saitažodžiai",
+  "search_results.no_results": "Nėra rezultatų.",
+  "search_results.no_search_yet": "Pabandykite ieškoti įrašų, profilių arba saitažodžių.",
   "search_results.see_all": "Žiūrėti viską",
   "search_results.statuses": "Įrašai",
+  "search_results.title": "Paieška užklausai „{q}“",
   "server_banner.about_active_users": "Žmonės, kurie naudojosi šiuo serveriu per pastarąsias 30 dienų (mėnesio aktyvūs naudotojai)",
   "server_banner.active_users": "aktyvūs naudotojai",
   "server_banner.administered_by": "Administruoja:",

app/javascript/mastodon/locales/lv.json

@@ -353,17 +353,8 @@
   "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.",
-  "interaction_modal.description.reply": "Ar Mastodon kontu tu vari atbildēt uz šo ziņu.",
-  "interaction_modal.login.action": "Nogādāt mani mājās",
-  "interaction_modal.login.prompt": "Tavas mājvietas servera domēns, piem., mastodon.social",
-  "interaction_modal.no_account_yet": "Neesi Mastodon?",
   "interaction_modal.on_another_server": "Citā serverī",
   "interaction_modal.on_this_server": "Šajā serverī",
-  "interaction_modal.sign_in": "Tu neesi pieteicies šajā serverī. Kur tiek mitināts Tavs konts?",
-  "interaction_modal.sign_in_hint": "Padoms: tā ir tīmekļvietne, kurā Tu reģistrējies. Ja neatceries, jāmeklē sveiciena e-pasts savā iesūtnē. Vari arī ievadīt pilnu lietotājvārdu (piem., @Mastodon@mastodon.social).",
   "interaction_modal.title.favourite": "Pievienot {name} ziņu izlasei",
   "interaction_modal.title.follow": "Sekot {name}",
   "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
@@ -553,8 +544,6 @@
   "privacy_policy.title": "Privātuma politika",
   "recommended": "Ieteicams",
   "refresh": "Atsvaidzināt",
-  "regeneration_indicator.label": "Ielādē…",
-  "regeneration_indicator.sublabel": "Tiek gatavota tava plūsma!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "Pirms {number, plural, one {# dienas} other {# dienām}}",
   "relative_time.full.hours": "Pirms {number, plural, one {# stundas} other {# stundām}}",

app/javascript/mastodon/locales/mk.json

@@ -198,8 +198,6 @@
   "privacy.change": "Штеловај статус на приватност",
   "privacy.public.short": "Јавно",
   "refresh": "Освежи",
-  "regeneration_indicator.label": "Вчитување…",
-  "regeneration_indicator.sublabel": "Вашиот новости се подготвуваат!",
   "relative_time.days": "{number}д",
   "relative_time.hours": "{number}ч",
   "relative_time.just_now": "сега",

app/javascript/mastodon/locales/ml.json

@@ -228,9 +228,6 @@
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
   "home.pending_critical_update.link": "പുതുകൾ കാണുക",
   "home.show_announcements": "പ്രഖ്യാപനങ്ങൾ കാണിക്കുക",
-  "interaction_modal.login.action": "ആമുഖം വരെ എടുത്തോണ്ടു് പോവുക",
-  "interaction_modal.login.prompt": "ആമുഖപ്രദാനിയുടെ മേഖലപേരു്. ഉദ: mastodon.social",
-  "interaction_modal.no_account_yet": "മാസ്റ്റഡോണിൽ ഇല്ലേ?",
   "interaction_modal.on_this_server": "ഈ സെർവറീൽ",
   "interaction_modal.title.favourite": "പ്രിയപ്പെട്ട {name}-ന്റെ എഴുതു്",
   "interaction_modal.title.follow": "{name}-െ പിന്തുടരുക",
@@ -343,8 +340,6 @@
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
   "privacy_policy.title": "സ്വകാര്യത്തനയം",
   "refresh": "പുതുക്കുക",
-  "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
-  "regeneration_indicator.sublabel": "നിങ്ങളുടെ താങ്ങളുടെ ആമുഖത്താളിന് തയാറാക്കുന്നു!",
   "relative_time.days": "{number}ദിവസം",
   "relative_time.full.just_now": "ഇപ്പോൾതന്നെ",
   "relative_time.hours": "{number}മണി",

app/javascript/mastodon/locales/mr.json

@@ -122,9 +122,6 @@
   "home.column_settings.show_replies": "उत्तरे दाखवा",
   "home.hide_announcements": "घोषणा लपवा",
   "home.show_announcements": "घोषणा दाखवा",
-  "interaction_modal.description.follow": "मॅस्टोडॉन वरील खात्यासह, तुम्ही त्यांच्या पोस्ट तुमच्या होम फीडमध्ये प्राप्त करण्यासाठी {name} चे अनुसरण करू शकता.",
-  "interaction_modal.description.reblog": "मॅस्टोडॉन वरील खात्यासह, तुम्ही ही पोस्ट तुमच्या स्वतःच्या अनुयायांसह शेअर करण्यासाठी बूस्ट करू शकता.",
-  "interaction_modal.description.reply": "मॅस्टोडॉनवरील खात्यासह, तुम्ही या पोस्टला प्रतिसाद देऊ शकता.",
   "interaction_modal.on_another_server": "वेगळ्या सर्व्हरवर",
   "interaction_modal.on_this_server": "या सर्व्हरवर",
   "interaction_modal.title.follow": "{name} चे अनुसरण करा",

app/javascript/mastodon/locales/ms.json

@@ -300,17 +300,8 @@
   "home.pending_critical_update.link": "Lihat pengemaskinian",
   "home.pending_critical_update.title": "Kemas kini keselamatan kritikal tersedia!",
   "home.show_announcements": "Tunjukkan pengumuman",
-  "interaction_modal.description.favourite": "Dengan akaun di Mastodon, anda boleh menggemari pos ini untuk memberitahu pengarang anda menghargainya dan menyimpannya untuk kemudian.",
-  "interaction_modal.description.follow": "Dengan akaun pada Mastodon, anda boleh mengikut {name} untuk menerima hantaran mereka di suapan rumah anda.",
-  "interaction_modal.description.reblog": "Dengan akaun pada Mastodon, anda boleh menggalakkan hantaran ini untuk dikongsi dengan pengikut anda.",
-  "interaction_modal.description.reply": "Dengan akaun pada Mastodon, anda boleh membalas kepada hantaran ini.",
-  "interaction_modal.login.action": "Bawa saya pulang rumah",
-  "interaction_modal.login.prompt": "Domain server utama anda, mis. mastodon.social",
-  "interaction_modal.no_account_yet": "Tak di Mastadon?",
   "interaction_modal.on_another_server": "Di pelayan lain",
   "interaction_modal.on_this_server": "Pada pelayan ini",
-  "interaction_modal.sign_in": "Anda tidak log masuk ke server ini. Di manakah akaun anda dihoskan?",
-  "interaction_modal.sign_in_hint": "Petua: Itulah tapak web tempat anda mendaftar. Jika anda tidak ingat, cari e-mel alu-aluan dalam peti masuk anda. Anda juga boleh memasukkan nama pengguna penuh anda! (cth. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Pos {name} kegemaran",
   "interaction_modal.title.follow": "Ikuti {name}",
   "interaction_modal.title.reblog": "Galak hantaran {name}",
@@ -464,8 +455,6 @@
   "privacy_policy.title": "Dasar Privasi",
   "recommended": "Disyorkan",
   "refresh": "Muat semula",
-  "regeneration_indicator.label": "Memuatkan…",
-  "regeneration_indicator.sublabel": "Suapan rumah anda sedang disediakan!",
   "relative_time.days": "{number}h",
   "relative_time.full.days": "{number, plural, other {# hari}} yang lalu",
   "relative_time.full.hours": "{number, plural, other {# jam}} yang lalu",

app/javascript/mastodon/locales/my.json

@@ -278,17 +278,8 @@
   "home.pending_critical_update.link": "အပ်ဒိတ်များကြည့်ရန်",
   "home.pending_critical_update.title": "အရေးကြီးသည့် လုံခြုံရေးအပ်ဒိတ် ရနိုင်ပါမည်။",
   "home.show_announcements": "ကြေညာချက်များကို ပြပါ",
-  "interaction_modal.description.favourite": "Mastodon အကောင့်ဖြင့် ဤပို့စ်ကို သင် favorite ပြုလုပ်ကြောင်း စာရေးသူအား အသိပေးပြီး နောက်ပိုင်းတွင် သိမ်းဆည်းနိုင်သည်။",
-  "interaction_modal.description.follow": "Mastodon အကောင့်ဖြင့် သင်၏ ပင်မစာမျက်နှာတွင် ၎င်းတို့၏ ပို့စ်များကို ရရှိရန်အတွက် {name} ကို စောင့်ကြည့်နိုင်ပါသည်။",
-  "interaction_modal.description.reblog": "Mastodon အကောင့်တစ်ခုဖြင့် သင်၏စောင့်ကြည့်သူများကို မျှဝေရန်အတွက် ဤပို့စ်ကို Boost လုပ်ပါ။",
-  "interaction_modal.description.reply": "Mastodon အကောင့်တစ်ခုဖြင့် သင် ဤပို့စ်ကို တုံ့ပြန်နိုင်ပါသည်။",
-  "interaction_modal.login.action": "ပင်မစာမျက်နှာသို့",
-  "interaction_modal.login.prompt": "သင့်ပင်မဆာဗာ၏ ဒိုမိန်း၊ ဥပမာ၊ mastodon.social",
-  "interaction_modal.no_account_yet": "Mastodon မှာ မဟုတ်ဘူးလား။",
   "interaction_modal.on_another_server": "တခြားဆာဗာပေါ်တွင်",
   "interaction_modal.on_this_server": "ဤဆာဗာတွင်",
-  "interaction_modal.sign_in": "သင်သည် ဤဆာဗာတွင် လော့ဂ်အင်မဝင်ပါ။ သင့်အကောင့်ကို မည်သည့်ဆာဗာတွင် ဖွင့်ထားပါသလဲ။",
-  "interaction_modal.sign_in_hint": "အကြံပြုချက် - ၎င်းသည် သင် အကောင့်ဖွင့်ထားသည့် ဝဘ်ဆိုက်ဖြစ်သည်။ မမှတ်မိပါက သင့် ဝင်စာပုံးရှိ welcome e-mail ကို ရှာပါ။ သင့်အသုံးပြုသူအမည်အပြည့်အစုံကိုလည်း ထည့်သွင်းနိုင်သည်။ (ဥပမာ @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorite {name} ၏ ပို့စ်",
   "interaction_modal.title.follow": "{name} ကို စောင့်ကြည့်မယ်",
   "interaction_modal.title.reblog": "{name} ၏ ပို့စ်ကို Boost လုပ်ပါ",
@@ -440,8 +431,6 @@
   "privacy_policy.title": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
   "recommended": "အကြံပြုသည်",
   "refresh": "ပြန်လည်စတင်ပါ",
-  "regeneration_indicator.label": "လုပ်ဆောင်နေသည်…",
-  "regeneration_indicator.sublabel": "သင့်ပင်မစာမျက်နှာကို ပြင်ဆင်နေပါသည်။",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} ago",
   "relative_time.full.hours": "{number, plural, one {# hour} other {# hours}} ago",

app/javascript/mastodon/locales/nan.json

@@ -38,8 +38,75 @@
   "account.following": "Lí跟tuè ê",
   "account.following_counter": "Teh跟tuè {count,plural,other {{count} ê lâng}}",
   "account.follows.empty": "Tsit ê用者iáu buē跟tuè別lâng。",
+  "account.go_to_profile": "行kàu個人資料",
+  "account.hide_reblogs": "Tshàng tuì @{name} 來ê轉PO",
+  "account.in_memoriam": "佇tsia追悼。",
+  "account.joined_short": "加入ê時",
+  "account.languages": "變更訂閱的語言",
+  "account.link_verified_on": "Tsit ê連結ê所有權佇 {date} 受檢查",
+  "account.locked_info": "Tsit ê口座ê隱私狀態鎖起來ah。所有者ē手動審查thang kā跟tuè ê lâng。",
+  "account.media": "媒體",
+  "account.mention": "提起 @{name}",
+  "account.moved_to": "{name} 指示tsit-má伊ê新口座是：",
+  "account.mute": "消音 @{name}",
+  "account.mute_notifications_short": "Kā通知消音",
+  "account.mute_short": "消音",
+  "account.muted": "消音ah",
+  "account.mutual": "相跟tuè",
+  "account.no_bio": "Bô提供敘述。",
+  "account.open_original_page": "開原來ê頁",
+  "account.posts": "PO文",
+  "account.posts_with_replies": "PO文kap回應",
+  "account.report": "檢舉 @{name}",
+  "account.requested": "Teh等待審查。Tshi̍h tsi̍t-ē 通取消跟tuè請求",
+  "account.requested_follow": "{name} 請求跟tuè lí",
+  "account.share": "分享 @{name} ê個人資料",
+  "account.show_reblogs": "顯示uì @{name} 來ê轉PO",
+  "account.statuses_counter": "{count, plural, other {{count} ê PO文}}",
+  "account.unblock": "取消封鎖 @{name}",
+  "account.unblock_domain": "Kā域名 {domain} 取消封鎖",
+  "account.unblock_short": "取消封鎖",
+  "account.unendorse": "Mài tī個人資料推薦伊",
+  "account.unfollow": "取消跟tuè",
+  "account.unmute": "取消消音 @{name}",
+  "account.unmute_notifications_short": "Kā通知取消消音",
+  "account.unmute_short": "取消消音",
+  "account_note.placeholder": "Tshi̍h tse加註kha",
+  "admin.dashboard.monthly_retention": "註冊以後ê用者維持率",
+  "admin.dashboard.retention.average": "平均",
+  "admin.dashboard.retention.cohort": "註冊ê月",
+  "admin.dashboard.retention.cohort_size": "新用者",
+  "admin.impact_report.instance_accounts": "個人資料ē hőng thâi掉ê用者數",
+  "admin.impact_report.instance_followers": "本站ê跟tuè者ē流失ê數",
+  "admin.impact_report.instance_follows": "In ê跟tuè者ē流失ê數",
+  "admin.impact_report.title": "影響ê摘要",
+  "alert.rate_limited.message": "請tī {retry_time, time, medium} 以後koh試。",
+  "alert.rate_limited.title": "限速ah",
+  "alert.unexpected.message": "發生意外ê錯誤。.",
+  "alert.unexpected.title": "Ai-ioh!",
+  "alt_text_badge.title": "替代文字",
+  "announcement.announcement": "公告",
+  "annual_report.summary.archetype.booster": "追求趣味ê",
+  "annual_report.summary.archetype.lurker": "有讀無PO ê",
+  "annual_report.summary.archetype.oracle": "先知",
+  "annual_report.summary.archetype.pollster": "愛發動投票ê",
+  "annual_report.summary.archetype.replier": "社交ê蝴蝶",
+  "annual_report.summary.followers.followers": "跟tuè lí ê",
+  "annual_report.summary.followers.total": "Lóng總有 {count} ê",
+  "annual_report.summary.here_it_is": "下kha是lí {year} 年ê回顧：",
+  "annual_report.summary.highlighted_post.by_favourites": "Hōo足tsē lâng收藏ê PO文",
+  "annual_report.summary.highlighted_post.by_reblogs": "Hōo足tsē lâng轉ê PO文",
   "annual_report.summary.percentile.text": "<topLabel>Tse 予lí變做 {domain} ê用戶ê </topLabel><percentage></percentage><bottomLabel></bottomLabel>",
   "block_modal.show_less": "看khah少",
+  "block_modal.show_more": "顯示其他ê內容",
+  "block_modal.they_cant_mention": "In buē-tàng 提起á是跟tuè lí。",
+  "block_modal.they_cant_see_posts": "Lín buē-tàng互相看著對方ê PO文。",
+  "block_modal.they_will_know": "In通看見in hőng封鎖。",
+  "block_modal.title": "Kám beh封鎖用者？",
+  "boost_modal.reblog": "Kám beh轉PO？",
+  "bundle_column_error.error.title": "害ah！",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "關",
   "compose.language.change": "換語言",
   "confirmations.follow_to_list.confirm": "跟tuè，加入kàu列單",
   "notification.favourite_pm": "{name} kah意lí ê私人提起",

app/javascript/mastodon/locales/nl.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Meldingen negeren van mensen die jou niet volgen?",
   "ignore_notifications_modal.not_following_title": "Meldingen negeren van mensen die je niet volgt?",
   "ignore_notifications_modal.private_mentions_title": "Meldingen negeren van ongevraagde privéberichten?",
-  "interaction_modal.description.favourite": "Je kunt met een Mastodon-account dit bericht als favoriet markeren, om die gebruiker te laten weten dat je het bericht waardeert en om het op te slaan.",
+  "interaction_modal.action.favourite": "Om verder te gaan, moet je vanaf je eigen account als favoriet markeren.",
-  "interaction_modal.description.follow": "Je kunt met een Mastodon-account {name} volgen, om zo diens berichten op jouw starttijdlijn te ontvangen.",
+  "interaction_modal.action.follow": "Om verder te gaan, moet je vanaf je eigen account volgen.",
-  "interaction_modal.description.reblog": "Je kunt met een Mastodon-account dit bericht boosten, om het zo met jouw volgers te delen.",
+  "interaction_modal.action.reblog": "Om verder te gaan, moet je vanaf je eigen account boosten.",
-  "interaction_modal.description.reply": "Je kunt met een Mastodon-account op dit bericht reageren.",
+  "interaction_modal.action.reply": "Om verder te gaan, moet je vanaf je eigen account reageren.",
-  "interaction_modal.description.vote": "Met een Mastodon-account kun je stemmen in deze peiling.",
+  "interaction_modal.action.vote": "Om verder te gaan, moet je vanaf je eigen account stemmen.",
-  "interaction_modal.login.action": "Ga naar start",
+  "interaction_modal.go": "Ga",
-  "interaction_modal.login.prompt": "Domein van jouw server, bv. mastodon.social",
+  "interaction_modal.no_account_yet": "Heb je nog geen account?",
-  "interaction_modal.no_account_yet": "Niet op Mastodon?",
   "interaction_modal.on_another_server": "Op een andere server",
   "interaction_modal.on_this_server": "Op deze server",
-  "interaction_modal.sign_in": "Je bent niet op deze server ingelogd. Op welke server bevindt zich jouw account?",
-  "interaction_modal.sign_in_hint": "Tip: Dat is de website waarop je je hebt geregistreerd. Wanneer je dit bent vergeten kun je naar de welkomstmail zoeken in je inbox. Je kunt ook je volledige gebruikersnaam invullen! (bv. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Bericht van {name} als favoriet markeren",
   "interaction_modal.title.follow": "{name} volgen",
   "interaction_modal.title.reblog": "Bericht van {name} boosten",
   "interaction_modal.title.reply": "Op het bericht van {name} reageren",
   "interaction_modal.title.vote": "Stemmen in {name}'s peiling",
+  "interaction_modal.username_prompt": "Bijv. {example}",
   "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}}",
@@ -475,13 +473,13 @@
   "lists.add_to_list": "Aan lijst toevoegen",
   "lists.add_to_lists": "{name} aan lijsten toevoegen",
   "lists.create": "Aanmaken",
-  "lists.create_a_list_to_organize": "Maak een nieuwe lijst aan om je Startpagina te organiseren",
+  "lists.create_a_list_to_organize": "Maak een nieuwe lijst aan om je starttijdlijn te organiseren",
   "lists.create_list": "Lijst aanmaken",
   "lists.delete": "Lijst verwijderen",
   "lists.done": "Klaar",
   "lists.edit": "Lijst bewerken",
   "lists.exclusive": "Leden op je Startpagina verbergen",
-  "lists.exclusive_hint": "Als iemand op deze lijst staat, verberg hem dan op je Startpagina om te voorkomen dat zijn berichten twee keer worden getoond.",
+  "lists.exclusive_hint": "Als iemand op deze lijst staat, verberg deze persoon dan op je starttijdlijn om te voorkomen dat zijn berichten twee keer worden getoond.",
   "lists.find_users_to_add": "Vind gebruikers om toe te voegen",
   "lists.list_members": "Lijstleden",
   "lists.list_members_count": "{count, plural, one{# lid} other{# leden}}",
@@ -549,8 +547,8 @@
   "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.favourite_pm": "{name} heeft je persoonlijke vermelding aan hun favorieten toegevoegd",
+  "notification.favourite_pm": "{name} heeft je privébericht als favoriet gemarkeerd",
-  "notification.favourite_pm.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben je persoonlijke vermelding aan hun favorieten toegevoegd",
+  "notification.favourite_pm.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben je privébericht als favoriet gemarkeerd",
   "notification.follow": "{name} volgt jou nu",
   "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> volgen jou nou",
   "notification.follow_request": "{name} wil jou graag volgen",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Privacybeleid",
   "recommended": "Aanbevolen",
   "refresh": "Vernieuwen",
-  "regeneration_indicator.label": "Aan het laden…",
+  "regeneration_indicator.please_stand_by": "Even geduld alsjeblieft.",
-  "regeneration_indicator.sublabel": "Jouw starttijdlijn wordt aangemaakt!",
+  "regeneration_indicator.preparing_your_home_feed": "Voorbereiden van jouw starttijdlijn…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagen}} geleden",
   "relative_time.full.hours": "{number, plural, one {# uur} other {# uur}} geleden",

app/javascript/mastodon/locales/nn.json

@@ -401,18 +401,8 @@
   "ignore_notifications_modal.not_followers_title": "Oversjå varsel frå folk som ikkje fylgjer deg?",
   "ignore_notifications_modal.not_following_title": "Oversjå varsel frå folk du ikkje fylgjer?",
   "ignore_notifications_modal.private_mentions_title": "Oversjå varsel frå masseutsende private omtaler?",
-  "interaction_modal.description.favourite": "Med ein konto på Mastodon kan du favorittmerka dette innlegget for å visa forfattaren at du set pris på det, og for å lagra det til seinare.",
-  "interaction_modal.description.follow": "Med ein konto på Mastodon kan du fylgja {name} for å sjå innlegga deira i din heimestraum.",
-  "interaction_modal.description.reblog": "Med ein konto på Mastodon kan du framheva dette innlegget for å dela det med dine eigne fylgjarar.",
-  "interaction_modal.description.reply": "Med ein konto på Mastodon kan du svara på dette innlegget.",
-  "interaction_modal.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?",
   "interaction_modal.on_another_server": "På ein annan tenar",
   "interaction_modal.on_this_server": "På denne tenaren",
-  "interaction_modal.sign_in": "Du er ikkje logga inn på denne tenaren. På kva for ein tenar høyrer kontoen din heime?",
-  "interaction_modal.sign_in_hint": "Tips: Det er nettstaden der du registrerte deg. Om du har gløymt kvar det var, sjå om du finn velkomst-eposten i innboksen din. Du kan òg skriva inn ditt fulle brukarnamn! (t.d. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Marker innlegget til {name} som favoritt",
   "interaction_modal.title.follow": "Fylg {name}",
   "interaction_modal.title.reblog": "Framhev {name} sitt innlegg",
@@ -664,8 +654,6 @@
   "privacy_policy.title": "Personvernsreglar",
   "recommended": "Tilrådd",
   "refresh": "Oppdater",
-  "regeneration_indicator.label": "Lastar…",
-  "regeneration_indicator.sublabel": "Heimetidslina di vert førebudd!",
   "relative_time.days": "{number}dg",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sidan",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timar}} sidan",

app/javascript/mastodon/locales/no.json

@@ -368,17 +368,8 @@
   "ignore_notifications_modal.not_followers_title": "Overse varsler fra folk som ikke følger deg?",
   "ignore_notifications_modal.not_following_title": "Overse varsler fra folk du ikke følger?",
   "ignore_notifications_modal.private_mentions_title": "Overse varsler fra uoppfordrede private omtaler?",
-  "interaction_modal.description.favourite": "Med en konto på Mastodon, kan du favorittmarkere dette innlegget for å la forfatteren vite at du satte pris på det, og lagre innlegget til senere.",
-  "interaction_modal.description.follow": "Med en konto på Mastodon, kan du følge {name} for å få innleggene deres i tidslinjen din.",
-  "interaction_modal.description.reblog": "Med en konto på Mastodon, kan du fremheve dette innlegget for å dele det med dine egne følgere.",
-  "interaction_modal.description.reply": "Med en konto på Mastodon, kan du svare på dette innlegget.",
-  "interaction_modal.login.action": "Ta meg hjem",
-  "interaction_modal.login.prompt": "Domenet til serveren din, eks. mastodon.social",
-  "interaction_modal.no_account_yet": "Ennå ikke på Mastodon?",
   "interaction_modal.on_another_server": "På en annen server",
   "interaction_modal.on_this_server": "På denne serveren",
-  "interaction_modal.sign_in": "Du er ikke logget inn på denne serveren. Hvor har du kontoen din?",
-  "interaction_modal.sign_in_hint": "Tips: Det er på nettstedet der du registrerte deg. Hvis du ikke husker det, kan du se etter velkomst e-posten i innboksen. Du kan også skrive inn hele brukernavnet ditt! (eks. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favorittmarker innlegget til {name}",
   "interaction_modal.title.follow": "Følg {name}",
   "interaction_modal.title.reblog": "Fremhev {name} sitt innlegg",
@@ -574,8 +565,6 @@
   "privacy_policy.title": "Personvernregler",
   "recommended": "Anbefalt",
   "refresh": "Oppfrisk",
-  "regeneration_indicator.label": "Laster…",
-  "regeneration_indicator.sublabel": "Dine tidslinje blir gjort klar!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dager}} siden",
   "relative_time.full.hours": "{number, plural, one {# time} other {# timer}} siden",

app/javascript/mastodon/locales/oc.json

@@ -398,8 +398,6 @@
   "privacy_policy.last_updated": "Darrièra actualizacion {date}",
   "privacy_policy.title": "Politica de confidencialitat",
   "refresh": "Actualizar",
-  "regeneration_indicator.label": "Cargament…",
-  "regeneration_indicator.sublabel": "Sèm a preparar vòstre flux d’acuèlh !",
   "relative_time.days": "fa {number}d",
   "relative_time.full.days": "{number, plural, one {# jorn} other {# jorns}} ago",
   "relative_time.full.hours": "fa {number, plural, one {# ora} other {# oras}}",

app/javascript/mastodon/locales/pa.json

@@ -248,8 +248,6 @@
   "home.hide_announcements": "ਐਲਾਨਾਂ ਨੂੰ ਓਹਲੇ ਕਰੋ",
   "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
   "ignore_notifications_modal.ignore": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ",
-  "interaction_modal.login.action": "ਮੈਨੂੰ ਮੁੱਖ ਸਫ਼ੇ ਉੱਤੇ ਲੈ ਜਾਓ",
-  "interaction_modal.no_account_yet": "Mastodon ਉੱਤੇ ਨਹੀਂ ਹੋ?",
   "interaction_modal.on_another_server": "ਵੱਖਰੇ ਸਰਵਰ ਉੱਤੇ",
   "interaction_modal.on_this_server": "ਇਸ ਸਰਵਰ ਉੱਤੇ",
   "interaction_modal.title.favourite": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕਰੋ",
@@ -410,7 +408,6 @@
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
   "recommended": "ਸਿਫ਼ਾਰਸ਼ੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
-  "regeneration_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ...",
   "relative_time.days": "{number}ਦਿਨ",
   "relative_time.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}} ਪਹਿਲਾਂ",
   "relative_time.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}} ਪਹਿਲਾਂ",

app/javascript/mastodon/locales/pl.json

@@ -31,7 +31,7 @@
   "account.featured_tags.last_status_never": "Brak postów",
   "account.featured_tags.title": "Polecane hasztagi {name}",
   "account.follow": "Obserwuj",
-  "account.follow_back": "Obserwuj wzajemnie",
+  "account.follow_back": "Również obserwuj",
   "account.followers": "Obserwujący",
   "account.followers.empty": "Nikt jeszcze nie obserwuje tego użytkownika.",
   "account.followers_counter": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
@@ -406,18 +406,8 @@
   "ignore_notifications_modal.not_followers_title": "Ignoruj powiadomienia od użytkowników którzy cię nie obserwują?",
   "ignore_notifications_modal.not_following_title": "Ignoruj powiadomienia od użytkowników których nie obserwujesz?",
   "ignore_notifications_modal.private_mentions_title": "Ignoruj powiadomienia o nieproszonych wzmiankach prywatnych?",
-  "interaction_modal.description.favourite": "Mając konto na Mastodonie, możesz dodawać wpisy do ulubionych by dać znać jego autorowi, że podoba Ci się ten wpis i zachować go na później.",
-  "interaction_modal.description.follow": "Mając konto na Mastodonie, możesz śledzić {name} by widzieć jego wpisy na swojej głównej osi czasu.",
-  "interaction_modal.description.reblog": "Mając konto na Mastodonie, możesz podbić ten wpis i udostępnić go Twoim obserwującym.",
-  "interaction_modal.description.reply": "Mając konto na Mastodonie, możesz odpowiedzieć na ten wpis.",
-  "interaction_modal.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?",
   "interaction_modal.on_another_server": "Na innym serwerze",
   "interaction_modal.on_this_server": "Na tym serwerze",
-  "interaction_modal.sign_in": "Nie jesteś zalogowany(-a) na tym serwerze. Gdzie masz konto?",
-  "interaction_modal.sign_in_hint": "To strona na której się rejestrowałeś(-aś). Jeżeli nie pamiętasz, poszukaj mejla z przywitaniem. Możesz też wprowadzić pełną nazwę użytkownika, à la @Mastodon@mastodon.social!",
   "interaction_modal.title.favourite": "Polub wpis użytkownika {name}",
   "interaction_modal.title.follow": "Śledź {name}",
   "interaction_modal.title.reblog": "Podbij wpis {name}",
@@ -544,6 +534,7 @@
   "notification.admin.report_statuses_other": "{name} zgłosił(a) {target}",
   "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
   "notification.admin.sign_up.name_and_others": "zarejestrował(-a) się {name} i {count, plural, one {# inna osoba} few {# inne osoby}  other {# innych osób}}",
+  "notification.annual_report.message": "Twój {year} #Wrapstodon jest już dostępny! Zobacz swoje podsumowanie roku i niezapomniane chwile na Mastodon!",
   "notification.annual_report.view": "Zobacz #Wrapstodon",
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
   "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba</a> polubiła twój wpis} few {# inne osoby</a> polubiły twój wpis} other {# innych osób</a> polubiło twój wpis}}",
@@ -695,8 +686,6 @@
   "privacy_policy.title": "Polityka prywatności",
   "recommended": "Zalecane",
   "refresh": "Odśwież",
-  "regeneration_indicator.label": "Ładuję…",
-  "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!",
   "relative_time.days": "{number} dni",
   "relative_time.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}} temu",
   "relative_time.full.hours": "{number, plural, one {# godzinę} few {# godziny} many {# godzin} other {# godzin}} temu",

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

@@ -103,6 +103,7 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag mais usada",
   "annual_report.summary.most_used_hashtag.none": "Nenhuma",
   "annual_report.summary.new_posts.new_posts": "novas publicações",
+  "annual_report.summary.percentile.text": "<topLabel>Isso lhe coloca no topo</topLabel><percentage></percentage><bottomLabel>de usuários de {domain}.</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)",
@@ -406,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não seguem você?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que você não segue?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?",
-  "interaction_modal.description.favourite": "Com uma conta no Mastodon, você pode marcar esta publicação como favorita para que o autor saiba que você gostou e salvá-la para mais tarde.",
+  "interaction_modal.action.favourite": "Para continuar, você precisa favoritar na sua conta.",
-  "interaction_modal.description.follow": "Com uma conta no Mastodon, você pode seguir {name} para receber publicações na sua página inicial.",
+  "interaction_modal.action.follow": "Para continuar, você precisa seguir da sua conta.",
-  "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.action.reblog": "Para continuar, você precisa impulsionar na sua conta.",
-  "interaction_modal.description.reply": "Com uma conta no Mastodon, você pode responder a esta publicação.",
+  "interaction_modal.action.reply": "Para continuar, você precisa responder na sua conta.",
-  "interaction_modal.description.vote": "Com uma conta no Mastodon, você pode votar nesta enquete.",
+  "interaction_modal.action.vote": "Para continuar, você precisa votar na sua conta.",
-  "interaction_modal.login.action": "Leve-me para casa",
+  "interaction_modal.go": "Ir",
-  "interaction_modal.login.prompt": "Domínio do seu servidor hospedeiro; por exemplo, mastodon.social",
+  "interaction_modal.no_account_yet": "Não possui uma conta ainda?",
-  "interaction_modal.no_account_yet": "Ainda não está no Mastodon?",
   "interaction_modal.on_another_server": "Em um servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.sign_in": "Você não está credenciado neste servidor. Onde sua conta está hospedada?",
-  "interaction_modal.sign_in_hint": "Dica: Esse é o site onde você se cadastrou. Se não se lembra, procure o e-mail de boas-vindas na sua caixa de entrada. Você também pode informar seu nome de usuário completo! (exemplo @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favoritar publicação de {name}",
   "interaction_modal.title.follow": "Seguir {name}",
   "interaction_modal.title.reblog": "Impulsionar publicação de {name}",
   "interaction_modal.title.reply": "Responder à publicação de {name}",
   "interaction_modal.title.vote": "Votar na enquete de {name}",
+  "interaction_modal.username_prompt": "p. e.x.: {example}",
   "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}}",
@@ -548,6 +547,8 @@
   "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.favourite_pm": "{name} favoritou sua menção privada",
+  "notification.favourite_pm.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> favoritou(ram) sua menção privada",
   "notification.follow": "{name} te seguiu",
   "notification.follow.name_and_others": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> seguiram você",
   "notification.follow_request": "{name} quer te seguir",
@@ -694,8 +695,8 @@
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
-  "regeneration_indicator.label": "Carregando…",
+  "regeneration_indicator.please_stand_by": "Aguarde um momento.",
-  "regeneration_indicator.sublabel": "Sua página inicial está sendo preparada!",
+  "regeneration_indicator.preparing_your_home_feed": "Preparando seu feed inicial…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dia} other {# dias}} atrás",
   "relative_time.full.hours": "{number, plural, one {# hora} other {# horas}} atrás",
@@ -779,8 +780,11 @@
   "search_results.accounts": "Perfis",
   "search_results.all": "Tudo",
   "search_results.hashtags": "Hashtags",
+  "search_results.no_results": "Sem resultados.",
+  "search_results.no_search_yet": "Tente buscar por publicações, perfis e hashtags.",
   "search_results.see_all": "Ver tudo",
   "search_results.statuses": "Toots",
+  "search_results.title": "Buscar por \"{q}\"",
   "server_banner.about_active_users": "Pessoas usando este servidor durante os últimos 30 dias (Usuários ativos mensalmente)",
   "server_banner.active_users": "usuários ativos",
   "server_banner.administered_by": "Administrado por:",

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

@@ -6,7 +6,7 @@
   "about.domain_blocks.preamble": "O Mastodon geralmente permite que veja e interaja com o conteúdo de utilizadores de qualquer outra instância no fediverso. Estas são as exceções desta instância em específico.",
   "about.domain_blocks.silenced.explanation": "Normalmente não verá perfis e conteúdo deste servidor, a menos que os procure explicitamente ou opte por os seguir.",
   "about.domain_blocks.silenced.title": "Limitados",
-  "about.domain_blocks.suspended.explanation": "Nenhum dado deste servidor será processado, armazenado ou trocado, impossibilitando qualquer interação ou comunicação com os utilizadores dessas instâncias.",
+  "about.domain_blocks.suspended.explanation": "Nenhum dado deste servidor será processado, armazenado ou trocado, tornando impossível qualquer interação ou comunicação com os utilizadores a partir deste servidor.",
   "about.domain_blocks.suspended.title": "Suspensos",
   "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
   "about.powered_by": "Rede social descentralizada baseada no {mastodon}",
@@ -18,7 +18,7 @@
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Bloquear domínio {domain}",
   "account.block_short": "Bloquear",
-  "account.blocked": "Bloqueado(a)",
+  "account.blocked": "Bloqueado",
   "account.cancel_follow_request": "Retirar pedido para seguir",
   "account.copy": "Copiar hiperligação para o perfil",
   "account.direct": "Mencionar @{name} em privado",
@@ -29,9 +29,9 @@
   "account.endorse": "Destacar no perfil",
   "account.featured_tags.last_status_at": "Última publicação em {date}",
   "account.featured_tags.last_status_never": "Sem publicações",
-  "account.featured_tags.title": "#Etiquetas destacadas por {name}",
+  "account.featured_tags.title": "Etiquetas destacadas por {name}",
   "account.follow": "Seguir",
-  "account.follow_back": "Seguir de volta",
+  "account.follow_back": "Seguir também",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -39,19 +39,19 @@
   "account.following_counter": "{count, plural, one {A seguir {counter}} other {A seguir {counter}}}",
   "account.follows.empty": "Este utilizador ainda não segue ninguém.",
   "account.go_to_profile": "Ir para o perfil",
-  "account.hide_reblogs": "Esconder partilhas de @{name}",
+  "account.hide_reblogs": "Esconder partilhas impulsionadas de @{name}",
   "account.in_memoriam": "Em Memória.",
   "account.joined_short": "Juntou-se a",
   "account.languages": "Alterar línguas subscritas",
   "account.link_verified_on": "O proprietário desta hiperligação foi verificado em {date}",
   "account.locked_info": "Esta conta é privada. O proprietário revê manualmente quem o pode seguir.",
-  "account.media": "Média",
+  "account.media": "Multimédia",
   "account.mention": "Mencionar @{name}",
   "account.moved_to": "{name} indicou que a sua nova conta agora é:",
-  "account.mute": "Silenciar @{name}",
+  "account.mute": "Ocultar @{name}",
-  "account.mute_notifications_short": "Silenciar notificações",
+  "account.mute_notifications_short": "Ocultar notificações",
-  "account.mute_short": "Silenciar",
+  "account.mute_short": "Ocultar",
-  "account.muted": "Silenciada",
+  "account.muted": "Ocultada",
   "account.mutual": "Mútuo",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.open_original_page": "Abrir a página original",
@@ -61,16 +61,16 @@
   "account.requested": "A aguardar aprovação. Clique para cancelar o pedido para seguir",
   "account.requested_follow": "{name} pediu para segui-lo",
   "account.share": "Partilhar o perfil @{name}",
-  "account.show_reblogs": "Mostrar partilhas de @{name}",
+  "account.show_reblogs": "Mostrar partilhas impulsionadas de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear o domínio {domain}",
   "account.unblock_short": "Desbloquear",
   "account.unendorse": "Não destacar no perfil",
   "account.unfollow": "Deixar de seguir",
-  "account.unmute": "Deixar de silenciar @{name}",
+  "account.unmute": "Desocultar @{name}",
-  "account.unmute_notifications_short": "Parar de silenciar notificações",
+  "account.unmute_notifications_short": "Desocultar notificações",
-  "account.unmute_short": "Deixar de silenciar",
+  "account.unmute_short": "Desocultar",
   "account_note.placeholder": "Clique para adicionar nota",
   "admin.dashboard.daily_retention": "Taxa de retenção de utilizadores por dia após a inscrição",
   "admin.dashboard.monthly_retention": "Taxa de retenção de utilizadores por mês após a inscrição",
@@ -87,22 +87,38 @@
   "alert.unexpected.title": "Bolas!",
   "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Anúncio",
-  "annual_report.summary.followers.total": "{count} total",
+  "annual_report.summary.archetype.booster": "O caçador de frescura",
-  "annual_report.summary.here_it_is": "Aqui está o seu {year} em revisão:",
+  "annual_report.summary.archetype.lurker": "O espreitador",
+  "annual_report.summary.archetype.oracle": "O oráculo",
+  "annual_report.summary.archetype.pollster": "O sondagens",
+  "annual_report.summary.archetype.replier": "A borboleta social",
+  "annual_report.summary.followers.followers": "seguidores",
+  "annual_report.summary.followers.total": "{count} no total",
+  "annual_report.summary.here_it_is": "Aqui está um resumo do ano {year}:",
+  "annual_report.summary.highlighted_post.by_favourites": "publicação mais favorita",
+  "annual_report.summary.highlighted_post.by_reblogs": "publicação mais impulsionada",
+  "annual_report.summary.highlighted_post.by_replies": "publicação com o maior número de respostas",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplicação mais utilizada",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "etiqueta mais utilizada",
+  "annual_report.summary.most_used_hashtag.none": "Nenhuma",
   "annual_report.summary.new_posts.new_posts": "novas publicações",
+  "annual_report.summary.percentile.text": "<topLabel>Isso coloca-o no topo</topLabel><percentage></percentage><bottomLabel>dos utilizadores de {domain}.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Este segredo fica entre nós.",
+  "annual_report.summary.thanks": "Obrigado por fazer parte do Mastodon!",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As mensagens públicas podem continuar a ser visíveis para utilizadores não autenticados.",
+  "block_modal.remote_users_caveat": "Vamos pedir ao servidor {domain} para respeitar a sua decisão. No entanto, não é garantido o seu cumprimento, uma vez que alguns servidores podem tratar os bloqueios de forma diferente. As publicações públicas podem continuar a ser visíveis para utilizadores não autenticados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
-  "block_modal.they_cant_mention": "Eles não o podem mencionar ou seguir.",
+  "block_modal.they_cant_mention": "Ele não o pode mencionar nem seguir.",
-  "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
+  "block_modal.they_cant_see_posts": "Não verá as publicações dele e ele não poderá ver as suas publicações.",
-  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+  "block_modal.they_will_know": "Ele pode ver que o bloqueou.",
   "block_modal.title": "Bloquear utilizador?",
-  "block_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
+  "block_modal.you_wont_see_mentions": "Não verá publicações que mencionem este utilizador.",
-  "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
+  "boost_modal.combo": "Pode premir {combo} para não voltar a ver isto",
   "boost_modal.reblog": "Impulsionar a publicação?",
-  "boost_modal.undo_reblog": "Retirar post?",
+  "boost_modal.undo_reblog": "Não impulsionar a publicação?",
   "bundle_column_error.copy_stacktrace": "Copiar relatório de erros",
   "bundle_column_error.error.body": "A página solicitada não pôde ser sintetizada. Isto pode ser devido a uma falha no nosso código ou a um problema de compatibilidade com o navegador.",
   "bundle_column_error.error.title": "Ó, não!",
@@ -113,6 +129,7 @@
   "bundle_column_error.routing.body": "A página solicitada não foi encontrada. Tem a certeza que o URL na barra de endereços está correto?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Fechar",
+  "bundle_modal_error.message": "Algo correu mal ao carregar este ecrã.",
   "bundle_modal_error.retry": "Tente de novo",
   "closed_registrations.other_server_instructions": "Visto que o Mastodon é descentralizado, pode criar uma conta noutro servidor e interagir com este na mesma.",
   "closed_registrations_modal.description": "Neste momento não é possível criar uma conta em {domain}, mas lembramos que não é preciso ter uma conta especificamente em {domain} para usar o Mastodon.",
@@ -120,18 +137,21 @@
   "closed_registrations_modal.preamble": "O Mastodon é descentralizado, por isso não importa onde a sua conta é criada, pois continuará a poder acompanhar e interagir com qualquer um neste servidor. Pode até alojar o seu próprio servidor!",
   "closed_registrations_modal.title": "Inscrevendo-se no Mastodon",
   "column.about": "Sobre",
-  "column.blocks": "Utilizadores Bloqueados",
+  "column.blocks": "Utilizadores bloqueados",
   "column.bookmarks": "Marcadores",
   "column.community": "Cronologia local",
+  "column.create_list": "Criar lista",
   "column.direct": "Menções privadas",
   "column.directory": "Explorar perfis",
   "column.domain_blocks": "Domínios bloqueados",
+  "column.edit_list": "Editar lista",
   "column.favourites": "Favoritos",
-  "column.firehose": "Cronologias",
+  "column.firehose": "Cronologias em tempo real",
-  "column.follow_requests": "Seguidores pendentes",
+  "column.follow_requests": "Pedidos de seguidores",
   "column.home": "Início",
+  "column.list_members": "Gerir membros da lista",
   "column.lists": "Listas",
-  "column.mutes": "Utilizadores silenciados",
+  "column.mutes": "Utilizadores ocultados",
   "column.notifications": "Notificações",
   "column.pins": "Publicações afixadas",
   "column.public": "Cronologia federada",
@@ -142,6 +162,7 @@
   "column_header.pin": "Afixar",
   "column_header.show_settings": "Mostrar configurações",
   "column_header.unpin": "Desafixar",
+  "column_search.cancel": "Cancelar",
   "column_subheading.settings": "Configurações",
   "community.column_settings.local_only": "Apenas local",
   "community.column_settings.media_only": "Apenas média",
@@ -151,15 +172,16 @@
   "compose.published.body": "Publicado.",
   "compose.published.open": "Abrir",
   "compose.saved.body": "Publicação guardada.",
-  "compose_form.direct_message_warning_learn_more": "Conhecer mais",
+  "compose_form.direct_message_warning_learn_more": "Saber mais",
-  "compose_form.encryption_warning": "As publicações no Mastodon não são criptografadas de ponta a ponta. Não partilhe nenhuma informação sensível através do Mastodon.",
+  "compose_form.encryption_warning": "As publicações no Mastodon não são encriptadas de ponta a ponta. Não partilhe qualquer informação sensível através do Mastodon.",
   "compose_form.hashtag_warning": "Esta publicação não será listada em qualquer etiqueta, pois não é pública. Apenas as publicações públicas podem ser pesquisadas por etiquetas.",
-  "compose_form.lock_disclaimer": "A sua conta não é {locked}. Qualquer pessoa pode segui-lo e ver as publicações direcionadas apenas a seguidores.",
+  "compose_form.lock_disclaimer": "A sua conta não está {locked}. Qualquer pessoa pode segui-lo para ver as suas publicações destinadas apenas aos seus seguidores.",
   "compose_form.lock_disclaimer.lock": "fechada",
   "compose_form.placeholder": "Em que está a pensar?",
   "compose_form.poll.duration": "Duração da sondagem",
   "compose_form.poll.multiple": "Escolha múltipla",
   "compose_form.poll.option_placeholder": "Opção {number}",
+  "compose_form.poll.single": "Uma opção",
   "compose_form.poll.switch_to_multiple": "Alterar a sondagem para permitir várias respostas",
   "compose_form.poll.switch_to_single": "Alterar a sondagem para permitir uma única resposta",
   "compose_form.poll.type": "Estilo",
@@ -167,8 +189,8 @@
   "compose_form.publish_form": "Nova publicação",
   "compose_form.reply": "Responder",
   "compose_form.save_changes": "Atualizar",
-  "compose_form.spoiler.marked": "Texto escondido atrás de aviso",
+  "compose_form.spoiler.marked": "Remover aviso de conteúdo",
-  "compose_form.spoiler.unmarked": "Juntar um aviso de conteúdo",
+  "compose_form.spoiler.unmarked": "Adicionar aviso de conteúdo",
   "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
@@ -176,28 +198,32 @@
   "confirmations.delete.message": "De certeza que quer eliminar esta publicação?",
   "confirmations.delete.title": "Eliminar publicação?",
   "confirmations.delete_list.confirm": "Eliminar",
-  "confirmations.delete_list.message": "Tens a certeza de que deseja eliminar permanentemente esta lista?",
+  "confirmations.delete_list.message": "Tem a certeza de que deseja eliminar permanentemente esta lista?",
   "confirmations.delete_list.title": "Eliminar lista?",
   "confirmations.discard_edit_media.confirm": "Descartar",
-  "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição ou pré-visualização do conteúdo. Descartar mesmo assim?",
+  "confirmations.discard_edit_media.message": "Tem alterações por guardar na descrição da multimédia ou pré-visualização do conteúdo. Descartar mesmo assim?",
   "confirmations.edit.confirm": "Editar",
-  "confirmations.edit.message": "Editar agora irá sobrescrever a mensagem que está a compor. Tem a certeza de que deseja continuar?",
+  "confirmations.edit.message": "Editar agora irá substituir a mensagem que está a compor. Tem a certeza de que deseja continuar?",
-  "confirmations.edit.title": "Sobrescrever publicação?",
+  "confirmations.edit.title": "Substituir publicação?",
+  "confirmations.follow_to_list.confirm": "Seguir e adicionar à lista",
+  "confirmations.follow_to_list.message": "Tem de seguir {name} para o adicionar a uma lista.",
+  "confirmations.follow_to_list.title": "Seguir utilizador?",
   "confirmations.logout.confirm": "Terminar sessão",
   "confirmations.logout.message": "Tem a certeza de que quer terminar a sessão?",
   "confirmations.logout.title": "Terminar sessão?",
-  "confirmations.mute.confirm": "Silenciar",
+  "confirmations.mute.confirm": "Ocultar",
-  "confirmations.redraft.confirm": "Eliminar & reescrever",
+  "confirmations.redraft.confirm": "Eliminar e reescrever",
-  "confirmations.redraft.message": "Tem a certeza de que quer eliminar e reescrever esta publicação? Os favoritos e partilhas perder-se-ão e as respostas à publicação original ficarão órfãs.",
+  "confirmations.redraft.message": "Tem a certeza de que quer eliminar e tornar a escrever esta publicação? Os favoritos e as publicações impulsionadas perder-se-ão e as respostas à publicação original ficarão órfãs.",
   "confirmations.redraft.title": "Eliminar e reescrever publicação?",
   "confirmations.reply.confirm": "Responder",
   "confirmations.reply.message": "Se responder agora, a mensagem que está a escrever será substituída. Tem a certeza que pretende continuar?",
-  "confirmations.reply.title": "Sobrescrever publicação?",
+  "confirmations.reply.title": "Substituir publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
+  "confirmations.unfollow.message": "De certeza que quer deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir utilizador?",
+  "confirmations.unfollow.title": "Deixar de seguir o utilizador?",
   "content_warning.hide": "Ocultar publicação",
   "content_warning.show": "Mostrar mesmo assim",
+  "content_warning.show_more": "Mostrar mais",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -207,18 +233,24 @@
   "copypaste.copy_to_clipboard": "Copiar para a área de transferência",
   "directory.federated": "Do fediverso conhecido",
   "directory.local": "Apenas de {domain}",
-  "directory.new_arrivals": "Recém chegados",
+  "directory.new_arrivals": "Recém-chegados",
   "directory.recently_active": "Recentemente ativo",
   "disabled_account_banner.account_settings": "Definições da conta",
-  "disabled_account_banner.text": "A sua conta {disabledAccount} está presentemente desativada.",
+  "disabled_account_banner.text": "A sua conta {disabledAccount} está atualmente desativada.",
   "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes de pessoas cujas contas são hospedadas por {domain}.",
   "dismissable_banner.dismiss": "Descartar",
+  "dismissable_banner.explore_links": "Estas notícias estão a ser mais partilhadas no fediverso hoje. As notícias mais recentes publicadas por mais pessoas diferentes têm uma classificação mais elevada.",
+  "dismissable_banner.explore_statuses": "Estas publicações de todo o fediverso estão a ganhar força hoje. As publicações mais recentes com mais impulsos e favoritos têm uma classificação mais elevada.",
+  "dismissable_banner.explore_tags": "Estas etiquetas estão a ganhar força no fediverso atualmente. As etiquetas que são utilizadas por mais pessoas diferentes são classificadas numa posição mais elevada.",
+  "dismissable_banner.public_timeline": "Estas são as publicações públicas mais recentes de pessoas no fediverso que as pessoas em {domain} seguem.",
   "domain_block_modal.block": "Bloquear servidor",
-  "domain_block_modal.block_account_instead": "Bloquear @{name} em alternativa",
+  "domain_block_modal.block_account_instead": "Bloquear antes @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "As pessoas deste servidor podem interagir com as suas publicações antigas.",
   "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode segui-lo.",
   "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
   "domain_block_modal.title": "Bloquear domínio?",
+  "domain_block_modal.you_will_lose_num_followers": "Irá perder {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} e {followingCount, plural, one {{followingCountDisplay} pessoa que segue} other {{followingCountDisplay} pessoas que segue}}.",
+  "domain_block_modal.you_will_lose_relationships": "Perderá todos os seguidores e pessoas que segue deste servidor.",
   "domain_block_modal.you_wont_see_posts": "Não verá publicações ou notificações de utilizadores neste servidor.",
   "domain_pill.activitypub_lets_connect": "Permite-lhe conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.",
   "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
@@ -234,48 +266,48 @@
   "domain_pill.your_server": "A sua casa digital, onde se encontram todas as suas publicações. Não gosta deste? Mude de servidor a qualquer momento e leve também os seus seguidores.",
   "domain_pill.your_username": "O seu identificador único neste servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em diferentes servidores.",
   "embed.instructions": "Incorpore esta publicação no seu site copiando o código abaixo.",
-  "embed.preview": "Podes ver aqui como irá ficar:",
+  "embed.preview": "Eis o aspeto que terá:",
   "emoji_button.activity": "Atividade",
   "emoji_button.clear": "Limpar",
-  "emoji_button.custom": "Personalizar",
+  "emoji_button.custom": "Personalizados",
   "emoji_button.flags": "Bandeiras",
-  "emoji_button.food": "Comida & Bebida",
+  "emoji_button.food": "Comida e bebidas",
-  "emoji_button.label": "Inserir Emoji",
+  "emoji_button.label": "Inserir emoji",
   "emoji_button.nature": "Natureza",
-  "emoji_button.not_found": "Nenhum emoji correspondente encontrado",
+  "emoji_button.not_found": "Não foram encontrados emojis correspondentes",
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Pessoas",
   "emoji_button.recent": "Utilizados regularmente",
   "emoji_button.search": "Pesquisar...",
   "emoji_button.search_results": "Resultados da pesquisa",
   "emoji_button.symbols": "Símbolos",
-  "emoji_button.travel": "Viagens & Lugares",
+  "emoji_button.travel": "Viagens e lugares",
   "empty_column.account_hides_collections": "Este utilizador escolheu não disponibilizar esta informação",
   "empty_column.account_suspended": "Conta suspensa",
   "empty_column.account_timeline": "Sem publicações por aqui!",
   "empty_column.account_unavailable": "Perfil indisponível",
-  "empty_column.blocks": "Ainda não bloqueaste qualquer utilizador.",
+  "empty_column.blocks": "Ainda não bloqueou nenhum utilizador.",
   "empty_column.bookmarked_statuses": "Ainda não tem nenhuma publicação marcada. Quando marcar uma, ela aparecerá aqui.",
-  "empty_column.community": "A cronologia local está vazia. Escreve algo público para começar!",
+  "empty_column.community": "A cronologia local está vazia. Escreva algo publicamente para começar!",
   "empty_column.direct": "Ainda não tem qualquer menção privada. Quando enviar ou receber uma, ela irá aparecer aqui.",
-  "empty_column.domain_blocks": "Ainda não há qualquer domínio escondido.",
+  "empty_column.domain_blocks": "Ainda não há qualquer domínio bloqueado.",
   "empty_column.explore_statuses": "Nada é tendência neste momento. Volte mais tarde!",
-  "empty_column.favourited_statuses": "Ainda não assinalou qualquer publicação como favorita. Quando o fizer, aparecerá aqui.",
+  "empty_column.favourited_statuses": "Ainda não assinalou qualquer publicação como favorita. Quando o fizer, ela aparecerá aqui.",
-  "empty_column.favourites": "Ainda ninguém assinalou esta publicação como favorita. Quando alguém o fizer, aparecerá aqui.",
+  "empty_column.favourites": "Ainda ninguém assinalou esta publicação como favorita. Quando alguém o fizer, ela aparecerá aqui.",
-  "empty_column.follow_requests": "Ainda não tens nenhum pedido de seguidor. Quando receberes algum, ele irá aparecer aqui.",
+  "empty_column.follow_requests": "Ainda não tem nenhum pedido de seguidor. Quando receber algum, ele irá aparecer aqui.",
-  "empty_column.followed_tags": "Ainda não segue nenhuma hashtag. Quando o fizer, ela aparecerá aqui.",
+  "empty_column.followed_tags": "Ainda não segue nenhuma etiqueta. Quando o fizer, ela aparecerá aqui.",
-  "empty_column.hashtag": "Não foram encontradas publicações com essa #etiqueta.",
+  "empty_column.hashtag": "Não foram encontradas publicações com esta #etiqueta.",
   "empty_column.home": "A sua linha cronológica inicial está vazia! Siga mais pessoas para a preencher.",
-  "empty_column.list": "Ainda não existem publicações nesta lista. Quando membros desta lista fizerem novas publicações, elas aparecerão aqui.",
+  "empty_column.list": "Ainda não existem publicações nesta lista. Quando os membros desta lista fizerem novas publicações, elas aparecerão aqui.",
-  "empty_column.mutes": "Ainda não silenciaste qualquer utilizador.",
+  "empty_column.mutes": "Ainda não ocultou nenhum utilizador.",
-  "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando você receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
+  "empty_column.notification_requests": "Tudo limpo! Não há nada aqui. Quando receber novas notificações, elas aparecerão aqui conforme as suas configurações.",
-  "empty_column.notifications": "Não tens notificações. Interage com outros utilizadores para iniciar uma conversa.",
+  "empty_column.notifications": "Não tem notificações. Interaja com outros utilizadores para iniciar uma conversa.",
-  "empty_column.public": "Não há nada aqui! Escreve algo publicamente ou segue outros utilizadores para veres aqui os conteúdos públicos",
+  "empty_column.public": "Não há nada aqui! Escreva algo publicamente ou siga outros utilizadores para ver aqui os conteúdos públicos",
-  "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a um problema de compatibilidade do navegador, esta página não pôde ser apresentada corretamente.",
+  "error.unexpected_crash.explanation": "Devido a um erro no nosso código ou a um problema de compatibilidade do navegador, esta página não pode ser apresentada corretamente.",
-  "error.unexpected_crash.explanation_addons": "Esta página não pôde ser exibida corretamente. Este erro provavelmente é causado por um complemento do navegador ou ferramentas de tradução automática.",
+  "error.unexpected_crash.explanation_addons": "Esta página não pode ser mostrada corretamente. Este erro provavelmente é causado por um complemento do navegador ou ferramentas de tradução automática.",
   "error.unexpected_crash.next_steps": "Tente atualizar a página. Se isso não ajudar, pode usar o Mastodon através de um navegador diferente ou uma aplicação nativa.",
   "error.unexpected_crash.next_steps_addons": "Tente desativá-los e atualizar a página. Se isso não ajudar, poderá ainda ser possível utilizar o Mastodon através de um navegador diferente ou de uma aplicação nativa.",
-  "errors.unexpected_crash.copy_stacktrace": "Copiar a stacktrace para o clipboard",
+  "errors.unexpected_crash.copy_stacktrace": "Copiar o stacktrace para a área de transferência",
   "errors.unexpected_crash.report_issue": "Reportar problema",
   "explore.suggested_follows": "Pessoas",
   "explore.title": "Explorar",
@@ -298,6 +330,7 @@
   "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 “<span>{title}</span>”",
   "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",
@@ -321,24 +354,26 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Semelhantes aos perfis que seguiu recentemente",
   "follow_suggestions.view_all": "Ver tudo",
   "follow_suggestions.who_to_follow": "Quem seguir",
-  "followed_tags": "Hashtags seguidas",
+  "followed_tags": "Etiquetas seguidas",
   "footer.about": "Sobre",
   "footer.directory": "Diretório de perfis",
-  "footer.get_app": "Obtém a aplicação",
+  "footer.get_app": "Obter a aplicação",
   "footer.keyboard_shortcuts": "Atalhos do teclado",
   "footer.privacy_policy": "Política de privacidade",
   "footer.source_code": "Ver código-fonte",
   "footer.status": "Estado",
+  "footer.terms_of_service": "Termos de serviço",
   "generic.saved": "Guardado",
   "getting_started.heading": "Primeiros passos",
+  "hashtag.admin_moderation": "Abrir interface de moderação para #{name}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
   "hashtag.column_settings.select.no_options_message": "Não foram encontradas sugestões",
   "hashtag.column_settings.select.placeholder": "Inserir #etiquetas…",
-  "hashtag.column_settings.tag_mode.all": "Todos estes",
+  "hashtag.column_settings.tag_mode.all": "Todas estas",
-  "hashtag.column_settings.tag_mode.any": "Qualquer destes",
+  "hashtag.column_settings.tag_mode.any": "Qualquer uma destas",
-  "hashtag.column_settings.tag_mode.none": "Nenhum destes",
+  "hashtag.column_settings.tag_mode.none": "Nenhuma destas",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionais para esta coluna",
   "hashtag.counter_by_accounts": "{count, plural,one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
@@ -361,9 +396,9 @@
   "home.pending_critical_update.link": "Ver atualizações",
   "home.pending_critical_update.title": "Atualização de segurança crítica disponível!",
   "home.show_announcements": "Exibir comunicações",
-  "ignore_notifications_modal.disclaimer": "O Mastodon não pode informar utilizadores que ignoraste as notificações deles. Ignorar notificações não irá parar as mensagens serem enviadas.",
+  "ignore_notifications_modal.disclaimer": "O Mastodon não pode informar os utilizadores de que ignorou as suas notificações. Ignorar as notificações não impedirá que as mensagens sejam enviadas.",
   "ignore_notifications_modal.filter_instead": "Filtrar em vez disso",
-  "ignore_notifications_modal.filter_to_act_users": "Ainda poderá aceitar, rejeitar, ou reportar utilizadores",
+  "ignore_notifications_modal.filter_to_act_users": "Ainda poderá aceitar, rejeitar ou reportar utilizadores",
   "ignore_notifications_modal.filter_to_avoid_confusion": "A filtragem ajuda a evitar potenciais equívocos",
   "ignore_notifications_modal.filter_to_review_separately": "Pode rever as notificações filtradas separadamente",
   "ignore_notifications_modal.ignore": "Ignorar notificações",
@@ -372,104 +407,127 @@
   "ignore_notifications_modal.not_followers_title": "Ignorar notificações de pessoas que não o seguem?",
   "ignore_notifications_modal.not_following_title": "Ignorar notificações de pessoas que não segue?",
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de Menções Privadas não solicitadas?",
-  "interaction_modal.description.favourite": "Com uma conta no Mastodon, pode adicionar assinalar esta publicação como favorita para que o autor saiba que gostou e guardá-la para mais tarde.",
+  "interaction_modal.action.favourite": "Para continuar, precisa definir como favorito a partir da sua conta.",
-  "interaction_modal.description.follow": "Com uma conta no Mastodon, pode seguir {name} para receber as suas publicações na sua página inicial.",
+  "interaction_modal.action.follow": "Para continuar, precisa seguir a partir da sua conta.",
-  "interaction_modal.description.reblog": "Com uma conta no Mastodon, pode impulsionar esta publicação para compartilhá-lo com os seus seguidores.",
+  "interaction_modal.action.reblog": "Para continuar, precisa republicar a partir da sua conta.",
-  "interaction_modal.description.reply": "Com uma conta no Mastodon, pode responder a esta publicação.",
+  "interaction_modal.action.reply": "Para continuar, precisa responder a partir da sua conta.",
-  "interaction_modal.login.action": "Leve-me a casa",
+  "interaction_modal.action.vote": "Para continuar é necessário votar a partir da sua conta.",
-  "interaction_modal.login.prompt": "Domínio do seu servidor, por exemplo, mastodon.social",
+  "interaction_modal.go": "Ir",
-  "interaction_modal.no_account_yet": "Não está no Mastodon?",
+  "interaction_modal.no_account_yet": "Ainda não tem conta?",
   "interaction_modal.on_another_server": "Num servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.sign_in": "Não tem sessão iniciada neste servidor. Em que servidor tem a sua conta?",
-  "interaction_modal.sign_in_hint": "Dica: O domínio do seu servidor é o site onde se inscreveu. Se não se lembrar, procure o e-mail de boas-vindas na sua caixa de entrada. Também pode introduzir o seu nome de utilizador completo! (por exemplo, @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Assinalar a publicação de {name} como favorita",
   "interaction_modal.title.follow": "Seguir {name}",
   "interaction_modal.title.reblog": "Impulsionar a publicação de {name}",
   "interaction_modal.title.reply": "Responder à publicação de {name}",
+  "interaction_modal.title.vote": "Votar na sondagem de {name}",
+  "interaction_modal.username_prompt": "Ex: {example}",
   "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}}",
-  "keyboard_shortcuts.back": "para voltar",
+  "keyboard_shortcuts.back": "retroceder",
-  "keyboard_shortcuts.blocked": "para abrir a lista de utilizadores bloqueados",
+  "keyboard_shortcuts.blocked": "abrir a lista de utilizadores bloqueados",
-  "keyboard_shortcuts.boost": "Impulsionar a publicação",
+  "keyboard_shortcuts.boost": "impulsionar a publicação",
-  "keyboard_shortcuts.column": "para focar uma publicação numa das colunas",
+  "keyboard_shortcuts.column": "focar uma publicação numa das colunas",
-  "keyboard_shortcuts.compose": "para focar na área de publicação",
+  "keyboard_shortcuts.compose": "focar área de texto da publicação",
   "keyboard_shortcuts.description": "Descrição",
-  "keyboard_shortcuts.direct": "para abrir a coluna de menções privadas",
+  "keyboard_shortcuts.direct": "abrir a coluna de menções privadas",
-  "keyboard_shortcuts.down": "para mover para baixo na lista",
+  "keyboard_shortcuts.down": "mover para baixo na lista",
-  "keyboard_shortcuts.enter": "para expandir uma publicação",
+  "keyboard_shortcuts.enter": "abrir publicação",
-  "keyboard_shortcuts.favourite": "Assinalar como favorita",
+  "keyboard_shortcuts.favourite": "assinalar como favorita",
-  "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
+  "keyboard_shortcuts.favourites": "abrir lista de favoritos",
-  "keyboard_shortcuts.federated": "para abrir a cronologia federada",
+  "keyboard_shortcuts.federated": "abrir a cronologia federada",
   "keyboard_shortcuts.heading": "Atalhos de teclado",
-  "keyboard_shortcuts.home": "para abrir a cronologia inicial",
+  "keyboard_shortcuts.home": "abrir a cronologia na página inicial",
   "keyboard_shortcuts.hotkey": "Atalho",
-  "keyboard_shortcuts.legend": "para mostrar esta legenda",
+  "keyboard_shortcuts.legend": "mostrar esta legenda",
-  "keyboard_shortcuts.local": "para abrir a cronologia local",
+  "keyboard_shortcuts.local": "abrir a cronologia local",
-  "keyboard_shortcuts.mention": "para mencionar o autor",
+  "keyboard_shortcuts.mention": "mencionar o autor",
-  "keyboard_shortcuts.muted": "para abrir a lista dos utilizadores silenciados",
+  "keyboard_shortcuts.muted": "abrir a lista dos utilizadores ocultados",
-  "keyboard_shortcuts.my_profile": "para abrir o teu perfil",
+  "keyboard_shortcuts.my_profile": "abrir o seu perfil",
-  "keyboard_shortcuts.notifications": "para abrir a coluna das notificações",
+  "keyboard_shortcuts.notifications": "abrir a coluna das notificações",
-  "keyboard_shortcuts.open_media": "para abrir media",
+  "keyboard_shortcuts.open_media": "abrir multimédia",
-  "keyboard_shortcuts.pinned": "Abrir lista de publicações fixadas",
+  "keyboard_shortcuts.pinned": "abrir lista de publicações fixadas",
-  "keyboard_shortcuts.profile": "para abrir o perfil do autor",
+  "keyboard_shortcuts.profile": "abrir o perfil do autor",
-  "keyboard_shortcuts.reply": "para responder",
+  "keyboard_shortcuts.reply": "responder à publicação",
-  "keyboard_shortcuts.requests": "para abrir a lista dos pedidos de seguidor",
+  "keyboard_shortcuts.requests": "abrir a lista dos pedidos de seguidor",
-  "keyboard_shortcuts.search": "Focar barra de pesquisa",
+  "keyboard_shortcuts.search": "focar barra de pesquisa",
   "keyboard_shortcuts.spoilers": "para mostrar/esconder o campo AC",
-  "keyboard_shortcuts.start": "para abrir a coluna dos \"primeiros passos\"",
+  "keyboard_shortcuts.start": "abrir a coluna dos \"primeiros passos\"",
-  "keyboard_shortcuts.toggle_hidden": "para mostrar/esconder texto atrás de CW",
+  "keyboard_shortcuts.toggle_hidden": "mostrar / esconder texto atrás do aviso de conteúdo",
-  "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar media",
+  "keyboard_shortcuts.toggle_sensitivity": "mostrar / ocultar multimédia",
-  "keyboard_shortcuts.toot": "para compor um novo toot",
+  "keyboard_shortcuts.toot": "criar uma nova publicação",
-  "keyboard_shortcuts.unfocus": "para remover o foco da área de texto/pesquisa",
+  "keyboard_shortcuts.unfocus": "remover o foco da área de texto / pesquisa",
-  "keyboard_shortcuts.up": "para mover para cima na lista",
+  "keyboard_shortcuts.up": "mover para cima na lista",
   "lightbox.close": "Fechar",
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
+  "lightbox.zoom_in": "Ampliar para o tamanho real",
+  "lightbox.zoom_out": "Ajustar para caber",
   "limited_account_hint.action": "Exibir perfil mesmo assim",
   "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores de {domain}.",
   "link_preview.author": "Por {name}",
   "link_preview.more_from_author": "Mais de {name}",
   "link_preview.shares": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
+  "lists.add_member": "Adicionar",
+  "lists.add_to_list": "Adicionar à lista",
+  "lists.add_to_lists": "Adicionar {name} às listas",
+  "lists.create": "Criar",
+  "lists.create_a_list_to_organize": "Criar uma nova lista para organizar a cronologia na página inicial",
+  "lists.create_list": "Criar lista",
   "lists.delete": "Eliminar lista",
+  "lists.done": "Concluído",
   "lists.edit": "Editar lista",
+  "lists.exclusive": "Ocultar membros na página inicial",
+  "lists.exclusive_hint": "Se alguém estiver nesta lista, oculte-o na cronologia da sua página inicial para evitar ver as publicações deles duas vezes.",
+  "lists.find_users_to_add": "Encontrar utilizadores adicionar",
+  "lists.list_members": "Membros da lista",
+  "lists.list_members_count": "{count, plural, one {# membro} other {# membros}}",
+  "lists.list_name": "Nome da lista",
+  "lists.new_list_name": "Nome da nova lista",
+  "lists.no_lists_yet": "Ainda não existem listas.",
+  "lists.no_members_yet": "Ainda não existem membros.",
+  "lists.no_results_found": "Nenhuns resultados encontrados.",
+  "lists.remove_member": "Remover",
   "lists.replies_policy.followed": "Qualquer utilizador seguido",
   "lists.replies_policy.list": "Membros da lista",
   "lists.replies_policy.none": "Ninguém",
+  "lists.save": "Guardar",
+  "lists.search": "Pesquisar",
+  "lists.show_replies_to": "Incluir respostas da lista de membros para",
   "load_pending": "{count, plural, one {# novo item} other {# novos itens}}",
   "loading_indicator.label": "A carregar…",
   "media_gallery.hide": "Esconder",
   "moved_to_account_banner.text": "A sua conta {disabledAccount} está, no momento, desativada, porque você migrou para {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Ocultar das notificações",
   "mute_modal.hide_options": "Ocultar opções",
-  "mute_modal.indefinite": "Até que eu os tire do silêncio",
+  "mute_modal.indefinite": "Até que eu deixe de o ocultar",
   "mute_modal.show_options": "Mostrar opções",
-  "mute_modal.they_can_mention_and_follow": "Eles podem mencioná-lo e segui-lo, mas você não os verá.",
+  "mute_modal.they_can_mention_and_follow": "Ele pode mencioná-lo e segui-lo, mas você não o verá.",
-  "mute_modal.they_wont_know": "Eles não saberão que foram silenciados.",
+  "mute_modal.they_wont_know": "Ele não saberá que o ocultou.",
-  "mute_modal.title": "Silenciar utilizador?",
+  "mute_modal.title": "Ocultar utilizador?",
-  "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
+  "mute_modal.you_wont_see_mentions": "Não verá publicações que mencionem este utilizador.",
-  "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
+  "mute_modal.you_wont_see_posts": "Não verá as publicações dele e ele não poderá ver as suas publicações.",
   "navigation_bar.about": "Sobre",
   "navigation_bar.administration": "Administração",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
   "navigation_bar.community_timeline": "Cronologia local",
-  "navigation_bar.compose": "Escrever novo toot",
+  "navigation_bar.compose": "Escrever nova publicação",
   "navigation_bar.direct": "Menções privadas",
   "navigation_bar.discover": "Descobrir",
   "navigation_bar.domain_blocks": "Domínios escondidos",
   "navigation_bar.explore": "Explorar",
   "navigation_bar.favourites": "Favoritos",
-  "navigation_bar.filters": "Palavras silenciadas",
+  "navigation_bar.filters": "Palavras ocultadas",
   "navigation_bar.follow_requests": "Seguidores pendentes",
-  "navigation_bar.followed_tags": "Hashtags seguidas",
+  "navigation_bar.followed_tags": "Etiquetas seguidas",
   "navigation_bar.follows_and_followers": "Seguindo e seguidores",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Sair",
   "navigation_bar.moderation": "Moderação",
-  "navigation_bar.mutes": "Utilizadores silenciados",
+  "navigation_bar.mutes": "Utilizadores ocultados",
   "navigation_bar.opened_in_classic_interface": "Por norma, publicações, contas, e outras páginas específicas são abertas na interface web clássica.",
   "navigation_bar.personal": "Pessoal",
   "navigation_bar.pins": "Publicações fixadas",
@@ -485,9 +543,14 @@
   "notification.admin.report_statuses_other": "{name} denunciou {target}",
   "notification.admin.sign_up": "{name} inscreveu-se",
   "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} inscreveram-se",
+  "notification.annual_report.message": "O seu #Wrapstodon {year} está à espera! Revela os destaques e os momentos memoráveis do seu ano no Mastodon!",
+  "notification.annual_report.view": "Ver #Wrapstodon",
   "notification.favourite": "{name} assinalou a sua publicação como favorita",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> assinalou a sua publicação como favorita",
+  "notification.favourite_pm": "{name} favoritou a sua menção privada",
+  "notification.favourite_pm.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro favoritou} other {# outros favoritaram}}</a> a sua menção privada",
   "notification.follow": "{name} começou a seguir-te",
+  "notification.follow.name_and_others": "{name} e <a>{count, plural, one {# outro seguiu-o} other {# outros seguiram-no}}</a>",
   "notification.follow_request": "{name} pediu para segui-lo",
   "notification.follow_request.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} pediram para segui-lo",
   "notification.label.mention": "Menção",
@@ -495,6 +558,7 @@
   "notification.label.private_reply": "Resposta privada",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menção",
+  "notification.mentioned_you": "{name} mencionou-o",
   "notification.moderation-warning.learn_more": "Saber mais",
   "notification.moderation_warning": "Recebeu um aviso de moderação",
   "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
@@ -506,8 +570,8 @@
   "notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
   "notification.own_poll": "A sua sondagem terminou",
   "notification.poll": "Terminou uma sondagem em que votou",
-  "notification.reblog": "{name} reforçou a tua publicação",
+  "notification.reblog": "{name} impulsionou a tua publicação",
-  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> reforçaram a sua publicação",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> impulsionaram a sua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
   "notification.relationships_severance_event.domain_block": "Um administrador de {from} bloqueou {target}, incluindo {followersCount} dos seus seguidores e {followingCount, plural, one {# conta} other {# contas}} que segue.",
@@ -545,10 +609,11 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.follow_request": "Novos pedidos de seguidor:",
+  "notifications.column_settings.group": "Agrupar",
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Resultados da sondagem:",
   "notifications.column_settings.push": "Notificações Push",
-  "notifications.column_settings.reblog": "Reforços:",
+  "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Reproduzir som",
   "notifications.column_settings.status": "Novas publicações:",
@@ -556,7 +621,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Destacar notificações por ler",
   "notifications.column_settings.update": "Edições:",
   "notifications.filter.all": "Todas",
-  "notifications.filter.boosts": "Reforços",
+  "notifications.filter.boosts": "Impulsos",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menções",
@@ -588,17 +653,21 @@
   "notifications_permission_banner.enable": "Ativar notificações no ambiente de trabalho",
   "notifications_permission_banner.how_to_control": "Para receber notificações quando o Mastodon não estiver aberto, ative as notificações no ambiente de trabalho. Depois da sua ativação, pode controlar precisamente quais tipos de interações geram notificações, através do botão {icon} acima.",
   "notifications_permission_banner.title": "Nunca perca nada",
+  "onboarding.follows.back": "Voltar",
+  "onboarding.follows.done": "Concluído",
   "onboarding.follows.empty": "Infelizmente, não é possível mostrar resultados neste momento. Pode tentar utilizar a pesquisa ou navegar na página \"Explorar\" para encontrar pessoas para seguir ou tentar novamente mais tarde.",
+  "onboarding.follows.search": "Pesquisar",
+  "onboarding.follows.title": "Siga pessoas para começar",
   "onboarding.profile.discoverable": "Permitir que o meu perfil seja descoberto",
   "onboarding.profile.discoverable_hint": "Quando opta pela possibilidade de ser descoberto no Mastodon, as suas mensagens podem aparecer nos resultados de pesquisa e nas tendências, e o seu perfil pode ser sugerido a pessoas com interesses semelhantes aos seus.",
   "onboarding.profile.display_name": "Nome a apresentar",
   "onboarding.profile.display_name_hint": "O seu nome completo ou o seu nome divertido…",
   "onboarding.profile.note": "Bio",
-  "onboarding.profile.note_hint": "Pode @mencionar outras pessoas ou #hashtags…",
+  "onboarding.profile.note_hint": "Pode @mencionar outras pessoas e usar #etiquetas…",
   "onboarding.profile.save_and_continue": "Guardar e continuar",
   "onboarding.profile.title": "Configuração do perfil",
-  "onboarding.profile.upload_avatar": "Carregar foto de perfil",
+  "onboarding.profile.upload_avatar": "Enviar foto de perfil",
-  "onboarding.profile.upload_header": "Carregar cabeçalho do perfil",
+  "onboarding.profile.upload_header": "Enviar cabeçalho do perfil",
   "password_confirmation.exceeds_maxlength": "A confirmação da palavra-passe excedeu o tamanho máximo ",
   "password_confirmation.mismatching": "A confirmação da palavra-passe não corresponde",
   "picture_in_picture.restore": "Colocá-lo de volta",
@@ -619,15 +688,15 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
-  "privacy.unlisted.additional": "Isto comporta-se exatamente como público, exceto que a publicação não aparecerá em feeds nem em etiquetas, explorar ou pesquisa Mastodon, mesmo que tenha optado por isso na sua conta.",
+  "privacy.unlisted.additional": "Este comportamento é exatamente igual ao do público, exceto que a publicação não aparecerá em cronologias, nas etiquetas, ao explorar ou na pesquisa do Mastodon, mesmo que tenha optado por participar em toda a sua conta.",
   "privacy.unlisted.long": "Menos fanfarras algorítmicas",
   "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
-  "regeneration_indicator.label": "A carregar…",
+  "regeneration_indicator.please_stand_by": "Por favor, aguarde.",
-  "regeneration_indicator.sublabel": "A tua página inicial está a ser preparada!",
+  "regeneration_indicator.preparing_your_home_feed": "A preparar a cronologia na sua página inicial…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural,one {# dia} other {# dias}} atrás",
   "relative_time.full.hours": "{number, plural,one {# hora}other {# horas}} atrás",
@@ -656,8 +725,8 @@
   "report.comment.title": "Há algo mais que pensa que devemos saber?",
   "report.forward": "Reencaminhar para {target}",
   "report.forward_hint": "A conta é de outro servidor. Enviar uma cópia da anónima da denúncia para lá também?",
-  "report.mute": "Silenciar",
+  "report.mute": "Ocultar",
-  "report.mute_explanation": "Não verá as publicações deles. Eles ainda poderão segui-lo e ver as suas publicações e não saberão que estão silenciados.",
+  "report.mute_explanation": "Não verá as publicações dele. Ele não poderá ver as suas publicações nem de o seguir. Ele não saberá que o ocultou.",
   "report.next": "Seguinte",
   "report.placeholder": "Comentários adicionais",
   "report.reasons.dislike": "Não gosto disto",
@@ -681,7 +750,7 @@
   "report.thanks.title": "Não quer ver isto?",
   "report.thanks.title_actionable": "Obrigado por denunciar. Iremos analisar.",
   "report.unfollow": "Deixar de seguir @{name}",
-  "report.unfollow_explanation": "Está a seguir esta conta. Para não voltar a ver as publicações desta conta na sua página inicial, deixe de a seguir.",
+  "report.unfollow_explanation": "Está a seguir esta conta. Para não voltar a ver as publicações desta conta na cronologia da sua página inicial, deixe de a seguir.",
   "report_notification.attached_statuses": "{count, plural,one {{count} publicação} other {{count} publicações}} em anexo",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "conteúdo ilegal",
@@ -696,7 +765,7 @@
   "search.placeholder": "Pesquisar",
   "search.quick_action.account_search": "Perfis com correspondência a {x}",
   "search.quick_action.go_to_account": "Ir para o perfil {x}",
-  "search.quick_action.go_to_hashtag": "Ir para a hashtag {x}",
+  "search.quick_action.go_to_hashtag": "Ir para a etiqueta {x}",
   "search.quick_action.open_url": "Abrir ligação no Mastodon",
   "search.quick_action.status_search": "Publicações com correspondência a {x}",
   "search.search_or_paste": "Pesquisar ou introduzir URL",
@@ -711,15 +780,18 @@
   "search_results.accounts": "Perfis",
   "search_results.all": "Tudo",
   "search_results.hashtags": "Etiquetas",
+  "search_results.no_results": "Sem resultados.",
+  "search_results.no_search_yet": "Tente procurar por publicações, perfis ou etiquetas.",
   "search_results.see_all": "Ver todos",
   "search_results.statuses": "Publicações",
+  "search_results.title": "Pesquisar por \"{q}\"",
   "server_banner.about_active_users": "Pessoas que utilizaram este servidor nos últimos 30 dias (Utilizadores Ativos Mensais)",
   "server_banner.active_users": "utilizadores ativos",
   "server_banner.administered_by": "Administrado por:",
   "server_banner.is_one_of_many": "{domain} é um dos muitos servidores Mastodon independentes que pode utilizar para participar no fediverso.",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Criar conta",
-  "sign_in_banner.follow_anyone": "Siga alguém no fediverso e veja tudo em ordem cronológica. Sem algoritmos, anúncios ou clickbait à vista.",
+  "sign_in_banner.follow_anyone": "Siga qualquer pessoa no fediverso e veja tudo por ordem cronológica. Sem algoritmos, anúncios ou caça-cliques à vista.",
   "sign_in_banner.mastodon_is": "O Mastodon é a melhor maneira de acompanhar o que está a acontecer.",
   "sign_in_banner.sign_in": "Iniciar sessão",
   "sign_in_banner.sso_redirect": "Inicie sessão ou registe-se",
@@ -728,8 +800,8 @@
   "status.admin_status": "Abrir esta publicação na interface de moderação",
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Guardar nos marcadores",
-  "status.cancel_reblog_private": "Deixar de reforçar",
+  "status.cancel_reblog_private": "Retirar impulso",
-  "status.cannot_reblog": "Não é possível partilhar esta publicação",
+  "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
   "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar hiperligação para a publicação",
   "status.delete": "Eliminar",
@@ -751,25 +823,25 @@
   "status.media_hidden": "Media escondida",
   "status.mention": "Mencionar @{name}",
   "status.more": "Mais",
-  "status.mute": "Silenciar @{name}",
+  "status.mute": "Ocultar @{name}",
-  "status.mute_conversation": "Silenciar conversa",
+  "status.mute_conversation": "Ocultar conversa",
   "status.open": "Expandir",
   "status.pin": "Afixar no perfil",
   "status.pinned": "Publicação afixada",
   "status.read_more": "Ler mais",
-  "status.reblog": "Partilhar",
+  "status.reblog": "Impulsionar",
-  "status.reblog_private": "Partilhar com a visibilidade original",
+  "status.reblog_private": "Impulsionar com a visibilidade original",
-  "status.reblogged_by": "{name} reforçou",
+  "status.reblogged_by": "{name} impulsionou",
-  "status.reblogs": "{count, plural, one {partilha} other {partilhas}}",
+  "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
-  "status.reblogs.empty": "Ainda ninguém reforçou esta publicação. Quando alguém o fizer, ele irá aparecer aqui.",
+  "status.reblogs.empty": "Ainda ninguém impulsionou esta publicação. Quando alguém o fizer, aparecerá aqui.",
-  "status.redraft": "Apagar & reescrever",
+  "status.redraft": "Eliminar e reescrever",
   "status.remove_bookmark": "Retirar dos marcadores",
   "status.replied_in_thread": "Responder na conversa",
   "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder à conversa",
   "status.report": "Denunciar @{name}",
-  "status.sensitive_warning": "Conteúdo problemático",
+  "status.sensitive_warning": "Conteúdo sensível",
   "status.share": "Partilhar",
   "status.show_less_all": "Mostrar menos para todas",
   "status.show_more_all": "Mostrar mais para todas",
@@ -778,13 +850,14 @@
   "status.translate": "Traduzir",
   "status.translated_from_with": "Traduzido do {lang} usando {provider}",
   "status.uncached_media_warning": "Pré-visualização não disponível",
-  "status.unmute_conversation": "Deixar de silenciar esta conversa",
+  "status.unmute_conversation": "Desocultar esta conversa",
   "status.unpin": "Desafixar do perfil",
   "subscribed_languages.lead": "Após a alteração, apenas as publicações nos idiomas selecionados aparecerão na sua página inicial e listas. Não selecione nenhum para receber publicações de todos os idiomas.",
   "subscribed_languages.save": "Guardar alterações",
   "subscribed_languages.target": "Alterar idiomas subscritos para {target}",
   "tabs_bar.home": "Início",
   "tabs_bar.notifications": "Notificações",
+  "terms_of_service.title": "Termos do serviço",
   "time_remaining.days": "{número, plural, um {# day} outro {# days}} faltam",
   "time_remaining.hours": "{número, plural, um {# hour} outro {# hours}} faltam",
   "time_remaining.minutes": "{número, plural, um {# minute} outro {# minutes}} faltam",
@@ -792,7 +865,7 @@
   "time_remaining.seconds": "{número, plural, um {# second} outro {# seconds}} faltam",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} {days, plural, one {no último dia} other {nos últimos {days} dias}}",
   "trends.trending_now": "Tendências atuais",
-  "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",
+  "ui.beforeunload": "O seu rascunho será perdido se abandonar o Mastodon.",
   "units.short.billion": "{count}MM",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}m",
@@ -802,6 +875,11 @@
   "upload_error.poll": "Não é permitido o envio de ficheiros em sondagens.",
   "upload_form.audio_description": "Descreva para pessoas com diminuição da acuidade auditiva",
   "upload_form.description": "Descreva para pessoas com diminuição da acuidade visual",
+  "upload_form.drag_and_drop.instructions": "Para escolher um anexo multimédia, prima espaço ou enter. Enquanto arrasta, utilize as teclas de setas para mover o anexo multimédia em qualquer direção. Prima espaço ou enter novamente para largar o anexo multimédia na sua nova posição ou prima escape para cancelar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo multimédia {item} foi descartado.",
+  "upload_form.drag_and_drop.on_drag_end": "O anexo multimédia {item} foi descartado.",
+  "upload_form.drag_and_drop.on_drag_over": "O anexo multimédia {item} foi movido.",
+  "upload_form.drag_and_drop.on_drag_start": "O anexo multimédia {item} foi escolhido.",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
   "upload_form.video_description": "Descreva para pessoas com diminuição da acuidade auditiva ou visual",
@@ -811,7 +889,7 @@
   "upload_modal.choose_image": "Escolher imagem",
   "upload_modal.description_placeholder": "Grave e cabisbaixo, o filho justo zelava pela querida mãe doente",
   "upload_modal.detect_text": "Detetar texto na imagem",
-  "upload_modal.edit_media": "Editar media",
+  "upload_modal.edit_media": "Editar multimédia",
   "upload_modal.hint": "Clique ou arraste o círculo na pré-visualização para escolher o ponto focal que será sempre visível em todas as miniaturas.",
   "upload_modal.preparing_ocr": "A preparar o reconhecimento de caracteres (OCR)…",
   "upload_modal.preview_label": "Pré-visualizar ({ratio})",
@@ -824,8 +902,8 @@
   "video.expand": "Expandir vídeo",
   "video.fullscreen": "Ecrã completo",
   "video.hide": "Esconder vídeo",
-  "video.mute": "Silenciar",
+  "video.mute": "Desativar som",
   "video.pause": "Pausar",
   "video.play": "Reproduzir",
-  "video.unmute": "Deixar de silenciar"
+  "video.unmute": "Ativar som"
 }

app/javascript/mastodon/locales/ro.json

@@ -279,13 +279,6 @@
   "home.pending_critical_update.link": "Vezi noutăți",
   "home.pending_critical_update.title": "Actualizare critică de securitate disponibilă!",
   "home.show_announcements": "Afișează anunțurile",
-  "interaction_modal.description.favourite": "Cu un cont pe Mastodon, poți adăuga această postare la favorite pentru a-l informa pe autorul ei că o apreciezi și pentru a o salva pentru mai târziu.",
-  "interaction_modal.description.follow": "Cu un cont Mastodon, poți urmări pe {name} pentru a vedea postările sale în cronologia ta principală.",
-  "interaction_modal.description.reblog": "Cu un cont pe Mastodon, poți distribui această postare pentru a le-o arăta și celor abonați ție.",
-  "interaction_modal.description.reply": "Cu un cont pe Mastodon, poți răspunde acestei postări.",
-  "interaction_modal.login.action": "Du-mă acasă",
-  "interaction_modal.login.prompt": "Adresa serverului tău acasă, de ex. mastodon.social",
-  "interaction_modal.no_account_yet": "Nu ești încă pe Mastodon?",
   "interaction_modal.on_another_server": "Pe un alt server",
   "interaction_modal.on_this_server": "Pe acest server",
   "interaction_modal.title.follow": "Urmărește pe {name}",
@@ -421,8 +414,6 @@
   "privacy_policy.last_updated": "Ultima actualizare în data de {date}",
   "privacy_policy.title": "Politică de confidențialitate",
   "refresh": "Reîncarcă",
-  "regeneration_indicator.label": "Se încarcă…",
-  "regeneration_indicator.sublabel": "Cronologia ta principală este în curs de pregătire!",
   "relative_time.days": "{number}z",
   "relative_time.full.days": "acum {number, plural, one {o zi} few {# zile} other {# de zile}}",
   "relative_time.full.hours": "acum {number, plural, one {o oră} few {# ore} other {# de ore}}",

app/javascript/mastodon/locales/ru.json

@@ -362,6 +362,7 @@
   "footer.privacy_policy": "Политика конфиденциальности",
   "footer.source_code": "Исходный код",
   "footer.status": "Статус",
+  "footer.terms_of_service": "Пользовательское соглашение",
   "generic.saved": "Сохранено",
   "getting_started.heading": "Начать",
   "hashtag.admin_moderation": "Открыть интерфейс модератора для #{name}",
@@ -406,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Игнорировать уведомления от людей, которые не следят за вами?",
   "ignore_notifications_modal.not_following_title": "Игнорировать уведомления от людей, за которыми вы не следите?",
   "ignore_notifications_modal.private_mentions_title": "Игнорировать уведомления о нежелательных личных сообщениях?",
-  "interaction_modal.description.favourite": "С учётной записью Mastodon, вы можете добавить этот пост в избранное, чтобы сохранить его на будущее и дать автору знать, что пост вам понравился.",
+  "interaction_modal.action.favourite": "Вы можете добавить этот пост в избранное со своей учётной записью.",
-  "interaction_modal.description.follow": "С учётной записью Mastodon вы можете подписаться на {name}, чтобы получать их посты в своей домашней ленте.",
+  "interaction_modal.action.follow": "Вы можете подписаться со своей учётной записью.",
-  "interaction_modal.description.reblog": "С учётной записью Mastodon, вы можете продвинуть этот пост, чтобы поделиться им со своими подписчиками.",
+  "interaction_modal.action.reblog": "Вы можете продвинуть этот пост со своей учётной записью.",
-  "interaction_modal.description.reply": "Вы можете ответить на этот пост с учётной записью Mastodon.",
+  "interaction_modal.action.reply": "Вы можете ответить на этот пост со своей учётной записью.",
-  "interaction_modal.description.vote": "Вы сможете проголосовать тут имея аккаунт Mastodon.",
+  "interaction_modal.action.vote": "Вы можете проголосовать в этом опросе со своей учётной записью.",
-  "interaction_modal.login.action": "Перейти на домашнюю страницу",
+  "interaction_modal.go": "Вперёд!",
-  "interaction_modal.login.prompt": "Домен вашего домашнего сервера, например, mastodon.social",
+  "interaction_modal.no_account_yet": "У вас нет никакой учётной записи?",
-  "interaction_modal.no_account_yet": "Еще не на Mastodon?",
   "interaction_modal.on_another_server": "На другом сервере",
   "interaction_modal.on_this_server": "На этом сервере",
-  "interaction_modal.sign_in": "Вы не вошли в систему на этом сервере. Где размещена ваша учетная запись?",
-  "interaction_modal.sign_in_hint": "Совет: Это сайт, на котором вы зарегистрировались. Если вы не помните, найдите приветственное письмо в своем почтовом ящике. Вы также можете ввести свое полное имя пользователя! (например, @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Добавить пост {name} в избранное",
   "interaction_modal.title.follow": "Подписаться на {name}",
-  "interaction_modal.title.reblog": "Продвинуть публикацию {name}",
+  "interaction_modal.title.reblog": "Продвинуть пост {name}",
   "interaction_modal.title.reply": "Ответить на пост {name}",
   "interaction_modal.title.vote": "Голосовать в опросе {name}",
+  "interaction_modal.username_prompt": "Например {example}",
   "intervals.full.days": "{number, plural, one {# день} few {# дня} other {# дней}}",
   "intervals.full.hours": "{number, plural, one {# час} few {# часа} other {# часов}}",
   "intervals.full.minutes": "{number, plural, one {# минута} few {# минуты} other {# минут}}",
@@ -548,6 +547,8 @@
   "notification.annual_report.view": "Перейти к #Wrapstodon",
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
   "notification.favourite.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> добавили ваш пост в избранное",
+  "notification.favourite_pm": "{name} добавил(а) ваше личное сообщение в избранное",
+  "notification.favourite_pm.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} отправил запрос на подписку",
@@ -694,8 +695,8 @@
   "privacy_policy.title": "Политика конфиденциальности",
   "recommended": "Рекомендуется",
   "refresh": "Обновить",
-  "regeneration_indicator.label": "Загрузка…",
+  "regeneration_indicator.please_stand_by": "Пожалуйста, подождите.",
-  "regeneration_indicator.sublabel": "Один момент, мы подготавливаем вашу ленту!",
+  "regeneration_indicator.preparing_your_home_feed": "Готовим вашу ленту…",
   "relative_time.days": "{number} д",
   "relative_time.full.days": "{number, plural, one {# день} many {# дней} other {# дня}} назад",
   "relative_time.full.hours": "{number, plural, one {# час} many {# часов} other {# часа}} назад",
@@ -779,8 +780,11 @@
   "search_results.accounts": "Профили",
   "search_results.all": "Все",
   "search_results.hashtags": "Хэштеги",
+  "search_results.no_results": "Ничего не найдено.",
+  "search_results.no_search_yet": "Попробуйте поискать посты, профили или хэштеги.",
   "search_results.see_all": "Показать все",
   "search_results.statuses": "Посты",
+  "search_results.title": "Поиск \"{q}\"",
   "server_banner.about_active_users": "Люди, заходившие на этот сервер за последние 30 дней (ежемесячные активные пользователи)",
   "server_banner.active_users": "активные пользователи",
   "server_banner.administered_by": "Управляется:",
@@ -853,6 +857,7 @@
   "subscribed_languages.target": "Изменить языки подписки для {target}",
   "tabs_bar.home": "Главная",
   "tabs_bar.notifications": "Уведомления",
+  "terms_of_service.title": "Пользовательское соглашение",
   "time_remaining.days": "{number, plural, one {остался # день} few {осталось # дня} many {осталось # дней} other {осталось # дней}}",
   "time_remaining.hours": "{number, plural, one {остался # час} few {осталось # часа} many {осталось # часов} other {осталось # часов}}",
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",

app/javascript/mastodon/locales/sa.json

@@ -249,9 +249,6 @@
   "home.column_settings.show_replies": "उत्तराणि दर्शय",
   "home.hide_announcements": "विज्ञापनानि प्रच्छादय",
   "home.show_announcements": "विज्ञापनानि दर्शय",
-  "interaction_modal.description.follow": "मास्टोडोनि एकौण्टा {name} नाम्ना उपभोक्तारमनुसर्तुं शक्नोषि तस्य पत्राणि लब्धुं ते गृहनिरासे।",
-  "interaction_modal.description.reblog": "मास्टोडिनि एकौण्टा पत्रमिदं बुस्तिति कर्तुं शक्नोषि ते स्वानुसारिणो भागं कर्तुम्।",
-  "interaction_modal.description.reply": "मास्टोडोनि एकौण्टा पत्रमिदं प्रतिवादयितुं शक्नोषि।",
   "interaction_modal.on_another_server": "अन्यस्मिन्सर्वरि",
   "interaction_modal.on_this_server": "अस्मिन्सर्वरि",
   "interaction_modal.title.follow": "{name} अनुसर",
@@ -383,8 +380,6 @@
   "privacy_policy.last_updated": "अन्तिमवारं परिवर्तितम् {date}",
   "privacy_policy.title": "गोपनीयतानीतिः",
   "refresh": "नवीकुरु",
-  "regeneration_indicator.label": "आरोपयति…",
-  "regeneration_indicator.sublabel": "तव गृहनिरासः सज्जीकृतोऽस्ति!",
   "relative_time.days": "{number}दि",
   "relative_time.full.days": "{number, plural, one {# दिनं} other {# दिनानि}} पूर्वम्",
   "relative_time.full.hours": "{number, plural, one {# होरा} other {# होराः}} पूर्वम्",

app/javascript/mastodon/locales/sc.json

@@ -338,10 +338,6 @@
   "ignore_notifications_modal.filter_instead": "Opuru filtra",
   "ignore_notifications_modal.filter_to_act_users": "As a pòdere ancora atzetare, refudare o sinnalare a utentes",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrare agiudat a evitare possìbiles confusiones",
-  "interaction_modal.description.reply": "Podes rispòndere a custa publicatzione cun unu contu de Mastodon.",
-  "interaction_modal.login.action": "Torra a sa pàgina printzipale",
-  "interaction_modal.login.prompt": "Su domìniu de su serbidore domèsticu tuo, pro esempru mastodon.social",
-  "interaction_modal.no_account_yet": "Non ses in Mastodon?",
   "interaction_modal.on_this_server": "In custu serbidore",
   "interaction_modal.title.follow": "Sighi a {name}",
   "interaction_modal.title.reply": "Risponde a sa publicatzione de {name}",
@@ -551,8 +547,6 @@
   "privacy_policy.title": "Polìtica de riservadesa",
   "recommended": "Cussigiadu",
   "refresh": "Atualiza",
-  "regeneration_indicator.label": "Carrighende…",
-  "regeneration_indicator.sublabel": "Preparende sa lìnia de tempus printzipale tua.",
   "relative_time.days": "{number} dies a oe",
   "relative_time.full.days": "{number, plural, one {# die} other {# dies}} a oe",
   "relative_time.full.hours": "{number, plural, one {# ora} other {# oras}} a immoe",

app/javascript/mastodon/locales/sco.json

@@ -234,9 +234,6 @@
   "home.column_settings.show_replies": "Shaw replies",
   "home.hide_announcements": "Hide annooncements",
   "home.show_announcements": "Shaw annooncements",
-  "interaction_modal.description.follow": "Wi a accoont on Mastodon, ye kin follae {name} tae get their posts on yer hame feed.",
-  "interaction_modal.description.reblog": "Wi a accoont on Mastodon, ye kin heeze this post tae ahare it wi yer ain follaers.",
-  "interaction_modal.description.reply": "Wi a accoont on Mastodon, ye kin sen a repone tae this post.",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
   "interaction_modal.title.follow": "Follae {name}",
@@ -365,8 +362,6 @@
   "privacy_policy.last_updated": "Last updatit {date}",
   "privacy_policy.title": "Privacy Policy",
   "refresh": "Refresh",
-  "regeneration_indicator.label": "Loadin…",
-  "regeneration_indicator.sublabel": "Yer hame feed is gettin sortit fir ye!",
   "relative_time.days": "{number}t",
   "relative_time.full.days": "{number, plural, one {# day} other {# days}} syne",
   "relative_time.full.hours": "{number, plural, one {# oor} other {# oors}} syne",

app/javascript/mastodon/locales/si.json

@@ -211,7 +211,6 @@
   "home.hide_announcements": "නිවේදන සඟවන්න",
   "home.pending_critical_update.link": "යාවත්කාල බලන්න",
   "home.show_announcements": "නිවේදන පෙන්වන්න",
-  "interaction_modal.login.action": "මුලට ගෙනයන්න",
   "interaction_modal.on_another_server": "වෙනත් සේවාදායකයක",
   "interaction_modal.on_this_server": "මෙම සේවාදායකයෙහි",
   "interaction_modal.title.favourite": "{name}ගේ ලිපිය ප්‍රිය කරන්න",
@@ -314,7 +313,6 @@
   "privacy.public.short": "ප්‍රසිද්ධ",
   "privacy_policy.title": "රහස්‍යතා ප්‍රතිපත්තිය",
   "refresh": "නැවුම් කරන්න",
-  "regeneration_indicator.label": "පූරණය වෙමින්…",
   "relative_time.days": "ද. {number}",
   "relative_time.full.days": "{number, plural, one {දවස් #} other {දවස් #}} කට පෙර",
   "relative_time.full.hours": "{number, plural, one {පැය #} other {පැය #}} කට පෙර",

app/javascript/mastodon/locales/sk.json

@@ -99,6 +99,7 @@
   "annual_report.summary.most_used_hashtag.none": "Žiaden",
   "annual_report.summary.new_posts.new_posts": "nové príspevky",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Nepovieme Berniemu.",
+  "annual_report.summary.thanks": "Vďaka, že si súčasťou Mastodonu!",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skryť zvuk",
   "block_modal.show_less": "Zobraziť menej",
@@ -333,8 +334,10 @@
   "footer.privacy_policy": "Pravidlá ochrany súkromia",
   "footer.source_code": "Zobraziť zdrojový kód",
   "footer.status": "Stav",
+  "footer.terms_of_service": "Podmienky prevozu",
   "generic.saved": "Uložené",
   "getting_started.heading": "Začíname",
+  "hashtag.admin_moderation": "Otvor moderovacie rozhranie pre #{name}",
   "hashtag.column_header.tag_mode.all": "a {additional}",
   "hashtag.column_header.tag_mode.any": "alebo {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
@@ -350,6 +353,9 @@
   "hashtag.follow": "Sledovať hashtag",
   "hashtag.unfollow": "Prestať sledovať hashtag",
   "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
+  "hints.profiles.posts_may_be_missing": "Niektoré príspevky z tohto profilu môžu chýbať.",
+  "hints.profiles.see_more_followers": "Pozri viac nasledovateľov na {domain}",
+  "hints.profiles.see_more_follows": "Pozri viac nasledovateľov na {domain}",
   "hints.profiles.see_more_posts": "Pozri viac príspevkov na {domain}",
   "hints.threads.replies_may_be_missing": "Odpovede z ostatných serverov môžu chýbať.",
   "hints.threads.see_more": "Pozri viac odpovedí na {domain}",
@@ -368,17 +374,8 @@
   "ignore_notifications_modal.not_followers_title": "Nevšímať si oznámenia od ľudí, ktorí ťa nenasledujú?",
   "ignore_notifications_modal.not_following_title": "Nevšímať si oznámenia od ľudí, ktorých nenasleduješ?",
   "ignore_notifications_modal.private_mentions_title": "Nevšímať si oznámenia o nevyžiadaných súkromných spomínaniach?",
-  "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.",
-  "interaction_modal.description.reblog": "S účtom na Mastodone môžete tento príspevok zdeľať so svojimi sledovateľmi.",
-  "interaction_modal.description.reply": "S účtom na Mastodone môžete na tento príspevok odpovedať.",
-  "interaction_modal.login.action": "Prejsť domov",
-  "interaction_modal.login.prompt": "Doména vášho domovského servera, napr. mastodon.social",
-  "interaction_modal.no_account_yet": "Nie ste na Mastodone?",
   "interaction_modal.on_another_server": "Na inom serveri",
   "interaction_modal.on_this_server": "Na tomto serveri",
-  "interaction_modal.sign_in": "Na tomto serveri nie ste prihlásený. Kde je váš účet hostený?",
-  "interaction_modal.sign_in_hint": "Tip: Toto je webová stránka, na ktorej ste sa zaregistrovali. Ak si nepamätáte, pohľadajte uvítací e-mail vo svojej schránke. Môžete tiež zadať svoje celé používateľské meno (napr. @Mastodon@mastodon.social).",
   "interaction_modal.title.favourite": "Ohviezdičkovať príspevok od {name}",
   "interaction_modal.title.follow": "Sledovať {name}",
   "interaction_modal.title.reblog": "Zdieľať príspevok od {name}",
@@ -498,6 +495,7 @@
   "notification.admin.report_statuses_other": "{name} nahlásil/a {target}",
   "notification.admin.sign_up": "Nová registráciu účtu {name}",
   "notification.favourite": "{name} hviezdičkuje váš príspevok",
+  "notification.favourite_pm": "{name} obľúbil/a tvoje súkromné spomenutie",
   "notification.follow": "{name} vás sleduje",
   "notification.follow_request": "{name} vás žiada sledovať",
   "notification.label.mention": "Zmienka",
@@ -510,6 +508,8 @@
   "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_none": "Tvoj účet dostal upozornenie od moderátora.",
+  "notification.moderation_warning.action_sensitive": "Tvoje príspevky budú odteraz označované ako chúlostivé.",
   "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",
@@ -615,8 +615,6 @@
   "privacy_policy.title": "Pravidlá ochrany súkromia",
   "recommended": "Odporúčané",
   "refresh": "Obnoviť",
-  "regeneration_indicator.label": "Načítavanie…",
-  "regeneration_indicator.sublabel": "Váš domovský kanál sa pripravuje.",
   "relative_time.days": "{number} dní",
   "relative_time.full.days": "Pred {number, plural, one {# dňom} other {# dňami}}",
   "relative_time.full.hours": "Pred {number, plural, one {# hodinou} other {# hodinami}}",
@@ -699,8 +697,11 @@
   "search_results.accounts": "Profily",
   "search_results.all": "Všetky",
   "search_results.hashtags": "Hashtagy",
+  "search_results.no_results": "Žiadne výsledky.",
+  "search_results.no_search_yet": "Skús vyhľadávať príspevky, profily, alebo hashtagy.",
   "search_results.see_all": "Zobraziť všetky",
   "search_results.statuses": "Príspevky",
+  "search_results.title": "Hľadaj \"{q}\"",
   "server_banner.about_active_users": "Ľudia používajúci tento server za posledných 30 dní (aktívni používatelia za mesiac)",
   "server_banner.active_users": "Aktívne účty",
   "server_banner.administered_by": "Správa servera:",
@@ -746,6 +747,7 @@
   "status.reblogs.empty": "Nikto ešte tento príspevok nezdieľal. Keď tak niekto urobí, zobrazí sa to tu.",
   "status.redraft": "Vymazať a prepísať",
   "status.remove_bookmark": "Odstrániť záložku",
+  "status.replied_in_thread": "Odpovedal/a vo vlákne",
   "status.replied_to": "Odpoveď na {name}",
   "status.reply": "Odpovedať",
   "status.replyAll": "Odpovedať vo vlákne",
@@ -766,6 +768,7 @@
   "subscribed_languages.target": "Zmeniť prihlásené jazyky pre {target}",
   "tabs_bar.home": "Domov",
   "tabs_bar.notifications": "Upozornenia",
+  "terms_of_service.title": "Podmienky prevozu",
   "time_remaining.days": "Ostáva{number, plural, one { # deň} few {jú # dni} many { # dní} other { # dní}}",
   "time_remaining.hours": "Ostáva{number, plural, one { # hodina} few {jú # hodiny} many { # hodín} other { # hodín}}",
   "time_remaining.minutes": "Ostáva{number, plural, one { # minúta} few {jú # minúty} many { # minút} other { # minút}}",

app/javascript/mastodon/locales/sl.json

@@ -368,17 +368,8 @@
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtriranje pomaga pri izogibanju morebitni zmedi",
   "ignore_notifications_modal.filter_to_review_separately": "Filtrirana obvestila lahko pregledate ločeno",
   "ignore_notifications_modal.ignore": "Prezri obvestila",
-  "interaction_modal.description.favourite": "Z računom na Mastodonu lahko to objavo postavite med priljubljene in tako avtorju nakažete, da jo cenite, in jo shranite za kasneje.",
-  "interaction_modal.description.follow": "Z računom na Mastodonu lahko sledite {name}, da prejemate njihove objave v svoj domači vir.",
-  "interaction_modal.description.reblog": "Z računom na Mastodonu lahko izpostavite to objavo, tako da jo delite s svojimi sledilci.",
-  "interaction_modal.description.reply": "Z računom na Mastodonu lahko odgovorite na to objavo.",
-  "interaction_modal.login.action": "Vrni me domov",
-  "interaction_modal.login.prompt": "Domena vašega domačega strežnika, npr. mastodon.social",
-  "interaction_modal.no_account_yet": "Niste na Mastodonu?",
   "interaction_modal.on_another_server": "Na drugem strežniku",
   "interaction_modal.on_this_server": "Na tem strežniku",
-  "interaction_modal.sign_in": "Niste prijavljeni v ta strežnik. Kje gostuje vaš račun?",
-  "interaction_modal.sign_in_hint": "Nasvet: To je spletno mesto, na katerem ste se prijavili. Če se ne spomnite, poiščite pozdravno e-poštno sporočilo v svojem e-poštnem predalu. Vpišete lahko tudi svoje celotno uporabniško ime (npr. @Mastodon@mastodon.social)!",
   "interaction_modal.title.favourite": "Daj objavo {name} med priljubljene",
   "interaction_modal.title.follow": "Sledi {name}",
   "interaction_modal.title.reblog": "Izpostavi objavo {name}",
@@ -620,8 +611,6 @@
   "privacy_policy.title": "Pravilnik o zasebnosti",
   "recommended": "Priporočeno",
   "refresh": "Osveži",
-  "regeneration_indicator.label": "Nalaganje …",
-  "regeneration_indicator.sublabel": "Vaš domači vir se pripravlja!",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "{number, plural, one {pred # dnem} two {pred # dnevoma} few {pred # dnevi} other {pred # dnevi}}",
   "relative_time.full.hours": "{number, plural, one {pred # uro} two {pred # urama} few {pred # urami} other {pred # urami}}",

app/javascript/mastodon/locales/sq.json

@@ -402,23 +402,21 @@
   "ignore_notifications_modal.not_followers_title": "Të shpërfillen njoftime nga persona që s’ju ndjekin?",
   "ignore_notifications_modal.not_following_title": "Të shpërfillen njoftime nga persona që s’i ndiqni?",
   "ignore_notifications_modal.private_mentions_title": "Të shpërfillen njoftime nga Përmendje Private të pakërkuara?",
-  "interaction_modal.description.favourite": "Me një llogari në Mastodon, mund ta tregoni këtë postim si të parapëlqyer, për t’i bërë të ditur autorit se e çmoni dhe e ruani për më vonë.",
+  "interaction_modal.action.favourite": "Që të vazhdoni, lypset t’i vini shenjë si i parapëlqyer që nga llogaria juaj.",
-  "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.action.follow": "Që të vazhdoni, lypset ta ndiqni që nga llogaria juaj.",
-  "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.action.reblog": "Që të vazhdoni, lypset ta riblogoni që nga llogaria juaj.",
-  "interaction_modal.description.reply": "Me një llogari në Mastodon, mund t’i përgjigjeni këtij postimi.",
+  "interaction_modal.action.reply": "Që të vazhdoni, lypset të përgjigjeni që nga llogaria juaj.",
-  "interaction_modal.description.vote": "Me një llogari në Mastodon, mund të votoni në këtë pyetësor.",
+  "interaction_modal.action.vote": "Që të vazhdoni, lypset të votoni që nga llogaria juaj.",
-  "interaction_modal.login.action": "Shpjemëni në shtëpi",
+  "interaction_modal.go": "Shko",
-  "interaction_modal.login.prompt": "Përkatësia e shërbyesit tuaj vatër, p.sh. mastodon.social",
+  "interaction_modal.no_account_yet": "S’keni ende një llogari?",
-  "interaction_modal.no_account_yet": "S’gjendeni në Mastodon?",
   "interaction_modal.on_another_server": "Në një tjetër shërbyes",
   "interaction_modal.on_this_server": "Në këtë shërbyes",
-  "interaction_modal.sign_in": "S’keni bërë hyrjen në këtë shërbyes. Ku strehoet llogaria juaj?",
-  "interaction_modal.sign_in_hint": "Ndihmës: Ky është sajti ku u regjistruat. Nëse s’e mbani mend, shihni te email-et tuaj për email-in e mirëseardhjes. Mudeni edhe të jepni emrin tuaj të plotë të përdoruesi! (p.sh. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Bëje të parapëlqyer postimin e {name}",
   "interaction_modal.title.follow": "Ndiq {name}",
   "interaction_modal.title.reblog": "Përforconi postimin e {name}",
   "interaction_modal.title.reply": "Përgjigjuni postimit të {name}",
   "interaction_modal.title.vote": "Votoni te pyetësori nga {name}",
+  "interaction_modal.username_prompt": "P.sh., {example}",
   "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}}",
@@ -692,8 +690,8 @@
   "privacy_policy.title": "Rregulla Privatësie",
   "recommended": "E rekomanduar",
   "refresh": "Rifreskoje",
-  "regeneration_indicator.label": "Po ngarkohet…",
+  "regeneration_indicator.please_stand_by": "Ju lutemi, mos u largoni.",
-  "regeneration_indicator.sublabel": "Prurja juaj vetjake po përgatitet!",
+  "regeneration_indicator.preparing_your_home_feed": "Po përgatitet prurja juaj e kreut…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# ditë} other {# ditë}} më parë",
   "relative_time.full.hours": "{number, plural, one {# orë} other {# orë}} më parë",
@@ -777,8 +775,11 @@
   "search_results.accounts": "Profile",
   "search_results.all": "Krejt",
   "search_results.hashtags": "Hashtag-ë",
+  "search_results.no_results": "S’ka përfundime.",
+  "search_results.no_search_yet": "Provoni të kërkoni për postime, profile ose hashtag-ë.",
   "search_results.see_all": "Shihni krejt",
   "search_results.statuses": "Mesazhe",
+  "search_results.title": "Kërko për “{q}”",
   "server_banner.about_active_users": "Persona që përdorin këtë shërbyes gjatë 30 ditëve të fundit (Përdorues Mujorë Aktivë)",
   "server_banner.active_users": "përdorues aktivë",
   "server_banner.administered_by": "Administruar nga:",

app/javascript/mastodon/locales/sr-Latn.json

@@ -336,17 +336,8 @@
   "home.pending_critical_update.link": "Pogledajte ažuriranja",
   "home.pending_critical_update.title": "Dostupno je kritično bezbednosno ažuriranje!",
   "home.show_announcements": "Prijaži najave",
-  "interaction_modal.description.favourite": "Sa nalogom na Mastodon-u, možete označiti ovu objavu kao omiljenu kako biste dali do znanja autoru da vam se sviđa i sačuvali je za kasnije.",
-  "interaction_modal.description.follow": "Sa nalogom na Mastodon-u, možete pratiti korisnika {name} kako biste primali njegove objave na početnoj stranici.",
-  "interaction_modal.description.reblog": "Sa nalogom na Mastodon-u, možete podržati ovu objavu kako bite je podelili sa svojim pratiocima.",
-  "interaction_modal.description.reply": "Sa nalogom na Mastodon-u, možete odgovoriti na ovu objavu.",
-  "interaction_modal.login.action": "Vodi me na početnu stranicu",
-  "interaction_modal.login.prompt": "Domen vašeg matičnog servera, npr. mastodon.social",
-  "interaction_modal.no_account_yet": "Niste na Mastodon-u?",
   "interaction_modal.on_another_server": "Na drugom serveru",
   "interaction_modal.on_this_server": "Na ovom serveru",
-  "interaction_modal.sign_in": "Niste prijavljeni na ovaj server. Gde je hostovan vaš nalog?",
-  "interaction_modal.sign_in_hint": "Savet: To je veb sajt na kome ste se registrovali. Ako se ne sećate, potražite e-poruku dobrodošlice u svom prijemnom sandučetu. Takođe možete uneti svoje puno korisničko ime! (npr. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Označi objavu korisnika {name} kao omiljenu",
   "interaction_modal.title.follow": "Zaprati {name}",
   "interaction_modal.title.reblog": "Podrži objavu korisnika {name}",
@@ -548,8 +539,6 @@
   "privacy_policy.title": "Politika privatnosti",
   "recommended": "Preporučeno",
   "refresh": "Osveži",
-  "regeneration_indicator.label": "Učitavanje…",
-  "regeneration_indicator.sublabel": "Vaša početna stranica se priprema!",
   "relative_time.days": "{number} dan.",
   "relative_time.full.days": "Pre {number, plural, one {# dan} few {# dana} other {# dana}}",
   "relative_time.full.hours": "pre {number, plural, one {# sat} few {# sata} other {# sati}}",

app/javascript/mastodon/locales/sr.json

@@ -336,17 +336,8 @@
   "home.pending_critical_update.link": "Погледајте ажурирања",
   "home.pending_critical_update.title": "Доступно је критично безбедносно ажурирање!",
   "home.show_announcements": "Пријажи најаве",
-  "interaction_modal.description.favourite": "Са налогом на Mastodon-у, можете означити ову објаву као омиљену како бисте дали до знања аутору да вам се свиђа и сачували је за касније.",
-  "interaction_modal.description.follow": "Са налогом на Mastodon-у, можете пратити корисника {name} како бисте примали његове објаве на почетној страници.",
-  "interaction_modal.description.reblog": "Са налогом на Mastodon-у, можете подржати ову објаву како бите је поделили са својим пратиоцима.",
-  "interaction_modal.description.reply": "Са налогом на Mastodon-у, можете одговорити на ову објаву.",
-  "interaction_modal.login.action": "Води ме на почетну страницу",
-  "interaction_modal.login.prompt": "Домен вашег матичног сервера, нпр. mastodon.social",
-  "interaction_modal.no_account_yet": "Нисте на Mastodon-у?",
   "interaction_modal.on_another_server": "На другом серверу",
   "interaction_modal.on_this_server": "На овом серверу",
-  "interaction_modal.sign_in": "Нисте пријављени на овај сервер. Где је хостован ваш налог?",
-  "interaction_modal.sign_in_hint": "Савет: То је веб сајт на коме сте се регистровали. Ако се не сећате, потражите е-поруку добродошлице у свом пријемном сандучету. Такође можете унети своје пуно корисничко име! (нпр. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Означи објаву корисника {name} као омиљену",
   "interaction_modal.title.follow": "Запрати {name}",
   "interaction_modal.title.reblog": "Подржи објаву корисника {name}",
@@ -548,8 +539,6 @@
   "privacy_policy.title": "Политика приватности",
   "recommended": "Препоручено",
   "refresh": "Освежи",
-  "regeneration_indicator.label": "Учитавање…",
-  "regeneration_indicator.sublabel": "Ваша почетна страница се припрема!",
   "relative_time.days": "{number} дан.",
   "relative_time.full.days": "Пре {number, plural, one {# дан} few {# дана} other {# дана}}",
   "relative_time.full.hours": "пре {number, plural, one {# сат} few {# сата} other {# сати}}",

app/javascript/mastodon/locales/sv.json

@@ -403,18 +403,8 @@
   "ignore_notifications_modal.not_followers_title": "Vill du ignorera aviseringar från personer som inte följer dig?",
   "ignore_notifications_modal.not_following_title": "Vill du blockera aviseringar från personer som du inte följer dig?",
   "ignore_notifications_modal.private_mentions_title": "Vill du ignorera aviseringar från oönskade privata omnämningar?",
-  "interaction_modal.description.favourite": "Med ett Mastodon-konto kan du favoritmarkera detta inlägg för att visa författaren att du gillar det och för att spara det till senare.",
-  "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se deras inlägg i ditt hemflöde.",
-  "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
-  "interaction_modal.description.reply": "Med ett Mastodon-konto kan du svara på detta inlägg.",
-  "interaction_modal.description.vote": "Med ett konto på Mastodon kan du delta i denna omröstning.",
-  "interaction_modal.login.action": "Ta hem mig",
-  "interaction_modal.login.prompt": "Domän för din hemserver, t.ex. mastodon.social",
-  "interaction_modal.no_account_yet": "Inte på Mastodon?",
   "interaction_modal.on_another_server": "På en annan server",
   "interaction_modal.on_this_server": "På denna server",
-  "interaction_modal.sign_in": "Du är inte inloggad på den här servern. Var är ditt konto ifrån?",
-  "interaction_modal.sign_in_hint": "Tips: Det är den webbplats där du registrerade dig. Om du inte kommer ihåg, leta efter välkomstmeddelandet i din mejlinkorg. Du kan också ange ditt fullständiga användarnamn! (t.ex. @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "Favoritmarkera {name}s inlägg",
   "interaction_modal.title.follow": "Följ {name}",
   "interaction_modal.title.reblog": "Boosta {name}s inlägg",
@@ -484,9 +474,12 @@
   "lists.new_list_name": "Nytt listnamn",
   "lists.no_lists_yet": "Ännu inga listor.",
   "lists.no_members_yet": "Inga medlemmar ännu.",
+  "lists.remove_member": "Ta bort",
   "lists.replies_policy.followed": "Alla användare som följs",
   "lists.replies_policy.list": "Medlemmar i listan",
   "lists.replies_policy.none": "Ingen",
+  "lists.save": "Spara",
+  "lists.search": "Sök",
   "load_pending": "{count, plural, one {# nytt objekt} other {# nya objekt}}",
   "loading_indicator.label": "Laddar…",
   "media_gallery.hide": "Dölj",
@@ -643,7 +636,10 @@
   "notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
   "notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
   "notifications_permission_banner.title": "Missa aldrig något",
+  "onboarding.follows.back": "Tillbaka",
+  "onboarding.follows.done": "Färdig",
   "onboarding.follows.empty": "Tyvärr kan inga resultat visas just nu. Du kan prova att använda sökfunktionen eller utforska sidan för att hitta personer att följa, eller försök igen senare.",
+  "onboarding.follows.search": "Sök",
   "onboarding.profile.discoverable": "Gör min profil upptäckbar",
   "onboarding.profile.discoverable_hint": "När du väljer att vara upptäckbar på Mastodon kan dina inlägg visas i sök- och trendresultat, och din profil kan föreslås för personer med liknande intressen som du.",
   "onboarding.profile.display_name": "Visningsnamn",
@@ -681,8 +677,6 @@
   "privacy_policy.title": "Integritetspolicy",
   "recommended": "Rekommenderas",
   "refresh": "Läs om",
-  "regeneration_indicator.label": "Laddar…",
-  "regeneration_indicator.sublabel": "Ditt hemmaflöde förbereds!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# dag} other {# dagar}} sedan",
   "relative_time.full.hours": "{number, plural, one {# timme} other {# timmar}} sedan",

app/javascript/mastodon/locales/ta.json

@@ -292,8 +292,6 @@
   "privacy.change": "நிலை தனியுரிமை",
   "privacy.public.short": "பொது",
   "refresh": "புதுப்பி",
-  "regeneration_indicator.label": "சுமையேற்றம்…",
-  "regeneration_indicator.sublabel": "உங்கள் வீட்டு ஊட்டம் தயார் செய்யப்படுகிறது!",
   "relative_time.days": "{number}நா",
   "relative_time.hours": "{number}ம",
   "relative_time.just_now": "இப்பொழுது",

app/javascript/mastodon/locales/te.json

@@ -198,8 +198,6 @@
   "poll_button.remove_poll": "ఎన్నికను తొలగించు",
   "privacy.change": "స్టేటస్ గోప్యతను సర్దుబాటు చేయండి",
   "privacy.public.short": "ప్రజా",
-  "regeneration_indicator.label": "లోడ్ అవుతోంది…",
-  "regeneration_indicator.sublabel": "మీ హోమ్ ఫీడ్ సిద్ధమవుతోంది!",
   "relative_time.just_now": "ఇప్పుడు",
   "reply_indicator.cancel": "రద్దు చెయ్యి",
   "report.forward": "{target}కి ఫార్వార్డ్ చేయండి",

app/javascript/mastodon/locales/th.json

@@ -97,6 +97,9 @@
   "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.most_used_hashtag.none": "ไม่มี",
   "annual_report.summary.new_posts.new_posts": "โพสต์ใหม่",
   "annual_report.summary.percentile.we_wont_tell_bernie": "เราจะไม่บอก Bernie",
@@ -124,6 +127,7 @@
   "bundle_column_error.routing.body": "ไม่พบหน้าที่ขอ คุณแน่ใจหรือไม่ว่า URL ในแถบที่อยู่ถูกต้อง?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "ปิด",
+  "bundle_modal_error.message": "มีบางอย่างผิดพลาดขณะโหลดหน้าจอนี้",
   "bundle_modal_error.retry": "ลองอีกครั้ง",
   "closed_registrations.other_server_instructions": "เนื่องจาก Mastodon เป็นแบบกระจายศูนย์ คุณสามารถสร้างบัญชีในเซิร์ฟเวอร์อื่นและยังคงโต้ตอบกับเซิร์ฟเวอร์นี้",
   "closed_registrations_modal.description": "ไม่สามารถสร้างบัญชีใน {domain} ได้ในปัจจุบัน แต่โปรดจำไว้ว่าคุณไม่จำเป็นต้องมีบัญชีใน {domain} โดยเฉพาะเพื่อใช้ Mastodon",
@@ -156,6 +160,7 @@
   "column_header.pin": "ปักหมุด",
   "column_header.show_settings": "แสดงการตั้งค่า",
   "column_header.unpin": "ถอนหมุด",
+  "column_search.cancel": "ยกเลิก",
   "column_subheading.settings": "การตั้งค่า",
   "community.column_settings.local_only": "ในเซิร์ฟเวอร์เท่านั้น",
   "community.column_settings.media_only": "สื่อเท่านั้น",
@@ -198,6 +203,8 @@
   "confirmations.edit.confirm": "แก้ไข",
   "confirmations.edit.message": "การแก้ไขในตอนนี้จะเขียนทับข้อความที่คุณกำลังเขียนในปัจจุบัน คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ?",
   "confirmations.edit.title": "เขียนทับโพสต์?",
+  "confirmations.follow_to_list.confirm": "ติดตามและเพิ่มไปยังรายการ",
+  "confirmations.follow_to_list.title": "ติดตามผู้ใช้?",
   "confirmations.logout.confirm": "ออกจากระบบ",
   "confirmations.logout.message": "คุณแน่ใจหรือไม่ว่าต้องการออกจากระบบ?",
   "confirmations.logout.title": "ออกจากระบบ?",
@@ -348,8 +355,10 @@
   "footer.privacy_policy": "นโยบายความเป็นส่วนตัว",
   "footer.source_code": "ดูโค้ดต้นฉบับ",
   "footer.status": "สถานะ",
+  "footer.terms_of_service": "เงื่อนไขการให้บริการ",
   "generic.saved": "บันทึกแล้ว",
   "getting_started.heading": "เริ่มต้นใช้งาน",
+  "hashtag.admin_moderation": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ #{name}",
   "hashtag.column_header.tag_mode.all": "และ {additional}",
   "hashtag.column_header.tag_mode.any": "หรือ {additional}",
   "hashtag.column_header.tag_mode.none": "โดยไม่มี {additional}",
@@ -391,18 +400,8 @@
   "ignore_notifications_modal.not_followers_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่ไม่ได้ติดตามคุณ?",
   "ignore_notifications_modal.not_following_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่คุณไม่ได้ติดตาม?",
   "ignore_notifications_modal.private_mentions_title": "เพิกเฉยการแจ้งเตือนจากการกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์?",
-  "interaction_modal.description.favourite": "ด้วยบัญชีใน Mastodon คุณสามารถชื่นชอบโพสต์นี้เพื่อแจ้งให้ผู้สร้างทราบว่าคุณชื่นชมโพสต์และบันทึกโพสต์ไว้สำหรับภายหลัง",
-  "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?",
   "interaction_modal.on_another_server": "ในเซิร์ฟเวอร์อื่น",
   "interaction_modal.on_this_server": "ในเซิร์ฟเวอร์นี้",
-  "interaction_modal.sign_in": "คุณไม่ได้เข้าสู่ระบบเซิร์ฟเวอร์นี้ บัญชีของคุณโฮสต์อยู่ที่ไหน?",
-  "interaction_modal.sign_in_hint": "เคล็ดลับ: นั่นคือเว็บไซต์ที่คุณได้ลงทะเบียน หากคุณจำไม่ได้ มองหาอีเมลต้อนรับในกล่องขาเข้าของคุณ คุณยังสามารถป้อนชื่อผู้ใช้เต็มของคุณ! (เช่น @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "ชื่นชอบโพสต์ของ {name}",
   "interaction_modal.title.follow": "ติดตาม {name}",
   "interaction_modal.title.reblog": "ดันโพสต์ของ {name}",
@@ -479,6 +478,7 @@
   "lists.replies_policy.list": "สมาชิกของรายการ",
   "lists.replies_policy.none": "ไม่มีใคร",
   "lists.save": "บันทึก",
+  "lists.search": "ค้นหา",
   "lists.show_replies_to": "รวมการตอบกลับจากสมาชิกของรายการถึง",
   "load_pending": "{count, plural, other {# รายการใหม่}}",
   "loading_indicator.label": "กำลังโหลด…",
@@ -531,6 +531,8 @@
   "notification.annual_report.view": "ดู #Wrapstodon",
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
   "notification.favourite.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ชื่นชอบโพสต์ของคุณ",
+  "notification.favourite_pm": "{name} ได้ชื่นชอบการกล่าวถึงแบบส่วนตัวของคุณ",
+  "notification.favourite_pm.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} ได้ขอติดตามคุณ",
@@ -635,7 +637,11 @@
   "notifications_permission_banner.enable": "เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป",
   "notifications_permission_banner.how_to_control": "เพื่อรับการแจ้งเตือนเมื่อ Mastodon ไม่ได้เปิด เปิดใช้งานการแจ้งเตือนบนเดสก์ท็อป คุณสามารถควบคุมชนิดของการโต้ตอบที่สร้างการแจ้งเตือนบนเดสก์ท็อปได้อย่างแม่นยำผ่านปุ่ม {icon} ด้านบนเมื่อเปิดใช้งานการแจ้งเตือน",
   "notifications_permission_banner.title": "ไม่พลาดสิ่งใด",
+  "onboarding.follows.back": "ย้อนกลับ",
+  "onboarding.follows.done": "เสร็จสิ้น",
   "onboarding.follows.empty": "น่าเสียดาย ไม่สามารถแสดงผลลัพธ์ได้ในตอนนี้ คุณสามารถลองใช้การค้นหาหรือเรียกดูหน้าสำรวจเพื่อค้นหาผู้คนที่จะติดตาม หรือลองอีกครั้งในภายหลัง",
+  "onboarding.follows.search": "ค้นหา",
+  "onboarding.follows.title": "ติดตามผู้คนเพื่อเริ่มต้นใช้งาน",
   "onboarding.profile.discoverable": "ทำให้โปรไฟล์ของฉันสามารถค้นพบได้",
   "onboarding.profile.discoverable_hint": "เมื่อคุณเลือกรับความสามารถในการค้นพบใน Mastodon โพสต์ของคุณอาจปรากฏในผลลัพธ์การค้นหาและกำลังนิยม และอาจเสนอแนะโปรไฟล์ของคุณให้กับผู้คนที่มีความสนใจคล้ายกับคุณ",
   "onboarding.profile.display_name": "ชื่อที่แสดง",
@@ -673,8 +679,6 @@
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
   "recommended": "แนะนำ",
   "refresh": "รีเฟรช",
-  "regeneration_indicator.label": "กำลังโหลด…",
-  "regeneration_indicator.sublabel": "กำลังเตรียมฟีดหน้าแรกของคุณ!",
   "relative_time.days": "{number} วัน",
   "relative_time.full.days": "{number, plural, other {# วัน}}ที่แล้ว",
   "relative_time.full.hours": "{number, plural, other {# ชั่วโมง}}ที่แล้ว",
@@ -758,8 +762,10 @@
   "search_results.accounts": "โปรไฟล์",
   "search_results.all": "ทั้งหมด",
   "search_results.hashtags": "แฮชแท็ก",
+  "search_results.no_results": "ไม่มีผลลัพธ์",
   "search_results.see_all": "ดูทั้งหมด",
   "search_results.statuses": "โพสต์",
+  "search_results.title": "ค้นหาสำหรับ \"{q}\"",
   "server_banner.about_active_users": "ผู้คนที่ใช้เซิร์ฟเวอร์นี้ในระหว่าง 30 วันที่ผ่านมา (ผู้ใช้ที่ใช้งานอยู่รายเดือน)",
   "server_banner.active_users": "ผู้ใช้ที่ใช้งานอยู่",
   "server_banner.administered_by": "ดูแลโดย:",
@@ -832,6 +838,7 @@
   "subscribed_languages.target": "เปลี่ยนภาษาที่บอกรับสำหรับ {target}",
   "tabs_bar.home": "หน้าแรก",
   "tabs_bar.notifications": "การแจ้งเตือน",
+  "terms_of_service.title": "เงื่อนไขการให้บริการ",
   "time_remaining.days": "เหลืออีก {number, plural, other {# วัน}}",
   "time_remaining.hours": "เหลืออีก {number, plural, other {# ชั่วโมง}}",
   "time_remaining.minutes": "เหลืออีก {number, plural, other {# นาที}}",

app/javascript/mastodon/locales/tok.json

@@ -101,9 +101,12 @@
   "block_modal.title": "o weka ala weka e jan",
   "block_modal.you_wont_see_mentions": "nimi ona li lon toki suli la sina lukin ala e toki ni.",
   "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
+  "boost_modal.reblog": "o wawa ala wawa e toki?",
+  "boost_modal.undo_reblog": "o pini ala pini e wawa toki?",
   "bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
   "bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
   "bundle_column_error.error.title": "ike a!",
+  "bundle_column_error.network.body": "mi lukin pana e lipu la, pakala li lon. ken la, pakala li tan ilo nanpa sina. ken la, pakala li tan ilo nanpa suli pi ma kulupu ni.",
   "bundle_column_error.network.title": "pakala la ilo sina li toki ala tawa ilo ante",
   "bundle_column_error.retry": "o ni sin",
   "bundle_column_error.return": "o tawa tomo",
@@ -113,6 +116,7 @@
   "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
   "bundle_modal_error.retry": "o ni sin",
   "closed_registrations.other_server_instructions": "kulupu Masoton li jo e jan lawa mute, la sina ken pali e sijelo lon ma ante, li ken lukin e ijo pi ma ni.",
+  "closed_registrations_modal.description": "tenpo ni la, sina ken ala pali e jan lon ma {domain}. taso sina wile kepeken ilo Masoton la, sina ken pali e jan lon ma ante lon ala ma {domain}.",
   "closed_registrations_modal.find_another_server": "o alasa e ma ante",
   "closed_registrations_modal.title": "sina kama lon kulupu Masoton",
   "column.about": "sona",
@@ -120,6 +124,7 @@
   "column.bookmarks": "awen toki",
   "column.community": "linja tenpo pi ma ni",
   "column.create_list": "o pali e kulupu",
+  "column.direct": "mu len",
   "column.directory": "o lukin e jan",
   "column.domain_blocks": "ma pi wile ala lukin",
   "column.edit_list": "o ante e kulupu",
@@ -153,6 +158,7 @@
   "compose_form.poll.duration": "tenpo pana",
   "compose_form.poll.multiple": "pana mute",
   "compose_form.poll.option_placeholder": "ken nanpa {number}",
+  "compose_form.poll.single": "toki pi wan taso",
   "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
   "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
   "compose_form.poll.type": "nasin",
@@ -161,18 +167,24 @@
   "compose_form.reply": "o toki lon ijo ni",
   "compose_form.save_changes": "o sin e ni",
   "compose_form.spoiler.marked": "o weka e toki pi ijo ike ken",
+  "compose_form.spoiler.unmarked": "o pali e toki pi ijo ike ken",
+  "compose_form.spoiler_placeholder": "toki pi ijo ike ken (sina ken ala e ni)",
   "confirmation_modal.cancel": "o pini",
   "confirmations.block.confirm": "o weka",
   "confirmations.delete.confirm": "o weka",
   "confirmations.delete.message": "sina wile ala wile weka e toki ni?",
+  "confirmations.delete.title": "o weka ala weka e toki?",
   "confirmations.delete_list.confirm": "o weka",
   "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
+  "confirmations.delete_list.title": "o weka ala weka e kulupu lipu?",
   "confirmations.discard_edit_media.confirm": "o weka",
   "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
   "confirmations.edit.confirm": "o ante",
   "confirmations.edit.message": "sina ante e toki sina la toki pali sina li weka. sina wile ala wile e ni?",
+  "confirmations.edit.title": "o weka ala weka e toki? ni la, toki li kama toki sin.",
   "confirmations.logout.confirm": "o weka",
   "confirmations.logout.message": "sina wile ala wile weka",
+  "confirmations.logout.title": "o weka?",
   "confirmations.mute.confirm": "o len",
   "confirmations.redraft.confirm": "o weka o pali sin e toki",
   "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
@@ -180,6 +192,7 @@
   "confirmations.reply.message": "sina toki lon toki ni la toki pali sina li weka. sina wile ala wile e ni?",
   "confirmations.unfollow.confirm": "o pini kute",
   "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
+  "content_warning.show": "o lukin",
   "conversation.delete": "o weka e toki ni",
   "conversation.mark_as_read": "ni o sin ala",
   "conversation.open": "o lukin e toki",
@@ -194,11 +207,17 @@
   "dismissable_banner.community_timeline": "ni li toki pi tenpo poka tawa ale tan jan lon ma lawa pi nimi {domain}.",
   "dismissable_banner.dismiss": "o weka",
   "domain_block_modal.block": "o weka e ma",
+  "domain_block_modal.they_wont_know": "ona li sona ala e ni: sina weka e ona.",
+  "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, other {jan {followersCountDisplay}}} li kute e sina la, ona kama kute ala e sina. sina kute e {followingCount, plural,other {jan {followingCountDisplay}}} la, sina kama kute ala e ona.",
+  "domain_block_modal.you_will_lose_relationships": "jan li lon kulupu ni la ona kute e sina la, ona li kama kute ala e sina. jan li lon kulupu ni la sina kute e ona la, sina kama kute ala e ona.",
   "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
   "domain_pill.server": "ma",
+  "domain_pill.their_handle": "nimi pi ona taso li ni:",
   "domain_pill.username": "nimi jan",
+  "domain_pill.your_username": "ni li nimi sina. ma sina la, sina taso li jo e ona. jan mute li lon ma ante la, ona li ken jo e nimi sama.",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
+  "emoji_button.clear": "o weka",
   "emoji_button.flags": "len ma",
   "emoji_button.food": "moku",
   "emoji_button.label": "o pana e sitelen pilin",
@@ -238,6 +257,7 @@
   "firehose.remote": "kulupu ante",
   "follow_request.authorize": "o ken",
   "follow_request.reject": "o ala",
+  "follow_suggestions.dismiss": "mi wile lukin sin ala e ni",
   "follow_suggestions.hints.friends_of_friends": "jan kute sina li lukin mute e toki pi jan ni.",
   "follow_suggestions.hints.most_followed": "jan mute lon ma {domain} li kute e jan ni.",
   "follow_suggestions.hints.most_interactions": "tenpo poka la jan mute pi ma {domain} li lukin mute e toki pi jan ni.",
@@ -257,8 +277,8 @@
   "hashtag.column_settings.tag_mode.all": "ale ni",
   "hashtag.column_settings.tag_mode.any": "wan ni",
   "hashtag.column_settings.tag_mode.none": "ala ni",
+  "hashtag.counter_by_uses": "{count, plural, other {toki {counter}}}",
   "home.pending_critical_update.link": "o lukin e ijo ilo sin",
-  "interaction_modal.login.action": "o lon tomo",
   "interaction_modal.on_another_server": "lon ma ante",
   "interaction_modal.on_this_server": "lon ma ni",
   "interaction_modal.title.favourite": "o suli e toki {name}",
@@ -333,7 +353,6 @@
   "poll.votes": "{votes, plural, other {pana #}}",
   "privacy.direct.long": "jan ale lon toki",
   "privacy.public.short": "tawa ale",
-  "regeneration_indicator.label": "ni li kama…",
   "relative_time.days": "{number}d",
   "relative_time.full.just_now": "tenpo ni",
   "relative_time.hours": "{number}h",

app/javascript/mastodon/locales/tr.json

@@ -407,23 +407,21 @@
   "ignore_notifications_modal.not_followers_title": "Takip etmeyen kişilerin bildirimlerini yoksay?",
   "ignore_notifications_modal.not_following_title": "Takip etmediğin kişilerin bildirimlerini yoksay?",
   "ignore_notifications_modal.private_mentions_title": "İstenmeyen özel bahsetmelerden gelen bildirimleri yoksay?",
-  "interaction_modal.description.favourite": "Bir Mastodon hesabıyla bu gönderiyi favorilerinize ekleyerek yazara gönderiyi beğendiğinizi bildirebilir ve daha sonrası için kaydedebilirsiniz.",
+  "interaction_modal.action.favourite": "Devam etmek için, hesabınızı kullanarak beğenmelisiniz.",
-  "interaction_modal.description.follow": "Mastodon'daki bir hesapla, {name} kişisini, ana akışınızdaki gönderilerini görmek üzere takip edebilirsiniz.",
+  "interaction_modal.action.follow": "Devam etmek için, hesabınızı kullanarak takip etmelisiniz.",
-  "interaction_modal.description.reblog": "Mastodon'daki bir hesapla, bu gönderiyi takipçilerinizle paylaşmak için tuşlayabilirsiniz.",
+  "interaction_modal.action.reblog": "Devam etmek için, hesabınızı kullanarak tekrar göndermelisiniz.",
-  "interaction_modal.description.reply": "Mastodon'daki bir hesapla, bu gönderiye yanıt verebilirsiniz.",
+  "interaction_modal.action.reply": "Devam etmek için, hesabınızı kullanarak yanıt vermelisiniz.",
-  "interaction_modal.description.vote": "Mastodon'daki bir hesapla, bu ankette oy kullanabilirsiniz.",
+  "interaction_modal.action.vote": "Devam etmek için, hesabınızı kullanarak oylamalısınız.",
-  "interaction_modal.login.action": "Anasayfaya geri dön",
+  "interaction_modal.go": "Git",
-  "interaction_modal.login.prompt": "Ev sunucunuzun etki alanı, örneğin mastodon.social",
+  "interaction_modal.no_account_yet": "Henüz bir hesabınız yok mu?",
-  "interaction_modal.no_account_yet": "Mastodon açık değil?",
   "interaction_modal.on_another_server": "Farklı bir sunucuda",
   "interaction_modal.on_this_server": "Bu sunucuda",
-  "interaction_modal.sign_in": "Bu sunucuya giriş yapmadınız. Hesabınız nerede barındırılıyor?",
-  "interaction_modal.sign_in_hint": "İpucu: Kaydolduğunuz web sitesi budur. Hatırlamıyorsanız, gelen kutunuzdaki hoş geldiniz e-postasını arayın. Tam kullanıcı adınızı da girebilirsiniz! (örneğin @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "{name} kişisinin gönderisini favorilerine ekle",
   "interaction_modal.title.follow": "{name} kişisini takip et",
   "interaction_modal.title.reblog": "{name} kişisinin gönderisini yeniden paylaş",
   "interaction_modal.title.reply": "{name} kişisinin gönderisine yanıt ver",
   "interaction_modal.title.vote": "{name} kullanıcısının anketinde oy kullan",
+  "interaction_modal.username_prompt": "Örnek: {example}",
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
   "intervals.full.minutes": "{number, plural, one {# dakika} other {# dakika}}",
@@ -697,8 +695,8 @@
   "privacy_policy.title": "Gizlilik Politikası",
   "recommended": "Önerilen",
   "refresh": "Yenile",
-  "regeneration_indicator.label": "Yükleniyor…",
+  "regeneration_indicator.please_stand_by": "Lütfen bekleyin.",
-  "regeneration_indicator.sublabel": "Ana akışın hazırlanıyor!",
+  "regeneration_indicator.preparing_your_home_feed": "Ana akışınız hazırlanıyor…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} önce",
   "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} önce",
@@ -782,8 +780,11 @@
   "search_results.accounts": "Profiller",
   "search_results.all": "Tümü",
   "search_results.hashtags": "Etiketler",
+  "search_results.no_results": "Sonuç yok.",
+  "search_results.no_search_yet": "Gönderiler, profiller veya etiketler için aramayı deneyin.",
   "search_results.see_all": "Tümünü gör",
   "search_results.statuses": "Gönderiler",
+  "search_results.title": "\"{q}\" için arama",
   "server_banner.about_active_users": "Bu sunucuyu son 30 günde kullanan insanlar (Aylık Etkin Kullanıcılar)",
   "server_banner.active_users": "etkin kullanıcılar",
   "server_banner.administered_by": "Yönetici:",

app/javascript/mastodon/locales/tt.json

@@ -229,9 +229,6 @@
   "home.column_settings.show_replies": "Җаваплар күрсәтү",
   "home.hide_announcements": "Игъланнарны яшерү",
   "home.show_announcements": "Белдерүләр бирегез",
-  "interaction_modal.description.follow": "Mastodon аккаунты белән сез иярә аласыз {name} аларның язмаларын өй тасмасында алу өчен.",
-  "interaction_modal.description.reblog": "Mastodon аккаунты ярдәмендә сез бу язманы үз шәкертләрегез белән уртаклашу өчен арттыра аласыз.",
-  "interaction_modal.description.reply": "Mastodon аккаунты белән сез бу язмага җавап бирә аласыз.",
   "interaction_modal.on_another_server": "Башка серверда",
   "interaction_modal.on_this_server": "Бу серверда",
   "interaction_modal.title.follow": "Иярү {name}",
@@ -327,7 +324,6 @@
   "privacy_policy.last_updated": "Соңгы яңарту {date}",
   "privacy_policy.title": "Хосусыйлык Сәясәте",
   "refresh": "Яңарту",
-  "regeneration_indicator.label": "Йөкләү...",
   "relative_time.days": "{number}к",
   "relative_time.full.days": "{number, plural, one {# көн} other {# көн}} элек",
   "relative_time.full.hours": "{number, plural, one {# сәгать} other {# сәгать}} элек",